From f99142015221f68cd2deb4413b51e1c69548ad52 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 18 Dec 2025 00:08:50 +0530 Subject: [PATCH] fix: Apply finance book filter conditionally --- erpnext/accounts/utils.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index e14dfd65e0d..9009aef40a9 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -300,20 +300,17 @@ def get_balance_on( cond.append("""gle.company = %s """ % (frappe.db.escape(company))) default_finance_book = frappe.get_cached_value("Company", company, "default_finance_book") - if default_finance_book: - if finance_book: - if include_default_fb_balances: - cond.append( - f"""gle.finance_book IN ( - {frappe.db.escape(finance_book)}, - {frappe.db.escape(default_finance_book)} - )""" - ) - else: - cond.append(f"""gle.finance_book = {frappe.db.escape(finance_book)}""") + if finance_book: + if default_finance_book and include_default_fb_balances: + cond.append( + f"gle.finance_book IN ({frappe.db.escape(finance_book)}, {frappe.db.escape(default_finance_book)})" + ) else: - if include_default_fb_balances: - cond.append(f"""gle.finance_book = {frappe.db.escape(default_finance_book)}""") + cond.append(f"gle.finance_book = {frappe.db.escape(finance_book)}") + + elif default_finance_book and include_default_fb_balances: + # No finance book passed → fall back to default + cond.append(f"gle.finance_book = {frappe.db.escape(default_finance_book)}") if account or (party_type and party) or account_type: precision = get_currency_precision()