Merge branch 'master' into edge
diff --git a/public/js/stock_analytics.js b/public/js/stock_analytics.js
index 5ebe65f..d6a994c 100644
--- a/public/js/stock_analytics.js
+++ b/public/js/stock_analytics.js
@@ -53,8 +53,8 @@
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}
];
diff --git a/startup/report_data_map.py b/startup/report_data_map.py
index 93995a9..ba3b546 100644
--- a/startup/report_data_map.py
+++ b/startup/report_data_map.py
@@ -87,7 +87,7 @@
},
"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": {
diff --git a/stock/page/stock_ageing/stock_ageing.js b/stock/page/stock_ageing/stock_ageing.js
index fb60771..edad9a7 100644
--- a/stock/page/stock_ageing/stock_ageing.js
+++ b/stock/page/stock_ageing/stock_ageing.js
@@ -48,6 +48,11 @@
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 @@
{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: [
diff --git a/stock/page/stock_balance/stock_balance.js b/stock/page/stock_balance/stock_balance.js
index bec1337..dccf498 100644
--- a/stock/page/stock_balance/stock_balance.js
+++ b/stock/page/stock_balance/stock_balance.js
@@ -42,7 +42,11 @@
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 @@
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},
];
},
diff --git a/stock/page/stock_ledger/stock_ledger.js b/stock/page/stock_ledger/stock_ledger.js
index 6d945bb..9af8894 100644
--- a/stock/page/stock_ledger/stock_ledger.js
+++ b/stock/page/stock_ledger/stock_ledger.js
@@ -52,9 +52,12 @@
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 @@
open_btn: true,
doctype: "dataContext.voucher_type"
}},
- {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 3607b00..75819a5 100644
--- a/stock/page/stock_level/stock_level.js
+++ b/stock/page/stock_level/stock_level.js
@@ -69,8 +69,15 @@
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 @@
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},
];
},