CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-19 18:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Show amount in transaction currency in general ledger report

Browse Source 
(cherry picked from commit d868122f12)
This commit is contained in:
Nabin Hait
2024-04-04 19:58:17 +05:30
committed by Mergify
parent 29e3a400f9
commit 67bac41df4
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@@ -347,7 +347,7 @@ def get_data_with_opening_closing(filters, account_details, accounting_dimension
# acc # acc
if acc_dict.entries: if acc_dict.entries:
# opening # opening
data.append({}) data.append({"debit_in_transaction_currency": None, "credit_in_transaction_currency": None})
if filters.get("group_by") != "Group by Voucher": if filters.get("group_by") != "Group by Voucher":
data.append(acc_dict.totals.opening) data.append(acc_dict.totals.opening)
@@ -359,7 +359,8 @@ def get_data_with_opening_closing(filters, account_details, accounting_dimension
# closing # closing
if filters.get("group_by") != "Group by Voucher": if filters.get("group_by") != "Group by Voucher":
data.append(acc_dict.totals.closing) data.append(acc_dict.totals.closing)
data.append({})
data.append({"debit_in_transaction_currency": None, "credit_in_transaction_currency": None})
else: else:
data += entries data += entries
@@ -380,6 +381,8 @@ def get_totals_dict():
credit=0.0, credit=0.0,
debit_in_account_currency=0.0, debit_in_account_currency=0.0,
credit_in_account_currency=0.0, credit_in_account_currency=0.0,
debit_in_transaction_currency=None,
credit_in_transaction_currency=None,
) )
return _dict( 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].debit_in_account_currency += gle.debit_in_account_currency
data[key].credit_in_account_currency += gle.credit_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 ( if filters.get("show_net_values_in_party_account") and account_type_map.get(data[key].account) in (
"Receivable", "Receivable",
"Payable", "Payable",