[IMP] improved code

bzr revid: tpa@tinyerp.com-20131227092506-ux2owmkzbg2jz8b2

diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index 1fda9ed..23ae817 100644 (file)
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -70,6 +70,10 @@ class crm_configuration(osv.TransientModel):
         'alias_domain' : fields.char('Alias Domain'),
     }
 
+    _defaults = {
+        'alias_domain': lambda self, cr, uid, context:self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context),
+    }
+
     def get_default_alias_prefix(self, cr, uid, ids, context=None):
         alias_name = ''
         mail_alias = self.pool.get('mail.alias')
@@ -100,14 +104,4 @@ class crm_configuration(osv.TransientModel):
                     mail_alias.create_unique_alias(cr, uid, {'alias_name': record.alias_prefix}, model_name="crm.lead", context=context)
         return True
 
-    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:
-            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}
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: