From 1d4ccbb291aad144f336136e6d82586a33f0a12d Mon Sep 17 00:00:00 2001
From: Jatin3128 <140256508+Jatin3128@users.noreply.github.com>
Date: Mon, 11 May 2026 13:41:23 +0530
Subject: [PATCH] fix(general-ledger): show raw GL entries when categorize_by
 is empty (#54816)

(cherry picked from commit dfbe847307c22d6f37cf6a808ccfbb72db3038bd)

# Conflicts:
#	erpnext/accounts/report/general_ledger/general_ledger.py
---
 .../report/general_ledger/general_ledger.py   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index d28311d8876..bb74d793fc4 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -398,6 +398,7 @@ def get_data_with_opening_closing(filters, account_details, accounting_dimension
 	# Opening for filtered account
 	data.append(totals.opening)
 
+<<<<<<< HEAD
 	if filters.get("categorize_by") != "Categorize by Voucher (Consolidated)":
 		for _acc, acc_dict in gle_map.items():
 			# 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"
 				):
 					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
 
@@ -467,7 +481,16 @@ def initialize_gle_map(gl_entries, filters, totals_dict):
 	group_by = group_by_field(filters.get("categorize_by"))
 
 	for gle in gl_entries:
+<<<<<<< HEAD
 		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