From 67bac41df4fdd62a3efda4bb61a7ab80d6b1d0af Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 4 Apr 2024 19:58:17 +0530 Subject: [PATCH] fix: Show amount in transaction currency in general ledger report (cherry picked from commit d868122f120559a21cca9aea11a44847de85b3a7) --- .../accounts/report/general_ledger/general_ledger.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index 4fd6a3bcf62..9c5b3af0f44 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -347,7 +347,7 @@ def get_data_with_opening_closing(filters, account_details, accounting_dimension # acc if acc_dict.entries: # opening - data.append({}) + data.append({"debit_in_transaction_currency": None, "credit_in_transaction_currency": None}) if filters.get("group_by") != "Group by Voucher": data.append(acc_dict.totals.opening) @@ -359,7 +359,8 @@ def get_data_with_opening_closing(filters, account_details, accounting_dimension # closing if filters.get("group_by") != "Group by Voucher": data.append(acc_dict.totals.closing) - data.append({}) + + data.append({"debit_in_transaction_currency": None, "credit_in_transaction_currency": None}) else: data += entries @@ -380,6 +381,8 @@ def get_totals_dict(): credit=0.0, debit_in_account_currency=0.0, credit_in_account_currency=0.0, + debit_in_transaction_currency=None, + credit_in_transaction_currency=None, ) return _dict( @@ -424,6 +427,10 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map): data[key].debit_in_account_currency += gle.debit_in_account_currency data[key].credit_in_account_currency += gle.credit_in_account_currency + if filters.get("add_values_in_transaction_currency") and key not in ["opening", "closing", "total"]: + data[key].debit_in_transaction_currency += gle.debit_in_transaction_currency + data[key].credit_in_transaction_currency += gle.credit_in_transaction_currency + if filters.get("show_net_values_in_party_account") and account_type_map.get(data[key].account) in ( "Receivable", "Payable",