Merge pull request #4723 from ShashaQin/patch-12

Stock Reconciliation Improvements

erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py

@@ -252,21 +252,23 @@ def get_items(warehouse, posting_date, posting_time):
 	items = frappe.get_list("Bin", fields=["item_code"], filters={"warehouse": warehouse}, as_list=1)
 
 	items += frappe.get_list("Item", fields=["name"], filters= {"is_stock_item": 1, "has_serial_no": 0,
-		"has_batch_no": 0, "has_variants": 0, "default_warehouse": warehouse}, as_list=1)
+		"has_batch_no": 0, "has_variants": 0, "disabled": 0, "default_warehouse": warehouse}, as_list=1)
 
 	res = []
 	for item in set(items):
 		stock_bal = get_stock_balance(item[0], warehouse, posting_date, posting_time,
 			with_valuation_rate=True)
 
-		res.append({
-			"item_code": item[0],
-			"warehouse": warehouse,
-			"qty": stock_bal[0],
-			"valuation_rate": stock_bal[1],
-			"current_qty": stock_bal[0],
-			"current_valuation_rate": stock_bal[1]
-		})
+		if frappe.db.get_value("Item",item[0],"disabled") == 0:
+
+			res.append({
+				"item_code": item[0],
+				"warehouse": warehouse,
+				"qty": stock_bal[0],
+				"valuation_rate": stock_bal[1],
+				"current_qty": stock_bal[0],
+				"current_valuation_rate": stock_bal[1]
+			})
 
 	return res
 

erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json

@@ -110,7 +110,7 @@
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
-   "description": "", 
+   "description": "Do not include symbols (ex. $)", 
    "fieldname": "valuation_rate", 
    "fieldtype": "Currency", 
    "hidden": 0, 
@@ -215,7 +215,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2015-11-30 02:34:10.385030", 
+ "modified": "2016-01-27 16:04:42.325454", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Reconciliation Item", 
@@ -226,4 +226,4 @@
  "read_only_onload": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC"
-}
+}