From bc3009d590af243ee28bb1e6994bcb2fae6d2bba Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Mon, 8 Oct 2012 14:03:51 +0200
Subject: [PATCH] [FIX] mail: default alias_domain should be web.base.url

bzr revid: odo@openerp.com-20121008120351-fqmjckrjmy52xdji
---
 addons/mail/data/mail_demo.xml |  5 -----
 addons/mail/res_config.py      | 13 +++++++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index 1350fd33547..7bda32c002b 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -42,10 +42,5 @@ This month you also get 250 EUR of eco-vouchers if you have been in the company
             <field name="type">comment</field>
         </record>
 
-        <record model="ir.config_parameter" id="user_mail_alias">
-            <field name="key">mail.catchall.domain</field>
-            <field name="value">demo.openerp.com</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py
index ce2f75687ba..91606e1c720 100644
--- a/addons/mail/res_config.py
+++ b/addons/mail/res_config.py
@@ -19,6 +19,8 @@
 #
 ##############################################################################
 
+import urlparse
+
 from openerp.osv import osv, fields
 
 class project_configuration(osv.TransientModel):
@@ -31,9 +33,16 @@ class project_configuration(osv.TransientModel):
     }
 
     def get_default_alias_domain(self, cr, uid, ids, context=None):
-        return {'alias_domain': self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)}
+        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}
 
     def set_alias_domain(self, cr, uid, ids, context=None):
         config_parameters = self.pool.get("ir.config_parameter")
         for record in self.browse(cr, uid, ids, context=context):
-            config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)
\ No newline at end of file
+            config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)