From c57c0d4e1df3cd1e6bc47373d56e966b48cda067 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 16 Jan 2013 10:31:55 +0530 Subject: [PATCH 1/2] item name and description added in stock ageing report --- stock/page/stock_ageing/stock_ageing.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stock/page/stock_ageing/stock_ageing.js b/stock/page/stock_ageing/stock_ageing.js index ea495ce6cd..780fb86f3e 100644 --- a/stock/page/stock_ageing/stock_ageing.js +++ b/stock/page/stock_ageing/stock_ageing.js @@ -54,7 +54,11 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({ {id: "earliest", name: "Earliest", field: "earliest", formatter: this.currency_formatter}, {id: "latest", name: "Latest", field: "latest", - formatter: this.currency_formatter} + formatter: this.currency_formatter}, + {id: "item_name", name: "Item Name", field: "item_name", + width: 100, formatter: this.text_formatter}, + {id: "description", name: "Description", field: "description", + width: 200, formatter: this.text_formatter}, ]; }, filters: [ From 44ffd4360ceca3bcc4326b4c6aeaed6914134193 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 16 Jan 2013 11:16:21 +0530 Subject: [PATCH 2/2] reorder level and qty added in stock level report --- startup/report_data_map.py | 3 +- stock/doctype/item/item.txt | 87 ++++++++++++--------------- stock/page/stock_level/stock_level.js | 10 ++- 3 files changed, 48 insertions(+), 52 deletions(-) diff --git a/startup/report_data_map.py b/startup/report_data_map.py index 228a8ae2a1..06bbf44e12 100644 --- a/startup/report_data_map.py +++ b/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": { diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt index d1fc4fcb93..1f623bbd39 100644 --- a/stock/doctype/item/item.txt +++ b/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, - "role": "System Manager", - "cancel": 1, - "permlevel": 0 + "write": 0, + "role": "Material Manager", + "cancel": 0, + "permlevel": 1 }, { + "amend": 0, + "create": 0, "doctype": "DocPerm", - "role": "System Manager", + "write": 0, + "role": "Material User", + "cancel": 0, "permlevel": 1 } ] \ No newline at end of file diff --git a/stock/page/stock_level/stock_level.js b/stock/page/stock_level/stock_level.js index 5b8c2e827b..9c755ef806 100644 --- a/stock/page/stock_level/stock_level.js +++ b/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];