From 5c9eddd31e16bf6f8afa5e3800e04c2ea1044c53 Mon Sep 17 00:00:00 2001 From: i-am-vimal Date: Thu, 19 Jun 2025 18:14:32 +0530 Subject: [PATCH] fix: add validation for exchange gain/loss entries --- erpnext/accounts/report/general_ledger/general_ledger.py | 3 +-- erpnext/accounts/report/utils.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index aa873d04431..71fa184b914 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -200,8 +200,7 @@ def get_gl_entries(filters, accounting_dimensions): voucher_type, voucher_subtype, voucher_no, {dimension_fields} cost_center, project, {transaction_currency_fields} against_voucher_type, against_voucher, account_currency, - against, is_opening, creation {select_fields}, - transaction_currency + against, is_opening, creation {select_fields} from `tabGL Entry` where company=%(company)s {get_conditions(filters)} {order_by_statement} diff --git a/erpnext/accounts/report/utils.py b/erpnext/accounts/report/utils.py index 5056b986187..02ba54604c4 100644 --- a/erpnext/accounts/report/utils.py +++ b/erpnext/accounts/report/utils.py @@ -101,7 +101,6 @@ def convert_to_presentation_currency(gl_entries, currency_info): account_currencies = list(set(entry["account_currency"] for entry in gl_entries)) for entry in gl_entries: - transaction_currency = entry.get("transaction_currency") debit = flt(entry["debit"]) credit = flt(entry["credit"]) debit_in_account_currency = flt(entry["debit_in_account_currency"]) @@ -111,7 +110,7 @@ def convert_to_presentation_currency(gl_entries, currency_info): if ( len(account_currencies) == 1 and account_currency == presentation_currency - and (transaction_currency is None or account_currency == transaction_currency) + and (debit_in_account_currency or credit_in_account_currency) ): entry["debit"] = debit_in_account_currency entry["credit"] = credit_in_account_currency