← Back to branch summary

~unifield-team/unifield-wm/us-826

« back to all changes in this revision

Viewing changes to sales_followup/sale_followup.py

  • Committer: Quentin THEURET
  • Date: 2011-11-08 06:39:23 UTC
  • mto: This revision was merged to the branch mainline in revision 442.
  • Revision ID: qt@tempo-consulting.fr-20111108063923-gmmelbkbcm8yvbu7
UF-485 [FIX] One order for two lines with the same supplier

Show diffs side-by-side

added added

removed removed

Lines of Context:
sales_followup/sale_followup.py
183
183
        
184
184
        for line in line_obj.browse(cr, uid, line_id, context=context):
185
185
            if line.type == 'make_to_order' and line.procurement_id:
186
 
                if line.procurement_id.purchase_id and line.procurement_id.purchase_id.state not in ('draft', 'rfq_done') and line.procurement_id.purchase_id.id not in purchase_ids:
 
186
                if line.procurement_id.purchase_id and line.procurement_id.purchase_id.state not in ('draft', 'rfq_done'):
187
187
                    purchase_ids.append(line.procurement_id.purchase_id.id)
188
188
                elif line.procurement_id.tender_id and line.procurement_id.tender_id.rfq_ids:
189
189
                    for rfq in line.procurement_id.tender_id.rfq_ids:
190
 
                        if rfq.state not in ('draft', 'rfq_done') and rfq.id not in purchase.ids:
 
190
                        if rfq.state not in ('draft', 'rfq_done'):
191
191
                            purchase_ids.append(rfq.id)
192
192
 
193
193
        return purchase_ids