From 2476a8aab91498d5a80e2da8b1b0e56794021a31 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 17 Apr 2018 20:45:06 +0530 Subject: [PATCH] a[fix] check content before making in condition --- .../report/stock_balance/stock_balance.py | 28 +++++++++++-------- .../stock/report/stock_ledger/stock_ledger.py | 5 +++- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py index 45035f25eb1..3e05716af59 100644 --- a/erpnext/stock/report/stock_balance/stock_balance.py +++ b/erpnext/stock/report/stock_balance/stock_balance.py @@ -200,13 +200,14 @@ def get_item_details(items, sle, filters): item_details = {} if not items: items = list(set([d.item_code for d in sle])) - - for item in frappe.db.sql(""" - select name, item_name, description, item_group, brand, stock_uom - from `tabItem` - where name in ({0}) - """.format(', '.join(['"' + frappe.db.escape(i, percent=False) + '"' for i in items])), as_dict=1): - item_details.setdefault(item.name, item) + + if items: + for item in frappe.db.sql(""" + select name, item_name, description, item_group, brand, stock_uom + from `tabItem` + where name in ({0}) + """.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: variant_values = get_variant_values_for(item_details.keys()) @@ -215,11 +216,14 @@ def get_item_details(items, sle, filters): return item_details def get_item_reorder_details(items): - item_reorder_details = frappe.db.sql(""" - select parent, warehouse, warehouse_reorder_qty, warehouse_reorder_level - from `tabItem Reorder` - where parent in ({0}) - """.format(', '.join(['"' + frappe.db.escape(i, percent=False) + '"' for i in items])), as_dict=1) + item_reorder_details = frappe._dict() + + if items: + item_reorder_details = frappe.db.sql(""" + select parent, warehouse, warehouse_reorder_qty, warehouse_reorder_level + from `tabItem Reorder` + where parent in ({0}) + """.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 5e185e05337..e29f50a5496 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.py +++ b/erpnext/stock/report/stock_ledger/stock_ledger.py @@ -93,11 +93,14 @@ def get_item_details(items, sl_entries): if not items: items = list(set([d.item_code for d in sl_entries])) + if not items: + return item_details + for item in frappe.db.sql(""" select name, item_name, description, item_group, brand, stock_uom from `tabItem` where name in ({0}) - """.format(', '.join(['"' + frappe.db.escape(i,percent=False) + '"' for i in items])), as_dict=1): + """.format(', '.join(['"' + frappe.db.escape(i,percent=False) + '"' for i in items])), as_dict=1, debug=1): item_details.setdefault(item.name, item) return item_details