Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #678 from SchrodingersGat/on-order

Browse Source 
Add "On Order" badge
This commit is contained in:
Oliver 2020-03-26 14:53:54 +11:00 committed by GitHub
commit 864a21ac85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
InvenTree/InvenTree/static/script/inventree/part.js
View File

@ -182,17 +182,27 @@ function loadPartTable(table, url, options={}) {
searchable: false, searchable: false,
sortable: true, sortable: true,
formatter: function(value, row, index, field) { formatter: function(value, row, index, field) {
console.log("On order:", row.on_order);
var html = "";
var link = "stock";
if (value) { if (value) {
if (row.units) { if (row.units) {
value += ' <i><small>' + row.units + '</small></i>'; value += ' <i><small>' + row.units + '</small></i>';
} }
return renderLink(value, '/part/' + row.pk + '/stock/'); html = value;
}
else { } else if (row.on_order) {
return "<span class='label label-warning'>No Stock</span>"; value = "<span class='label label-primary'>On Order : " + row.on_order + "</span>";
link = "orders";
} else {
value ="<span class='label label-warning'>No Stock</span>";
} }
return renderLink(value, '/part/' + row.pk + "/" + link + "/");
} }
}); });

1
InvenTree/part/api.py
View File

@ -172,6 +172,7 @@ class PartList(generics.ListCreateAPIView):
'active', 'active',
).annotate( ).annotate(
in_stock=Sum('stock_items__quantity'), in_stock=Sum('stock_items__quantity'),
on_order=Sum('supplier_parts__purchase_order_line_items__quantity'),
) )
# TODO - Annotate total being built # TODO - Annotate total being built