diff --git a/addons/stock_picking_wave/stock_picking_wave.py b/addons/stock_picking_wave/stock_picking_wave.py
index 1f09c359e1a..d302fcfc4f8 100644
--- a/addons/stock_picking_wave/stock_picking_wave.py
+++ b/addons/stock_picking_wave/stock_picking_wave.py
@@ -28,7 +28,7 @@ class stock_picking_wave(osv.osv):
 class stock_picking(osv.osv):
     _inherit = "stock.picking"
     _columns = {
-        'wave_id': fields.many2one('picking.wave', 'Picking Wave', help='Picking wave associated to this picking'),
+        'wave_id': fields.many2one('stock.picking.wave', 'Picking Wave', help='Picking wave associated to this picking'),
     }
 
     def wave_confirm_picking(self, cr, uid, ids, context=None):
@@ -49,4 +49,16 @@ class stock_picking(osv.osv):
         """
         for id in ids:
             workflow.trg_validate(uid, 'stock.picking', id, 'button_cancel', cr)
-        return True
\ No newline at end of file
+        return True
+
+class stock_picking_in(osv.osv):
+    _inherit = "stock.picking.in"
+    _columns = {
+        'wave_id': fields.many2one('stock.picking.wave', 'Picking Wave', help='Picking wave associated to this picking'),
+    }
+
+class stock_picking_out(osv.osv):
+    _inherit = "stock.picking.out"
+    _columns = {
+        'wave_id': fields.many2one('stock.picking.wave', 'Picking Wave', help='Picking wave associated to this picking'),
+    }
\ No newline at end of file
diff --git a/addons/stock_picking_wave/stock_picking_wave_view.xml b/addons/stock_picking_wave/stock_picking_wave_view.xml
index dadc4920ee3..2653f41e99b 100644
--- a/addons/stock_picking_wave/stock_picking_wave_view.xml
+++ b/addons/stock_picking_wave/stock_picking_wave_view.xml
@@ -78,5 +78,42 @@
             </field>
         </record>
         <menuitem action="action_picking_wave" id="menu_action_picking_wave" parent="stock.menu_stock_warehouse_mgmt" sequence="30"/>
+
+        <record model="ir.ui.view" id="view_stock_picking_wave_inherit">
+        <field name="name">stock.picking.wave.inherit.form</field>
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='auto_picking']" position="after">
+                <field name="wave_id"/>
+            </xpath>
+
+        </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_stock_picking_in_wave_inherit">
+        <field name="name">stock.picking.in.wave.inherit.form</field>
+        <field name="model">stock.picking.in</field>
+        <field name="inherit_id" ref="stock.view_picking_in_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='auto_picking']" position="after">
+                <field name="wave_id"/>
+            </xpath>
+
+        </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_stock_picking_out_wave_inherit">
+        <field name="name">stock.picking.out.wave.inherit.form</field>
+        <field name="model">stock.picking.out</field>
+        <field name="inherit_id" ref="stock.view_picking_out_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='auto_picking']" position="after">
+                <field name="wave_id"/>
+            </xpath>
+
+        </field>
+        </record>
+
     </data>
 </openerp>
\ No newline at end of file