From adc1e1b8182224eb6fabf54a3ff00f64aca33f40 Mon Sep 17 00:00:00 2001 From: Thibault Francois Date: Tue, 29 Mar 2011 10:48:22 +0200 Subject: [PATCH] [FIX] do not assign to partner if do not link is selected bzr revid: tfr@openerp.com-20110329084822-fdvagtj4j8q62nbt --- addons/crm/wizard/crm_lead_to_opportunity.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py index e41e92d0929..f6626aabb89 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity.py +++ b/addons/crm/wizard/crm_lead_to_opportunity.py @@ -165,11 +165,18 @@ Leads Could not convert into Opportunity")) stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=','opportunity'),('sequence','>=',1)]) data = self.browse(cr, uid, ids[0], context=context) - partner_ids = [] - if data.action == 'create': - partner_ids = self._create_partner(cr, uid, ids, context=context) - partner_id = partner_ids and partner_ids[0] or data.partner_id.id + + if data.action == 'create': + partner_ids = [] + partner_ids = self._create_partner(cr, uid, ids, context=context) + partner_id = partner_ids and partner_ids[0] + elif data.action == 'exist': + partner_id = data.partner_id and data.partner_id.id + else: + partner_id = False + + self._convert(cr, uid, ids, lead, partner_id, stage_ids, context=context) #If we convert in mass, don't merge if there is no other opportunity but no warning if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass_convert') ):