diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 4b273a9cc81..058bf361d50 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -46,7 +46,7 @@ This module also uses analytic accounting and is compatible with the invoice on
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/hr_expenses_analysis.jpeg', 'images/hr_expenses.jpeg'],
-    'depends': ['hr', 'account_voucher'],
+    'depends': ['hr', 'account_voucher','procurement'],
     'data': [
         'security/ir.model.access.csv',
         'hr_expense_data.xml',
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 06e9fcef5bd..a245d11850c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -966,7 +966,7 @@
         <record id="product.product_normal_form_supply_view" model="ir.ui.view">
             <field name="name">product.normal.form.mrp.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="procurement.product_template_form_view_procurement"/>
+            <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='supply_method']" position="attributes">
                     <attribute name="invisible">False</attribute>
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index 85e33be777a..9f9331575e6 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -39,6 +39,7 @@
         'base_setup',
         'base_status',
         'product',
+        'procurement'
         'analytic',
         'board',
         'mail',
diff --git a/addons/stock/stock_demo.yml b/addons/stock/stock_demo.yml
index 93f488c8354..99565f0c08c 100644
--- a/addons/stock/stock_demo.yml
+++ b/addons/stock/stock_demo.yml
@@ -31,7 +31,6 @@
     name: Ice Cream
     type: product
     categ_id: product.product_category_1
-    supply_method: buy
     list_price: 100.0
     standard_price: 70.0
     uom_id: product.product_uom_kgm
diff --git a/addons/stock_no_autopicking/stock_no_autopicking_view.xml b/addons/stock_no_autopicking/stock_no_autopicking_view.xml
index 9fb2b703efe..6610d202634 100644
--- a/addons/stock_no_autopicking/stock_no_autopicking_view.xml
+++ b/addons/stock_no_autopicking/stock_no_autopicking_view.xml
@@ -5,7 +5,7 @@
         <record model="ir.ui.view" id="view_product_form_auto_pick">
             <field name="name">product.normal.auto_pick.form</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view" />
+            <field name="inherit_id" ref="procurement.product_template_form_view_procurement"/>
             <field name="arch" type="xml">
                 <field name="product_manager" position="after">
                     <field name="auto_pick" />