diff --git a/addons/account_voucher/models/account_voucher.py b/addons/account_voucher/models/account_voucher.py
index 0c489a88c56..3fe90b001a1 100644
--- a/addons/account_voucher/models/account_voucher.py
+++ b/addons/account_voucher/models/account_voucher.py
@@ -148,7 +148,6 @@ class AccountVoucher(models.Model):
 
     @api.multi
     def action_cancel_draft(self):
-        self.create_workflow()
         self.write({'state': 'draft'})
 
     @api.multi
diff --git a/addons/sale/data/sale_demo.xml b/addons/sale/data/sale_demo.xml
index be41326e3bc..1df1730c088 100644
--- a/addons/sale/data/sale_demo.xml
+++ b/addons/sale/data/sale_demo.xml
@@ -265,9 +265,9 @@
         </record>
 
         <!-- Confirm some Sale Orders-->
-        <workflow action="order_confirm" model="sale.order" ref="sale_order_4"/>
+        <function model="sale.order" name="action_confirm" eval="[[ref('sale_order_4')]]"/>
 
-        <workflow action="order_confirm" model="sale.order" ref="sale_order_7"/>
+        <function model="sale.order" name="action_confirm" eval="[[ref('sale_order_7')]]"/>
 
         <record id="message_sale_1" model="mail.message">
             <field name="model">sale.order</field>
diff --git a/addons/stock/wizard/make_procurement.py b/addons/stock/wizard/make_procurement.py
index 0aa361ca383..3ae8f6d6bf8 100644
--- a/addons/stock/wizard/make_procurement.py
+++ b/addons/stock/wizard/make_procurement.py
@@ -74,7 +74,6 @@ class MakeProcurement(models.TransientModel):
                 'location_id': wizard.warehouse_id.lot_stock_id.id,
                 'company_id': wizard.warehouse_id.company_id.id,
                 'route_ids': [(6, 0, wizard.route_ids.ids)]})
-            procurement.signal_workflow('button_confirm')
         return {
             'view_type': 'form',
             'view_mode': 'tree,form',
diff --git a/addons/website_portal_sale/data/sale_demo.xml b/addons/website_portal_sale/data/sale_demo.xml
index 4072f56214f..fc477d95a1b 100644
--- a/addons/website_portal_sale/data/sale_demo.xml
+++ b/addons/website_portal_sale/data/sale_demo.xml
@@ -71,6 +71,6 @@
 
 
         <!-- Confirm some Sale Orders-->
-        <workflow action="order_confirm" model="sale.order" ref="sale_order_2"/>
+        <function model="sale.order" name="action_confirm" eval="[[ref('sale_order_2')]]"/>
 
 </odoo>