From c6d0006d26c0f72395393699ed675f9ebfac01d3 Mon Sep 17 00:00:00 2001
From: Christophe Simonis
Date: Thu, 21 Nov 2013 18:09:49 +0100
Subject: [PATCH] [FIX] email.template: add safe filter over email address to
allow emails to be sent in the format 'Name ' and avoid
escaping. followup of commit mat@openerp.com-20131121151305-t5je12s4w5uctu0k
bzr revid: chs@openerp.com-20131121170949-5rzr7qovzzkzyvvw
---
addons/crm/crm_lead_data.xml | 4 ++--
addons/crm/crm_lead_view.xml | 2 +-
addons/crm_partner_assign/crm_partner_assign_data.xml | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 1cd3d51be90..ff39138f4d9 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -204,7 +204,7 @@
${object.partner_id != False and object.partner_id.id}
- ${not object.partner_id and object.email_from}
+ ${not object.partner_id and object.email_from|safe}
@@ -212,7 +212,7 @@
admin@example.com
- ${object.user_id != False and object.user_id.email}
+ ${object.user_id != False and object.user_id.email|safe}
Reminder on Lead: ${object.id} from ${object.partner_id != False and object.partner_id.name or object.contact_name}
This opportunity did not have any activity since at least 5 days. Here are some details:
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index d7e18c38a29..2c0829c6883 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -600,7 +600,7 @@
id="crm.action_lead_mass_mail"
context="{
'default_composition_mode': 'mass_mail',
- 'default_email_to':'{$object.email or \'\'}',
+ 'default_email_to':'{$object.email or \'\'|safe}',
'default_use_template': True,
'default_template_id': ref('crm.email_template_opportunity_mail'),
}"
diff --git a/addons/crm_partner_assign/crm_partner_assign_data.xml b/addons/crm_partner_assign/crm_partner_assign_data.xml
index 3b5dbeb4322..34366eb10ea 100644
--- a/addons/crm_partner_assign/crm_partner_assign_data.xml
+++ b/addons/crm_partner_assign/crm_partner_assign_data.xml
@@ -19,8 +19,8 @@
Lead Mass Mail
- ${ctx['partner_id'].email}
- ${user.email or ''}
+ ${ctx['partner_id'].email|safe}
+ ${user.email or ''|safe}
Fwd: Lead: ${ctx['partner_id'].name}
-
\ No newline at end of file
+