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

set total in tax table if category not valuation and consider deductions (#10870)

Browse Source
This commit is contained in:
Nabin Hait 2017-09-21 16:15:30 +05:30 committed by GitHub
parent 12fd8a6047
commit 3d5d858933
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,12 +285,14 @@ 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) ?
tax.tax_amount_after_discount_amount : 0);
if (tax.add_deduct_tax == "Deduct") { tax_amount = -1*tax_amount; }
if(row_idx==0) { if(row_idx==0) {
tax.total = flt(this.frm.doc.net_total + tax.tax_amount_after_discount_amount, tax.total = flt(this.frm.doc.net_total + tax_amount, precision("total", tax));
precision("total", tax));
} else { } else {
tax.total = flt(this.frm.doc["taxes"][row_idx-1].total + tax.tax_amount_after_discount_amount, tax.total = flt(this.frm.doc["taxes"][row_idx-1].total + tax_amount, precision("total", tax));
precision("total", tax));
} }
}, },