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

Merge branch 'develop' into currency-exchange-settings

Browse Source
This commit is contained in:
Dany Robert 2021-09-05 19:50:19 +05:30 committed by GitHub
commit f46022993c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,15 +100,15 @@ def convert_to_presentation_currency(gl_entries, currency_info, company):
if entry.get('credit'): if entry.get('credit'):
entry['credit'] = credit_in_account_currency entry['credit'] = credit_in_account_currency
else: else:
value = debit or credit
date = currency_info['report_date'] date = currency_info['report_date']
converted_value = convert(value, 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)
if entry.get('debit'): if entry.get('debit'):
entry['debit'] = converted_value entry['debit'] = converted_debit_value
if entry.get('credit'): if entry.get('credit'):
entry['credit'] = converted_value entry['credit'] = converted_credit_value
converted_gl_list.append(entry) converted_gl_list.append(entry)