summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2013-09-30 10:38:29 +0200
committerOlivier Dony <odo@openerp.com>2013-09-30 10:38:29 +0200
commite3ddf3bbc41ff9d52c0f6ebad3fa699ab1f83e0e (patch)
tree281b923b829d1d37faf611c7e22c2c6075a43883
parent3a4a093ba7ae50feebdb4cfdb6afbc75b69ee6d1 (diff)
[FIX] 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-20130930083829-h7s3vmvmld91d67e
-rw-r--r--addons/auth_signup/auth_signup_data.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml
index 31e3b61a9f6..1b4e3e05502 100644
--- a/addons/auth_signup/auth_signup_data.xml
+++ b/addons/auth_signup/auth_signup_data.xml
@@ -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">