diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 1671124b7fe..f203996b541 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -77,9 +77,8 @@
                 </form>
             </field>
         </record>
-        
 
-		<record id="do_view_procurements" model="ir.actions.act_window">
+        <record id="do_view_procurements" model="ir.actions.act_window">
             <field name="name">Procurement for Groups  </field>
             <field name="res_model">procurement.order</field>
             <field name="view_type">form</field>
@@ -87,26 +86,14 @@
 			<field name="domain">[('group_id','=',active_id)]</field>			
         </record>
         
-<!-- 
-		<record id="do_view_pickings" model="ir.actions.act_window">
-            <field name="name">Pickings for Groups  </field>
-            <field name="res_model">stock.picking</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-			<field name="domain">[('group_id','=',active_id)]</field>			
-        </record>
-        <button name="%(do_view_pickings)d" string="View all procurements" type="action" />
--->
- 
-                
- 		<record id="procurement_group_form_view" model="ir.ui.view">
+        <record id="procurement_group_form_view" model="ir.ui.view">
             <field name="name">procurement.group.form</field>
             <field name="model">procurement.group</field>
             <field name="arch" type="xml">
                 <form string="Procurement group" version="7.0">
                     <sheet>
 						<div class="oe_right oe_button_box">
-							<button name="%(do_view_procurements)d" string="View all procurements" type="action" />
+							<button name="%(do_view_procurements)d" string="View related procurements" type="action" />
             			</div>
                         <group>
                             <field name="name"/>
@@ -163,10 +150,6 @@
             </field>
         </record>
         
-		
-        
- 	        
-
         <record id="procurement_exceptions" model="ir.actions.act_window">
             <field name="name">Procurements</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 18ad626b84b..b5343f39c91 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -76,5 +76,6 @@
         <menuitem action="action_picking_tree_picking_to_invoice"
             id="menu_action_picking_tree_picking_to_invoice"
             parent="purchase.menu_procurement_management_invoice" sequence="90"/>
+
     </data>
 </openerp>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index bda4bc6ecd9..eaf0778f35f 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2146,7 +2146,7 @@ class stock_warehouse(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
         'partner_id': fields.many2one('res.partner', 'Address'),
         'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True, domain=[('usage', '=', 'internal')]),
-        'code': fields.char('Warehouse Unique Identifier', size=5, required=True, help="Short name used to identify your warehouse"),
+        'code': fields.char('Warehouse Unique Identifier', size=5, required=True, help="Short name used to identify your warehouse"),        
     }
 
     def _default_stock_id(self, cr, uid, context=None):
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 5a8a2533e9e..53f76cc765f 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1868,5 +1868,24 @@
                 </form>
             </field>
         </record>
+
+        <record id="do_view_pickings" model="ir.actions.act_window">
+            <field name="name">Pickings for Groups  </field>
+            <field name="res_model">stock.picking</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+			<field name="domain">[('group_id','=',active_id)]</field>			
+        </record>
+        <record id="procurement_group_form_view_herited" model="ir.ui.view">
+            <field name="name">procurement.group.form.herited</field>
+            <field name="model">procurement.group</field>
+            <field name="inherit_id" ref="procurement.procurement_group_form_view"/>
+            <field name="arch" type="xml">
+		        <xpath expr="/form/sheet/div/button" position="after">
+		        	<button name="%(do_view_pickings)d" string="View related pickings" type="action" />
+		        </xpath>        
+            </field>
+        </record>
+        
     </data>
 </openerp>
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 0df162489a6..a3946ec2b9a 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -62,7 +62,7 @@ class stock_warehouse(osv.osv):
     }
     _defaults = {
         'reception_steps': 'one_step',
-        'delivery_steps': 'ship_only',
+        'delivery_steps': 'ship_only',        
     }
 
     def switch_location(self, cr, uid, ids, warehouse, new_reception_step=False, new_delivery_step=False, context=None):
@@ -274,7 +274,9 @@ class stock_warehouse(osv.osv):
         route_obj.write(cr, uid, set_active_route_ids, {'active': True}, context=context)
         return True
 
+            
     def create(self, cr, uid, vals, context=None):
+        
         if context is None:
             context = {}
         if vals is None:
@@ -368,6 +370,15 @@ class stock_warehouse(osv.osv):
         output_loc = wh_output_stock_loc
         if warehouse.delivery_steps == 'ship_only':
             output_loc = wh_stock_loc
