diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py index 626c20e1ae..88600e88cc 100644 --- a/erpnext/controllers/queries.py +++ b/erpnext/controllers/queries.py @@ -358,31 +358,31 @@ def warehouse_query(doctype, txt, searchfield, start, page_len, filters): filter_dict = get_doctype_wise_filters(filters) sub_query = """ select round(`tabBin`.actual_qty, 2) from `tabBin` - where `tabBin`.warehouse = `tabWarehouse`.name - {bin_conditions} """.format( - bin_conditions=get_filters_cond(doctype, filter_dict.get("Bin"), bin_conditions)) + where `tabBin`.warehouse = `tabWarehouse`.name + {bin_conditions} """.format( + bin_conditions=get_filters_cond(doctype, filter_dict.get("Bin"), bin_conditions)) response = frappe.db.sql("""select `tabWarehouse`.name, - CONCAT_WS(" : ", "Actual Qty", ifnull( ({sub_query}), 0) ) as actual_qty - from `tabWarehouse` - where - `tabWarehouse`.`{key}` like %(txt)s - {fcond} {mcond} - order by - `tabWarehouse`.name desc - limit - %(start)s, %(page_len)s - """.format( - sub_query=sub_query, - key=frappe.db.escape(searchfield), - fcond=get_filters_cond(doctype, filter_dict.get("Warehouse"), conditions), - mcond=get_match_cond(doctype) - ), - { - "txt": "%%%s%%" % frappe.db.escape(txt), - "start": start, - "page_len": page_len - }) + CONCAT_WS(" : ", "Actual Qty", ifnull( ({sub_query}), 0) ) as actual_qty + from `tabWarehouse` + where + `tabWarehouse`.`{key}` like %(txt)s + {fcond} {mcond} + order by + `tabWarehouse`.name desc + limit + %(start)s, %(page_len)s + """.format( + sub_query=sub_query, + key=frappe.db.escape(searchfield), + fcond=get_filters_cond(doctype, filter_dict.get("Warehouse"), conditions), + mcond=get_match_cond(doctype) + ), + { + "txt": "%%%s%%" % frappe.db.escape(txt), + "start": start, + "page_len": page_len + }) return response