odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] showing help message for leads and its alias 

bzr revid: fp@tinyerp.com-20140126093236-9djrusln4wvi3zdx
This commit is contained in:
Fabien Pinckaers 2014-01-26 10:32:36 +01:00
parent 28a0355775
commit 3e2c0c6d64
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/crm/crm_lead_menu.xml
View File

@ -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,
}

5
addons/mail/mail_thread.py
View File

@ -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:

1
addons/website_crm/data/website_crm_data.xml
View File

@ -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>