diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 237d18b5b49..d8560b2394c 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -235,13 +235,13 @@
-
+
diff --git a/addons/product/product.py b/addons/product/product.py
index 2bb6dfe8c5e..bd5acf731e6 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -130,7 +130,7 @@ class product_uom(osv.osv):
_order = "name"
_columns = {
'name': fields.char('Unit of Measure', required=True, translate=True),
- 'category_id': fields.many2one('product.uom.categ', 'Category', required=True, ondelete='cascade',
+ 'category_id': fields.many2one('product.uom.categ', 'Product Category', required=True, ondelete='cascade',
help="Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios."),
'factor': fields.float('Ratio', required=True,digits=(12, 12),
help='How much bigger or smaller this unit is compared to the reference Unit of Measure for this category:\n'\
diff --git a/addons/sale_stock/stock_view.xml b/addons/sale_stock/stock_view.xml
index 9d03ecd3e57..2c7c80ba25f 100644
--- a/addons/sale_stock/stock_view.xml
+++ b/addons/sale_stock/stock_view.xml
@@ -30,17 +30,6 @@
-
- stock.location.route.tree.inherit
-
- stock.location.route
-
-
-
-
-
-
-
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 4ee6f3a926b..a275d8f35ae 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -111,7 +111,7 @@ class stock_location(osv.osv):
'parent_right': fields.integer('Right Parent', select=1),
'company_id': fields.many2one('res.company', 'Company', select=1, help='Let this field empty if this location is shared between all companies'),
- 'scrap_location': fields.boolean('Scrap Location', help='Check this box to allow using this location to put scrapped/damaged goods.'),
+ 'scrap_location': fields.boolean('Is a Scrap Location', help='Check this box to allow using this location to put scrapped/damaged goods.'),
'removal_strategy_ids': fields.one2many('product.removal', 'location_id', 'Removal Strategies'),
'putaway_strategy_ids': fields.one2many('product.putaway', 'location_id', 'Put Away Strategies'),
}
@@ -2415,7 +2415,7 @@ class stock_warehouse(osv.osv):
_description = "Warehouse"
_columns = {
- 'name': fields.char('Name', size=128, required=True, select=True),
+ 'name': fields.char('Warehouse Name', size=128, required=True, select=True),
'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
'partner_id': fields.many2one('res.partner', 'Address'),
'view_location_id': fields.many2one('stock.location', 'View Location', required=True, domain=[('usage', '=', 'view')]),
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 303785da294..de46d21dc2b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1016,6 +1016,18 @@
+
+ stock.move.graph
+ stock.move
+
+
+
+
+
+
+
+
+
stock.move.tree
stock.move
@@ -1254,6 +1266,13 @@
+
+
+ graph
+
+
+
+
@@ -2072,9 +2091,6 @@
-
-
-
@@ -2093,10 +2109,10 @@
-
+
-
+
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 8c90b27960f..c71db88a8e1 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -8,7 +8,6 @@
stock.move.scrap