diff options
| author | Fabien Pinckaers <fp@tinyerp.com> | 2014-01-26 10:32:36 +0100 |
|---|---|---|
| committer | Fabien Pinckaers <fp@tinyerp.com> | 2014-01-26 10:32:36 +0100 |
| commit | 3e2c0c6d644938872943fcb5eef3797b6c2fff79 (patch) | |
| tree | 4b9a308f105e1857ac483ddaf61544f73d6ccbe2 | |
| parent | 28a035577501ab8e68c0f92fb9c43a7a5107bc80 (diff) | |
[FIX] showing help message for leads and its alias
bzr revid: fp@tinyerp.com-20140126093236-9djrusln4wvi3zdx
| -rw-r--r-- | addons/crm/crm_lead_menu.xml | 1 | ||||
| -rw-r--r-- | addons/mail/mail_thread.py | 5 | ||||
| -rw-r--r-- | addons/website_crm/data/website_crm_data.xml | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml index 170d072ed85..2f1a2ca16cd 100644 --- a/addons/crm/crm_lead_menu.xml +++ b/addons/crm/crm_lead_menu.xml @@ -12,6 +12,7 @@ <field name="context">{ 'default_type':'lead', 'stage_type':'lead', + 'empty_list_help_model': 'crm.case.section', 'needaction_menu_ref': 'crm.menu_crm_opportunities', 'search_default_unassigned':1, } diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index b8dbc580abf..7549fb26dbe 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -114,10 +114,9 @@ class mail_thread(osv.AbstractModel): object_id.alias_id.alias_force_thread_id == 0: alias = object_id.alias_id elif catchall_domain and model: # no specific res_id given -> generic help message, take an example alias (i.e. alias of some section_id) - model_id = self.pool.get('ir.model').search(cr, uid, [("model", "=", self._name)], context=context)[0] alias_obj = self.pool.get('mail.alias') - alias_ids = alias_obj.search(cr, uid, [("alias_model_id", "=", model_id), ("alias_name", "!=", False), ('alias_force_thread_id', '=', 0)], context=context, order='id ASC') - if alias_ids and len(alias_ids) == 1: # if several aliases -> incoherent to propose one guessed from nowhere, therefore avoid if several aliases + alias_ids = alias_obj.search(cr, uid, [("alias_parent_model_id.model", "=", model), ("alias_name", "!=", False), ('alias_force_thread_id', '=', False)], context=context, order='id ASC') + if alias_ids and len(alias_ids) == 1: alias = alias_obj.browse(cr, uid, alias_ids[0], context=context) if alias: diff --git a/addons/website_crm/data/website_crm_data.xml b/addons/website_crm/data/website_crm_data.xml index 22fdbd607b6..80c8530935d 100644 --- a/addons/website_crm/data/website_crm_data.xml +++ b/addons/website_crm/data/website_crm_data.xml @@ -16,7 +16,6 @@ <field name="name">Website</field> <field name="code">Website</field> <field name="use_leads">True</field> - <field name="alias_name">Website</field> <field name="member_ids" eval="[(4, ref('base.user_root'))]"/> </record> |