diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 01214bad6a4..ee19895b58d 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="product.product_search_form_view"/>
             <field name="arch" type="xml">
                    <field name="pricelist_id" position="before">
-                       <field name="location_id" context="{'location': self}" domain="[]"/>
+                       <field name="location_id" context="{'location': self}"/>
                        <separator orientation="vertical"/>
                    </field>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 2f9fe026a61..fb4c0046cec 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1508,8 +1508,8 @@
                         <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Future stock moves that are ready"/>
                         <separator orientation="vertical"/>
                         <field name="product_id"/>
-                        <field name="location_id" string="Location" domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
-                        <field name="address_id" string="Partner" context="{'contact_display':'partner'}" domain="[('picking_id.address_id','ilike',self)]"/>
+                        <field name="location_id" string="Location" filter_domain="['|',('location_id','ilike',self),('location_dest_id','ilike',self)]"/>
+                        <field name="address_id" string="Partner" context="{'contact_display':'partner'}" filter_domain="[('picking_id.address_id','ilike',self)]"/>
                         <field name="date_planned"/>
                     </group>
                     <newline/>
@@ -1676,7 +1676,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Extended options..." groups="base.group_extended">
-                       <field name="tracking_id"  context="{'tracking': self}" domain="[]" />
+                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
                     </group>
                 </search>
             </field>
@@ -1969,4 +1969,4 @@
             parent="menu_warehouse_config" />
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>