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

Merge pull request #4976 from saurabh6790/pr_from_si

Browse Source 
[fixes] set amount in PR by checking party_account_currency field
This commit is contained in:
Nabin Hait
2016-03-14 19:01:07 +05:30
parent c2f973b521 c54619570a
commit a098b4178a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/payment_request/payment_request.py
View File

@@ -211,7 +211,10 @@ def get_amount(ref_doc, dt):
grand_total = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid)
if dt == "Sales Invoice":
grand_total = flt(ref_doc.outstanding_amount)
if ref_doc.party_account_currency == ref_doc.currency:
grand_total = flt(ref_doc.outstanding_amount)
else:
grand_total = flt(ref_doc.outstanding_amount) / ref_doc.conversion_rate
if grand_total > 0 :
return grand_total