nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 12:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

a[fix] check content before making in condition

Browse Source
This commit is contained in:
Saurabh
2018-04-17 20:45:06 +05:30
parent 46ffbb74ff
commit 2476a8aab9
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/report/stock_balance/stock_balance.py
View File

@@ -201,6 +201,7 @@ def get_item_details(items, sle, filters):
if not items: if not items:
items = list(set([d.item_code for d in sle])) items = list(set([d.item_code for d in sle]))
if items:
for item in frappe.db.sql(""" for item in frappe.db.sql("""
select name, item_name, description, item_group, brand, stock_uom select name, item_name, description, item_group, brand, stock_uom
from `tabItem` from `tabItem`
@@ -215,6 +216,9 @@ def get_item_details(items, sle, filters):
return item_details return item_details
def get_item_reorder_details(items): def get_item_reorder_details(items):
item_reorder_details = frappe._dict()
if items:
item_reorder_details = frappe.db.sql(""" item_reorder_details = frappe.db.sql("""
select parent, warehouse, warehouse_reorder_qty, warehouse_reorder_level select parent, warehouse, warehouse_reorder_qty, warehouse_reorder_level
from `tabItem Reorder` from `tabItem Reorder`

5
erpnext/stock/report/stock_ledger/stock_ledger.py
View File

@@ -93,11 +93,14 @@ def get_item_details(items, sl_entries):
if not items: if not items:
items = list(set([d.item_code for d in sl_entries])) items = list(set([d.item_code for d in sl_entries]))
if not items:
return item_details
for item in frappe.db.sql(""" for item in frappe.db.sql("""
select name, item_name, description, item_group, brand, stock_uom select name, item_name, description, item_group, brand, stock_uom
from `tabItem` from `tabItem`
where name in ({0}) 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) item_details.setdefault(item.name, item)
return item_details return item_details