diff --git a/src/backend/InvenTree/part/templates/part/bom.html b/src/backend/InvenTree/part/templates/part/bom.html index 76420441a06..71baa052498 100644 --- a/src/backend/InvenTree/part/templates/part/bom.html +++ b/src/backend/InvenTree/part/templates/part/bom.html @@ -26,5 +26,25 @@ {% include "filter_list.html" with id="bom" %} +
+ + +
+
+ + + diff --git a/src/backend/InvenTree/templates/js/translated/bom.js b/src/backend/InvenTree/templates/js/translated/bom.js index f54f96acc11..e3abc738855 100644 --- a/src/backend/InvenTree/templates/js/translated/bom.js +++ b/src/backend/InvenTree/templates/js/translated/bom.js @@ -1095,7 +1095,7 @@ function loadBomTable(table, options={}) { ); }, footerFormatter: function(data) { - // Display overall price range the "footer" of the price_range column + // Display overall price range in the "footer" of the price_range column var min_price = 0; var max_price = 0; @@ -1118,6 +1118,13 @@ function loadBomTable(table, options={}) { continue; } + // check if it is a consumable and add it only if required + var include_consumables_in_pricing = document.getElementById('include_consumables_in_bom_pricing').checked + if(row.consumable && !include_consumables_in_pricing){ + continue; + } + + // At this point, we have at least *some* information any_pricing = true; diff --git a/src/backend/InvenTree/templates/js/translated/forms.js b/src/backend/InvenTree/templates/js/translated/forms.js index 222cc55223f..38a8df0c40d 100644 --- a/src/backend/InvenTree/templates/js/translated/forms.js +++ b/src/backend/InvenTree/templates/js/translated/forms.js @@ -1646,22 +1646,6 @@ function addFieldCallbacks(fields, options) { function addFieldCallback(name, field, options) { const el = getFormFieldElement(name, options); - if (field.onEdit) { - el.change(function() { - - var value = getFormFieldValue(name, field, options); - let onEditHandlers = field.onEdit; - - if (!Array.isArray(onEditHandlers)) { - onEditHandlers = [onEditHandlers]; - } - - for (const onEdit of onEditHandlers) { - onEdit(value, name, field, options); - } - }); - } - if(field.onInput){ el.on('input', function(){