From 0cd792ebb215c6cbe72238fbc7595944728aa3ca Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 24 May 2017 17:31:58 +0530 Subject: [PATCH] Revert "Update taxes_and_totals.py" This reverts commit e4afab7fb0a58a75bc650158cf3c595b7a89c72e. --- erpnext/controllers/taxes_and_totals.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py index 822d50bfdf8..87c4719b08f 100644 --- a/erpnext/controllers/taxes_and_totals.py +++ b/erpnext/controllers/taxes_and_totals.py @@ -462,10 +462,9 @@ class calculate_taxes_and_totals(object): if self.doc.is_pos: for payment in self.doc.get('payments'): - 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 + payment.base_amount = flt(flt(payment.amount) * self.doc.conversion_rate) + paid_amount += flt(payment.amount) + base_paid_amount += flt(payment.base_amount) elif not self.doc.is_return: self.doc.set('payments', [])