Merge pull request #40863 from nabinhait/gl-amount-in-transaction-currency
fix: Show amount in transaction currency in general ledger report
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index 888e040..ade17be 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -347,7 +347,7 @@
# 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 @@
# 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 @@
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 @@
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",