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

Revert "Update taxes_and_totals.py"

Browse Source 
This reverts commit e4afab7fb0.
This commit is contained in:
Nabin Hait
2017-05-24 17:31:58 +05:30
parent e4afab7fb0
commit 0cd792ebb2
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/controllers/taxes_and_totals.py
View File

@@ -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', [])