[FIX] mail.mail: typo in previous commits
bzr revid: odo@openerp.com-20121009134414-923kv1ciw00pxh6v
This commit is contained in:
parent
0ce1ef32a8
commit
cb57169c97
|
@ -65,7 +65,7 @@ class mail_mail(osv.Model):
|
||||||
def _get_default_from(self, cr, uid, context=None):
|
def _get_default_from(self, cr, uid, context=None):
|
||||||
this = self.pool.get('res.users').browse(cr, uid, uid, context=context)
|
this = self.pool.get('res.users').browse(cr, uid, uid, context=context)
|
||||||
if this.alias_domain:
|
if this.alias_domain:
|
||||||
return '%s@%s' % (this.alias, this.alias_domain)
|
return '%s@%s' % (this.alias_name, this.alias_domain)
|
||||||
elif this.email:
|
elif this.email:
|
||||||
return this.email
|
return this.email
|
||||||
raise osv.except_osv(_('Invalid Action!'), _("Unable to send email, please configure the sender's email address or alias."))
|
raise osv.except_osv(_('Invalid Action!'), _("Unable to send email, please configure the sender's email address or alias."))
|
||||||
|
|
Loading…
Reference in New Issue