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

shifted item name and description fields to the left of stock reports

Browse Source
This commit is contained in:
Anand Doshi 2013-02-26 12:23:39 +05:30
parent a4d8e6b177
commit 805fdf313c
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/stock_analytics.js
View File

@ -53,8 +53,8 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({
formatter: this.check_formatter},
{id: "name", name: "Item", field: "name", width: 300,
formatter: this.tree_formatter},
{id: "stock_uom", name: "UOM", field: "stock_uom", width: 100},
{id: "brand", name: "Brand", field: "brand", width: 100},
{id: "stock_uom", name: "UOM", field: "stock_uom", width: 100},
{id: "opening", name: "Opening", field: "opening", hidden: true,
formatter: this.currency_formatter}
];

2
startup/report_data_map.py
View File

@ -87,7 +87,7 @@ data_map = {
},
"Stock Ledger Entry": {
"columns": ["name", "posting_date", "posting_time", "item_code", "warehouse", "actual_qty as qty",
"voucher_type", "voucher_no", "ifnull(incoming_rate,0) as incoming_rate"],
"voucher_type", "voucher_no", "ifnull(incoming_rate,0) as incoming_rate", "stock_uom"],
"conditions": ["ifnull(is_cancelled, 'No')='No'"],
"order_by": "posting_date, posting_time, name",
"links": {

10
stock/page/stock_ageing/stock_ageing.js
View File

@ -48,6 +48,11 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({
open_btn: true,
doctype: '"Item"'
}},
{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},
{id: "brand", name: "Brand", field: "brand", width: 100},
{id: "average_age", name: "Average Age", field: "average_age",
formatter: this.currency_formatter},
{id: "earliest", name: "Earliest", field: "earliest",
@ -55,11 +60,6 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({
{id: "latest", name: "Latest", field: "latest",
formatter: this.currency_formatter},
{id: "stock_uom", name: "UOM", field: "stock_uom", width: 100},
{id: "brand", name: "Brand", field: "brand", width: 100},
{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: [

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

@ -42,7 +42,11 @@ erpnext.StockBalance = erpnext.StockAnalytics.extend({
this.columns = [
{id: "name", name: "Item", field: "name", width: 300,
formatter: this.tree_formatter},
{id: "item_name", name: "Item Name", field: "item_name", width: 100},
{id: "description", name: "Description", field: "description", width: 200,
formatter: this.text_formatter},
{id: "brand", name: "Brand", field: "brand", width: 100},
{id: "stock_uom", name: "UOM", field: "stock_uom", width: 100},
{id: "opening_qty", name: "Opening Qty", field: "opening_qty", width: 100,
formatter: this.currency_formatter},
{id: "inflow_qty", name: "In Qty", field: "inflow_qty", width: 100,
@ -60,11 +64,6 @@ erpnext.StockBalance = erpnext.StockAnalytics.extend({
formatter: this.currency_formatter},
{id: "closing_value", name: "Closing Value", field: "closing_value", width: 100,
formatter: this.currency_formatter},
{id: "stock_uom", name: "UOM", field: "stock_uom", width: 100},
{id: "brand", name: "Brand", field: "brand", width: 100},
{id: "item_name", name: "Item Name", field: "item_name", width: 100},
{id: "description", name: "Description", field: "description", width: 200,
formatter: this.text_formatter},
];
},

5
stock/page/stock_ledger/stock_ledger.js
View File

@ -52,9 +52,12 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({
open_btn: true,
doctype: '"Item"',
}},
{id: "description", name: "Description", field: "description", width: 200,
formatter: this.text_formatter},
{id: "warehouse", name: "Warehouse", field: "warehouse", width: 100,
link_formatter: {filter_input: "warehouse"}},
{id: "brand", name: "Brand", field: "brand", width: 100},
{id: "stock_uom", name: "UOM", field: "stock_uom", width: 100},
{id: "qty", name: "Qty", field: "qty", width: 100,
formatter: this.currency_formatter},
{id: "balance", name: "Balance Qty", field: "balance", width: 100,
@ -69,8 +72,6 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({
open_btn: true,
doctype: "dataContext.voucher_type"
}},
{id: "description", name: "Description", field: "description", width: 200,
formatter: this.text_formatter},
];
},

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

@ -69,8 +69,15 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
open_btn: true,
doctype: '"Item"',
}},
{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},
{id: "brand", name: "Brand", field: "brand", width: 100,
link_formatter: {filter_input: "brand"}},
{id: "warehouse", name: "Warehouse", field: "warehouse", width: 100,
link_formatter: {filter_input: "warehouse"}},
{id: "uom", name: "UOM", field: "uom", width: 60},
{id: "actual_qty", name: "Actual Qty",
field: "actual_qty", width: 80, formatter: this.currency_formatter},
{id: "planned_qty", name: "Planned Qty",
@ -87,13 +94,6 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
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"}},
{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},
];
},