From 9502276166f95c451773a7c7358c83a6d4703f6e Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Mon, 10 Feb 2014 11:07:27 +0100
Subject: [PATCH 1/7] [FIX]work on view for better usability

bzr revid: csn@openerp.com-20140210100727-1q2q61t3c3nxfd10
---
 addons/delivery/delivery_view.xml             |  2 +-
 addons/product/product.py                     |  2 +-
 addons/sale_stock/stock_view.xml              | 11 --------
 addons/stock/stock.py                         |  4 +--
 addons/stock/stock_view.xml                   | 26 +++++++++++++++----
 addons/stock/wizard/stock_move_view.xml       |  3 +--
 .../stock_picking_wave/stock_picking_wave.py  |  5 +---
 .../stock_picking_wave_demo.xml               |  4 ---
 .../stock_picking_wave_view.xml               | 15 +----------
 9 files changed, 28 insertions(+), 44 deletions(-)

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 @@
                     <group>
                         <field name="carrier_id"/>
                         <field name="carrier_tracking_ref"/>
-                        <field name="number_of_packages"/>
                     </group>
                     <group>
                         <label for="weight" string="Weight"/>
                         <div>
                             <field name="weight" class="oe_inline"/>
                             <field name="weight_uom_id" nolabel="1" class="oe_inline"/>
+                            <field name="number_of_packages"/>
                         </div>
                         <field name="weight_net" groups="base.group_no_one"/>
                     </group>
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 @@
                 </xpath>
             </field>
         </record>
-        <record id="stock_location_route_tree_inherit" model="ir.ui.view">
-            <field name="name">stock.location.route.tree.inherit</field>
-            <field name="inherit_id" ref="stock.stock_location_route_tree"/>
-            <field name="model">stock.location.route</field>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='warehouse_selectable']" position="after">
-                    <field name="sale_selectable"/>
-                </xpath>
-            </field>
-        </record>
-
 
     </data>
 </openerp>
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 @@
             </field>
         </record>
 
+        <record id="view_move_graph" model="ir.ui.view">
+            <field name="name">stock.move.graph</field>
+            <field name="model">stock.move</field>
+            <field name="arch" type="xml">
+                <graph string="Stock Moves Analysis" type="pivot">
+                    <field name="product_id" type="row"/>
+                    <field name="location_dest_id" groups="stock.group_locations" type="row"/>
+                    <field name="product_uom_qty" type="measure"/>
+                </graph>
+            </field>
+        </record>
+
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">stock.move.tree</field>
             <field name="model">stock.move</field>
@@ -1254,6 +1266,13 @@
         <field name="act_window_id" ref="action_move_form2"/>
         </record>
 
+        <record model="ir.actions.act_window.view" id="action_stock_move_graph_all">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_move_graph"/>
+        <field name="act_window_id" ref="action_move_form2"/>
+        </record>
+
         <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3" groups="stock.group_locations"/>
 
         <record id="action_stock_stock_ui" model="ir.actions.client">
@@ -2072,9 +2091,6 @@
                 <tree string="Routes">
                     <field name="sequence" widget="handle" />
                     <field name="name"/>
-                    <field name="product_selectable"/>
-                    <field name="product_categ_selectable"/>
-                    <field name="warehouse_selectable"/>
                 </tree>
             </field>
         </record>
@@ -2093,10 +2109,10 @@
                     <group>
                         <group>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="sequence" string="Sequence" groups="base.group_no_one"/>
+                            <field name="active" groups="stock.group_adv_location" />
                         </group>
                         <group>
-                            <field name="active" groups="stock.group_adv_location" />
+                            <field name="sequence" string="Sequence" groups="base.group_no_one"/>
                         </group>
                     </group>
                     <separator string="Applicable On"/>
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 @@
             <field name="model">stock.move.scrap</field>
             <field name="arch" type="xml">
                 <form string="Scrap Move" version="7.0">
-                    <separator string="Scrap Products"/>
                     <group>
                         <field name="product_id"  readonly="1"/>
                         <label for="product_qty"/>
@@ -22,7 +21,7 @@
                             domain="[('usage','!=','view'),('scrap_location','=',True)]" groups="stock.group_locations"/>
                     </group>
                     <footer>
