commit e9cf1aba77a5a73237fa9d0bd687d83a0ef3cc36
author Ayush Shukla <ayush.as.shukla@gmail.com> Thu May 25 14:14:55 2017 +0530
committer Nabin Hait <nabinhait@gmail.com> Thu May 25 14:14:55 2017 +0530
tree b72e8bcb022bbf2e48307bf44120bc8fb2bb354c
parent c2bf50042f23afc1317c372940c490762bceb1d5

added float and rebase with hotfix (#9019)

erpnext/controllers/taxes_and_totals.py

diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index c1c1fd7..822d50b 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -462,7 +462,8 @@
 
 		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: