inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 04:55:44 +00:00
Code Activity

Merge branch 'inventree:master' into internal-price

Browse Source
This commit is contained in:
Matthias Mair
2021-06-17 16:42:57 +02:00
committed by GitHub
parent dd58f89977 bc46cca9f0
commit 44464de2b6
44 changed files with 2596 additions and 2319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
InvenTree/templates/js/stock.js
View File

@ -159,7 +159,7 @@ function loadStockTestResultsTable(table, options) {
// Set "parent" for each existing row
tableData.forEach(function(item, idx) {
tableData[idx].parent = options.stock_item;
tableData[idx].parent = parent_node;
});
// Once the test template data are loaded, query for test results
@ -660,6 +660,11 @@ function loadStockTable(table, options) {
title: '{% trans "Last Updated" %}',
sortable: true,
},
{
field: 'purchase_price',
title: '{% trans "Purchase Price" %}',
sortable: true,
},
{
field: 'packaging',
title: '{% trans "Packaging" %}',