diff options
| author | Christophe Simonis <chs@openerp.com> | 2013-11-25 16:00:54 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2013-11-25 16:00:54 +0100 |
| commit | bb1e256f5b24bb4fc4b64e1fa973f86a30e4bace (patch) | |
| tree | 95f1de1c67b507b0d10786d04aa0f98bcd22243a /addons/auth_signup/auth_signup_data.xml | |
| parent | f148061b9455e39d3b3e6f316a5c7d586e1aad88 (diff) | |
| parent | 7baee2822180db919e6754f04c0fa9bc8aaafe92 (diff) | |
[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
Diffstat (limited to 'addons/auth_signup/auth_signup_data.xml')
| -rw-r--r-- | addons/auth_signup/auth_signup_data.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml index 1b4e3e05502..65ada8f39db 100644 --- a/addons/auth_signup/auth_signup_data.xml +++ b/addons/auth_signup/auth_signup_data.xml @@ -22,8 +22,8 @@ <record id="reset_password_email" model="email.template"> <field name="name">Reset Password</field> <field name="model_id" ref="base.model_res_users"/> - <field name="email_from"><![CDATA[${object.company_id.name} <${object.company_id.email or user.email}>]]></field> - <field name="email_to">${object.email}</field> + <field name="email_from"><![CDATA[${object.company_id.name} <${(object.company_id.email or user.email)|safe}>]]></field> + <field name="email_to">${object.email|safe}</field> <field name="subject">Password reset</field> <field name="body_html"><![CDATA[ <p>A password reset was requested for the OpenERP account linked to this email.</p> @@ -37,8 +37,8 @@ <record id="set_password_email" model="email.template"> <field name="name">OpenERP Enterprise Connection</field> <field name="model_id" ref="base.model_res_users"/> - <field name="email_from"><![CDATA[${object.company_id.name} <${object.company_id.email or user.email}>]]></field> - <field name="email_to">${object.email}</field> + <field name="email_from"><![CDATA[${object.company_id.name} <${(object.company_id.email or user.email)|safe}>]]></field> + <field name="email_to">${object.email|safe}</field> <field name="subject"><![CDATA[${object.company_id.name} invitation to connect on OpenERP]]></field> <field name="body_html"> <![CDATA[ |