nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into multi-barcode

Browse Source
This commit is contained in:
tundebabzy
2018-01-10 21:49:27 +01:00
committed by GitHub
parent da40999ed8 619c42b934
commit 76dddbf26e
414 changed files with 105304 additions and 77387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/queries.py
View File

@@ -418,6 +418,6 @@ def get_batch_numbers(doctype, txt, searchfield, start, page_len, filters):
'where (`tabBatch`.expiry_date >= CURDATE() or `tabBatch`.expiry_date IS NULL)'
if filters and filters.get('item_code'):
query += 'where item = %(item_code)s' % filters
query += 'and item = %(item_code)s'
return frappe.db.sql(query)
return frappe.db.sql(query, filters)