From b8214efe450c3ce63b4d9476a176a4d0ef3fbf46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 16 May 2013 13:24:25 +0200 Subject: [PATCH] =?UTF-8?q?[FIX]=20mail:=20email=5Ffrom=20does=20not=20tak?= =?UTF-8?q?e=20alias=20into=20account=20if=20it=20is=20False.=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bzr revid: tde@openerp.com-20130516112425-n3qq2lm509qa8hy5 --- addons/mail/mail_alias.py | 2 +- addons/mail/mail_mail.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py index 4ecc41b6ee8..86b4959e4f6 100644 --- a/addons/mail/mail_alias.py +++ b/addons/mail/mail_alias.py @@ -175,7 +175,7 @@ class mail_alias(osv.Model): registry = RegistryManager.get(cr.dbname) mail_alias = registry.get('mail.alias') child_class_model = registry[child_model_name] - no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test':False}) + no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test': False}) # Use read() not browse(), to avoid prefetching uninitialized inherited fields for obj_data in child_class_model.read(cr, SUPERUSER_ID, no_alias_ids, [alias_key]): alias_vals = {'alias_name': False} diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py index 3c30a950230..2c6e3fb308e 100644 --- a/addons/mail/mail_mail.py +++ b/addons/mail/mail_mail.py @@ -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)