CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-23 05:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: consolidate gl entries by project in General Ledger Report (backport #46314) (#46321)

Browse Source 
fix: consolidate gl entries by project in General Ledger Report (#46314)

(cherry picked from commit 1f685efcaf)

Co-authored-by: Lakshit Jain <108322669+ljain112@users.noreply.github.com>
This commit is contained in:
mergify[bot]
2025-03-05 16:18:42 +05:30
committed by GitHub
parent 506dd3c6b9
commit 6aa8803068
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -534,6 +534,7 @@ def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map, tot
for dim in accounting_dimensions: for dim in accounting_dimensions:
keylist.append(gle.get(dim)) keylist.append(gle.get(dim))
keylist.append(gle.get("cost_center")) keylist.append(gle.get("cost_center"))
keylist.append(gle.get("project"))
key = tuple(keylist) key = tuple(keylist)
if key not in consolidated_gle: if key not in consolidated_gle:
@@ -679,10 +680,11 @@ def get_columns(filters):
{"label": _("Against Account"), "fieldname": "against", "width": 120}, {"label": _("Against Account"), "fieldname": "against", "width": 120},
{"label": _("Party Type"), "fieldname": "party_type", "width": 100}, {"label": _("Party Type"), "fieldname": "party_type", "width": 100},
{"label": _("Party"), "fieldname": "party", "width": 100}, {"label": _("Party"), "fieldname": "party", "width": 100},
{"label": _("Project"), "options": "Project", "fieldname": "project", "width": 100},
] ]
if filters.get("include_dimensions"): if filters.get("include_dimensions"):
columns.append({"label": _("Project"), "options": "Project", "fieldname": "project", "width": 100})
for dim in get_accounting_dimensions(as_list=False): for dim in get_accounting_dimensions(as_list=False):
columns.append( columns.append(
{"label": _(dim.label), "options": dim.label, "fieldname": dim.fieldname, "width": 100} {"label": _(dim.label), "options": dim.label, "fieldname": dim.fieldname, "width": 100}