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

added description in stock level and balance report

Browse Source
This commit is contained in:
Nabin Hait 2012-12-31 17:16:23 +05:30
parent 056bdabc6b
commit 6072a682bc
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
startup/report_data_map.py
View File

@ -60,7 +60,7 @@ data_map = {
# Stock # Stock
"Item": { "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"], "item_group as parent_item_group", "stock_uom", "brand", "valuation_method"],
# "conditions": ["docstatus < 2"], # "conditions": ["docstatus < 2"],
"order_by": "name", "order_by": "name",

19
stock/page/stock_balance/stock_balance.js
View File

@ -42,15 +42,18 @@ erpnext.StockBalance = erpnext.StockAnalytics.extend({
this.columns = [ this.columns = [
{id: "name", name: "Item", field: "name", width: 300, {id: "name", name: "Item", field: "name", width: 300,
formatter: this.tree_formatter}, 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: "brand", name: "Brand", field: "brand", width: 100},
{id: "opening", name: "Opening", field: "opening", {id: "item_name", name: "Item Name", field: "item_name", width: 100},
formatter: this.currency_formatter}, {id: "description", name: "Description", field: "description", width: 200,
{id: "inflow", name: "In", field: "inflow", formatter: this.text_formatter},
formatter: this.currency_formatter},
{id: "outflow", name: "Out", field: "outflow",
formatter: this.currency_formatter},
{id: "closing", name: "Closing", field: "closing",
formatter: this.currency_formatter},
]; ];
}, },

6
stock/page/stock_level/stock_level.js
View File

@ -84,10 +84,12 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
{id: "projected_qty", name: "Projected Qty", {id: "projected_qty", name: "Projected Qty",
field: "projected_qty", width: 80, formatter: this.currency_formatter}, field: "projected_qty", width: 80, formatter: this.currency_formatter},
{id: "uom", name: "UOM", field: "uom", width: 60}, {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, {id: "brand", name: "Brand", field: "brand", width: 100,
link_formatter: {filter_input: "brand"}}, 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},
]; ];
}, },