diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index ad2427372b3..4a1f0a122d6 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1836,7 +1836,7 @@ class stock_inventory(osv.osv):
         domain = ' location_id in %s'
         args = (tuple(location_ids),)
         if inventory.partner_id:
-            domain += ' and partner_id = %s'
+            domain += ' and owner_id = %s'
             args += (inventory.partner_id.id,)
         if inventory.lot_id:
             domain += ' and lot_id = %s'
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8ece2647fe3..62dddfcf5fe 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -132,7 +132,7 @@
                     <notebook attrs="{'invisible':[('state','=','draft')]}">
                         <page string="Inventory Details" >
                             <button name="set_checked_qty" states="confirm" string="⇒ Set Checked Quantity to 0" type="object" class="oe_link oe_right" groups="stock.group_stock_user"/>
-                            <field name="line_ids" string="Inventory Details" context="{'default_location_id': location_id}">
+                            <field name="line_ids" string="Inventory Details" context="{'default_location_id': location_id,  'default_product_id': product_id, 'default_prod_lot_id': lot_id, 'default_package_id': package_id}">
                                 <tree string="Inventory Details" editable="bottom" colors="blue: product_qty != real_qty">
                                     <field context="{'location':location_id, 'uom':product_uom_id, 'to_date':parent.date}" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom_id,parent.date)"  domain="[('type','=','product')]"/>
                                     <field name="real_qty" readonly="1"/>