From 50b2c041aa5e6a532b4acb221cd0a5a7d2a9426c Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 12 Feb 2014 15:13:02 +0100
Subject: [PATCH] [FIX]delivery form view + some label

bzr revid: csn@openerp.com-20140212141302-g08x29wejo2om79o
---
 addons/delivery/delivery_view.xml               | 14 +++++++-------
 addons/stock/stock.py                           |  2 +-
 addons/stock_picking_wave/stock_picking_wave.py |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index d8560b2394c..672d5f4dcf8 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -27,15 +27,13 @@
                         </h1>
                     </div>
                     <group>
-                        <group name="general">
+                        <field name="active"/>
+                    </group>
+                    <group>
+                        <group string="General Information">
                             <field name="partner_id"/>
                             <field name="product_id"/>
                         </group>
-                        <group>
-                        <field name="active"/>
-                        </group>
-                    </group>
-                    <group col="4">
                         <group string="Pricing Information">
                             <field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
                             <label for="free_if_more_than"/>
@@ -43,10 +41,12 @@
                                 <field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
                                 <field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
                             </div>
-                        </group>
+                        
                         <newline/>
                         <field name="use_detailed_pricelist"/>
+                        </group>
                     </group>
+
                     <field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
                         <tree string="Delivery grids">
                               <field name="sequence"/>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9ba82dc1da4..e84b8cccb05 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -3805,7 +3805,7 @@ class stock_picking_type(osv.osv):
         return res and res[0] or False
 
     _columns = {
-        'name': fields.char('Name', translate=True, required=True),
+        'name': fields.char('Picking Type Name', translate=True, required=True),
         'complete_name': fields.function(_get_name, type='char', string='Name'),
         'auto_force_assign': fields.boolean('Automatic Availability', help='This picking type does\'t need to check for the availability in source location.'),
         'color': fields.integer('Color'),
diff --git a/addons/stock_picking_wave/stock_picking_wave.py b/addons/stock_picking_wave/stock_picking_wave.py
index 5050fe06996..d75aa864c95 100644
--- a/addons/stock_picking_wave/stock_picking_wave.py
+++ b/addons/stock_picking_wave/stock_picking_wave.py
@@ -9,7 +9,7 @@ class stock_picking_wave(osv.osv):
         'name': fields.char('Picking wave name', required=True, help='Name of the picking wave'),
         'user_id': fields.many2one('res.users', 'Responsible', help='Person responsible for this wave'),
         'picking_ids': fields.one2many('stock.picking', 'wave_id', 'Pickings', help='List of picking associated to this wave'),
-        'state': fields.selection([('draft', 'Draft'), ('in_progress', 'Running'), ('done', 'Done'), ('cancel', 'Cancelled')], required=True),
+        'state': fields.selection([('draft', 'Draft'), ('in_progress', 'Running'), ('done', 'Done'), ('cancel', 'Cancelled')], string="State", required=True),
     }
 
     _defaults = {