odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] email.template: add safe filter over email address to allow emails to be sent in the format 'Name <name@company.com>' and avoid escaping. 

followup of commit mat@openerp.com-20131121151305-t5je12s4w5uctu0k

bzr revid: chs@openerp.com-20131121170949-5rzr7qovzzkzyvvw
This commit is contained in:
Christophe Simonis 2013-11-21 18:09:49 +01:00
parent 6fd552c3ce
commit c6d0006d26
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/crm/crm_lead_data.xml
View File

@ -204,7 +204,7 @@
<field name="model_id" ref="crm.model_crm_lead"/>
<field name="auto_delete" eval="True"/>
<field name="partner_to">${object.partner_id != False and object.partner_id.id}</field>
<field name="email_to">${not object.partner_id and object.email_from}</field>
<field name="email_to">${not object.partner_id and object.email_from|safe}</field>
<field name="body_html"></field>
</record>
<record id="email_template_opportunity_reminder_mail" model="email.template">
@ -212,7 +212,7 @@
<field name="model_id" ref="crm.model_crm_lead"/>
<field name="auto_delete" eval="True"/>
<field name="email_from">admin@example.com</field>
<field name="email_to">${object.user_id != False and object.user_id.email}</field>
<field name="email_to">${object.user_id != False and object.user_id.email|safe}</field>
<field name="subject">Reminder on Lead: ${object.id} from ${object.partner_id != False and object.partner_id.name or object.contact_name}</field>
<field name="body_html"><![CDATA[<p>This opportunity did not have any activity since at least 5 days. Here are some details:</p>
<ul>

2
addons/crm/crm_lead_view.xml
View File

@ -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'),
}"

6
addons/crm_partner_assign/crm_partner_assign_data.xml
View File

@ -19,8 +19,8 @@
<field name="name">Lead Mass Mail</field>
<field name="model_id" model="ir.model" search="[('name', '=', 'crm.lead.forward.to.partner')]"></field>
<field name="auto_delete" eval="True"/>
<field name="email_to">${ctx['partner_id'].email}</field>
<field name="email_from">${user.email or ''}</field>
<field name="email_to">${ctx['partner_id'].email|safe}</field>
<field name="email_from">${user.email or ''|safe}</field>
<field name="subject">Fwd: Lead: ${ctx['partner_id'].name}</field>
<field name="body_html"><![CDATA[
@ -56,4 +56,4 @@ PS: It looks like you do not have an account manager assigned to you, please con
]]></field>
</record>
</data>
</openerp>
</openerp>