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

[MERGE] auth_signup: invitation mail - fallback to user email when company has no email 

This avoids a confusing error message. The email
sender does not matter much in this case anyway.

bzr revid: odo@openerp.com-20131003105149-6v1vpv53k0dol53e
This commit is contained in:
Olivier Dony 2013-10-03 12:51:49 +02:00
parent 22baa3253f e3ddf3bbc4
commit 25e2badecf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/auth_signup/auth_signup_data.xml
View File

@ -22,7 +22,7 @@
<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}>]]></field>
<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="subject">Password reset</field>
<field name="body_html"><![CDATA[
@ -37,7 +37,7 @@
<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}>]]></field>
<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="subject"><![CDATA[${object.company_id.name} invitation to connect on OpenERP]]></field>
<field name="body_html">