mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-04 20:59:11 +00:00
removed searchfield condition from get_match_cond frappe/erpnext#1457
This commit is contained in:
@@ -171,5 +171,5 @@ def item_details(doctype, txt, searchfield, start, page_len, filters):
|
||||
and ifnull(qty, 0) > ifnull(packed_qty, 0))
|
||||
and %s like "%s" %s
|
||||
limit %s, %s """ % ("%s", searchfield, "%s",
|
||||
get_match_cond(doctype, searchfield), "%s", "%s"),
|
||||
get_match_cond(doctype), "%s", "%s"),
|
||||
(filters["delivery_note"], "%%%s%%" % txt, start, page_len))
|
||||
@@ -631,7 +631,7 @@ def query_sales_return_doc(doctype, txt, searchfield, start, page_len, filters):
|
||||
or `customer` like %%(txt)s) %s %s
|
||||
order by name, customer, customer_name
|
||||
limit %s""" % (doctype, searchfield, conditions,
|
||||
get_match_cond(doctype, searchfield), "%(start)s, %(page_len)s"),
|
||||
get_match_cond(doctype), "%(start)s, %(page_len)s"),
|
||||
{"txt": "%%%s%%" % txt, "start": start, "page_len": page_len},
|
||||
as_list=True)
|
||||
|
||||
@@ -641,7 +641,7 @@ def query_purchase_return_doc(doctype, txt, searchfield, start, page_len, filter
|
||||
and (`%s` like %%(txt)s
|
||||
or `supplier` like %%(txt)s) %s
|
||||
order by name, supplier, supplier_name
|
||||
limit %s""" % (doctype, searchfield, get_match_cond(doctype, searchfield),
|
||||
limit %s""" % (doctype, searchfield, get_match_cond(doctype),
|
||||
"%(start)s, %(page_len)s"), {"txt": "%%%s%%" % txt, "start":
|
||||
start, "page_len": page_len}, as_list=True)
|
||||
|
||||
@@ -679,7 +679,7 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
|
||||
's_warehouse': filters['s_warehouse'],
|
||||
'posting_date': filters['posting_date'],
|
||||
'txt': "%%%s%%" % txt,
|
||||
'mcond':get_match_cond(doctype, searchfield),
|
||||
'mcond':get_match_cond(doctype),
|
||||
"start": start,
|
||||
"page_len": page_len
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user