diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c58f234e115..4967fe23c77 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -236,6 +236,7 @@
                     <field name="product_uom" select="1" string="UOM"/>
                     <field name="prodlot_id" select="1"/>
                     <field name="product_packaging"/>
+                    <field name="picking_id"/>
                     <field name="location_id" select="1"/>
                     <field name="location_dest_id" select="1"/>
                     <field name="date" select="1"/>
@@ -257,6 +258,7 @@
                     <field name="product_uom" select="1" string="UOM"/>
                     <field name="prodlot_id" select="1"/>
                     <field name="product_packaging"/>
+                    <field name="picking_id"/>
                     <field name="location_id" select="1"/>
                     <field name="location_dest_id" select="1"/>
                     <field name="date" select="1"/>
@@ -271,14 +273,24 @@
             model="stock.production.lot"
             name="stock.traceability.lot.amont"
             string="Downstream traceability"/>
+
         <wizard
             id="action_lot4"
             model="stock.production.lot"
             name="stock.traceability.lot.aval"
             string="Upstream traceability"/>
 
-        <wizard id="action4" model="stock.tracking" name="stock.traceability.amont" string="Upstream traceability"/>
-        <wizard id="action2" model="stock.tracking" name="stock.traceability.aval" string="Downstream traceability"/>
+        <wizard
+            id="action4"
+            model="stock.tracking"
+            name="stock.traceability.amont"
+            string="Downstream traceability"/>
+
+        <wizard
+            id="action2"
+            model="stock.tracking"
+            name="stock.traceability.aval"
+            string="Upstream traceability"/>
 
         <record id="action3" model="ir.actions.act_window">
             <field name="name">Downstream traceability</field>
@@ -296,7 +308,6 @@
             <field eval="True" name="object"/>
         </record>
 
-
         #
         # Composed lots
         #
@@ -1216,6 +1227,7 @@
                     <newline/>
                     <field name="prodlot_id" select="1" context="{'location_id':location_id, 'product_id':product_id}" domain="[('product_id','=',product_id)]" on_change="onchange_lot_id(prodlot_id,product_qty, location_id)"/>
                     <field name="tracking_id" select="1"/>
+                    <field name="picking_id"/>
                     <newline/>
                     <label/>
                     <button name="%(track_line)d" string="Split in production lots" type="action"/>
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index 1e04921ea3c..df268a0a574 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -3,46 +3,73 @@
     <data>
         
         <!--
-		<wizard string="UPS xml file" model="stock.move.lot" name="stock.ups_xml" />
-		-->
+        <wizard string="UPS xml file" model="stock.move.lot" name="stock.ups_xml" />
+        -->
         
         
-        <wizard id="move_split" model="stock.picking" multi="True" name="stock.move.split" string="Split move line"/>
-        <wizard id="partial_picking" model="stock.picking" multi="True" name="stock.partial_picking" string="Partial packing"/>
-        <wizard id="track_line" model="stock.move" multi="True" name="stock.move.track" string="Track line"/>
-        <wizard id="make_picking" model="stock.picking" multi="True" name="stock.picking.make" string="Make packing"/>
-        <!--
-		<wizard string="Replace element" model="stock.tracking" name="stock.move.replace" id="move_replace" />
-		-->
-        <wizard id="return_picking" model="stock.picking" name="stock.return.picking" string="Return packing"/>
-        
-        <wizard id="wizard_invoice_onshipping" keyword="client_action_multi" model="stock.picking" name="stock.invoice_onshipping" string="Create invoice"/>
-        
-	<wizard
-	string="Set Stock to 0"
-	model="stock.inventory"
-	name="inventory.merge.stock.zero"
-	keyword="client_action_multi"
-	id="wizard_merge_inventory_zero"/>
+        <wizard
+            id="move_split"
+            model="stock.picking"
+            multi="True"
+            name="stock.move.split"
+            string="Split move line"/>
 
+        <wizard
+            id="partial_picking"
+            model="stock.picking"
+            multi="True"
+            name="stock.partial_picking"
+            string="Partial packing"/>
 
-	<wizard
-		string="Merge inventories"
-		model="stock.inventory"
-		name="inventory.merge"
-		keyword="client_action_multi"
-		multi="True"
-		id="wizard_merge_inventory"/>
+    <wizard
+        id="track_line"
+        model="stock.move"
+        multi="True"
+        name="stock.move.track"
+        string="Track line"/>
 
-		
-		<wizard
-			string="Fill Inventory"
-			model="stock.inventory"
-			name="stock.fill_inventory"
-			keyword="client_action_multi"
-			id="wizard_fill_inventory"
-		/>
+    <wizard id="make_picking" model="stock.picking" multi="True" name="stock.picking.make" string="Make packing"/>
 
-		<wizard id="location_product" model="stock.location" name="stock.location.products" string="Products by Location"/> 
+    <wizard
+        id="return_picking"
+        model="stock.picking"
+        name="stock.return.picking"
+        string="Return packing"/>
+
+    <wizard
+        id="wizard_invoice_onshipping"
+        keyword="client_action_multi"
+        model="stock.picking"
+        name="stock.invoice_onshipping"
+        string="Create invoice"/>
+
+    <wizard
+        string="Set Stock to 0"
+        model="stock.inventory"
+        name="inventory.merge.stock.zero"
+        keyword="client_action_multi"
+        id="wizard_merge_inventory_zero"/>
+
+    <wizard
+        string="Merge inventories"
+        model="stock.inventory"
+        name="inventory.merge"
+        keyword="client_action_multi"
+        multi="True"
+        id="wizard_merge_inventory"/>
+
+    <wizard
+        string="Fill Inventory"
+        model="stock.inventory"
+        name="stock.fill_inventory"
+        keyword="client_action_multi"
+        id="wizard_fill_inventory"
+    />
+
+    <wizard
+        id="location_product"
+        model="stock.location"
+        name="stock.location.products"
+        string="Products by Location"/> 
     </data>
 </openerp>