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

[FIX] mail.mail: typo in previous commits 

bzr revid: odo@openerp.com-20121009134414-923kv1ciw00pxh6v
This commit is contained in:
Olivier Dony 2012-10-09 15:44:14 +02:00
parent 0ce1ef32a8
commit cb57169c97
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/mail/mail_mail.py
View File

@ -65,7 +65,7 @@ class mail_mail(osv.Model):
def _get_default_from(self, cr, uid, context=None):
this = self.pool.get('res.users').browse(cr, uid, uid, context=context)
if this.alias_domain:
return '%s@%s' % (this.alias, this.alias_domain)
return '%s@%s' % (this.alias_name, this.alias_domain)
elif this.email:
return this.email
raise osv.except_osv(_('Invalid Action!'), _("Unable to send email, please configure the sender's email address or alias."))