diff options
| author | Olivier Dony <odo@openerp.com> | 2013-10-03 12:51:49 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2013-10-03 12:51:49 +0200 |
| commit | 25e2badecf9daef44eee6e7190da97fff577ed02 (patch) | |
| tree | 1f6e6af02a1d04ba088c868dab12986f4089e009 | |
| parent | 22baa3253fef208b1c173c550e384aa7578c359c (diff) | |
| parent | e3ddf3bbc41ff9d52c0f6ebad3fa699ab1f83e0e (diff) | |
[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
| -rw-r--r-- | addons/auth_signup/auth_signup_data.xml | 4 |
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"> |