[FIX]crm: leads/opps merge order, was not the same as before the state removal from the stages

bzr revid: dle@openerp.com-20131016144849-yueclv7xqmk806nz
This commit is contained in:
Denis Ledoux 2013-10-16 16:48:49 +02:00
parent fa9905e335
commit b95f5443db
1 changed files with 4 additions and 2 deletions

View File

@ -611,10 +611,12 @@ class crm_lead(format_address, osv.osv):
opportunities = self.browse(cr, uid, ids, context=context)
sequenced_opps = []
# Sorting the leads/opps according to the confidence level of its stage, which relates to the probability of winning it
# The confidence level increases with the stage sequence, except when the stage probability is 0.0 (Lost cases)
# An Opportunity always has higher confidence level than a lead, unless its stage probability is 0.0
for opportunity in opportunities:
sequence = -1
# TDE: was "if opportunity.stage_id and opportunity.stage_id.state != 'cancel':"
if opportunity.probability == 0 and opportunity.stage_id and opportunity.stage_id.sequence != 1 and opportunity.stage_id.fold:
if opportunity.stage_id and opportunity.stage_id.probability != 0 and opportunity.stage_id.sequence != 1:
sequence = opportunity.stage_id.sequence
sequenced_opps.append(((int(sequence != -1 and opportunity.type == 'opportunity'), sequence, -opportunity.id), opportunity))