nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Revert tax calculation changes

Browse Source
This commit is contained in:
marination
2020-09-15 09:42:51 +05:30
parent 22d3729427
commit b7cd84196d
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/controllers/taxes_and_totals.py
View File

@@ -220,14 +220,10 @@ class calculate_taxes_and_totals(object):
return current_tax_fraction, inclusive_tax_amount_per_qty return current_tax_fraction, inclusive_tax_amount_per_qty
def _get_tax_rate(self, tax, item_tax_map): def _get_tax_rate(self, tax, item_tax_map):
if item_tax_map: if tax.account_head in item_tax_map:
if tax.account_head in item_tax_map: return flt(item_tax_map.get(tax.account_head), self.doc.precision("rate", tax))
return flt(item_tax_map.get(tax.account_head), self.doc.precision("rate", tax))
else:
return tax.rate
else: else:
# If no item tax template against item dont calculate tax against it return tax.rate
return 0
def calculate_net_total(self): def calculate_net_total(self):
self.doc.total_qty = self.doc.total = self.doc.base_total = self.doc.net_total = self.doc.base_net_total = 0.0 self.doc.total_qty = self.doc.total = self.doc.base_total = self.doc.net_total = self.doc.base_net_total = 0.0

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

@@ -223,13 +223,8 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
}, },
_get_tax_rate: function(tax, item_tax_map) { _get_tax_rate: function(tax, item_tax_map) {
if(!$.isEmptyObject(item_tax_map)) { return (Object.keys(item_tax_map).indexOf(tax.account_head) != -1) ?
return (Object.keys(item_tax_map).indexOf(tax.account_head) != -1) ? flt(item_tax_map[tax.account_head], precision("rate", tax)) : tax.rate;
flt(item_tax_map[tax.account_head], precision("rate", tax)) : tax.rate;
} else {
// If no item tax template against item dont calculate tax against it
return 0;
}
}, },
calculate_net_total: function() { calculate_net_total: function() {