From 776d4aa12f1349a751faa6f394bd5a896b15c1ce Mon Sep 17 00:00:00 2001 From: "ajay javiya (OpenERP)" Date: Mon, 24 Sep 2012 12:38:49 +0530 Subject: [PATCH] [FIX]:Fix convert Lead to opportunity bzr revid: aja@tinyerp.com-20120924070849-1cvvztpwe6lrsn1f --- addons/crm/wizard/crm_lead_to_opportunity.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py index 1b340e26465..44ce73c23fe 100644 --- a/addons/crm/wizard/crm_lead_to_opportunity.py +++ b/addons/crm/wizard/crm_lead_to_opportunity.py @@ -143,10 +143,8 @@ class crm_lead2opportunity_partner(osv.osv_memory): lead = self.pool.get('crm.lead') lead_ids = context.get('active_ids', []) data = self.browse(cr, uid, ids, context=context)[0] - if data.name == "merge": - self._merge_opportunity(cr, uid, ids, data.opportunity_ids, data.name, context=context) - else: - self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids}, context=context) + self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids}, context=context) + self._merge_opportunity(cr, uid, ids, data.opportunity_ids, data.name, context=context) return lead.redirect_opportunity_view(cr, uid, lead_ids[0], context=context)