[FIX] mail: default email From should consider user email if there is no alias

bzr revid: odo@openerp.com-20121008120421-k9aj7g6vsr3zu5u2
2012-10-08 14:04:21 +02:00
parent bc3009d590
commit 43595fbeb1
1 changed files with 6 additions and 4 deletions
@@ -63,10 +63,12 @@ class mail_mail(osv.Model):
    }

    def _get_default_from(self, cr, uid, context=None):
-        cur = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if not cur.alias_domain:
-            raise osv.except_osv(_('Invalid Action!'), _('Unable to send email, set an alias domain in your server settings.'))
-        return cur.alias_name + '@' + cur.alias_domain
+        this = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if this.alias_domain:
+            return '%s@%s' % (this.alias, 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."))

    _defaults = {
        'state': 'outgoing',