Merge branch 'inventree:master' into price-history

2025-07-04 04:30:56 +00:00 · 2021-05-28 12:14:03 +02:00
parent b15c20611d 723a900388
commit 9cc81df276
36 changed files with 571 additions and 113 deletions
--- a/InvenTree/templates/js/bom.js
+++ b/InvenTree/templates/js/bom.js
@ -243,6 +243,22 @@ function loadBomTable(table, options) {
        }
    });

+    cols.push(
+    {
+        field: 'purchase_price_range',
+        title: '{% trans "Purchase Price Range" %}',
+        searchable: false,
+        sortable: true,
+    });
+
+    cols.push(
+    {
+        field: 'purchase_price_avg',
+        title: '{% trans "Purchase Price Average" %}',
+        searchable: false,
+        sortable: true,
+    });
+
    /*

    // TODO - Re-introduce the pricing column at a later stage,