diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot index c8b5cd48516..fe21327daab 100644 --- a/addons/resource/i18n/resource.pot +++ b/addons/resource/i18n/resource.pot @@ -242,6 +242,13 @@ msgid "" "record without removing it." msgstr "" +#. module: resource +#: code:addons/resource/models/resource.py:0 +#, python-format +msgid "" +"In a calendar with 2 weeks mode, all periods need to be in the sections." +msgstr "" + #. module: resource #: model_terms:ir.ui.view,arch_db:resource.view_resource_resource_search msgid "Inactive" diff --git a/addons/resource/models/resource.py b/addons/resource/models/resource.py index daf16b47e16..fb79c8819ae 100644 --- a/addons/resource/models/resource.py +++ b/addons/resource/models/resource.py @@ -204,6 +204,14 @@ class ResourceCalendar(models.Model): default.update(name=_('%s (copy)') % (self.name)) return super(ResourceCalendar, self).copy(default) + @api.constrains('attendance_ids') + def _check_attendance_ids(self): + for resource in self: + if (resource.two_weeks_calendar and + resource.attendance_ids.filtered(lambda a: a.display_type == 'line_section') and + not resource.attendance_ids.sorted('sequence')[0].display_type): + raise ValidationError(_("In a calendar with 2 weeks mode, all periods need to be in the sections.")) + @api.depends('two_weeks_calendar') def _compute_two_weeks_explanation(self): today = fields.Date.today() diff --git a/addons/resource/views/resource_views.xml b/addons/resource/views/resource_views.xml index b3c24fb2058..e407f579d10 100644 --- a/addons/resource/views/resource_views.xml +++ b/addons/resource/views/resource_views.xml @@ -204,6 +204,7 @@ +