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

fix: Presentation currency conversion in reports (#27316)

Browse Source 
(cherry picked from commit ceaa804f04)

# Conflicts:
#	erpnext/accounts/report/utils.py
This commit is contained in:
Deepesh Garg
2021-09-05 17:21:29 +05:30
committed by Mergify
parent f5160dc83d
commit f4aadf4768
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/report/utils.py
View File

@@ -107,6 +107,7 @@ def convert_to_presentation_currency(gl_entries, currency_info, company):
if credit_in_account_currency: if credit_in_account_currency:
entry["credit"] = credit_in_account_currency entry["credit"] = credit_in_account_currency
else: else:
<<<<<<< HEAD
date = currency_info["report_date"] date = currency_info["report_date"]
converted_debit_value = convert(debit, presentation_currency, company_currency, date) converted_debit_value = convert(debit, presentation_currency, company_currency, date)
converted_credit_value = convert(credit, presentation_currency, company_currency, date) converted_credit_value = convert(credit, presentation_currency, company_currency, date)
@@ -116,6 +117,17 @@ def convert_to_presentation_currency(gl_entries, currency_info, company):
if entry.get("credit"): if entry.get("credit"):
entry["credit"] = converted_credit_value entry["credit"] = converted_credit_value
=======
date = currency_info['report_date']
converted_debit_value = convert(debit, presentation_currency, company_currency, date)
converted_credit_value = convert(credit, presentation_currency, company_currency, date)
if entry.get('debit'):
entry['debit'] = converted_debit_value
if entry.get('credit'):
entry['credit'] = converted_credit_value
>>>>>>> ceaa804f04 (fix: Presentation currency conversion in reports (#27316))
converted_gl_list.append(entry) converted_gl_list.append(entry)