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

feat: consider expiry_date during Batch queries (#20065)

Browse Source
This commit is contained in:
Sun Howwrongbum 2019-12-24 12:29:25 +05:30 committed by Nabin Hait
parent 818c49279c
commit 088be37e64
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/controllers/queries.py
View File

@ -311,6 +311,7 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
and sle.item_code = %(item_code)s and sle.item_code = %(item_code)s
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.manufacturing_date like %(txt)s) or batch.manufacturing_date like %(txt)s)
and batch.docstatus < 2 and batch.docstatus < 2
{cond} {cond}
@ -329,6 +330,7 @@ def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
where batch.disabled = 0 where batch.disabled = 0
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 manufacturing_date like %(txt)s) or manufacturing_date like %(txt)s)
and docstatus < 2 and docstatus < 2
{0} {0}