From e9cf1aba77a5a73237fa9d0bd687d83a0ef3cc36 Mon Sep 17 00:00:00 2001 From: Ayush Shukla Date: Thu, 25 May 2017 14:14:55 +0530 Subject: [PATCH] added float and rebase with hotfix (#9019) --- erpnext/controllers/taxes_and_totals.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py index c1c1fd7cda..822d50bfdf 100644 --- a/erpnext/controllers/taxes_and_totals.py +++ b/erpnext/controllers/taxes_and_totals.py @@ -462,7 +462,8 @@ class calculate_taxes_and_totals(object): if self.doc.is_pos: for payment in self.doc.get('payments'): - payment.base_amount = flt(payment.amount * self.doc.conversion_rate) + payment.amount = flt(payment.amount) + payment.base_amount = payment.amount * flt(self.doc.conversion_rate) paid_amount += payment.amount base_paid_amount += payment.base_amount elif not self.doc.is_return: