commit a098b4178a6a569844601a52735d719fbc682b40
author Nabin Hait <nabinhait@gmail.com> Mon Mar 14 19:01:07 2016 +0530
committer Nabin Hait <nabinhait@gmail.com> Mon Mar 14 19:01:07 2016 +0530
tree e4322a74b344ae3064838bd792416b961e1fea6c
parent c2f973b5218f6a8ff8419fc2db5e70d097ce57c1
parent c54619570a37e774476fcc9123f28a0d76705289

Merge pull request #4976 from saurabh6790/pr_from_si

[fixes] set amount in PR by checking party_account_currency field

erpnext/accounts/doctype/payment_request/payment_request.py

diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py
index bd4cc4d..f2679ba 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -211,7 +211,10 @@
 		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