diff --git a/models/scop_cotisations_idf.py b/models/scop_cotisations_idf.py index c6f153d114eca408254ac1329d2554d7c98a6d93..699379fc27852d02e75d5fbcde55f9d7a63701e2 100644 --- a/models/scop_cotisations_idf.py +++ b/models/scop_cotisations_idf.py @@ -172,14 +172,14 @@ class ScopCotisationsIDF(models.Model): ['partner_id', '=', partner.id], ['type', '=', 'inv']]) letters = set(invoice_lines.mapped('lettrage')) - if letters: - lines_to_lettre = self.filtered( - lambda l: l.partner_id.id == partner.id - and l.type != 'inv') - for line in lines_to_lettre: - if line.lettrage in letters: - line.invoice_id = invoice_lines.filtered( - lambda l: l.lettrage == line.lettrage)[0] + lines_to_lettre = self.search([ + ['year', '=', year], + ['partner_id', '=', partner.id], + ['type', '!=', 'inv']]) + for line in lines_to_lettre: + if line.lettrage in letters: + line.invoice_id = invoice_lines.filtered( + lambda l: l.lettrage == line.lettrage)[0] def action_open_payment(self): return { diff --git a/models/scop_invoice_idf.py b/models/scop_invoice_idf.py index 72be7e9b60c7be2cd369ea9399d73cf181a93ce0..f48a732d4e44eb769247bf2badb499780f017d41 100644 --- a/models/scop_invoice_idf.py +++ b/models/scop_invoice_idf.py @@ -149,14 +149,14 @@ class ScopinvoiceIDF(models.Model): ['partner_id', '=', partner.id], ['type', '=', 'inv']]) letters = set(invoice_lines.mapped('lettrage')) - if letters: - lines_to_lettre = self.filtered( - lambda l: l.partner_id.id == partner.id - and l.type != 'inv') - for line in lines_to_lettre: - if line.lettrage in letters: - line.invoice_id = invoice_lines.filtered( - lambda l: l.lettrage == line.lettrage)[0] + lines_to_lettre = self.search([ + ['year', '=', year], + ['partner_id', '=', partner.id], + ['type', '!=', 'inv']]) + for line in lines_to_lettre: + if line.lettrage in letters: + line.invoice_id = invoice_lines.filtered( + lambda l: l.lettrage == line.lettrage)[0] def action_open_payment(self): return {