From 7bade7f1fe08370d655e12929b2376814dac018a Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Fri, 25 Oct 2024 13:30:28 +0530 Subject: [PATCH] fix: set bill_no before `against_voucher` gets concatenated --- .../accounts/report/general_ledger/general_ledger.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index 753cf0f5934..fdaf3fe2a59 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -348,10 +348,18 @@ def get_accounts_with_children(accounts): return frappe.qb.from_(doctype).select(doctype.name).where(Criterion.any(conditions)).run(pluck=True) +def set_bill_no(gl_entries): + inv_details = get_supplier_invoice_details() + for gl in gl_entries: + gl["bill_no"] = inv_details.get(gl.get("against_voucher"), "") + + def get_data_with_opening_closing(filters, account_details, accounting_dimensions, gl_entries): data = [] totals_dict = get_totals_dict() + set_bill_no(gl_entries) + gle_map = initialize_gle_map(gl_entries, filters, totals_dict) totals, entries = get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map, totals_dict) @@ -542,7 +550,6 @@ def get_account_type_map(company): def get_result_as_list(data, filters): balance, _balance_in_account_currency = 0, 0 - inv_details = get_supplier_invoice_details() for d in data: if not d.get("posting_date"): @@ -552,7 +559,6 @@ def get_result_as_list(data, filters): d["balance"] = balance d["account_currency"] = filters.account_currency - d["bill_no"] = inv_details.get(d.get("against_voucher"), "") return data