fix: Revert tax calculation changes
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 59c60f7..f578e7e 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -220,14 +220,10 @@
return current_tax_fraction, inclusive_tax_amount_per_qty
def _get_tax_rate(self, tax, item_tax_map):
- if 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))
- else:
- return tax.rate
+ if tax.account_head in item_tax_map:
+ return flt(item_tax_map.get(tax.account_head), self.doc.precision("rate", tax))
else:
- # If no item tax template against item dont calculate tax against it
- return 0
+ return tax.rate
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
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 87f6d6a..3bc7021 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -223,13 +223,8 @@
},
_get_tax_rate: function(tax, item_tax_map) {
- if(!$.isEmptyObject(item_tax_map)) {
- return (Object.keys(item_tax_map).indexOf(tax.account_head) != -1) ?
- 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;
- }
+ return (Object.keys(item_tax_map).indexOf(tax.account_head) != -1) ?
+ flt(item_tax_map[tax.account_head], precision("rate", tax)) : tax.rate;
},
calculate_net_total: function() {