fix: handle empty FBs properly in TB and GL [v14] (backport #35189) (#…

…35192)

fix: handle empty FBs properly in TB and GL [v14] (#35189)

fix: handle empty FBs properly in TB and GL
(cherry picked from commit ed5f39c)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
(cherry picked from commit e2af66c)

erpnext/accounts/report/financial_statements.py

@@ -532,14 +532,18 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
 						_("To use a different finance book, please uncheck 'Include Default Book Entries'")
 					)
 				else:
-					additional_conditions.append("(finance_book in (%(finance_book)s) OR finance_book IS NULL)")
+					additional_conditions.append(
+						"(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)"
+					)
 			else:
-				additional_conditions.append("(finance_book in (%(company_fb)s) OR finance_book IS NULL)")
+				additional_conditions.append("(finance_book in (%(company_fb)s, '') OR finance_book IS NULL)")
 		else:
 			if filters.get("finance_book"):
-				additional_conditions.append("(finance_book in (%(finance_book)s) OR finance_book IS NULL)")
+				additional_conditions.append(
+					"(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)"
+				)
 			else:
-				additional_conditions.append("(finance_book IS NULL)")
+				additional_conditions.append("(finance_book in ('') OR finance_book IS NULL)")
 
 	if accounting_dimensions:
 		for dimension in accounting_dimensions:

erpnext/accounts/report/general_ledger/general_ledger.py

@@ -296,14 +296,14 @@ def get_conditions(filters):
 					_("To use a different finance book, please uncheck 'Include Default Book Entries'")
 				)
 			else:
-				conditions.append("(finance_book in (%(finance_book)s) OR finance_book IS NULL)")
+				conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)")
 		else:
-			conditions.append("(finance_book in (%(company_fb)s) OR finance_book IS NULL)")
+			conditions.append("(finance_book in (%(company_fb)s, '') OR finance_book IS NULL)")
 	else:
 		if filters.get("finance_book"):
-			conditions.append("(finance_book in (%(finance_book)s) OR finance_book IS NULL)")
+			conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)")
 		else:
-			conditions.append("(finance_book IS NULL)")
+			conditions.append("(finance_book in ('') OR finance_book IS NULL)")
 
 	if not filters.get("show_cancelled_entries"):
 		conditions.append("is_cancelled = 0")

erpnext/accounts/report/trial_balance/trial_balance.py

@@ -166,14 +166,16 @@ def get_rootwise_opening_balances(filters, report_type):
 					_("To use a different finance book, please uncheck 'Include Default Book Entries'")
 				)
 			else:
-				additional_conditions += " AND (finance_book in (%(finance_book)s) OR finance_book IS NULL)"
+				additional_conditions += (
+					" AND (finance_book in (%(finance_book)s, '') OR finance_book IS NULL)"
+				)
 		else:
-			additional_conditions += " AND (finance_book in (%(company_fb)s) OR finance_book IS NULL)"
+			additional_conditions += " AND (finance_book in (%(company_fb)s, '') OR finance_book IS NULL)"
 	else:
 		if filters.get("finance_book"):
-			additional_conditions += " AND (finance_book in (%(finance_book)s) OR finance_book IS NULL)"
+			additional_conditions += " AND (finance_book in (%(finance_book)s, '') OR finance_book IS NULL)"
 		else:
-			additional_conditions += " AND (finance_book IS NULL)"
+			additional_conditions += " AND (finance_book in ('') OR finance_book IS NULL)"
 
 	accounting_dimensions = get_accounting_dimensions(as_list=False)