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

[Fix] Wrong batch showing in the popup (#12421)

Browse Source
This commit is contained in:
rohitwaghchaure 2018-01-12 16:22:33 +05:30 committed by Nabin Hait
parent bba5fd7a38
commit 9fbed5617f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/pos_profile/pos_profile.py
View File

@ -25,7 +25,7 @@ class POSProfile(Document):
`tabPOS Profile User` pfu, `tabPOS Profile` pf `tabPOS Profile User` pfu, `tabPOS Profile` pf
where where
pf.name = pfu.parent and pfu.user = %s and pf.name != %s and pf.company = %s pf.name = pfu.parent and pfu.user = %s and pf.name != %s and pf.company = %s
and pfu.default=1""", (row.user, self.name, self.company)) and pfu.default=1 and pf.disabled = 0""", (row.user, self.name, self.company))
if row.default and res: if row.default and res:
msgprint(_("Already set default in pos profile {0} for user {1}, kindly disabled default") msgprint(_("Already set default in pos profile {0} for user {1}, kindly disabled default")

9
erpnext/controllers/queries.py
View File

@ -414,10 +414,11 @@ def get_doctype_wise_filters(filters):
@frappe.whitelist() @frappe.whitelist()
def get_batch_numbers(doctype, txt, searchfield, start, page_len, filters): def get_batch_numbers(doctype, txt, searchfield, start, page_len, filters):
query = 'select batch_id from `tabBatch` ' \ query = """select batch_id from `tabBatch`
'where (`tabBatch`.expiry_date >= CURDATE() or `tabBatch`.expiry_date IS NULL)' where (expiry_date >= CURDATE() or expiry_date IS NULL)
and name like '{txt}'""".format(txt = frappe.db.escape('%{0}%'.format(txt)))
if filters and filters.get('item_code'): if filters and filters.get('item'):
query += 'where item = %(item_code)s' % filters query += " and item = '{item}'".format(item = frappe.db.escape(filters.get('item')))
return frappe.db.sql(query) return frappe.db.sql(query)