nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-29 18:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43831 from frappe/mergify/bp/version-15-hotfix/pr-43830

Browse Source 
fix: set bill_no before `against_voucher` gets concatenated (backport #43830)
This commit is contained in:
ruthra kumar
2024-10-25 14:28:36 +05:30
committed by GitHub
parent bf4fb53575 81297ce168
commit 18f32b8de6
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) 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): def get_data_with_opening_closing(filters, account_details, accounting_dimensions, gl_entries):
data = [] data = []
totals_dict = get_totals_dict() totals_dict = get_totals_dict()
set_bill_no(gl_entries)
gle_map = initialize_gle_map(gl_entries, filters, totals_dict) gle_map = initialize_gle_map(gl_entries, filters, totals_dict)
totals, entries = get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map, totals_dict) totals, entries = get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map, totals_dict)
@@ -539,7 +547,6 @@ def get_account_type_map(company):
def get_result_as_list(data, filters): def get_result_as_list(data, filters):
balance, _balance_in_account_currency = 0, 0 balance, _balance_in_account_currency = 0, 0
inv_details = get_supplier_invoice_details()
for d in data: for d in data:
if not d.get("posting_date"): if not d.get("posting_date"):
@@ -549,7 +556,6 @@ def get_result_as_list(data, filters):
d["balance"] = balance d["balance"] = balance
d["account_currency"] = filters.account_currency d["account_currency"] = filters.account_currency
d["bill_no"] = inv_details.get(d.get("against_voucher"), "")
return data return data