[FIX] Alias domain was not set correctly by default + layout issues

This commit is contained in:
Yannick Tivisse
2015-07-06 11:24:36 +02:00
parent ec5891e35a
commit 4953ec66b4
2 changed files with 2 additions and 9 deletions
+1 -1
View File
@@ -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):
+1 -8
View File
@@ -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>