diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c13fae41c20..a8b3f9d8f73 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -677,8 +677,8 @@ class sale_order(osv.osv):
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         #EDI EXport data
         id = ids[0]
-        if not self.browse(cr, uid, id, context).partner_id.opt_out: 
-            order.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)
+#        if not self.browse(cr, uid, id, context).partner_id.opt_out: 
+#            order.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)
         ctx = context.copy()
         ctx.update({'active_model': 'sale.order', 'active_id': id, 'mail.compose.template_id': template_id})
         return {
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f47bb09e2fa..e01bf8ab725 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -206,7 +206,6 @@
                                 <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
                                 <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
                                 <button name="action_quotation_sent" string="Send" type="object" icon="terp-mail-message-new" states="draft"/>
-                                <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
                                 <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
                                 <button name="print_quotation" string="Print Quotation" type="object" icon="gtk-print" states="draft"/>