Merge branch 'develop' into currency-exchange-settings
This commit is contained in:
commit
f46022993c
@ -100,15 +100,15 @@ def convert_to_presentation_currency(gl_entries, currency_info, company):
|
||||
if entry.get('credit'):
|
||||
entry['credit'] = credit_in_account_currency
|
||||
else:
|
||||
value = debit or credit
|
||||
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'):
|
||||
entry['debit'] = converted_value
|
||||
entry['debit'] = converted_debit_value
|
||||
|
||||
if entry.get('credit'):
|
||||
entry['credit'] = converted_value
|
||||
entry['credit'] = converted_credit_value
|
||||
|
||||
converted_gl_list.append(entry)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user