nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 23:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(general-ledger): show raw GL entries when categorize_by is empty (#54816)

Browse Source 
(cherry picked from commit dfbe847307)

# Conflicts:
#	erpnext/accounts/report/general_ledger/general_ledger.py
This commit is contained in:
Jatin3128
2026-05-11 13:41:23 +05:30
committed by Mergify
parent d57ec6c094
commit 1d4ccbb291
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -398,6 +398,7 @@ def get_data_with_opening_closing(filters, account_details, accounting_dimension
# Opening for filtered account # Opening for filtered account
data.append(totals.opening) data.append(totals.opening)
<<<<<<< HEAD
if filters.get("categorize_by") != "Categorize by Voucher (Consolidated)": if filters.get("categorize_by") != "Categorize by Voucher (Consolidated)":
for _acc, acc_dict in gle_map.items(): for _acc, acc_dict in gle_map.items():
# acc # acc
@@ -408,6 +409,19 @@ def get_data_with_opening_closing(filters, account_details, accounting_dimension
filters.get("categorize_by") and filters.get("categorize_by") != "Categorize by Voucher" filters.get("categorize_by") and filters.get("categorize_by") != "Categorize by Voucher"
): ):
data.append(acc_dict.totals.opening) data.append(acc_dict.totals.opening)
=======
if not filters.get("categorize_by"):
all_entries = []
for acc_dict in gle_map.values():
all_entries.extend(acc_dict.entries)
data += all_entries
elif filters.get("categorize_by") != "Categorize by Voucher (Consolidated)":
set_opening_closing = (not filters.get("categorize_by") and not filters.get("voucher_no")) or (
filters.get("categorize_by") and filters.get("categorize_by") != "Categorize by Voucher"
)
set_total = filters.get("categorize_by") or not filters.voucher_no
>>>>>>> dfbe847307 (fix(general-ledger): show raw GL entries when categorize_by is empty (#54816))
data += acc_dict.entries data += acc_dict.entries
@@ -467,7 +481,16 @@ def initialize_gle_map(gl_entries, filters, totals_dict):
group_by = group_by_field(filters.get("categorize_by")) group_by = group_by_field(filters.get("categorize_by"))
for gle in gl_entries: for gle in gl_entries:
<<<<<<< HEAD
gle_map.setdefault(gle.get(group_by), _dict(totals=copy.deepcopy(totals_dict), entries=[])) gle_map.setdefault(gle.get(group_by), _dict(totals=copy.deepcopy(totals_dict), entries=[]))
=======
group_by_value = gle.get(group_by)
if group_by_value not in gle_map:
gle_map[group_by_value] = _dict(
totals=get_totals_dict(),
entries=[],
)
>>>>>>> dfbe847307 (fix(general-ledger): show raw GL entries when categorize_by is empty (#54816))
return gle_map return gle_map