[FIX]crm: crm lead/opp merge, when opp has stage with state cancel, then it is less...

bzr revid: dle@openerp.com-20130402101331-12skhykfzrv35nno

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 332390f..fe48c9c 100644 (file)
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -632,7 +632,7 @@ class crm_lead(base_stage, format_address, osv.osv):
             sequence = -1
             if opportunity.stage_id and opportunity.stage_id.state != 'cancel':
                 sequence = opportunity.stage_id.sequence
-            sequenced_opps.append(((int(opportunity.type == 'opportunity'), sequence, -opportunity.id), opportunity))
+            sequenced_opps.append(((int(sequence != -1 and opportunity.type == 'opportunity'), sequence, -opportunity.id), opportunity))
 
         sequenced_opps.sort(reverse=True)
         opportunities = map(itemgetter(1), sequenced_opps)