-                        <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
+                        <button name="move_scrap" string="Scrap Products" type="object" class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>
diff --git a/addons/stock_picking_wave/stock_picking_wave.py b/addons/stock_picking_wave/stock_picking_wave.py
index fa70f61c3bd..5050fe06996 100644
--- a/addons/stock_picking_wave/stock_picking_wave.py
+++ b/addons/stock_picking_wave/stock_picking_wave.py
@@ -6,12 +6,9 @@ class stock_picking_wave(osv.osv):
     _name = "stock.picking.wave"
     _order = "name desc"
     _columns = {
-        'name': fields.char('name', required=True, help='Name of the picking wave'),
+        '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'),
-        'time': fields.float('Time', help='Time it will take to perform the wave'),
         'picking_ids': fields.one2many('stock.picking', 'wave_id', 'Pickings', help='List of picking associated to this wave'),
-        'capacity': fields.float('Capacity', help='The capacity of the transport used to get the goods'),
-        'capacity_uom': fields.many2one('product.uom', 'Unit of Measure', help='The Unity Of Measure of the transport capacity'),
         'state': fields.selection([('draft', 'Draft'), ('in_progress', 'Running'), ('done', 'Done'), ('cancel', 'Cancelled')], required=True),
     }
 
diff --git a/addons/stock_picking_wave/stock_picking_wave_demo.xml b/addons/stock_picking_wave/stock_picking_wave_demo.xml
index 0ef026422ec..890adf104f6 100644
--- a/addons/stock_picking_wave/stock_picking_wave_demo.xml
+++ b/addons/stock_picking_wave/stock_picking_wave_demo.xml
@@ -6,15 +6,11 @@
 	        -->
 		<record id="stock_picking_wave_dry_1" model="stock.picking.wave">
 	        <field name="name">Picking Dry for John</field>
-	        <field name="capacity">15</field>
-	        <field name="capacity_uom" ref="product.product_uom_ton" />   
 			<field name="state">in_progress</field>   
 	    </record>
 	        
 		<record id="stock_picking_wave_freeze_1" model="stock.picking.wave">
 	        <field name="name">Picking Freeze for Mickael</field>
-	        <field name="capacity">600</field>   
-			<field name="capacity_uom" ref="product.product_uom_kgm" />			
 			<field name="state">in_progress</field>
 	    </record>
 	
diff --git a/addons/stock_picking_wave/stock_picking_wave_view.xml b/addons/stock_picking_wave/stock_picking_wave_view.xml
index c6f920e01d2..450232603e1 100644
--- a/addons/stock_picking_wave/stock_picking_wave_view.xml
+++ b/addons/stock_picking_wave/stock_picking_wave_view.xml
@@ -21,17 +21,7 @@
                             </h1>
                         </div>
                         <group>
-                            <group>
-                                <field name="user_id"/>
-                            </group>
-                            <group>
-                                <label for="capacity"/>
-                                <div>
-                                    <field name="capacity" class="oe_inline"/>
-                                    <field name="capacity_uom" class="oe_inline"/>
-                                </div>
-                                <field name="time" widget="float_time"/>
-                            </group>
+                            <field name="user_id"/>
                         </group>
                         <separator string="Pickings"/>
                         <field name="picking_ids" widget="many2many" domain="[('state', 'not in', ('done', 'cancel'))]">
@@ -60,9 +50,6 @@
                 <tree string="Stock Picking Waves" colors="black:state in ('in_progress','done');grey: state=='cancel'">
                     <field name="name"/>
                     <field name="user_id"/>
-                    <field name="capacity"/>
-                    <field name="capacity_uom"/>
-                    <field name="time" widget="float_time"/>
                     <field name="state"/>
                 </tree>
             </field>

From b8826aaa30999120488cab7f158a00b42414e1b4 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 12 Feb 2014 13:46:46 +0100
Subject: [PATCH 2/7] [FIX]various usability thing

