From: Thibault Delavallée <tde@openerp.com>
Date: Tue, 27 Aug 2013 16:18:01 +0000 (+0200)
Subject: [FIX] crm: fixed regression in merge_notify, due to a cleaning in opportunities mergi... 
X-Git-Tag: InsPy_master01~954^2~37
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=0dfe3a2e677aad8a4c03e215a81787f299707d98;p=odoo%2Fodoo.git

[FIX] crm: fixed regression in merge_notify, due to a cleaning in opportunities merging a few months ago

bzr revid: tde@openerp.com-20130827161801-d8i11n5uq7n4v9r8
---

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 6e8e966..9d17526 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -636,7 +636,7 @@ class crm_lead(format_address, osv.osv):
         # Merge notifications about loss of information
         opportunities = [highest]
         opportunities.extend(opportunities_rest)
-        self._merge_notify(cr, uid, highest, opportunities, context=context)
+        self._merge_notify(cr, uid, highest.id, opportunities, context=context)
         # Check if the stage is in the stages of the sales team. If not, assign the stage with the lowest sequence
         if merged_data.get('section_id'):
             section_stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('section_ids', 'in', merged_data['section_id']), ('type', '=', merged_data.get('type'))], order='sequence', context=context)