From fbc37b5db40ee75b7a509406b4f10dfd267a4053 Mon Sep 17 00:00:00 2001 From: manu Date: Fri, 29 Oct 2021 16:56:06 +0200 Subject: [PATCH] [FIX] contract: Avoid error in invoicing contracts crone --- contract/__manifest__.py | 2 +- contract/models/contract.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/contract/__manifest__.py b/contract/__manifest__.py index 5e4245684..5a9291a33 100644 --- a/contract/__manifest__.py +++ b/contract/__manifest__.py @@ -11,7 +11,7 @@ { "name": "Recurring - Contracts Management", - "version": "15.0.1.0.0", + "version": "15.0.1.0.1", "category": "Contract Management", "license": "AGPL-3", "author": "Tecnativa, ACSONE SA/NV, Odoo Community Association (OCA)", diff --git a/contract/models/contract.py b/contract/models/contract.py index 478d39a6f..a514f70be 100644 --- a/contract/models/contract.py +++ b/contract/models/contract.py @@ -607,8 +607,12 @@ class ContractContract(models.Model): # Invoice by companies, so assignation emails get correct context companies_to_invoice = self.read_group(domain, ["company_id"], ["company_id"]) for row in companies_to_invoice: - contracts_to_invoice = self.search(row["__domain"]).with_context( - allowed_company_ids=[row["company_id"][0]] + contracts_to_invoice = ( + self.search(row["__domain"]) + .with_context(allowed_company_ids=[row["company_id"][0]]) + .filtered( + lambda a: not a.date_end or a.recurring_next_date <= a.date_end + ) ) invoices |= contracts_to_invoice._recurring_create_invoice(date_ref) return invoices