From 4953ec66b4fab522a299a90f57eda49181b4e441 Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Fri, 3 Jul 2015 16:48:46 +0200
Subject: [PATCH] [FIX] Alias domain was not set correctly by default + layout
 issues

---
 addons/crm/res_config.py       | 2 +-
 addons/crm/res_config_view.xml | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index 00a4fc81591..b0062559cab 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -27,7 +27,7 @@ class crm_configuration(osv.TransientModel):
     }
 
     _defaults = {
-        'alias_domain': lambda self, cr, uid, context: self.pool["ir.config_parameter"].get_param(cr, uid, "mail.catchall.domain", context),
+        'alias_domain': lambda self, cr, uid, context: self.pool["ir.config_parameter"].get_param(cr, uid, "mail.catchall.domain", context=context),
     }
 
     def _find_default_lead_alias_id(self, cr, uid, context=None):
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 0a444d765f1..338063a3546 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -55,18 +55,11 @@
                                 </div>
                                  <div attrs="{'invisible': [('alias_domain', 'not in', ['localhost', '', False])]}">
                                     <p>
-                                        <label string="Your alias domain is not configured yet, or is still 'localhost'"/>
+                                        <label string="To be able to set your Leads Email Alias, you need to fill your alias domain first."/>
                                         <button type="action" name="base_setup.action_general_configuration" string="Configure your domain alias" icon="gtk-execute" class="oe_inline oe_link"/>
                                     </p>
                                 </div>
                             </div>
-                        <div attrs="{'invisible': [('alias_domain', '!=', False)]}">
-                            <p>
-                                To be able to set your Leads Email Alias, you need to fill your alias domain first.
-                            </p>
-                            <button type="action" name="%(base_setup.action_general_configuration)d"
-                                string="Configure alias domain" class="oe_link" />
-                        </div>
                         </group>
                     </div>
 	            </div>