From e4afab7fb0a58a75bc650158cf3c595b7a89c72e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 19 May 2017 18:59:16 +0530 Subject: [PATCH] Update taxes_and_totals.py --- erpnext/controllers/taxes_and_totals.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py index 87c4719b08..822d50bfdf 100644 --- a/erpnext/controllers/taxes_and_totals.py +++ b/erpnext/controllers/taxes_and_totals.py @@ -462,9 +462,10 @@ class calculate_taxes_and_totals(object): if self.doc.is_pos: for payment in self.doc.get('payments'): - payment.base_amount = flt(flt(payment.amount) * self.doc.conversion_rate) - paid_amount += flt(payment.amount) - base_paid_amount += flt(payment.base_amount) + 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: self.doc.set('payments', [])