+        
+        color = 0    
+        all_used_color = self.pool.get('stock.picking.type').search_read(cr,uid, [('warehouse_id','!=',False),('color','!=',False)],['color'],order='color')
+        for nColor in all_used_color:            
+            if nColor['color'] == color and color < 9:
+                color += 1 
+            elif nColor['color'] > color or color == 9:
+                break;
+                                
         in_picking_type_id = picking_type_obj.create(cr, uid, vals={
             'name': _('Receptions'),
             'warehouse_id': new_id,
@@ -375,7 +386,8 @@ class stock_warehouse(osv.osv):
             'auto_force_assign': True,
             'sequence_id': in_seq_id,
             'default_location_src_id': supplier_loc.id,
-            'default_location_dest_id': input_loc.id}, context=context)
+            'default_location_dest_id': input_loc.id,
+            'color' : color }, context=context)
         out_picking_type_id = picking_type_obj.create(cr, uid, vals={
             'name': _('Delivery Orders'),
             'warehouse_id': new_id,
@@ -383,7 +395,8 @@ class stock_warehouse(osv.osv):
             'sequence_id': out_seq_id,
             'delivery': True,
             'default_location_src_id': output_loc.id,
-            'default_location_dest_id': customer_loc.id}, context=context)
+            'default_location_dest_id': customer_loc.id,
+            'color' : color }, context=context)
         internal_picking_type_id = picking_type_obj.create(cr, uid, vals={
             'name': _('Internal Transfers'),
             'warehouse_id': new_id,
@@ -391,7 +404,8 @@ class stock_warehouse(osv.osv):
             'sequence_id': internal_seq_id,
             'default_location_src_id': wh_stock_loc.id,
             'default_location_dest_id': wh_stock_loc.id,
-            'pack': True,}, context=context)
+            'pack': True,
+            'color' : color }, context=context)
 
         #create routes and push/pull rules
         default_route_id = self.create_route(cr, uid, new_id, warehouse, context=context)
diff --git a/addons/stock_multi_warehouse/stock_multi_warehouse.yml b/addons/stock_multi_warehouse/stock_multi_warehouse.yml
index 38b6083bd02..37f7d5ed367 100644
--- a/addons/stock_multi_warehouse/stock_multi_warehouse.yml
+++ b/addons/stock_multi_warehouse/stock_multi_warehouse.yml
@@ -41,6 +41,7 @@
     code: 'WH1'
     reception_steps: 'three_steps'
     delivery_steps: 'pick_pack_ship'
+
 -
   Create WH2 warehouse in Dubai and configure it
 -
diff --git a/addons/stock_picking_wave/__openerp__.py b/addons/stock_picking_wave/__openerp__.py
index 15de1fe308d..d024c1af168 100644
--- a/addons/stock_picking_wave/__openerp__.py
+++ b/addons/stock_picking_wave/__openerp__.py
@@ -33,11 +33,14 @@ This module adds the picking wave option in warehouse management.
     'data': ['security/ir.model.access.csv',
             'stock_picking_wave_view.xml',
             'stock_picking_wave_sequence.xml',
-            'wizard/picking_to_wave_view.xml',            
+            'wizard/picking_to_wave_view.xml',
             ],
     'demo': [
             'stock_picking_wave_demo.xml',
              ],
+    'css': [
+        'static/src/css/test.css',      
+    ],
     
     'installable': True,
     'auto_install': False,
diff --git a/addons/stock_picking_wave/stock_picking_wave.py b/addons/stock_picking_wave/stock_picking_wave.py
index 7456995cffc..33148cac6f0 100644
--- a/addons/stock_picking_wave/stock_picking_wave.py
+++ b/addons/stock_picking_wave/stock_picking_wave.py
@@ -14,7 +14,6 @@ class stock_picking_wave(osv.osv):
         'capacity_uom': fields.many2one('product.uom', 'Unit of Measure', help='The Unity Of Measure of the transport capacity'),
         'wave_type_id': fields.many2one('stock.picking.wave.type', 'Picking Wave Type'),
         'state': fields.selection([('in_progress', 'Running'), ('done', 'Done'), ('cancel', 'Cancelled')], required=True),
-
     }
 
     _defaults = {