Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Codition in batch selector query

Browse Source
This commit is contained in:
Deepesh Garg 2020-10-05 13:55:53 +05:30
parent 96fadb7c9b
commit f58a5ec6a5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/controllers/queries.py
View File

@ -368,6 +368,8 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
searchfields = meta.get_search_fields() searchfields = meta.get_search_fields()
search_columns = '' search_columns = ''
search_cond = ''
if searchfields: if searchfields:
search_columns = ", " + ", ".join(searchfields) search_columns = ", " + ", ".join(searchfields)
search_cond = " or " + " or ".join([field + " like %(txt)s" for field in searchfields]) search_cond = " or " + " or ".join([field + " like %(txt)s" for field in searchfields])
@ -389,11 +391,11 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
and sle.warehouse = %(warehouse)s and sle.warehouse = %(warehouse)s
and (sle.batch_no like %(txt)s and (sle.batch_no like %(txt)s
or batch.expiry_date like %(txt)s or batch.expiry_date like %(txt)s
or batch.manufacturing_date like %(txt)s) or batch.manufacturing_date like %(txt)s
{search_cond})
and batch.docstatus < 2 and batch.docstatus < 2
{cond} {cond}
{match_conditions} {match_conditions}
{search_cond}
group by batch_no {having_clause} group by batch_no {having_clause}
order by batch.expiry_date, sle.batch_no desc order by batch.expiry_date, sle.batch_no desc
limit %(start)s, %(page_len)s""".format( limit %(start)s, %(page_len)s""".format(
@ -413,11 +415,12 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
and item = %(item_code)s and item = %(item_code)s
and (name like %(txt)s and (name like %(txt)s
or expiry_date like %(txt)s or expiry_date like %(txt)s
or manufacturing_date like %(txt)s) or manufacturing_date like %(txt)s
{search_cond})
and docstatus < 2 and docstatus < 2
{0} {0}
{match_conditions} {match_conditions}
{search_cond}
order by expiry_date, name desc order by expiry_date, name desc
limit %(start)s, %(page_len)s""".format(cond, search_columns = search_columns, limit %(start)s, %(page_len)s""".format(cond, search_columns = search_columns,
search_cond = search_cond, match_conditions=get_match_cond(doctype)), args) search_cond = search_cond, match_conditions=get_match_cond(doctype)), args)