From 9fbb8192e19524cdea2f9b0204f4d641bc0b3a25 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 17 Apr 2018 11:56:46 +0530 Subject: [PATCH] [fix] do not escape % while using clause (#13677) --- erpnext/stock/report/stock_balance/stock_balance.py | 6 +++--- erpnext/stock/report/stock_ledger/stock_ledger.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py index 17491ede95..45035f25eb 100644 --- a/erpnext/stock/report/stock_balance/stock_balance.py +++ b/erpnext/stock/report/stock_balance/stock_balance.py @@ -104,7 +104,7 @@ def get_stock_ledger_entries(filters, items): item_conditions_sql = '' if items: item_conditions_sql = ' and sle.item_code in ({})'\ - .format(', '.join(['"' + frappe.db.escape(i) + '"' for i in items])) + .format(', '.join(['"' + frappe.db.escape(i, percent=False) + '"' for i in items])) conditions = get_conditions(filters) @@ -205,7 +205,7 @@ def get_item_details(items, sle, filters): select name, item_name, description, item_group, brand, stock_uom from `tabItem` where name in ({0}) - """.format(', '.join(['"' + frappe.db.escape(i) + '"' for i in items])), as_dict=1): + """.format(', '.join(['"' + frappe.db.escape(i, percent=False) + '"' for i in items])), as_dict=1): item_details.setdefault(item.name, item) if filters.get('show_variant_attributes', 0) == 1: @@ -219,7 +219,7 @@ def get_item_reorder_details(items): select parent, warehouse, warehouse_reorder_qty, warehouse_reorder_level from `tabItem Reorder` where parent in ({0}) - """.format(', '.join(['"' + frappe.db.escape(i) + '"' for i in items])), as_dict=1) + """.format(', '.join(['"' + frappe.db.escape(i, percent=False) + '"' for i in items])), as_dict=1) return dict((d.parent + d.warehouse, d) for d in item_reorder_details) diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py index c9286a3e87..5e185e0533 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.py +++ b/erpnext/stock/report/stock_ledger/stock_ledger.py @@ -56,7 +56,7 @@ def get_stock_ledger_entries(filters, items): item_conditions_sql = '' if items: item_conditions_sql = 'and sle.item_code in ({})'\ - .format(', '.join(['"' + frappe.db.escape(i) + '"' for i in items])) + .format(', '.join(['"' + frappe.db.escape(i,percent=False) + '"' for i in items])) return frappe.db.sql("""select concat_ws(" ", posting_date, posting_time) as date, item_code, warehouse, actual_qty, qty_after_transaction, incoming_rate, valuation_rate, @@ -97,7 +97,7 @@ def get_item_details(items, sl_entries): select name, item_name, description, item_group, brand, stock_uom from `tabItem` where name in ({0}) - """.format(', '.join(['"' + frappe.db.escape(i) + '"' for i in items])), as_dict=1): + """.format(', '.join(['"' + frappe.db.escape(i,percent=False) + '"' for i in items])), as_dict=1): item_details.setdefault(item.name, item) return item_details