Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't show disabled items in the stock balance report (#14851)

Browse Source
This commit is contained in:
rohitwaghchaure 2018-07-09 16:56:41 +05:30 committed by Nabin Hait
parent f38d6d9c44
commit 07d0e9a2b2
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,32 +21,33 @@ def execute(filters=None):
data = [] data = []
for (company, item, warehouse) in sorted(iwb_map): for (company, item, warehouse) in sorted(iwb_map):
qty_dict = iwb_map[(company, item, warehouse)] if item_map.get(item):
item_reorder_level = 0 qty_dict = iwb_map[(company, item, warehouse)]
item_reorder_qty = 0 item_reorder_level = 0
if item + warehouse in item_reorder_detail_map: item_reorder_qty = 0
item_reorder_level = item_reorder_detail_map[item + warehouse]["warehouse_reorder_level"] if item + warehouse in item_reorder_detail_map:
item_reorder_qty = item_reorder_detail_map[item + warehouse]["warehouse_reorder_qty"] item_reorder_level = item_reorder_detail_map[item + warehouse]["warehouse_reorder_level"]
item_reorder_qty = item_reorder_detail_map[item + warehouse]["warehouse_reorder_qty"]
report_data = [item, item_map[item]["item_name"], report_data = [item, item_map[item]["item_name"],
item_map[item]["item_group"], item_map[item]["item_group"],
item_map[item]["brand"], item_map[item]["brand"],
item_map[item]["description"], warehouse, item_map[item]["description"], warehouse,
item_map[item]["stock_uom"], qty_dict.opening_qty, item_map[item]["stock_uom"], qty_dict.opening_qty,
qty_dict.opening_val, qty_dict.in_qty, qty_dict.opening_val, qty_dict.in_qty,
qty_dict.in_val, qty_dict.out_qty, qty_dict.in_val, qty_dict.out_qty,
qty_dict.out_val, qty_dict.bal_qty, qty_dict.out_val, qty_dict.bal_qty,
qty_dict.bal_val, qty_dict.val_rate, qty_dict.bal_val, qty_dict.val_rate,
item_reorder_level, item_reorder_level,
item_reorder_qty, item_reorder_qty,
company company
] ]
if filters.get('show_variant_attributes', 0) == 1: if filters.get('show_variant_attributes', 0) == 1:
variants_attributes = get_variants_attributes() variants_attributes = get_variants_attributes()
report_data += [item_map[item].get(i) for i in variants_attributes] report_data += [item_map[item].get(i) for i in variants_attributes]
data.append(report_data) data.append(report_data)
if filters.get('show_variant_attributes', 0) == 1: if filters.get('show_variant_attributes', 0) == 1:
columns += ["{}:Data:100".format(i) for i in get_variants_attributes()] columns += ["{}:Data:100".format(i) for i in get_variants_attributes()]
@ -200,12 +201,12 @@ def get_item_details(items, sle, filters):
item_details = {} item_details = {}
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: 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`
where name in ({0}) where name in ({0}) and ifnull(disabled, 0) = 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):
item_details.setdefault(item.name, item) item_details.setdefault(item.name, item)