Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[hotfix] Wrong calculation of total in taxes and totals (#10924)

Browse Source
This commit is contained in:
rohitwaghchaure 2017-09-27 11:49:13 +05:30 committed by Nabin Hait
parent df8fbd7d72
commit 45d45f4247
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/public/js/controllers/taxes_and_totals.js
View File

@ -288,8 +288,11 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
}, },
set_cumulative_total: function(row_idx, tax) { set_cumulative_total: function(row_idx, tax) {
var tax_amount = (in_list(["Valuation and Total", "Total"], tax.category) ? var tax_amount = tax.tax_amount_after_discount_amount;
tax.tax_amount_after_discount_amount : 0); if (tax.category == 'Valuation') {
tax_amount = 0;
}
if (tax.add_deduct_tax == "Deduct") { tax_amount = -1*tax_amount; } if (tax.add_deduct_tax == "Deduct") { tax_amount = -1*tax_amount; }
if(row_idx==0) { if(row_idx==0) {