diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 793d7e76fb1..9ebb084ecb2 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -346,14 +346,25 @@ class purchase_order(osv.osv):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)})
         return True
 
+    def _hook_message_sent(self, cr, uid, purchase_id, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        wf_service.trg_validate(uid, 'purchase.order', purchase_id, 'send_rfq', cr)
+        return True
+
     def wkf_send_rfq(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         template_id = self.pool.get('email.template').search(cr, uid, [('model_id', '=', 'purchase.order')])
-        self.write(cr, uid, ids, {'state' : 'send'})
 
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
 
+        #EDI EXport data
+        id = ids[0]
+        order = self.browse(cr, uid, id, context)
+        if not order.partner_id.opt_out: 
+            order.edi_export_and_email(template_ext_id='purchase.email_template_edi_purchase', context=context)
+        ctx = context.copy()
+        ctx.update({'active_model': 'purchase.order', 'active_id': id, 'mail.compose.template_id': template_id})
         return {
             'view_type': 'form',
             'view_mode': 'form',
@@ -362,7 +373,8 @@ class purchase_order(osv.osv):
             'view_id': res_id,
             'type': 'ir.actions.act_window',
             'target': 'new',
-            'context': {'active_model': 'purchase.order','mail.compose.template_id' :template_id},
+            'context': ctx,
+            'nodestroy': True,
         }
 
     #TODO: implement messages system
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 2a17c9bc58d..ad064bab696 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -196,7 +196,7 @@
                             </group>
                             <group col="16" colspan="4">
                                 <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
-                                <button name="send_rfq" states="draft" string="Send" icon="terp-mail-message-new"/>
+                                <button name="wkf_send_rfq" states="draft" string="Send" type="object" icon="terp-mail-message-new"/>
                                 <button name="view_report" string="Print" states="draft" type="object" icon="gtk-print"/>
                                 <button name="action_cancel" states="except_picking,except_invoice,wait" string="Cancel" type="object" icon="gtk-cancel"/>
                                 <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index a7d67dd87a1..38010780c7f 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -17,7 +17,7 @@
             <field name="wkf_id" ref="purchase_order"/>
             <field name="name">send</field>
             <field name="kind">function</field>
-            <field name="action">wkf_send_rfq()</field>
+            <field name="action">write({'state':'send'})</field>
         </record>
         <record id="act_confirmed" model="workflow.activity">
             <field name="wkf_id" ref="purchase_order"/>