From e48220bf9d36d9c5aaebd0e16a112c41a165da99 Mon Sep 17 00:00:00 2001 From: Thibault Francois Date: Wed, 16 Mar 2011 15:36:16 +0100 Subject: [PATCH] [FIX] no warning in mass convert if merge bzr revid: tfr@openerp.com-20110316143616-h5bs0klfnbqcd6ob --- addons/crm/wizard/crm_lead_to_opportunity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py index 51d3c80a92e..ec342ab8245 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity.py +++ b/addons/crm/wizard/crm_lead_to_opportunity.py @@ -170,7 +170,7 @@ Leads Could not convert into Opportunity")) partner_id = partner_ids and partner_ids[0] or data.partner_id.id 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') ): + if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass_convert') ): merge_obj = self.pool.get('crm.merge.opportunity') self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [data.opportunity_ids[0].id])]}, context=context) context.update({'lead_ids' : record_id})