bzr revid: csn@openerp.com-20140212124646-301rfsr1712cdy18
---
 addons/product/product.py                     |  2 +-
 addons/stock/stock.py                         | 20 +++++++++++++++++++
 .../wizard/stock_valuation_history.py         |  6 ++++--
 .../wizard/stock_valuation_history_view.xml   | 20 +++++++++++++++++--
 4 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index bd5acf731e6..9169ec99ead 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -578,7 +578,7 @@ class product_product(osv.osv):
         if context is None:
             context = {}
         product = self.browse(cr, uid, product_id, context=context)
-        date = context.get('history_date', time.strftime('%Y-%m-%d %H:%M:%s'))
+        date = context.get('history_date', time.strftime('%Y-%m-%d %H:%M:%S'))
         prices_history_obj = self.pool.get('prices.history')
         history_ids = prices_history_obj.search(cr, uid, [('company_id', '=', company_id), ('product_template_id', '=', product.product_tmpl_id.id), ('datetime', '<=', date)], limit=1)
         if history_ids:
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index c20b47e99d3..9ba82dc1da4 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -82,6 +82,26 @@ class stock_location(osv.osv):
         context_with_inactive['active_test'] = False
         return self.search(cr, uid, [('id', 'child_of', ids)], context=context_with_inactive)
 
