inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-31 05:05:42 +00:00
Code Activity

Update BOM table to include variant stock information

Browse Source
This commit is contained in:
Oliver Walters
2022-04-15 22:45:22 +10:00
parent 7f07c52689
commit 6f5b560fb6
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
InvenTree/templates/js/translated/bom.js
View File

@@ -807,15 +807,27 @@ function loadBomTable(table, options={}) {
var url = `/part/${row.sub_part_detail.pk}/?display=part-stock`; var url = `/part/${row.sub_part_detail.pk}/?display=part-stock`;
// Calculate total "available" (unallocated) quantity // Calculate total "available" (unallocated) quantity
var total = row.available_stock + row.available_substitute_stock; var total = row.available_stock;
total += (row.available_substitute_stock || 0);
total += (row.available_variant_stock || 0);
var text = `${total}`; var text = `${total}`;
if (total <= 0) { if (total <= 0) {
text = `<span class='badge rounded-pill bg-danger'>{% trans "No Stock Available" %}</span>`; text = `<span class='badge rounded-pill bg-danger'>{% trans "No Stock Available" %}</span>`;
} else { } else {
if (row.available_substitute_stock > 0) { var extra = '';
text += `<span title='{% trans "Includes substitute stock" %}' class='fas fa-info-circle float-right icon-blue'></span>`; if (row.available_substitute_stock && row.available_variant_stock) {
extra = '{% trans "Includes variant and substitute stock" %}';
} else if (row.available_variant_stock) {
extra = '{% trans "Includes variant stock" %}';
} else if (row.available_substitute_stock) {
extra = '{% trans "Includes substitute stock" %}';
}
if (extra) {
text += `<span title='${extra}' class='fas fa-info-circle float-right icon-blue'></span>`;
} }
} }
@@ -910,7 +922,7 @@ function loadBomTable(table, options={}) {
formatter: function(value, row) { formatter: function(value, row) {
var can_build = 0; var can_build = 0;
var available = row.available_stock + row.available_substitute_stock; var available = row.available_stock + (row.available_substitute_stock || 0) + (row.available_variant_stock || 0);
if (row.quantity > 0) { if (row.quantity > 0) {
can_build = available / row.quantity; can_build = available / row.quantity;