From a5677f23b23d2580d35c63efa75a89c51ffcb081 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 10 Oct 2011 16:36:27 +0200
Subject: [PATCH] [IMP] edi: no need for XML markup escaping inside CDATA

bzr revid: odo@openerp.com-20111010143627-dkxk2xab2phyob3g
---
 addons/account/edi/invoice_action_data.xml         | 4 ++--
 addons/purchase/edi/purchase_order_action_data.xml | 4 ++--
 addons/sale/edi/sale_order_action_data.xml         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index eaf30f02b3d..6d7ea3bffe6 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -130,7 +130,7 @@ A new invoice is available for ${object.partner_id.name}:
        % if object.origin:
        | Order reference: ${object.origin}
        % endif
-       | Your contact: ${object.user_id.name} ${object.user_id.user_email and '&lt;%s&gt;'%(object.user_id.user_email) or ''}
+       | Your contact: ${object.user_id.name} ${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}
 
 You can view the invoice document, download it and pay online using the following link:
     ${ctx.get('edi_web_url_view') or 'n/a'}
@@ -157,7 +157,7 @@ Thank you for choosing ${object.company_id.name}!
 
 
 --
-${object.user_id.name} ${object.user_id.user_email and '&lt;%s&gt;'%(object.user_id.user_email) or ''}
+${object.user_id.name} ${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}
 ${object.company_id.name}
 % if object.company_id.street:
 ${object.company_id.street or ''}
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index cd18e024f21..740d0fe7491 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -136,7 +136,7 @@ Your order for ${object.partner_id.name} has just been validated:
        % if object.partner_ref:
        | Your reference: ${object.partner_ref}<br />
        % endif
-       | Your contact: ${object.validator.name} ${object.validator.user_email and '&lt;%s&gt;'%(object.validator.user_email) or ''}
+       | Your contact: ${object.validator.name} ${object.validator.user_email and '<%s>'%(object.validator.user_email) or ''}
 
 You can view the order confirmation, download it and even pay online using the following link:
     ${ctx.get('edi_web_url_view') or 'n/a'}
@@ -163,7 +163,7 @@ Thank you for choosing ${object.company_id.name}!
 
 
 --
-${object.validator.name} ${object.validator.user_email and '&lt;%s&gt;'%(object.validator.user_email) or ''}
+${object.validator.name} ${object.validator.user_email and '<%s>'%(object.validator.user_email) or ''}
 ${object.company_id.name}
 % if object.company_id.street:
 ${object.company_id.street or ''}
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index b256728f49b..691665f4919 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -138,7 +138,7 @@ Your order for ${object.partner_id.name} has just been validated:
        % if object.client_order_ref:
        | Your reference: ${object.client_order_ref}<br />
        % endif
-       | Your contact: ${object.user_id.name} ${object.user_id.user_email and '&lt;%s&gt;'%(object.user_id.user_email) or ''}
+       | Your contact: ${object.user_id.name} ${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}
 
 You can view the order confirmation, download it and even pay online using the following link:
     ${ctx.get('edi_web_url_view') or 'n/a'}
@@ -165,7 +165,7 @@ Thank you for choosing ${object.company_id.name}!
 
 
 --
-${object.user_id.name} ${object.user_id.user_email and '&lt;%s&gt;'%(object.user_id.user_email) or ''}
+${object.user_id.name} ${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}
 ${object.company_id.name}
 % if object.company_id.street:
 ${object.company_id.street or ''}