inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 04:26:44 +00:00
Code

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

11
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;
},
@ -1390,7 +1390,7 @@ function loadSalesOrderLineItemTable(table, options={}) {
}
},
footerFormatter: function() {
return '{% trans "Total" %}'
return '{% trans "Total" %}';
},
},
{
@ -1405,10 +1405,10 @@ function loadSalesOrderLineItemTable(table, options={}) {
title: '{% trans "Quantity" %}',
footerFormatter: function(data) {
return data.map(function(row) {
return +row['quantity']
return +row['quantity'];
}).reduce(function(sum, i) {
return sum + i
}, 0)
return sum + i;
}, 0);
},
switchable: false,
},
@ -1432,6 +1432,7 @@ function loadSalesOrderLineItemTable(table, options={}) {
currency: row.sale_price_currency
}
);
return formatter.format(total);
},
footerFormatter: function(data) {