nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

added float and rebase with hotfix (#9019)

Browse Source
This commit is contained in:
Ayush Shukla
2017-05-25 14:14:55 +05:30
committed by Nabin Hait
parent c2bf50042f
commit e9cf1aba77
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/controllers/taxes_and_totals.py
View File

@@ -462,7 +462,8 @@ class calculate_taxes_and_totals(object):
if self.doc.is_pos: if self.doc.is_pos:
for payment in self.doc.get('payments'): 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 paid_amount += payment.amount
base_paid_amount += payment.base_amount base_paid_amount += payment.base_amount
elif not self.doc.is_return: elif not self.doc.is_return: