Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update taxes_and_totals.py

Browse Source
This commit is contained in:
Rushabh Mehta 2017-05-19 18:59:16 +05:30 committed by Nabin Hait
parent bf4915b285
commit e4afab7fb0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/controllers/taxes_and_totals.py
View File

@ -462,9 +462,10 @@ 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(flt(payment.amount) * self.doc.conversion_rate) payment.amount = flt(payment.amount)
paid_amount += flt(payment.amount) payment.base_amount = payment.amount * flt(self.doc.conversion_rate)
base_paid_amount += flt(payment.base_amount) paid_amount += payment.amount
base_paid_amount += payment.base_amount
elif not self.doc.is_return: elif not self.doc.is_return:
self.doc.set('payments', []) self.doc.set('payments', [])