diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 552bf7aa374..ab1424c2a20 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -54,6 +54,7 @@ Dashboard / Reports for Purchase Management will include:
         'purchase_sequence.xml',
         'company_view.xml',
         'purchase_data.xml',
+        'purchase_data.yml',
         'wizard/purchase_order_group_view.xml',
         'wizard/purchase_line_invoice_view.xml',
         'purchase_report.xml',
diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index 27ff2b1c49f..9efdf34452c 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -42,12 +42,6 @@
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_product_pricelist_purchase')]"/>
             <field eval="'product.pricelist,'+str(list0)" name="value"/>
         </record>
-        
-        <function
-            eval="('default',False,'picking_type_id', [('purchase.order', False)], ref('stock.picking_type_in'), True, False, False, False, True)"
-            id="purchase_default_set"
-            model="ir.values"
-            name="set"/>
 
         <!-- Purchase-related subtypes for messaging / Chatter -->
         <record id="mt_rfq_confirmed" model="mail.message.subtype">
diff --git a/addons/purchase/purchase_data.yml b/addons/purchase/purchase_data.yml
new file mode 100644
index 00000000000..bac800958c5
--- /dev/null
+++ b/addons/purchase/purchase_data.yml
@@ -0,0 +1,6 @@
+-
+  !python {model: ir.values, id: purchase_default_set}: |
+    whr = self.pool.get('stock.warehouse').browse(cr, uid, ref('stock.warehouse0'), context=context)
+    self.set(cr, uid, 'default',False,'picking_type_id', [('purchase.order', False)], whr.in_type_id.id, True, False, False, False, True)
+
+