From b16de17c746c1acd459f1bd95e5beb6d42268467 Mon Sep 17 00:00:00 2001
From: "Purnendu Singh (OpenERP)" <psi@tinyerp.com>
Date: Fri, 9 Mar 2012 10:59:48 +0530
Subject: [PATCH] [IMP] sale: revert the changes related to EDI

bzr revid: psi@tinyerp.com-20120309052948-iy1o89q06uj440oy
---
 addons/sale/edi/sale_order_action_data.xml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index 56cee553b9e..3d7a554ff4a 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -2,7 +2,14 @@
 <openerp>
     <data>
         <!-- EDI Export + Send email Action  -->
-        
+        <record id="ir_actions_server_edi_sale" model="ir.actions.server">
+            <field name="code">if not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)</field>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="condition">True</field>
+            <field name="name">Auto-email confirmed sale orders</field>
+        </record>
 
         <!-- EDI related Email Templates menu -->
         <record model="ir.actions.act_window" id="action_email_templates">
@@ -23,18 +30,9 @@
          so users can freely customize/delete them -->
     <data noupdate="1">
          <!-- bind the mailing server action to sale.order confirmed activity -->
-        <!--
-        <record id="ir_actions_server_edi_sale" model="ir.actions.server">
-            <field name="code">if not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)</field>
-            <field name="state">code</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="sale.model_sale_order"/>
-            <field name="condition">True</field>
-            <field name="name">Auto-email confirmed sale orders</field>
-        </record> 
         <record id="sale.act_wait_ship" model="workflow.activity">
             <field name="action_id" ref="ir_actions_server_edi_sale"/>
-        </record> -->
+        </record>
 
 
         <!--Email template -->