perf: don't use ifnull where it's not required (#36336)
ifnull isn't really required when doing `!= 'anything'` because if it's null then value will be falsy. ifnull is only required when checking `= ''` if you treat `null = ''` Actuall better fix would be make things explcitly non-nullable, then we won't ever have to add this on such fields. ref: https://github.com/frappe/frappe/pull/21822
This commit is contained in:
parent
56e7cc7e05
commit
1d7dbd3456
@ -1738,7 +1738,7 @@ def get_orders_to_be_billed(
|
|||||||
{party_type} = %s
|
{party_type} = %s
|
||||||
and docstatus = 1
|
and docstatus = 1
|
||||||
and company = %s
|
and company = %s
|
||||||
and ifnull(status, "") != "Closed"
|
and status != "Closed"
|
||||||
and if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) > advance_paid
|
and if({rounded_total_field}, {rounded_total_field}, {grand_total_field}) > advance_paid
|
||||||
and abs(100 - per_billed) > 0.01
|
and abs(100 - per_billed) > 0.01
|
||||||
{condition}
|
{condition}
|
||||||
|
@ -720,7 +720,7 @@ def get_additional_conditions(from_date, ignore_closing_entries, filters):
|
|||||||
additional_conditions = []
|
additional_conditions = []
|
||||||
|
|
||||||
if ignore_closing_entries:
|
if ignore_closing_entries:
|
||||||
additional_conditions.append("ifnull(gl.voucher_type, '')!='Period Closing Voucher'")
|
additional_conditions.append("gl.voucher_type != 'Period Closing Voucher'")
|
||||||
|
|
||||||
if from_date:
|
if from_date:
|
||||||
additional_conditions.append("gl.posting_date >= %(from_date)s")
|
additional_conditions.append("gl.posting_date >= %(from_date)s")
|
||||||
|
@ -208,7 +208,7 @@ def set_gl_entries_by_account(
|
|||||||
additional_conditions = []
|
additional_conditions = []
|
||||||
|
|
||||||
if ignore_closing_entries:
|
if ignore_closing_entries:
|
||||||
additional_conditions.append("and ifnull(voucher_type, '')!='Period Closing Voucher'")
|
additional_conditions.append("and voucher_type !='Period Closing Voucher'")
|
||||||
|
|
||||||
if from_date:
|
if from_date:
|
||||||
additional_conditions.append("and posting_date >= %(from_date)s")
|
additional_conditions.append("and posting_date >= %(from_date)s")
|
||||||
|
@ -475,7 +475,7 @@ def get_invoice_so_dn_map(invoice_list):
|
|||||||
si_items = frappe.db.sql(
|
si_items = frappe.db.sql(
|
||||||
"""select parent, sales_order, delivery_note, so_detail
|
"""select parent, sales_order, delivery_note, so_detail
|
||||||
from `tabSales Invoice Item` where parent in (%s)
|
from `tabSales Invoice Item` where parent in (%s)
|
||||||
and (ifnull(sales_order, '') != '' or ifnull(delivery_note, '') != '')"""
|
and (sales_order != '' or delivery_note != '')"""
|
||||||
% ", ".join(["%s"] * len(invoice_list)),
|
% ", ".join(["%s"] * len(invoice_list)),
|
||||||
tuple(inv.name for inv in invoice_list),
|
tuple(inv.name for inv in invoice_list),
|
||||||
as_dict=1,
|
as_dict=1,
|
||||||
@ -510,7 +510,7 @@ def get_invoice_cc_wh_map(invoice_list):
|
|||||||
si_items = frappe.db.sql(
|
si_items = frappe.db.sql(
|
||||||
"""select parent, cost_center, warehouse
|
"""select parent, cost_center, warehouse
|
||||||
from `tabSales Invoice Item` where parent in (%s)
|
from `tabSales Invoice Item` where parent in (%s)
|
||||||
and (ifnull(cost_center, '') != '' or ifnull(warehouse, '') != '')"""
|
and (cost_center != '' or warehouse != '')"""
|
||||||
% ", ".join(["%s"] * len(invoice_list)),
|
% ", ".join(["%s"] * len(invoice_list)),
|
||||||
tuple(inv.name for inv in invoice_list),
|
tuple(inv.name for inv in invoice_list),
|
||||||
as_dict=1,
|
as_dict=1,
|
||||||
|
@ -161,7 +161,7 @@ def get_leaf_boms() -> List[str]:
|
|||||||
"""select name from `tabBOM` bom
|
"""select name from `tabBOM` bom
|
||||||
where docstatus=1 and is_active=1
|
where docstatus=1 and is_active=1
|
||||||
and not exists(select bom_no from `tabBOM Item`
|
and not exists(select bom_no from `tabBOM Item`
|
||||||
where parent=bom.name and ifnull(bom_no, '')!='')"""
|
where parent=bom.name and bom_no !='')"""
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ def get_issued_items_cost():
|
|||||||
"""select se.project, sum(se_item.amount) as amount
|
"""select se.project, sum(se_item.amount) as amount
|
||||||
from `tabStock Entry` se, `tabStock Entry Detail` se_item
|
from `tabStock Entry` se, `tabStock Entry Detail` se_item
|
||||||
where se.name = se_item.parent and se.docstatus = 1 and ifnull(se_item.t_warehouse, '') = ''
|
where se.name = se_item.parent and se.docstatus = 1 and ifnull(se_item.t_warehouse, '') = ''
|
||||||
and ifnull(se.project, '') != '' group by se.project""",
|
and se.project != '' group by se.project""",
|
||||||
as_dict=1,
|
as_dict=1,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -102,7 +102,7 @@ def get_stock_ledger_entries_for_batch_no(filters):
|
|||||||
.where(
|
.where(
|
||||||
(sle.docstatus < 2)
|
(sle.docstatus < 2)
|
||||||
& (sle.is_cancelled == 0)
|
& (sle.is_cancelled == 0)
|
||||||
& (fn.IfNull(sle.batch_no, "") != "")
|
& (sle.batch_no != "")
|
||||||
& (sle.posting_date <= filters["to_date"])
|
& (sle.posting_date <= filters["to_date"])
|
||||||
)
|
)
|
||||||
.groupby(sle.voucher_no, sle.batch_no, sle.item_code, sle.warehouse)
|
.groupby(sle.voucher_no, sle.batch_no, sle.item_code, sle.warehouse)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user