From cae74718a64e45594a0b9741b32884113ee893dc Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 23 Sep 2013 09:41:22 +0200
Subject: [PATCH] [FIX]improve views

bzr revid: csn@openerp.com-20130923074122-qydjm9coe8ndmxlo
---
 .../sale_stock_location_view.xml              |  2 +-
 addons/stock/stock_view.xml                   | 18 ++++-----
 addons/stock_location/stock_location.py       |  7 ++--
 addons/stock_location/stock_location_view.xml | 37 ++++++++++---------
 4 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/addons/sale_stock_location/sale_stock_location_view.xml b/addons/sale_stock_location/sale_stock_location_view.xml
index 07590c31ba2..63503ba1472 100644
--- a/addons/sale_stock_location/sale_stock_location_view.xml
+++ b/addons/sale_stock_location/sale_stock_location_view.xml
@@ -45,7 +45,7 @@
             <field name="model">stock.location.route</field>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='warehouse_selectable']" position="after">
-                    <field name="sale_selectable"/>
+                    <field name="sale_selectable" string="Sale Order Lines"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ca8172e0b87..d2a12a9cf81 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1807,15 +1807,15 @@
             <field name="arch" type="xml">
                 <form string="Route" version="7.0">
                     <sheet>
-                    <div class="oe_title">
-                        <h1>
-                            <label string="Route name"/>
-                        </h1>
-                        <h2>
-                        <field name="name" class="oe_inline"/>
-                    </h2>
-                    </div>
-                    <field name="sequence" groups="base.group_no_one"/>
+                    <group string="Route">
+
+                        <group>
+                            <field name="name" class="oe_inline"/>
+                        </group>
+                        <group>
+                            <field name="sequence" string="Sequence" groups="base.group_no_one"/>
+                        </group>
+                    </group>
                     <group string="Pull Rules" colspan="4" >
                         <field name="pull_ids" colspan="4" nolabel="1"/>
                     </group>
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index db5ef8517d7..6d10ac03373 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -41,15 +41,16 @@ class stock_location_route(osv.osv):
 class stock_warehouse(osv.osv):
     _inherit = 'stock.warehouse'
     _columns = {
-        'route_id': fields.many2one('stock.location.route', 'Default Route', domain="[('warehouse_selectable', '=', True)]", help='Default route through the warehouse'),
+        'route_id': fields.many2one('stock.location.route', 'Default Delivery Route', domain="[('warehouse_selectable', '=', True)]", help='Default route through the warehouse'),
     }
 
 
 class stock_location_path(osv.osv):
     _name = "stock.location.path"
     _description = "Pushed Flows"
+    _order = "name"
     _columns = {
-        'name': fields.char('Operation', size=64, required=True),
+        'name': fields.char('Operation Name', size=64, required=True),
         'company_id': fields.many2one('res.company', 'Company'),
         'route_id': fields.many2one('stock.location.route', 'Route'),
         'location_from_id': fields.many2one('stock.location', 'Source Location', ondelete='cascade', select=1, required=True),
@@ -60,7 +61,7 @@ class stock_location_path(osv.osv):
             ("2binvoiced", "To Be Invoiced"),
             ("none", "Not Applicable")], "Invoice Status",
             required=True,), 
-        'picking_type_id': fields.many2one('stock.picking.type', 'Picking Type', required=True, help="This is the picking type associated with the different pickings"), 
+        'picking_type_id': fields.many2one('stock.picking.type', 'Type of the new Operation', required=True, help="This is the picking type associated with the different pickings"), 
         'auto': fields.selection(
             [('auto','Automatic Move'), ('manual','Manual Operation'),('transparent','Automatic No Step Added')],
             'Automatic Move',
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index a8cd0ce81bc..899ddfb7c0d 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -101,15 +101,17 @@
 			<field name="arch" type="xml">
 				<form string="Location Paths" version="7.0">
 					<group col="4">
-						<field name="name"/>
-						<newline />
-						<field name="company_id" groups="base.group_multi_company" />
-						<newline />
-						<field name="location_from_id"/>
-						<field name="location_dest_id"/>
-						<field name="picking_type_id"/>
-						<field name="auto"/>
-						<field name="delay"/>
+                        <group>
+    						<field name="name"/>
+                            <field name="location_from_id"/>
+                            <field name="location_dest_id"/>
+                        </group>
+                        <group>
+                            <field name="company_id" groups="base.group_multi_company" />
+                            <field name="picking_type_id"/>
+                            <field name="auto"/>
+                            <field name="delay"/>
+                        </group>
 					</group>
 				</form>
 			</field>
@@ -125,7 +127,6 @@
 					<group string="Routes" colspan="4">
 					    <div class="oe_inline">
 					        <p attrs="{'invisible':[('route_ids','=',False)]}">
-					        The routes on this category are: 
         					<field name="route_ids" nolabel="1" widget="many2many_tags" class="oe_inline"/>
         					</p>
         					<p attrs="{'invisible':[('parent_id','=',False)]}">
@@ -140,7 +141,7 @@
                             Removal strategies define the method used for suggesting the 
                             location to take the products from
                         </p>
-                        <field name="removal_strategy_ids" class ="oe_inline">
+                        <field name="removal_strategy_ids">
                             <tree editable="bottom" string="removal">
                                 <field name="location_id"/>
                                 <field name="method"/>
@@ -156,7 +157,7 @@
                             Putaway strategies define the method used for suggesting the 
                             location to put the products
                         </p>
-                        <field name="putaway_strategy_ids" class="oe_inline">
+                        <field name="putaway_strategy_ids">
                             <tree string="Put Away" editable="bottom">
                                 <field name="location_id"/>
                                 <field name="method"/>
@@ -199,14 +200,16 @@
 			<field name="model">stock.location.route</field>
 			<field name="inherit_id" ref="stock.stock_location_route_form_view"/>
 			<field name="arch" type="xml">
-			    <xpath expr="//field[@name='sequence']" position="after">
-			        <group>
+			    <xpath expr="//group[@string='Pull Rules']" position="before">
+			        <separator string="Applicable On"/>
+                    <p class="oe_grey">Check these box so that the user can select this route during the following operations</p>
+                    <group>
                         <group>
-                            <field name="product_categ_selectable"/>
-                            <field name="product_selectable"/>
+                            <field name="product_categ_selectable" string="Product Categories"/>
+                            <field name="product_selectable" string="Products"/>
                         </group>
                         <group>
-                            <field name="warehouse_selectable"/>
+                            <field name="warehouse_selectable" string="Warehouses"/>
                         </group>
                     </group>
                     <group string="Push Rules" colspan="4" >