From 209013864e0c12b9f5b273cccc64dce7327b5efd Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Tue, 27 Feb 2018 18:49:08 +0100 Subject: [PATCH] [FIX]GOLEM Activity : if season is not on period, do not check start / end dates coherence --- golem_activity/__manifest__.py | 2 +- golem_activity/models/golem_activity.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/golem_activity/__manifest__.py b/golem_activity/__manifest__.py index cf63b8e..cd2b276 100644 --- a/golem_activity/__manifest__.py +++ b/golem_activity/__manifest__.py @@ -18,7 +18,7 @@ { 'name': 'GOLEM activities', 'summary': 'Extends Odoo products for multi-activity', - 'version': '10.0.2.1.0', + 'version': '10.0.2.1.1', 'category': 'GOLEM', 'author': 'Fabien Bourgeois, Michel Dessenne', 'license': 'AGPL-3', diff --git a/golem_activity/models/golem_activity.py b/golem_activity/models/golem_activity.py index bb25069..6fffefb 100644 --- a/golem_activity/models/golem_activity.py +++ b/golem_activity/models/golem_activity.py @@ -108,15 +108,16 @@ class GolemActivity(models.Model): def _check_period(self): """ Checks if end date if after start date """ for activity in self: + season = activity.season_id if activity.date_start and activity.date_stop and \ activity.date_start > activity.date_stop: raise models.ValidationError(_('Start of the period cannot be ' 'after end of the period.')) - if activity.season_id.date_start > activity.date_start: + if season.date_start and season.date_start > activity.date_start: msg = _(u'Activity start date can not be set before ' 'linked season start.') raise models.ValidationError(msg) - if activity.season_id.date_end < activity.date_stop: + if season.date_end and season.date_end < activity.date_stop: msg = _(u'Activity end date can not be set after ' 'linked season end.') raise models.ValidationError(msg)