inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-03 12:10:59 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master' into drf-api-forms

Browse Source
This commit is contained in:
Oliver
2021-07-03 12:35:40 +10:00
parent 55f8fefe79 d8f5cc7f56
commit 90a3a8a288
21 changed files with 6565 additions and 5674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -685,6 +685,20 @@ function loadStockTable(table, options) {
return renderLink(text, link);
}
},
{
field: 'supplier_part',
title: '{% trans "Supplier Part" %}',
formatter: function(value, row) {
if (!value) {
return '-';
}
var link = `/supplier-part/${row.supplier_part}/stock/`;
var text = `${row.supplier_part_detail.SKU}`;
return renderLink(text, link);
}
},
{
field: 'purchase_price',
title: '{% trans "Purchase Price" %}',

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

@ -205,7 +205,12 @@ function getAvailableTableFilters(tableKey) {
batch: {
title: '{% trans "Batch" %}',
description: '{% trans "Batch code" %}',
}
},
has_purchase_price: {
type: 'bool',
title: '{% trans "Has purchase price" %}',
description: '{% trans "Show stock items which have a purchase price set" %}',
},
};
}