From 13f8bcd289f3e4737a5d52dd95dca8e6df4bc0de Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Thu, 20 Nov 2025 18:14:34 +0530 Subject: [PATCH] fix: adjust a few more queries Signed-off-by: Akhil Narang --- erpnext/accounts/utils.py | 9 ++++++--- erpnext/projects/doctype/task/task.py | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index f489dab133e..de58c0a930c 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -11,8 +11,8 @@ import frappe.defaults from frappe import _, qb, throw from frappe.desk.reportview import build_match_conditions from frappe.model.meta import get_field_precision -from frappe.query_builder import AliasedQuery, Case, Criterion, Table -from frappe.query_builder.functions import Count, Max, Round, Sum +from frappe.query_builder import AliasedQuery, Case, Criterion, Field, Table +from frappe.query_builder.functions import Count, IfNull, Max, Round, Sum from frappe.query_builder.utils import DocType from frappe.utils import ( add_days, @@ -1311,7 +1311,10 @@ def get_children(doctype, parent, company, is_root=False, include_disabled=False if frappe.db.has_column(doctype, "disabled") and not include_disabled: filters.append(["disabled", "=", False]) - filters.append([f'ifnull(`{parent_fieldname}`,"")', "=", "" if is_root else parent]) + if is_root: + filters.append(IfNull(Field(parent_fieldname), "") == "") + else: + filters.append([parent_fieldname, "=", parent]) if is_root: fields += ["root_type", "report_type", "account_currency"] if doctype == "Account" else [] diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py index cb971f13992..4caf72e5966 100755 --- a/erpnext/projects/doctype/task/task.py +++ b/erpnext/projects/doctype/task/task.py @@ -409,7 +409,9 @@ def get_children(doctype, parent, task=None, project=None, is_root=False): # via expand child filters.append(["parent_task", "=", parent]) else: - filters.append(['ifnull(`parent_task`, "")', "=", ""]) + from frappe.query_builder import Field, functions + + filters.append(functions.IfNull(Field("parent_task"), "") == "") if project: filters.append(["project", "=", project])