reorder level and qty added in stock level report

startup/report_data_map.py

@@ -61,7 +61,8 @@ data_map = {
 	# Stock
 	"Item": {
 		"columns": ["name", "if(item_name=name, '', item_name) as item_name", "description", 
-			"item_group as parent_item_group", "stock_uom", "brand", "valuation_method"],
+			"item_group as parent_item_group", "stock_uom", "brand", "valuation_method", 
+			"re_order_level", "re_order_qty"],
 		# "conditions": ["docstatus < 2"],
 		"order_by": "name",
 		"links": {

stock/doctype/item/item.txt

@@ -2,21 +2,21 @@
  {
   "owner": "Administrator", 
   "docstatus": 0, 
-  "creation": "2012-12-17 14:56:32", 
+  "creation": "2012-12-28 11:01:35", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-27 10:36:56"
+  "modified": "2013-01-16 11:14:57"
  }, 
  {
   "allow_attach": 1, 
   "search_fields": "item_name,description,item_group,customer_code", 
   "module": "Stock", 
+  "doctype": "DocType", 
+  "autoname": "field:item_code", 
   "document_type": "Master", 
   "description": "A Product or a Service that is bought, sold or kept in stock.", 
-  "autoname": "field:item_code", 
   "name": "__common__", 
   "default_print_format": "Standard", 
   "allow_rename": 1, 
-  "doctype": "DocType", 
   "max_attachments": 1
  }, 
  {
@@ -30,7 +30,9 @@
   "name": "__common__", 
   "parent": "Item", 
   "read": 1, 
+  "submit": 0, 
   "doctype": "DocPerm", 
+  "report": 1, 
   "parenttype": "DocType", 
   "parentfield": "permissions"
  }, 
@@ -860,46 +862,6 @@
   "fieldtype": "Text Editor", 
   "permlevel": 0
  }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "cancel": 0, 
-  "role": "Material Manager", 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "cancel": 0, 
-  "role": "Material Manager", 
-  "permlevel": 0
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "cancel": 0, 
-  "role": "Material User", 
-  "permlevel": 1
- }, 
- {
-  "amend": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "submit": 0, 
-  "write": 0, 
-  "cancel": 0, 
-  "role": "Material User", 
-  "permlevel": 0
- }, 
  {
   "create": 1, 
   "doctype": "DocPerm", 
@@ -909,23 +871,48 @@
   "permlevel": 0
  }, 
  {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "write": 0, 
+  "role": "Material Manager", 
+  "cancel": 0, 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 0, 
+  "create": 0, 
+  "doctype": "DocPerm", 
+  "write": 0, 
+  "role": "Material User", 
+  "cancel": 0, 
+  "permlevel": 0
+ }, 
+ {
+  "amend": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
   "write": 0, 
   "role": "Material Master Manager", 
+  "cancel": 0, 
   "permlevel": 1
  }, 
  {
-  "create": 1, 
+  "amend": 0, 
+  "create": 0, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "write": 0, 
-  "role": "System Manager", 
+  "role": "Material Manager", 
-  "cancel": 1, 
+  "cancel": 0, 
-  "permlevel": 0
+  "permlevel": 1
  }, 
  {
+  "amend": 0, 
+  "create": 0, 
   "doctype": "DocPerm", 
-  "role": "System Manager", 
+  "write": 0, 
+  "role": "Material User", 
+  "cancel": 0, 
   "permlevel": 1
  }
 ]

stock/page/stock_level/stock_level.js

@@ -83,6 +83,10 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
 				field: "reserved_qty", width: 80, formatter: this.currency_formatter},
 			{id: "projected_qty", name: "Projected Qty", 
 				field: "projected_qty", width: 80, formatter: this.currency_formatter},
+			{id: "re_order_level", name: "Re-Order Level", 
+				field: "re_order_level", width: 80, formatter: this.currency_formatter},
+			{id: "re_order_qty", name: "Re-Order Qty", 
+				field: "re_order_qty", width: 80, formatter: this.currency_formatter},
 			{id: "uom", name: "UOM", field: "uom", width: 60},
 			{id: "brand", name: "Brand", field: "brand", width: 100,
 				link_formatter: {filter_input: "brand"}},
@@ -171,7 +175,7 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
 				});
 			}
 		);
-
+		
 		// sort by item, warehouse
 		this._data = $.map(Object.keys(this.item_warehouse_map).sort(), function(key) {
 			return me.item_warehouse_map[key];
@@ -202,6 +206,10 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
 				id: key,
 			}
 			this.reset_item_values(row);
+			
+			row["re_order_level"] = item.re_order_level
+			row["re_order_qty"] = item.re_order_qty
+			
 			this.item_warehouse_map[key] = row;
 		}
 		return this.item_warehouse_map[key];