nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 13:49:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31958 from frappe/mergify/bp/version-14-hotfix/pr-31950

Browse Source 
fix: display amount in account currency if party is supplied (backport #31950)
This commit is contained in:
Deepesh Garg
2022-08-25 11:06:42 +05:30
committed by GitHub
parent 54f4504df6 15915d7053
commit c6d3e9f432
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@@ -187,7 +187,11 @@ class ReceivablePayableReport(object):
if not row: if not row:
return return
amount = ple.amount # amount in "Party Currency", if its supplied. If not, amount in company currency
if self.filters.get(scrub(self.party_type)):
amount = ple.amount_in_account_currency
else:
amount = ple.amount
amount_in_account_currency = ple.amount_in_account_currency amount_in_account_currency = ple.amount_in_account_currency
# update voucher # update voucher
@@ -685,7 +689,7 @@ class ReceivablePayableReport(object):
ple.party, ple.party,
ple.posting_date, ple.posting_date,
ple.due_date, ple.due_date,
ple.account_currency.as_("currency"), ple.account_currency,
ple.amount, ple.amount,
ple.amount_in_account_currency, ple.amount_in_account_currency,
) )