mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Fix for StockItem model
- Allow sales_order_line to be blank
This commit is contained in:
parent
6dd79af0b6
commit
3a71a4f63a
@ -230,10 +230,6 @@ function loadStockTable(table, options) {
|
||||
}
|
||||
|
||||
html = imageHoverIcon(thumb) + renderLink(name, url);
|
||||
|
||||
if (row.allocated) {
|
||||
html += `<span class='fas fa-bookmark label-right' title='StockItem has been allocated'></span>`;
|
||||
}
|
||||
|
||||
return html;
|
||||
}
|
||||
@ -261,9 +257,18 @@ function loadStockTable(table, options) {
|
||||
val = +val.toFixed(5);
|
||||
}
|
||||
|
||||
var text = renderLink(val, '/stock/item/' + row.pk + '/');
|
||||
var html = renderLink(val, `/stock/item/${row.pk}/`);
|
||||
|
||||
return text;
|
||||
if (row.allocated) {
|
||||
html += `<span class='fas fa-bookmark label-right' title='StockItem has been allocated'></span>`;
|
||||
}
|
||||
|
||||
// 70 = "LOST"
|
||||
if (row.status == 70) {
|
||||
html += `<span class='fas fa-question-circle label-right' title='StockItem is lost'></span>`;
|
||||
}
|
||||
|
||||
return html;
|
||||
}
|
||||
},
|
||||
{
|
||||
|
20
InvenTree/stock/migrations/0030_auto_20200422_0015.py
Normal file
20
InvenTree/stock/migrations/0030_auto_20200422_0015.py
Normal file
@ -0,0 +1,20 @@
|
||||
# Generated by Django 3.0.5 on 2020-04-22 00:15
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('order', '0023_auto_20200420_2309'),
|
||||
('stock', '0029_auto_20200421_2359'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='stockitem',
|
||||
name='sales_order_line',
|
||||
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='stock_items', to='order.SalesOrderLineItem'),
|
||||
),
|
||||
]
|
@ -373,7 +373,7 @@ class StockItem(MPTTModel):
|
||||
SalesOrderLineItem,
|
||||
on_delete=models.SET_NULL,
|
||||
related_name='stock_items',
|
||||
null=True)
|
||||
null=True, blank=True)
|
||||
|
||||
# last time the stock was checked / counted
|
||||
stocktake_date = models.DateField(blank=True, null=True)
|
||||
|
Loading…
Reference in New Issue
Block a user