diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py index 3e890b4dd4..114925469b 100644 --- a/erpnext/stock/doctype/batch/batch.py +++ b/erpnext/stock/doctype/batch/batch.py @@ -261,15 +261,14 @@ def get_batch_no(item_code, warehouse, qty=1, throw=False): def get_batches(item_code, warehouse, qty=1, throw=False): - batches = frappe.db.sql( - 'select batch_id, sum(actual_qty) as qty from `tabBatch` join `tabStock Ledger Entry` ignore index (item_code, warehouse) ' - 'on (`tabBatch`.batch_id = `tabStock Ledger Entry`.batch_no )' - 'where `tabStock Ledger Entry`.item_code = %s and `tabStock Ledger Entry`.warehouse = %s ' - 'and (`tabBatch`.expiry_date >= CURDATE() or `tabBatch`.expiry_date IS NULL)' - 'group by batch_id ' - 'order by `tabBatch`.expiry_date ASC, `tabBatch`.creation ASC', - (item_code, warehouse), - as_dict=True - ) - return batches + return frappe.db.sql(""" + select batch_id, sum(`tabStock Ledger Entry`.actual_qty) as qty + from `tabBatch` + join `tabStock Ledger Entry` ignore index (item_code, warehouse) + on (`tabBatch`.batch_id = `tabStock Ledger Entry`.batch_no ) + where `tabStock Ledger Entry`.item_code = %s and `tabStock Ledger Entry`.warehouse = %s + and (`tabBatch`.expiry_date >= CURDATE() or `tabBatch`.expiry_date IS NULL) + group by batch_id + order by `tabBatch`.expiry_date ASC, `tabBatch`.creation ASC' + """, (item_code, warehouse), as_dict=True) \ No newline at end of file