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

crm merge fix 

bzr revid: al@openerp.com-20130201104728-35rh2flvyjq8pxkn
This commit is contained in:
Antony Lesuisse 2013-02-01 11:47:28 +01:00
parent 3843ebd45b
commit 822d1b3d13
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/crm/wizard/crm_lead_to_opportunity.py
View File

@ -62,15 +62,11 @@ class crm_lead2opportunity_partner(osv.osv_memory):
ids = []
if partner_id:
# Search for opportunities that have the same partner and that arent done or cancelled
ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('type', '=', 'opportunity'), '!', ('state', 'in', ['done', 'cancel'])])
ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('type', '=', 'opportunity')])
if ids:
opportunities.append(ids[0])
if not partner_id:
if email:
# Find email of existing opportunity matching the email_from of the lead
cr.execute("""select id from crm_lead where type='opportunity' and
substring(email_from from '([^ ,<@]+@[^> ,]+)') in (%s)""" % (','.join(email)))
ids = map(lambda x:x[0], cr.fetchall())
if email:
ids = lead_obj.search(cr, uid, [('email', 'ilike', email), ('type', '=', 'opportunity')])
if ids:
opportunities.append(ids[0])