From b837118c79fa7dadb91c58dc2f289402a0c4e097 Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Thu, 17 Jan 2019 09:38:54 +0100 Subject: [PATCH] [FIX+IMP] contract: recurring_next_date is required if date_end is null + rename recurring_interval to Invoice Every --- contract/models/abstract_contract_line.py | 4 ++-- contract/models/contract_line.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/contract/models/abstract_contract_line.py b/contract/models/abstract_contract_line.py index b4ab198f2..fce1fde2b 100644 --- a/contract/models/abstract_contract_line.py +++ b/contract/models/abstract_contract_line.py @@ -75,8 +75,8 @@ class AccountAbstractAnalyticContractLine(models.AbstractModel): ) recurring_interval = fields.Integer( default=1, - string='Repeat Every', - help="Repeat every (Days/Week/Month/Year)", + string='Invoice Every', + help="Invoice every (Days/Week/Month/Year)", required=True, ) date_start = fields.Date(string='Date Start') diff --git a/contract/models/contract_line.py b/contract/models/contract_line.py index f97117a09..ba61c5db0 100644 --- a/contract/models/contract_line.py +++ b/contract/models/contract_line.py @@ -436,7 +436,8 @@ class AccountAnalyticInvoiceLine(models.Model): def _check_recurring_next_date_recurring_invoices(self): for rec in self.filtered('contract_id.recurring_invoices'): if not rec.recurring_next_date and ( - not rec.last_date_invoiced + not rec.date_end + or not rec.last_date_invoiced or rec.last_date_invoiced < rec.date_end ): raise ValidationError(