From 6072a682bc150e9a81935868e6292dab39883afc Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 31 Dec 2012 17:16:23 +0530 Subject: [PATCH] added description in stock level and balance report --- startup/report_data_map.py | 2 +- stock/page/stock_balance/stock_balance.js | 19 +++++++++++-------- stock/page/stock_level/stock_level.js | 6 ++++-- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/startup/report_data_map.py b/startup/report_data_map.py index 912246c51b4..c7a8ab7e7ef 100644 --- a/startup/report_data_map.py +++ b/startup/report_data_map.py @@ -60,7 +60,7 @@ data_map = { # Stock "Item": { - "columns": ["name", "if(item_name=name, '', item_name) as item_name", + "columns": ["name", "if(item_name=name, '', item_name) as item_name", "description", "item_group as parent_item_group", "stock_uom", "brand", "valuation_method"], # "conditions": ["docstatus < 2"], "order_by": "name", diff --git a/stock/page/stock_balance/stock_balance.js b/stock/page/stock_balance/stock_balance.js index b25d150b996..da6b831d93d 100644 --- a/stock/page/stock_balance/stock_balance.js +++ b/stock/page/stock_balance/stock_balance.js @@ -42,15 +42,18 @@ erpnext.StockBalance = erpnext.StockAnalytics.extend({ this.columns = [ {id: "name", name: "Item", field: "name", width: 300, formatter: this.tree_formatter}, + {id: "opening", name: "Opening", field: "opening", width: 100, + formatter: this.currency_formatter}, + {id: "inflow", name: "In", field: "inflow", width: 100, + formatter: this.currency_formatter}, + {id: "outflow", name: "Out", field: "outflow", width: 100, + formatter: this.currency_formatter}, + {id: "closing", name: "Closing", field: "closing", width: 100, + formatter: this.currency_formatter}, {id: "brand", name: "Brand", field: "brand", width: 100}, - {id: "opening", name: "Opening", field: "opening", - formatter: this.currency_formatter}, - {id: "inflow", name: "In", field: "inflow", - formatter: this.currency_formatter}, - {id: "outflow", name: "Out", field: "outflow", - formatter: this.currency_formatter}, - {id: "closing", name: "Closing", field: "closing", - formatter: this.currency_formatter}, + {id: "item_name", name: "Item Name", field: "item_name", width: 100}, + {id: "description", name: "Description", field: "description", width: 200, + formatter: this.text_formatter}, ]; }, diff --git a/stock/page/stock_level/stock_level.js b/stock/page/stock_level/stock_level.js index 87fce6a9bca..356864f9112 100644 --- a/stock/page/stock_level/stock_level.js +++ b/stock/page/stock_level/stock_level.js @@ -84,10 +84,12 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({ {id: "projected_qty", name: "Projected Qty", field: "projected_qty", width: 80, formatter: this.currency_formatter}, {id: "uom", name: "UOM", field: "uom", width: 60}, - {id: "item_name", name: "Item Name", field: "item_name", width: 100, - formatter: this.text_formatter}, {id: "brand", name: "Brand", field: "brand", width: 100, link_formatter: {filter_input: "brand"}}, + {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}, ]; },