From 0a4545af1f150ed68411c0e57d018332c2279882 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 --- .../report/general_ledger/general_ledger.py | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index d86f463ff35..731aa8e041c 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -401,7 +401,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) @@ -413,7 +413,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 @@ -434,6 +435,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( @@ -483,9 +486,20 @@ 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"): + ) in ( + "Receivable", + "Payable", + ): net_value = data[key].debit - data[key].credit net_value_in_account_currency = ( data[key].debit_in_account_currency - data[key].credit_in_account_currency -- GitLab