[FIX] mail: email_from does not take alias into account if it is False.é
bzr revid: tde@openerp.com-20130516112425-n3qq2lm509qa8hy5
This commit is contained in:
parent
44d189fd9f
commit
b8214efe45
|
@ -71,7 +71,7 @@ class mail_mail(osv.Model):
|
|||
|
||||
def _get_default_from(self, cr, uid, context=None):
|
||||
this = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
|
||||
if this.alias_domain:
|
||||
if this.alias_domain and this.alias_name:
|
||||
return '%s <%s@%s>' % (this.name, this.alias_name, this.alias_domain)
|
||||
elif this.email:
|
||||
return '%s <%s>' % (this.name, this.email)
|
||||
|
|
Loading…
Reference in New Issue