pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merged lp:~openerp-dev/openobject-addons/trunk-traceback_issue_crm-shp

Browse Source 
bzr revid: nco@tinyerp.com-20121126110914-l6swpj06g8ohyhgf
This commit is contained in:
Nimesh (Open ERP)
2012-11-26 16:39:14 +05:30
parent 6c5d138286 844ecbd308
commit 665f4cd11c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/wizard/crm_merge_opportunities.py
+7 -6
View File
@@ -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 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)
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'),