From 00b6936b70c6f65daa83b7ea80ccfd2e279df970 Mon Sep 17 00:00:00 2001
From: "dle@openerp.com" <>
Date: Tue, 5 Feb 2013 15:51:46 +0100
Subject: [PATCH] [FIX]Convert to opportunity. Take oldest opportunity stage
 except cancel

bzr revid: dle@openerp.com-20130205145146-w1yqv4hqtwbskso0
---
 addons/crm/crm_lead.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 52e9e4ed942..25fe1987784 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -474,9 +474,9 @@ class crm_lead(base_stage, format_address, osv.osv):
     def _merge_get_result_stage(self, cr, uid, opps, context=None):
         stage = None
         for opp in opps:
-            if not stage:
+            if not stage and opp.stage_id.state != 'cancel':
                 stage = opp.stage_id.id
-            if opp.type == 'opportunity':
+            if opp.type == 'opportunity' and opp.stage_id.state != 'cancel':
                 return opp.stage_id.id
         return stage