From 8252117fe56628afe26b48b57eae46ac63975051 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 19 May 2015 16:29:44 +0530 Subject: [PATCH] set tax amount also in base currency after manipulation --- erpnext/controllers/taxes_and_totals.py | 3 +++ erpnext/public/js/controllers/taxes_and_totals.js | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py index 3efb9132f2b..e77a9a66197 100644 --- a/erpnext/controllers/taxes_and_totals.py +++ b/erpnext/controllers/taxes_and_totals.py @@ -282,6 +282,9 @@ class calculate_taxes_and_totals(object): last_tax.tax_amount += diff last_tax.tax_amount_after_discount_amount += diff last_tax.total += diff + + self._set_in_company_currency(last_tax, + ["total", "tax_amount", "tax_amount_after_discount_amount"]) def calculate_totals(self): self.doc.grand_total = flt(self.doc.get("taxes")[-1].total diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js index 00451773a4b..4a26d6d39cb 100644 --- a/erpnext/public/js/controllers/taxes_and_totals.js +++ b/erpnext/public/js/controllers/taxes_and_totals.js @@ -319,6 +319,8 @@ erpnext.taxes_and_totals = erpnext.stock.StockController.extend({ tax.tax_amount_after_discount_amount = flt(tax.tax_amount_after_discount_amount + discount_amount_loss, precision("tax_amount", tax)); tax.total = flt(tax.total + discount_amount_loss, precision("total", tax)); + + this.set_in_company_currency(tax, ["total", "tax_amount_after_discount_amount"]); }, manipulate_grand_total_for_inclusive_tax: function() { @@ -338,6 +340,9 @@ erpnext.taxes_and_totals = erpnext.stock.StockController.extend({ last_tax.tax_amount += diff; last_tax.tax_amount_after_discount += diff; last_tax.total += diff; + + this.set_in_company_currency(last_tax, + ["total", "tax_amount", "tax_amount_after_discount_amount"]); } } }