diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 06b391513e0..95c1c6e2423 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -39,6 +39,7 @@ class stock_picking(osv.osv):
     _columns = {
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
             ondelete='set null', select=True),
+        
     }
     _defaults = {
         'purchase_id': False,
@@ -134,5 +135,6 @@ class stock_picking_in(osv.osv):
     _columns = {
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order',
             ondelete='set null', select=True),
+        'warehouse_id': fields.related('purchase_id', 'warehouse_id', type='many2one', relation='stock.warehouse', string='Warehouse'),
     }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index df6ba9531f3..18b9e3579f1 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -51,9 +51,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                 <xpath expr="/form/sheet/group/group/field[@name='date']" position="before">
+                <xpath expr="//field[@name='date']" position="before">
                     <field name="purchase_id"/>
                 </xpath>
+                <xpath expr="//field[@name='company_id']" position="after">
+                    <field name="warehouse_id"/>
+                </xpath>
             </field>
         </record>