From: Stefan Rijnhart <stefan@therp.nl>
Date: Wed, 23 Apr 2014 12:14:11 +0000 (+0200)
Subject: [FIX] Don't reset an existing but empty mail.catchall.domain
X-Git-Tag: InsPy_master01~40^2~9^2^2~6^2
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=d77b000aff4f842b111eaea035b33350ac3e287d;p=odoo%2Fodoo.git

[FIX] Don't reset an existing but empty mail.catchall.domain

bzr revid: stefan@therp.nl-20140423121411-l3qyijr6fnsexrtn
---

diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py
index 91606e1..0e2e362 100644
--- a/addons/mail/res_config.py
+++ b/addons/mail/res_config.py
@@ -33,14 +33,14 @@ class project_configuration(osv.TransientModel):
     }
 
     def get_default_alias_domain(self, cr, uid, ids, context=None):
-        alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)
-        if not alias_domain:
+        alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", default=None, context=context)
+        if alias_domain is None:
             domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "web.base.url", context=context)
             try:
                 alias_domain = urlparse.urlsplit(domain).netloc.split(':')[0]
             except Exception:
                 pass
-        return {'alias_domain': alias_domain}
+        return {'alias_domain': alias_domain or False}
 
     def set_alias_domain(self, cr, uid, ids, context=None):
         config_parameters = self.pool.get("ir.config_parameter")