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 remote-tracking branch 'inventree/master' into drf-api-forms

Browse Source
This commit is contained in:
Oliver
2021-06-29 09:57:03 +10:00
parent 374344d0e2 4eef3c99bc
commit 798bc17311
9 changed files with 131 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
InvenTree/templates/js/bom.js
View File

@ -259,26 +259,19 @@ function loadBomTable(table, options) {
sortable: true,
});
/*
// TODO - Re-introduce the pricing column at a later stage,
// once the pricing has been "fixed"
// O.W. 2020-11-24
cols.push(
{
field: 'price_range',
title: '{% trans "Price" %}',
title: '{% trans "Buy Price" %}',
sortable: true,
formatter: function(value, row, index, field) {
if (value) {
return value;
} else {
return "<span class='warning-msg'>{% trans "No pricing available" %}</span>";
return "<span class='warning-msg'>{% trans 'No pricing available' %}</span>";
}
}
});
*/
cols.push({
field: 'optional',

1
InvenTree/templates/js/build.js
View File

@ -231,6 +231,7 @@ function loadBuildOrderAllocationTable(table, options={}) {
{
field: 'quantity',
title: '{% trans "Quantity" %}',
sortable: true,
}
]
});

1
InvenTree/templates/js/order.js
View File

@ -391,6 +391,7 @@ function loadSalesOrderAllocationTable(table, options={}) {
{
field: 'quantity',
title: '{% trans "Quantity" %}',
sortable: true,
}
]
});