~camptocamp/openerp-crm/7.0-pending-merge

« back to all changes in this revision

Viewing changes to crm_claim_merge/crm_claim.py

  • Committer: Guewen Baconnier
  • Date: 2014-05-02 09:09:41 UTC
  • mfrom: (4.1.21 openerp-crm)
  • Revision ID: guewen.baconnier@camptocamp.com-20140502090941-4vagtxh9jr29ph2p
mergeĀ fromĀ lp:~camptocamp/openerp-crm/7.0-crm_claim_merge-gbr

Show diffs side-by-side

added added

removed removed

Lines of Context:
336
336
            merge_in = self._merge_get_default_main(cr, uid, claims,
337
337
                                                    context=context)
338
338
        else:
339
 
            for claim in claims[:]:
 
339
            for claim in claims:
340
340
                if claim.id == merge_in_id:
341
341
                    merge_in = claim
342
342
                    break