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

[MERGE] fix few crm issue 

bzr revid: tfr@openerp.com-20110420152955-8pae1j13cgfqpv2h
This commit is contained in:
tfr@openerp.com 2011-04-20 17:29:55 +02:00
parent 8de084aeb7
commit e0c7efa201
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/crm/crm.py
View File

@ -454,9 +454,9 @@ class crm_case(object):
"""
for case in self.browse(cr, uid, ids, context=context):
if not destination and not case.email_from:
raise osv.except_osv(_('Error!'), ("Partner Email is not specified in Case"))
return False
if not case.user_id.user_email:
raise osv.except_osv(_('Error!'), ("User Email is not specified in Case"))
return False
if destination and case.section_id.user_id:
case_email = case.section_id.user_id.user_email

2
addons/crm/wizard/crm_merge_opportunities.py
View File

@ -68,6 +68,8 @@ class crm_merge_opportunity(osv.osv_memory):
ids = list(set(ids) - set(context.get('lead_ids', False)) )
lead_obj = self.pool.get('crm.lead')
op_id = lead_obj.search(cr, uid, [('id', 'in', ids)], order='create_date' , context=context)
if not op_id:
return False
opps = lead_obj.browse(cr, uid, [op_id[0]], context=context)
return opps[0]