From 9c53158d0226eada60855dd1888853cd02f66f7b Mon Sep 17 00:00:00 2001 From: "pankita shah (Open ERP)" Date: Thu, 22 Nov 2012 10:33:12 +0530 Subject: [PATCH 1/2] [IMP] traceback when merge leads after delete all leads bzr revid: shp@tinyerp.com-20121122050312-rg63jnvfiuzcfxw0 --- addons/crm/wizard/crm_merge_opportunities.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py index edfefb5e5bc..38deba8cd77 100644 --- a/addons/crm/wizard/crm_merge_opportunities.py +++ b/addons/crm/wizard/crm_merge_opportunities.py @@ -32,12 +32,13 @@ class crm_merge_opportunity(osv.osv_memory): lead = self.pool.get('crm.lead') record = self.browse(cr, uid, ids[0], context=context) opportunities = record.opportunity_ids - #TOFIX: why need to check lead_ids here - lead_ids = [opportunities[0].id] - self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, lead_ids)]}, context=context) - context['lead_ids'] = lead_ids - merge_id = lead.merge_opportunity(cr, uid, [x.id for x in opportunities], context=context) - return lead.redirect_opportunity_view(cr, uid, merge_id, context=context) + if opportunities: + #TOFIX: why need to check lead_ids here + lead_ids = [opportunities[0].id] + self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, lead_ids)]}, context=context) + context['lead_ids'] = lead_ids + merge_id = lead.merge_opportunity(cr, uid, [x.id for x in opportunities], context=context) + return lead.redirect_opportunity_view(cr, uid, merge_id, context=context) _columns = { 'opportunity_ids': fields.many2many('crm.lead', rel='merge_opportunity_rel', id1='merge_id', id2='opportunity_id', string='Leads/Opportunities'), From a63e244dcabe82870f13752b7b9d5dff49fb6759 Mon Sep 17 00:00:00 2001 From: "pankita shah (Open ERP)" Date: Thu, 22 Nov 2012 15:35:35 +0530 Subject: [PATCH 2/2] [IMP] add condiction for opportunities bzr revid: shp@tinyerp.com-20121122100535-3u7wqjof7znk3kxq --- addons/crm/wizard/crm_merge_opportunities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py index 38deba8cd77..93b163f3d27 100644 --- a/addons/crm/wizard/crm_merge_opportunities.py +++ b/addons/crm/wizard/crm_merge_opportunities.py @@ -32,7 +32,7 @@ class crm_merge_opportunity(osv.osv_memory): lead = self.pool.get('crm.lead') record = self.browse(cr, uid, ids[0], context=context) opportunities = record.opportunity_ids - if opportunities: + if len(opportunities): #TOFIX: why need to check lead_ids here lead_ids = [opportunities[0].id] self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, lead_ids)]}, context=context)