schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use 'eq' and isnull() on qb conditions

Browse Source 
(cherry picked from commit eee86d2e4b)
(cherry picked from commit 22689958da)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
This commit is contained in:
ruthra kumar
2024-03-28 09:17:36 +05:30
committed by Akhil Narang
parent 2425119b5e
commit b4ed2d2c16
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches/v14_0/update_flag_for_return_invoices.py
View File

@@ -22,7 +22,7 @@ def execute():
.where( .where(
(si.creation.gte(creation_date)) (si.creation.gte(creation_date))
& (si.docstatus == 1) & (si.docstatus == 1)
& (si.is_return == True) # noqa: E712 & (si.is_return.eq(True))
& (si.return_against.notnull()) & (si.return_against.notnull())
) )
.run() .run()
@@ -51,7 +51,7 @@ def execute():
.where( .where(
(pi.creation.gte(creation_date)) (pi.creation.gte(creation_date))
& (pi.docstatus == 1) & (pi.docstatus == 1)
& (pi.is_return == True) # noqa: E712 & (pi.is_return.eq(True))
& (pi.return_against.notnull()) & (pi.return_against.notnull())
) )
.run() .run()

6
erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py
View File

@@ -62,10 +62,10 @@ def fetch_item_prices(
or_conditions = [] or_conditions = []
if items: if items:
and_conditions.append(ip.item_code.isin([x.item_code for x in 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.customer.isnull())
or_conditions.append(ip.price_list == None) # noqa: E711 or_conditions.append(ip.price_list.isnull())
if customer: if customer:
or_conditions.append(ip.customer == customer) or_conditions.append(ip.customer == customer)