Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'inventree/master' into sales-order-allocation-fixes

Browse Source
This commit is contained in:
Oliver 2021-10-06 17:28:38 +11:00
commit cbd2732622
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
InvenTree/templates/js/translated/order.js
View File

@ -1254,7 +1254,7 @@ function showAllocationSubTable(index, row, element, options) {
html += makeIconButton('fa-trash-alt icon-red', 'button-allocation-delete', pk, '{% trans "Delete stock allocation" %}');
}
html += "</div>";
html += '</div>';
return html;
},
@ -1389,8 +1389,8 @@ function loadSalesOrderLineItemTable(table, options={}) {
return '-';
}
},
footerFormatter: function() {
return '{% trans "Total" %}'
footerFormatter: function() {
return '{% trans "Total" %}';
},
},
{
@ -1404,11 +1404,11 @@ function loadSalesOrderLineItemTable(table, options={}) {
field: 'quantity',
title: '{% trans "Quantity" %}',
footerFormatter: function(data) {
return data.map(function (row) {
return +row['quantity']
}).reduce(function (sum, i) {
return sum + i
}, 0)
return data.map(function(row) {
return +row['quantity'];
}).reduce(function(sum, i) {
return sum + i;
}, 0);
},
switchable: false,
},
@ -1432,12 +1432,13 @@ function loadSalesOrderLineItemTable(table, options={}) {
currency: row.sale_price_currency
}
);
return formatter.format(total);
},
footerFormatter: function(data) {
var total = data.map(function (row) {
var total = data.map(function(row) {
return +row['sale_price'] * row['quantity'];
}).reduce(function (sum, i) {
}).reduce(function(sum, i) {
return sum + i;
}, 0);
@ -1452,7 +1453,7 @@ function loadSalesOrderLineItemTable(table, options={}) {
);
return formatter.format(total);
}
}
},
{
field: 'stock',