diff --git a/erpnext/patches/v14_0/update_flag_for_return_invoices.py b/erpnext/patches/v14_0/update_flag_for_return_invoices.py index e8b54d6afef..2136d55a786 100644 --- a/erpnext/patches/v14_0/update_flag_for_return_invoices.py +++ b/erpnext/patches/v14_0/update_flag_for_return_invoices.py @@ -22,7 +22,7 @@ def execute(): .where( (si.creation.gte(creation_date)) & (si.docstatus == 1) - & (si.is_return == True) # noqa: E712 + & (si.is_return.eq(True)) & (si.return_against.notnull()) ) .run() @@ -51,7 +51,7 @@ def execute(): .where( (pi.creation.gte(creation_date)) & (pi.docstatus == 1) - & (pi.is_return == True) # noqa: E712 + & (pi.is_return.eq(True)) & (pi.return_against.notnull()) ) .run() diff --git a/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py b/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py index 3922beae1d2..84da765d930 100644 --- a/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py +++ b/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py @@ -62,10 +62,10 @@ def fetch_item_prices( or_conditions = [] if items: and_conditions.append(ip.item_code.isin([x.item_code for x in items])) - and_conditions.append(ip.selling == True) # noqa: E712 + and_conditions.append(ip.selling.eq(True)) - or_conditions.append(ip.customer == None) # noqa: E711 - or_conditions.append(ip.price_list == None) # noqa: E711 + or_conditions.append(ip.customer.isnull()) + or_conditions.append(ip.price_list.isnull()) if customer: or_conditions.append(ip.customer == customer)