vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: use proper ifnull filter

Browse source 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
This commit is contained in:
Akhil Narang 2025-11-20 16:16:14 +05:30
parent 5530648ab2
commit 81575386c9
No known key found for this signature in database
GPG key ID: 9DCC61E211BF645F
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/custom/doctype/custom_field/custom_field.py
View file

@ -9,7 +9,7 @@ from frappe.custom.doctype.property_setter.property_setter import delete_propert
from frappe.model import core_doctypes_list
from frappe.model.docfield import supports_translation
from frappe.model.document import Document
from frappe.query_builder.functions import IfNull
from frappe.query_builder import Field, functions
from frappe.utils import cstr, random_string
@ -285,7 +285,7 @@ def get_fields_label(doctype=None):
def create_custom_field_if_values_exist(doctype, df):
df = frappe._dict(df)
if df.fieldname in frappe.db.get_table_columns(doctype) and frappe.db.count(
dt=doctype, filters=IfNull(df.fieldname, "") != ""
dt=doctype, filters=functions.IfNull(Field(df.fieldname), "") != ""
):
create_custom_field(doctype, df)

4
frappe/desk/reportview.py
View file

@ -738,10 +738,12 @@ def get_filter_dashboard_data(stats, doctype, filters=None):
continue
tagcount = []
if tag["type"] not in ["Date", "Datetime"]:
from frappe.query_builder import Field, functions
tagcount = frappe.get_list(
doctype,
fields=[tag["name"], {"COUNT": "*"}],
filters=[*filters, "ifnull(`{}`,'')!=''".format(tag["name"])],
filters=[*filters, functions.IfNull(Field(tag["name"]), "") != ""],
group_by=tag["name"],
as_list=True,
)