+    def _name_get(self, cr, uid, browse_location, context=None):
+        # browse_location = self.browse(cr, uid, id, context=context)
+        location_type = browse_location.usage
+        name = ''
+        while location_type != 'view':
+            name = browse_location.name + '/' + name
+            browse_location = browse_location.location_id
+            location_type = browse_location.usage
+        name = browse_location.name + '/' + name
+        return name
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not ids:
+            return []
+        #reads = self.read(cr, uid, ids, ['name','location_id'], context=context)
+        res = []
+        for location in self.browse(cr, uid, ids, context=context):
+            res.append((location.id, self._name_get(cr, uid, location, context=context)))
+        return res
+
     _columns = {
         'name': fields.char('Location Name', size=64, required=True, translate=True),
         'active': fields.boolean('Active', help="By unchecking the active field, you may hide a location without deleting it."),
diff --git a/addons/stock_account/wizard/stock_valuation_history.py b/addons/stock_account/wizard/stock_valuation_history.py
index a56726bb1c6..ff3c1afc48e 100644
--- a/addons/stock_account/wizard/stock_valuation_history.py
+++ b/addons/stock_account/wizard/stock_valuation_history.py
@@ -8,10 +8,12 @@ class wizard_valuation_history(osv.osv_memory):
     _name = 'wizard.valuation.history'
     _description = 'Wizard that opens the stock valuation history table'
     _columns = {
+        'choose_date': fields.boolean('Choose a particular date'),
         'date': fields.datetime('Date', required=True),
     }
 
     _defaults = {
+        'choose_date': False,
         'date': fields.datetime.now,
     }
 
@@ -27,7 +29,7 @@ class wizard_valuation_history(osv.osv_memory):
             'domain': "[('date', '<=', '" + data['date'] + "')]",
             'name': _('Stock Value At Date'),
             'view_type': 'form',
-            'view_mode': 'tree',
+            'view_mode': 'tree,graph',
             'res_model': 'stock.history',
             'type': 'ir.actions.act_window',
             'context': ctx,
@@ -68,7 +70,7 @@ class stock_history(osv.osv):
         'location_id': fields.many2one('stock.location', 'Location', required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'product_categ_id': fields.many2one('product.category', 'Product Category', required=True),
-        'quantity': fields.integer('Quantity'),
+        'quantity': fields.integer('Quant quantity'),
         'date': fields.datetime('Operation Date'),
         'price_unit_on_quant': fields.float('Value'),
         'cost_method': fields.char('Cost Method'),
diff --git a/addons/stock_account/wizard/stock_valuation_history_view.xml b/addons/stock_account/wizard/stock_valuation_history_view.xml
index 51594478759..1b398a5810b 100644
--- a/addons/stock_account/wizard/stock_valuation_history_view.xml
+++ b/addons/stock_account/wizard/stock_valuation_history_view.xml
@@ -7,14 +7,18 @@
             <field name="model">wizard.valuation.history</field>
             <field name="arch" type="xml">
                 <form string="Choose your date" version="7.0">
-                    <p class="oe_gray">
+                    <p class="oe_gray" attrs="{'invisible': [('choose_date', '=', False)]}">
                         Choose the date for wich you want to get the stock valuation of your products.
 
                         This will filter the stock operation that weren't done at the selected date, to retreive the quantity
                         you had, and gives you the inventory value according to the standard price used at that time.
                     </p>
+                    <p class="oe_gray" attrs="{'invisible': [('choose_date', '=', True)]}">
+                        Retrieve the stock valuation of your products at current day
+                    </p>
                     <group>
-                        <field name="date"/>
+                        <field name="choose_date"/>
+                        <field name="date" attrs="{'invisible': [('choose_date', '=', False)]}"/>
                     </group>
                     <footer>
                         <button name="open_table" string="Retrieve the Inventory Value" type="object"  class="oe_highlight"  />
@@ -49,6 +53,18 @@
            </tree>
         </field>
     </record>
+    <record id="view_stock_history_report_graph" model="ir.ui.view">
+        <field name="name">stock.history.value.graph</field>
+        <field name="model">stock.history</field>
+        <field name="arch" type="xml">
+            <graph string="Stock Value At Date" type="pivot">
+                <field name="product_id" type="row"/>
+                <field name="inventory_value" type="measure"/>
+                <field name="quantity" type="measure"/>
+                <field name="location_id" type="row"/>
+            </graph>
+        </field>
+    </record>
     <record id="view_stock_history_report_search" model="ir.ui.view">
         <field name="name">stock.history.report.search</field>
         <field name="model">stock.history</field>

From fdf9fc34dc0cc3f1c970d5869b2501d123df38b0 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 12 Feb 2014 14:19:37 +0100
Subject: [PATCH 3/7] [FIX]replace stock by location menu with stock valuation
 manu

bzr revid: csn@openerp.com-20140212131937-wkxij6dmk32vd4ue
---
 addons/stock/stock_view.xml                   | 33 -------------------
 .../wizard/stock_valuation_history_view.xml   | 15 +++++++++
 2 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 4012296d514..51554480f52 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -585,16 +585,6 @@
         <menuitem action="action_location_form" id="menu_action_location_form" groups="stock.group_locations"
             parent="menu_stock_configuration" sequence="5"/>
 
-        <record id="view_location_tree" model="ir.ui.view">
-            <field name="name">stock.location.tree</field>
-            <field name="model">stock.location</field>
-            <field name="field_parent">child_ids</field>
-            <field name="arch" type="xml">
-                <tree toolbar="1" string="Locations" >
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
         <record model="ir.actions.act_window" id="action_product_location_tree">
             <field name="context">{'product_id': active_id}</field>
             <field name="name">Stock by Location</field>
@@ -605,29 +595,6 @@
             <field name="name">Moves</field>
             <field name="res_model">stock.move</field>
         </record>
-        <record id="action_location_tree" model="ir.actions.act_window">
-            <field name="name">Inventory by Location</field>
-            <field name="res_model">stock.location</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="domain">[('location_id','=',False)]</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="view_location_tree"/>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to add a location.
-              </p><p>
-                This is the structure of your company's warehouses and
-                locations. You can click on a location to get the list of the
-                products and their stock level in this particular location and
-                all its children.
-              </p>
-            </field>
-        </record>
-        <menuitem action="action_location_tree"
-            id="menu_action_location_tree"
-            parent="menu_stock_inventory_control"
-            groups="stock.group_locations"
-            sequence="20"/>
 
         <record id="view_warehouse" model="ir.ui.view">
             <field name="name">stock.warehouse</field>
diff --git a/addons/stock_account/wizard/stock_valuation_history_view.xml b/addons/stock_account/wizard/stock_valuation_history_view.xml
index 1b398a5810b..ea8b983f13e 100644
--- a/addons/stock_account/wizard/stock_valuation_history_view.xml
+++ b/addons/stock_account/wizard/stock_valuation_history_view.xml
@@ -83,6 +83,21 @@
             </search>
         </field>
     </record>
+
+    <record id="action_history_tree" model="ir.actions.act_window">
+            <field name="name">Current Inventory Valuation</field>
+            <field name="res_model">stock.history</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="domain">[('date','&lt;=',time.strftime('%Y-%m-%d %H:%M:%S'))]</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="view_id" ref="view_stock_history_report_tree"/>
+    </record>
+    <menuitem action="action_history_tree"
+            id="menu_action_history_tree"
+            parent="stock.menu_stock_inventory_control"
+            groups="stock.group_locations"
+            sequence="20"/>
     </data>
 </openerp>
 

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 4/7] [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 = {

From 09e1e4f411609e1861a001c8ee3c076394f1accb Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Wed, 12 Feb 2014 15:55:16 +0100
Subject: [PATCH 5/7] [FIX]stock_picking advance tab view

bzr revid: csn@openerp.com-20140212145516-rj2pg7utmz91w14y
---
 addons/stock/stock_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 51554480f52..354f294e78f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -783,11 +783,10 @@
                             <field name="note" placeholder="Add an internal note..." class="oe_inline"/>
                         </page>
                         <page string="Additional Info">
-                            <group>
+                            <group string="General Informations">
                                 <group>
                                     <field name="move_type"/>
                                     <field name="picking_type_id"/>
-                                    <field name="priority"/>
                                     <field name="picking_type_code" invisible="1"/>
                                     <field name="quant_reserved_exist" invisible="1"/>                                    
                                 </group>
@@ -795,6 +794,7 @@
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                                     <field name="date_done" groups="base.group_no_one"/>
                                     <field name="group_id"/>
+                                    <field name="priority"/>
                                 </group>
                             </group>
                         </page>

From 73183be46903aaa67be8b2e3939d59818bab543d Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 13 Feb 2014 10:48:20 +0100
Subject: [PATCH 6/7] [FIX]when creating location for warehouse, use warehouse
 code as base name for location instead of warehouse name

bzr revid: csn@openerp.com-20140213094820-v76n4fuqd1omicvy
---
 addons/mrp/stock.py      |  7 ++++---
 addons/purchase/stock.py |  7 ++++---
 addons/stock/stock.py    | 11 ++++++-----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 59b41e71c90..1863959882e 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -259,11 +259,12 @@ class stock_warehouse(osv.osv):
             all_routes += [warehouse.manufacture_pull_id.route_id.id]
         return all_routes
 
-    def _handle_renaming(self, cr, uid, warehouse, name, context=None):
-        res = super(stock_warehouse, self)._handle_renaming(cr, uid, warehouse, name, context=context)
+    def _handle_renaming(self, cr, uid, warehouse, name, code, context=None):
+        res = super(stock_warehouse, self)._handle_renaming(cr, uid, warehouse, name, code, context=context)
         pull_obj = self.pool.get('procurement.rule')
         #change the manufacture pull rule name
-        pull_obj.write(cr, uid, warehouse.manufacture_pull_id.id, {'name': warehouse.manufacture_pull_id.name.replace(warehouse.name, name, 1)}, context=context)
+        if warehouse.manufacture_pull_id:
+            pull_obj.write(cr, uid, warehouse.manufacture_pull_id.id, {'name': warehouse.manufacture_pull_id.name.replace(warehouse.name, name, 1)}, context=context)
         return res
 
     def _get_all_products_to_resupply(self, cr, uid, warehouse, context=None):
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 06b484ec149..f0adb7b2afc 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -148,11 +148,12 @@ class stock_warehouse(osv.osv):
                         break
         return res
 
-    def _handle_renaming(self, cr, uid, warehouse, name, context=None):
-        res = super(stock_warehouse, self)._handle_renaming(cr, uid, warehouse, name, context=context)
+    def _handle_renaming(self, cr, uid, warehouse, name, code, context=None):
+        res = super(stock_warehouse, self)._handle_renaming(cr, uid, warehouse, name, code, context=context)
         pull_obj = self.pool.get('procurement.rule')
         #change the buy pull rule name
-        pull_obj.write(cr, uid, warehouse.buy_pull_id.id, {'name': warehouse.buy_pull_id.name.replace(warehouse.name, name, 1)}, context=context)
+        if warehouse.buy_pull_id:
+            pull_obj.write(cr, uid, warehouse.buy_pull_id.id, {'name': warehouse.buy_pull_id.name.replace(warehouse.name, name, 1)}, context=context)
         return res
 
     def change_route(self, cr, uid, ids, warehouse, new_reception_step=False, new_delivery_step=False, context=None):
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index e84b8cccb05..a48ef96c57e 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2793,7 +2793,7 @@ class stock_warehouse(osv.osv):
 
         #create view location for warehouse
         wh_loc_id = location_obj.create(cr, uid, {
-                'name': _(vals.get('name')),
+                'name': _(vals.get('code')),
                 'usage': 'view',
                 'location_id': data_obj.get_object_reference(cr, uid, 'stock', 'stock_location_locations')[1]
             }, context=context)
@@ -2950,14 +2950,14 @@ class stock_warehouse(osv.osv):
             'pick_pack_ship': (_('Pick + Pack + Ship'), [(warehouse.lot_stock_id, warehouse.wh_pack_stock_loc_id, warehouse.pick_type_id.id), (warehouse.wh_pack_stock_loc_id, warehouse.wh_output_stock_loc_id, warehouse.pack_type_id.id), (warehouse.wh_output_stock_loc_id, customer_loc, warehouse.out_type_id.id)]),
         }
 
-    def _handle_renaming(self, cr, uid, warehouse, name, context=None):
+    def _handle_renaming(self, cr, uid, warehouse, name, code, context=None):
         location_obj = self.pool.get('stock.location')
         route_obj = self.pool.get('stock.location.route')
         pull_obj = self.pool.get('procurement.rule')
         push_obj = self.pool.get('stock.location.path')
         #rename location
         location_id = warehouse.lot_stock_id.location_id.id
-        location_obj.write(cr, uid, location_id, {'name': name}, context=context)
+        location_obj.write(cr, uid, location_id, {'name': code}, context=context)
         #rename route and push-pull rules
         for route in warehouse.route_ids:
             route_obj.write(cr, uid, route.id, {'name': route.name.replace(warehouse.name, name, 1)}, context=context)
@@ -2985,12 +2985,13 @@ class stock_warehouse(osv.osv):
                 self.switch_location(cr, uid, warehouse.id, warehouse, vals.get('reception_steps', False), vals.get('delivery_steps', False), context=context)
                 # switch between route
                 self.change_route(cr, uid, ids, warehouse, vals.get('reception_steps', False), vals.get('delivery_steps', False), context=context_with_inactive)
+                warehouse.refresh()
             if vals.get('code') or vals.get('name'):
                 name = warehouse.name
                 #rename sequence
                 if vals.get('name'):
-                    name = vals.get('name')
-                    self._handle_renaming(cr, uid, warehouse, name, context=context_with_inactive)
+                    name = vals.get('name', warehouse.name)
+                self._handle_renaming(cr, uid, warehouse, name, vals.get('code', warehouse.code), context=context_with_inactive)
                 seq_obj.write(cr, uid, warehouse.in_type_id.sequence_id.id, {'name': name + _(' Sequence in'), 'prefix': vals.get('code', warehouse.code) + '\IN\\'}, context=context)
                 seq_obj.write(cr, uid, warehouse.out_type_id.sequence_id.id, {'name': name + _(' Sequence out'), 'prefix': vals.get('code', warehouse.code) + '\OUT\\'}, context=context)
                 seq_obj.write(cr, uid, warehouse.pack_type_id.sequence_id.id, {'name': name + _(' Sequence packing'), 'prefix': vals.get('code', warehouse.code) + '\PACK\\'}, context=context)

From 97004a22d154a8a1bae7345111dd47f0abb603c0 Mon Sep 17 00:00:00 2001
From: Cedric Snauwaert <csn@openerp.com>
Date: Thu, 13 Feb 2014 13:40:36 +0100
Subject: [PATCH 7/7] [FIX]undo delete attribute name on delivery view

bzr revid: csn@openerp.com-20140213124036-7grmw3aq0os2qtft
---
 addons/delivery/delivery_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 672d5f4dcf8..055ca985494 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -29,7 +29,7 @@
                     <group>
                         <field name="active"/>
                     </group>
-                    <group>
+                    <group name="general">
                         <group string="General Information">
                             <field name="partner_id"/>
                             <field name="product_id"/>