diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 304b325128c..bff7892b74c 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -174,6 +174,8 @@ class pos_order(osv.osv):
         move_obj = self.pool.get('stock.move')
 
         for order in self.browse(cr, uid, ids, context=context):
+            if not order.state=='draft':
+                continue
             addr = order.partner_id and partner_obj.address_get(cr, uid, [order.partner_id.id], ['delivery']) or {}
             picking_id = picking_obj.create(cr, uid, {
                 'origin': order.name,
diff --git a/addons/point_of_sale/point_of_sale_workflow.xml b/addons/point_of_sale/point_of_sale_workflow.xml
index 4daa2d17099..c8e05788d3d 100644
--- a/addons/point_of_sale/point_of_sale_workflow.xml
+++ b/addons/point_of_sale/point_of_sale_workflow.xml
@@ -18,8 +18,7 @@
     <record model="workflow.activity" id="act_paid">
       <field name="wkf_id" ref="wkf_pos"/>
       <field name="name">paid</field>
-      <field name="action">action_paid()</field>
-      <field name="kind">function</field>
+      <field name="kind">dummy</field>
     </record>
 
     <record model="workflow.activity" id="act_done">