commit e4afab7fb0a58a75bc650158cf3c595b7a89c72e
author Rushabh Mehta <rmehta@gmail.com> Fri May 19 18:59:16 2017 +0530
committer Nabin Hait <nabinhait@gmail.com> Wed May 24 17:29:23 2017 +0530
tree 83568beb59d88508913d3087e43a07c404f66be7
parent bf4915b285be46cac921a21b738fda84ee8940b1

Update taxes_and_totals.py

erpnext/controllers/taxes_and_totals.py

diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 87c4719..822d50b 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -462,9 +462,10 @@
 
 		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', [])