From 5a3acab1109a9d6e20b06d9521c078b427fe432b Mon Sep 17 00:00:00 2001 From: Anand Baburajan Date: Mon, 8 May 2023 16:54:00 +0530 Subject: [PATCH] fix: handle empty FBs properly in TB and GL [develop] (#35190) fix: handle empty FBs properly in TB and GL --- erpnext/accounts/report/financial_statements.py | 5 +++-- erpnext/accounts/report/general_ledger/general_ledger.py | 8 ++++---- erpnext/accounts/report/trial_balance/trial_balance.py | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py index 76a01db714..8a47e1c011 100644 --- a/erpnext/accounts/report/financial_statements.py +++ b/erpnext/accounts/report/financial_statements.py @@ -546,12 +546,13 @@ def apply_additional_conditions(doctype, query, from_date, ignore_closing_entrie ) query = query.where( - (gl_entry.finance_book.isin([cstr(filters.finance_book), cstr(company_fb)])) + (gl_entry.finance_book.isin([cstr(filters.finance_book), cstr(company_fb), ""])) | (gl_entry.finance_book.isnull()) ) else: query = query.where( - (gl_entry.finance_book.isin([cstr(filters.finance_book)])) | (gl_entry.finance_book.isnull()) + (gl_entry.finance_book.isin([cstr(filters.finance_book), ""])) + | (gl_entry.finance_book.isnull()) ) if accounting_dimensions: diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py index 0b05c11668..d47e3da313 100644 --- a/erpnext/accounts/report/general_ledger/general_ledger.py +++ b/erpnext/accounts/report/general_ledger/general_ledger.py @@ -253,14 +253,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") diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py index 57dac2af49..22bebb7d19 100644 --- a/erpnext/accounts/report/trial_balance/trial_balance.py +++ b/erpnext/accounts/report/trial_balance/trial_balance.py @@ -256,12 +256,12 @@ def get_opening_balance( ) opening_balance = opening_balance.where( - (closing_balance.finance_book.isin([cstr(filters.finance_book), cstr(company_fb)])) + (closing_balance.finance_book.isin([cstr(filters.finance_book), cstr(company_fb), ""])) | (closing_balance.finance_book.isnull()) ) else: opening_balance = opening_balance.where( - (closing_balance.finance_book.isin([cstr(filters.finance_book)])) + (closing_balance.finance_book.isin([cstr(filters.finance_book), ""])) | (closing_balance.finance_book.isnull()) )