mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-01 19:29:10 +00:00
fix(stock): change qb to qb get_query to fix filter issues (#55443)
This commit is contained in:
committed by
GitHub
parent
f2e7d90688
commit
4ef17c9c1b
@@ -433,10 +433,15 @@ def get_delivery_notes_to_be_billed(
|
|||||||
.where((DeliveryNote.docstatus == 1) & (DeliveryNote.is_return == 0) & (DeliveryNote.per_billed > 0))
|
.where((DeliveryNote.docstatus == 1) & (DeliveryNote.is_return == 0) & (DeliveryNote.per_billed > 0))
|
||||||
)
|
)
|
||||||
|
|
||||||
|
query = frappe.qb.get_query(
|
||||||
|
"Delivery Note",
|
||||||
|
fields=fields,
|
||||||
|
filters=filters,
|
||||||
|
ignore_permissions=False,
|
||||||
|
)
|
||||||
|
|
||||||
query = (
|
query = (
|
||||||
frappe.qb.from_(DeliveryNote)
|
query.where(
|
||||||
.select(*[DeliveryNote[f] for f in fields])
|
|
||||||
.where(
|
|
||||||
(DeliveryNote.docstatus == 1)
|
(DeliveryNote.docstatus == 1)
|
||||||
& (DeliveryNote.status.notin(["Stopped", "Closed"]))
|
& (DeliveryNote.status.notin(["Stopped", "Closed"]))
|
||||||
& (DeliveryNote[searchfield].like(f"%{txt}%"))
|
& (DeliveryNote[searchfield].like(f"%{txt}%"))
|
||||||
@@ -450,12 +455,11 @@ def get_delivery_notes_to_be_billed(
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
.orderby(DeliveryNote[searchfield], order=Order.asc)
|
||||||
|
.limit(page_len)
|
||||||
|
.offset(start)
|
||||||
)
|
)
|
||||||
if filters and isinstance(filters, dict):
|
|
||||||
for key, value in filters.items():
|
|
||||||
query = query.where(DeliveryNote[key] == value)
|
|
||||||
|
|
||||||
query = query.orderby(DeliveryNote[searchfield], order=Order.asc).limit(page_len).offset(start)
|
|
||||||
return query.run(as_dict=as_dict)
|
return query.run(as_dict=as_dict)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user