From a65a2f3249fdb6960fa127b15a238fe26f47d4cd Mon Sep 17 00:00:00 2001 From: michel Date: Mon, 29 Jan 2018 22:55:36 +0100 Subject: [PATCH 01/15] [TMP] Check the date start ans date end related to season date --- golem_activity/models/golem_activity.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/golem_activity/models/golem_activity.py b/golem_activity/models/golem_activity.py index 7f0a504..b9a26e8 100644 --- a/golem_activity/models/golem_activity.py +++ b/golem_activity/models/golem_activity.py @@ -102,6 +102,14 @@ class GolemActivity(models.Model): 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 < activity.season_id.date_end: + msg = _(u'Start of the period is in range of an ' + 'existing period.') + raise models.ValidationError(msg) + if activity.season_id.date_end < activity.date_stop > activity.season_id.date_start: + msg = _(u'End of the period is in range of an ' + 'existing period.') + raise models.ValidationError(msg) @api.onchange('season_id') def _onchange_season_dates(self): -- 2.47.2 From 8b7b88a88962448d19fd836f1811b231a5e6d69a Mon Sep 17 00:00:00 2001 From: michel Date: Mon, 29 Jan 2018 22:56:08 +0100 Subject: [PATCH 02/15] [TMP] Check the date start ans date end related to season date --- golem_activity/models/golem_activity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/golem_activity/models/golem_activity.py b/golem_activity/models/golem_activity.py index b9a26e8..26582dc 100644 --- a/golem_activity/models/golem_activity.py +++ b/golem_activity/models/golem_activity.py @@ -110,7 +110,7 @@ class GolemActivity(models.Model): msg = _(u'End of the period is in range of an ' 'existing period.') raise models.ValidationError(msg) - +git @api.onchange('season_id') def _onchange_season_dates(self): """ Sets defaults dates according to season """ -- 2.47.2 From 85a2bf1214268609b7338cfcadd60ecda2d6b337 Mon Sep 17 00:00:00 2001 From: michel Date: Mon, 29 Jan 2018 22:57:03 +0100 Subject: [PATCH 03/15] [TMP] Check the date start ans date end related to season date --- golem_activity/models/golem_activity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/golem_activity/models/golem_activity.py b/golem_activity/models/golem_activity.py index 26582dc..b9a26e8 100644 --- a/golem_activity/models/golem_activity.py +++ b/golem_activity/models/golem_activity.py @@ -110,7 +110,7 @@ class GolemActivity(models.Model): msg = _(u'End of the period is in range of an ' 'existing period.') raise models.ValidationError(msg) -git + @api.onchange('season_id') def _onchange_season_dates(self): """ Sets defaults dates according to season """ -- 2.47.2 From 48e5ae730887257168cbc77ae56b536b7dea9169 Mon Sep 17 00:00:00 2001 From: michel Date: Mon, 29 Jan 2018 23:06:31 +0100 Subject: [PATCH 04/15] [TMP] msg --- golem_activity/models/golem_activity.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/golem_activity/models/golem_activity.py b/golem_activity/models/golem_activity.py index b9a26e8..cc749aa 100644 --- a/golem_activity/models/golem_activity.py +++ b/golem_activity/models/golem_activity.py @@ -103,11 +103,11 @@ class GolemActivity(models.Model): raise models.ValidationError(_('Start of the period cannot be ' 'after end of the period.')) if activity.season_id.date_start > activity.date_start < activity.season_id.date_end: - msg = _(u'Start of the period is in range of an ' + msg = _(u'Start of the activity is not in range of an ' 'existing period.') raise models.ValidationError(msg) if activity.season_id.date_end < activity.date_stop > activity.season_id.date_start: - msg = _(u'End of the period is in range of an ' + msg = _(u'End of the activity is not in range of an ' 'existing period.') raise models.ValidationError(msg) -- 2.47.2 From 149654fdb6aad7cfe3bccc28c25c3a878b906a19 Mon Sep 17 00:00:00 2001 From: michel Date: Mon, 29 Jan 2018 23:30:11 +0100 Subject: [PATCH 05/15] [TMP]Version update and author. --- golem_activity/__manifest__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/golem_activity/__manifest__.py b/golem_activity/__manifest__.py index ede28ce..d884115 100644 --- a/golem_activity/__manifest__.py +++ b/golem_activity/__manifest__.py @@ -18,9 +18,9 @@ { 'name': 'GOLEM activities', 'summary': 'Extends Odoo products for multi-activity', - 'version': '10.0.2.0.0', + 'version': '10.0.2.0.1', 'category': 'GOLEM', - 'author': 'Fabien Bourgeois', + 'author': 'Fabien Bourgeois, Michel Dessenne', 'license': 'AGPL-3', 'application': True, 'installable': True, -- 2.47.2 From 7727e9d51d1a0c3ca738679ed4f31b10557056d2 Mon Sep 17 00:00:00 2001 From: michel Date: Tue, 30 Jan 2018 17:01:56 +0100 Subject: [PATCH 06/15] [TMP] Msg and check activity date start end date stop. --- golem_activity/models/golem_activity.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/golem_activity/models/golem_activity.py b/golem_activity/models/golem_activity.py index cc749aa..7664279 100644 --- a/golem_activity/models/golem_activity.py +++ b/golem_activity/models/golem_activity.py @@ -102,12 +102,12 @@ class GolemActivity(models.Model): 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 < activity.season_id.date_end: - msg = _(u'Start of the activity is not in range of an ' + if activity.season_id.date_start > activity.date_start: + msg = _(u'The start date of the activity is not in range of an ' 'existing period.') raise models.ValidationError(msg) - if activity.season_id.date_end < activity.date_stop > activity.season_id.date_start: - msg = _(u'End of the activity is not in range of an ' + if activity.season_id.date_end < activity.date_stop: + msg = _(u'The end date of the activity is not in range of an ' 'existing period.') raise models.ValidationError(msg) -- 2.47.2 From fcf151b6152e6eed8219b6f147059613cb243503 Mon Sep 17 00:00:00 2001 From: michel Date: Thu, 1 Feb 2018 10:34:02 +0100 Subject: [PATCH 07/15] [TMP] Date for is_recurent. --- golem_activity/models/golem_activity.py | 3 +++ golem_activity/views/golem_activity_views.xml | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/golem_activity/models/golem_activity.py b/golem_activity/models/golem_activity.py index 7664279..6ad49ca 100644 --- a/golem_activity/models/golem_activity.py +++ b/golem_activity/models/golem_activity.py @@ -30,6 +30,7 @@ class GolemActivityType(models.Model): name = fields.Char('Activity type', required=True, translate=True) is_recurrent = fields.Boolean('Is recurrent?') + class GolemActivity(models.Model): """ GOLEM Activity """ _name = 'golem.activity' @@ -46,6 +47,8 @@ class GolemActivity(models.Model): full_name = fields.Char('Name', compute='_compute_full_name', store=True, index=True) + display_date = fields.Boolean('Display date?', default=True) + @api.multi @api.depends('name', 'default_code') diff --git a/golem_activity/views/golem_activity_views.xml b/golem_activity/views/golem_activity_views.xml index 0912382..1f57ed0 100644 --- a/golem_activity/views/golem_activity_views.xml +++ b/golem_activity/views/golem_activity_views.xml @@ -59,10 +59,14 @@ along with this program. If not, see . attrs="{'invisible': [('is_recurrent', '=', False)]}" /> + + attrs="{'invisible':[('is_recurrent', '=', True), + ('display_date', '=', False)]}" /> + attrs="{'invisible':[('is_recurrent', '=', True), + ('display_date', '=', False)]}" /> -- 2.47.2 From 62741ca650be52b5b4e468c082904de27e0b63a5 Mon Sep 17 00:00:00 2001 From: michel Date: Thu, 1 Feb 2018 15:38:44 +0100 Subject: [PATCH 08/15] / --- golem_activity/models/golem_activity.py | 3 --- golem_activity/views/golem_activity_views.xml | 8 ++------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/golem_activity/models/golem_activity.py b/golem_activity/models/golem_activity.py index 6ad49ca..7664279 100644 --- a/golem_activity/models/golem_activity.py +++ b/golem_activity/models/golem_activity.py @@ -30,7 +30,6 @@ class GolemActivityType(models.Model): name = fields.Char('Activity type', required=True, translate=True) is_recurrent = fields.Boolean('Is recurrent?') - class GolemActivity(models.Model): """ GOLEM Activity """ _name = 'golem.activity' @@ -47,8 +46,6 @@ class GolemActivity(models.Model): full_name = fields.Char('Name', compute='_compute_full_name', store=True, index=True) - display_date = fields.Boolean('Display date?', default=True) - @api.multi @api.depends('name', 'default_code') diff --git a/golem_activity/views/golem_activity_views.xml b/golem_activity/views/golem_activity_views.xml index 1f57ed0..0912382 100644 --- a/golem_activity/views/golem_activity_views.xml +++ b/golem_activity/views/golem_activity_views.xml @@ -59,14 +59,10 @@ along with this program. If not, see . attrs="{'invisible': [('is_recurrent', '=', False)]}" /> - + attrs="{'invisible': [('is_recurrent', '=', True)]}" /> + attrs="{'invisible': [('is_recurrent', '=', True)]}" /> -- 2.47.2 From 64115c746c1df92c2ee7930cac300bdeeef12bb2 Mon Sep 17 00:00:00 2001 From: michel Date: Thu, 1 Feb 2018 16:00:42 +0100 Subject: [PATCH 09/15] [TMP] Display date in if_recurent --- golem_activity/models/golem_activity.py | 2 ++ golem_activity/views/golem_activity_views.xml | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/golem_activity/models/golem_activity.py b/golem_activity/models/golem_activity.py index 7664279..b1d0a9d 100644 --- a/golem_activity/models/golem_activity.py +++ b/golem_activity/models/golem_activity.py @@ -30,6 +30,7 @@ class GolemActivityType(models.Model): name = fields.Char('Activity type', required=True, translate=True) is_recurrent = fields.Boolean('Is recurrent?') + class GolemActivity(models.Model): """ GOLEM Activity """ _name = 'golem.activity' @@ -46,6 +47,7 @@ class GolemActivity(models.Model): full_name = fields.Char('Name', compute='_compute_full_name', store=True, index=True) + is_fullseason = fields.Boolean('Not full season?', default=False) @api.multi @api.depends('name', 'default_code') diff --git a/golem_activity/views/golem_activity_views.xml b/golem_activity/views/golem_activity_views.xml index 0912382..e754f6d 100644 --- a/golem_activity/views/golem_activity_views.xml +++ b/golem_activity/views/golem_activity_views.xml @@ -59,10 +59,15 @@ along with this program. If not, see . attrs="{'invisible': [('is_recurrent', '=', False)]}" /> + + + attrs="{'invisible':[('is_recurrent', '=', True), + ('is_fullseason', '=', False)]}" /> + attrs="{'invisible':[('is_recurrent', '=', True), + ('is_fullseason', '=', False)]}" /> @@ -111,8 +116,7 @@ along with this program. If not, see . - + -- 2.47.2 From 588954ab0ba1e6c3b2d774fd93dad6faf940fca9 Mon Sep 17 00:00:00 2001 From: michel Date: Thu, 1 Feb 2018 17:02:39 +0100 Subject: [PATCH 10/15] [TMP) add computed for is_fullseason --- golem_activity/models/golem_activity.py | 12 +++++++++++- golem_activity/views/golem_activity_views.xml | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/golem_activity/models/golem_activity.py b/golem_activity/models/golem_activity.py index b1d0a9d..f448bee 100644 --- a/golem_activity/models/golem_activity.py +++ b/golem_activity/models/golem_activity.py @@ -47,7 +47,17 @@ class GolemActivity(models.Model): full_name = fields.Char('Name', compute='_compute_full_name', store=True, index=True) - is_fullseason = fields.Boolean('Not full season?', default=False) + is_fullseason = fields.Boolean('Is full season?', + compute='_compute_is_full_season', default=True) + + @api.multi + @api.depends('date_start', 'date_stop') + def _compute_is_full_season(self): + """ Display date for is full season """ + for activity in self: + if activity.date_start == activity.season_id.date_start and \ + activity.date_stop == activity.season_id.date_end: + activity.is_fullseason = False @api.multi @api.depends('name', 'default_code') diff --git a/golem_activity/views/golem_activity_views.xml b/golem_activity/views/golem_activity_views.xml index e754f6d..543d5d6 100644 --- a/golem_activity/views/golem_activity_views.xml +++ b/golem_activity/views/golem_activity_views.xml @@ -60,7 +60,7 @@ along with this program. If not, see . - - . attrs="{'invisible':[('is_recurrent', '=', False)]}" /> + ('is_fullseason', '=', True)]}" /> + ('is_fullseason', '=', True)]}" /> -- 2.47.2 From 7ce13e730f34d008b5ec48f8324c4ccdb4d24bd0 Mon Sep 17 00:00:00 2001 From: michel Date: Thu, 1 Feb 2018 17:26:47 +0100 Subject: [PATCH 13/15] [TMP] Text msg check_period --- golem_activity/models/golem_activity.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/golem_activity/models/golem_activity.py b/golem_activity/models/golem_activity.py index f8563d0..750e97b 100644 --- a/golem_activity/models/golem_activity.py +++ b/golem_activity/models/golem_activity.py @@ -113,12 +113,12 @@ class GolemActivity(models.Model): raise models.ValidationError(_('Start of the period cannot be ' 'after end of the period.')) if activity.season_id.date_start > activity.date_start: - msg = _(u'The start date of the activity is not in range of an ' - 'existing period.') + 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: - msg = _(u'The end date of the activity is not in range of an ' - 'existing period.') + msg = _(u'Activity end date can not be set after ' + 'linked season start.') raise models.ValidationError(msg) @api.onchange('season_id') -- 2.47.2 From e0c25a24e1b2cbe541c66716c8f821e38f730504 Mon Sep 17 00:00:00 2001 From: michel Date: Thu, 1 Feb 2018 17:27:40 +0100 Subject: [PATCH 14/15] [TMP]Update number --- golem_activity/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/golem_activity/__manifest__.py b/golem_activity/__manifest__.py index d884115..cf63b8e 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.0.1', + 'version': '10.0.2.1.0', 'category': 'GOLEM', 'author': 'Fabien Bourgeois, Michel Dessenne', 'license': 'AGPL-3', -- 2.47.2 From a60f41c170a6cb2ec29d4d9e612618cdc4587250 Mon Sep 17 00:00:00 2001 From: michel Date: Thu, 1 Feb 2018 17:40:49 +0100 Subject: [PATCH 15/15] [TMP] Translate FR --- golem_activity/i18n/fr.po | 42 +++++++++++++++++-------- golem_activity/i18n/golem_activity.pot | 41 +++++++++++++++++------- golem_activity/models/golem_activity.py | 2 +- 3 files changed, 59 insertions(+), 26 deletions(-) diff --git a/golem_activity/i18n/fr.po b/golem_activity/i18n/fr.po index d1b65f0..702d3fe 100644 --- a/golem_activity/i18n/fr.po +++ b/golem_activity/i18n/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-14 06:14+0000\n" -"PO-Revision-Date: 2017-06-14 06:14+0000\n" +"POT-Creation-Date: 2018-02-01 16:28+0000\n" +"PO-Revision-Date: 2018-02-01 16:28+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -78,6 +78,18 @@ msgstr "Nom de l'activité" msgid "Activity Types" msgstr "Types d'activité" +#. module: golem_activity +#: code:addons/golem_activity/models/golem_activity.py:120 +#, python-format +msgid "Activity end date can not be set after linked season end." +msgstr "La date de fin ne peut pas être apprêt la date de fin de la saison." + +#. module: golem_activity +#: code:addons/golem_activity/models/golem_activity.py:116 +#, python-format +msgid "Activity start date can not be set before linked season start." +msgstr "La date de début ne peut pas être avant la date de début de la saison." + #. module: golem_activity #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_name msgid "Activity type" @@ -273,7 +285,7 @@ msgid "Expense Account" msgstr "Compte de dépenses" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:120 +#: code:addons/golem_activity/models/golem_activity.py:138 #: selection:golem.activity,weekday:0 #, python-format msgid "Friday" @@ -350,6 +362,11 @@ msgstr "Numéro d'article international (IAN) utilisé pour identifier cet artic msgid "Invoicing" msgstr "Facturation" +#. module: golem_activity +#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_is_fullseason +msgid "Is full season?" +msgstr "Est sur toute la saison ?" + #. module: golem_activity #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_is_recurrent #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_is_recurrent @@ -405,7 +422,7 @@ msgid "Membership Start Date" msgstr "Date de début d'adhésion" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:116 +#: code:addons/golem_activity/models/golem_activity.py:134 #: selection:golem.activity,weekday:0 #, python-format msgid "Monday" @@ -493,7 +510,7 @@ msgid "Sale Price" msgstr "Prix de vente" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:121 +#: code:addons/golem_activity/models/golem_activity.py:139 #: selection:golem.activity,weekday:0 #, python-format msgid "Saturday" @@ -540,8 +557,8 @@ msgid "Start date" msgstr "Date de début" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:103 -#: code:addons/golem_activity/models/golem_activity.py:138 +#: code:addons/golem_activity/models/golem_activity.py:113 +#: code:addons/golem_activity/models/golem_activity.py:156 #, python-format msgid "Start of the period cannot be after end of the period." msgstr "Le début de la période ne peut être antérieure à sa fin" @@ -557,7 +574,7 @@ msgid "Stop time" msgstr "Heure de fin" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:122 +#: code:addons/golem_activity/models/golem_activity.py:140 #: selection:golem.activity,weekday:0 #, python-format msgid "Sunday" @@ -601,7 +618,7 @@ msgid "This field holds the image used as image for the activity." msgstr "This field holds the image used as image for the activity." #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:119 +#: code:addons/golem_activity/models/golem_activity.py:137 #: selection:golem.activity,weekday:0 #, python-format msgid "Thursday" @@ -618,14 +635,14 @@ msgid "True" msgstr "True" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:117 +#: code:addons/golem_activity/models/golem_activity.py:135 #: selection:golem.activity,weekday:0 #, python-format msgid "Tuesday" msgstr "Mardi" #. module: golem_activity -#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_id_3959 +#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_id_3891 msgid "Type" msgstr "Type" @@ -655,7 +672,7 @@ msgid "Warranty" msgstr "Garantie" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:118 +#: code:addons/golem_activity/models/golem_activity.py:136 #: selection:golem.activity,weekday:0 #, python-format msgid "Wednesday" @@ -680,4 +697,3 @@ msgstr "Atelier" #: model:ir.ui.view,arch_db:golem_activity.golem_activity_form msgid "describe the activity characteristics..." msgstr "Décrivez ici les caractéristiques de l'activité..." - diff --git a/golem_activity/i18n/golem_activity.pot b/golem_activity/i18n/golem_activity.pot index 0118dfc..3b770b9 100644 --- a/golem_activity/i18n/golem_activity.pot +++ b/golem_activity/i18n/golem_activity.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 10.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-14 06:14+0000\n" -"PO-Revision-Date: 2017-06-14 06:14+0000\n" +"POT-Creation-Date: 2018-02-01 16:28+0000\n" +"PO-Revision-Date: 2018-02-01 16:28+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -74,6 +74,18 @@ msgstr "" msgid "Activity Types" msgstr "" +#. module: golem_activity +#: code:addons/golem_activity/models/golem_activity.py:120 +#, python-format +msgid "Activity end date can not be set after linked season start." +msgstr "" + +#. module: golem_activity +#: code:addons/golem_activity/models/golem_activity.py:116 +#, python-format +msgid "Activity start date can not be set before linked season start." +msgstr "" + #. module: golem_activity #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_name msgid "Activity type" @@ -269,7 +281,7 @@ msgid "Expense Account" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:120 +#: code:addons/golem_activity/models/golem_activity.py:138 #: selection:golem.activity,weekday:0 #, python-format msgid "Friday" @@ -346,6 +358,11 @@ msgstr "" msgid "Invoicing" msgstr "" +#. module: golem_activity +#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_is_fullseason +msgid "Is full season?" +msgstr "" + #. module: golem_activity #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_is_recurrent #: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_is_recurrent @@ -401,7 +418,7 @@ msgid "Membership Start Date" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:116 +#: code:addons/golem_activity/models/golem_activity.py:134 #: selection:golem.activity,weekday:0 #, python-format msgid "Monday" @@ -489,7 +506,7 @@ msgid "Sale Price" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:121 +#: code:addons/golem_activity/models/golem_activity.py:139 #: selection:golem.activity,weekday:0 #, python-format msgid "Saturday" @@ -536,8 +553,8 @@ msgid "Start date" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:103 -#: code:addons/golem_activity/models/golem_activity.py:138 +#: code:addons/golem_activity/models/golem_activity.py:113 +#: code:addons/golem_activity/models/golem_activity.py:156 #, python-format msgid "Start of the period cannot be after end of the period." msgstr "" @@ -553,7 +570,7 @@ msgid "Stop time" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:122 +#: code:addons/golem_activity/models/golem_activity.py:140 #: selection:golem.activity,weekday:0 #, python-format msgid "Sunday" @@ -597,7 +614,7 @@ msgid "This field holds the image used as image for the activity." msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:119 +#: code:addons/golem_activity/models/golem_activity.py:137 #: selection:golem.activity,weekday:0 #, python-format msgid "Thursday" @@ -614,14 +631,14 @@ msgid "True" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:117 +#: code:addons/golem_activity/models/golem_activity.py:135 #: selection:golem.activity,weekday:0 #, python-format msgid "Tuesday" msgstr "" #. module: golem_activity -#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_id_3959 +#: model:ir.model.fields,field_description:golem_activity.field_golem_activity_type_id_3891 msgid "Type" msgstr "" @@ -651,7 +668,7 @@ msgid "Warranty" msgstr "" #. module: golem_activity -#: code:addons/golem_activity/models/golem_activity.py:118 +#: code:addons/golem_activity/models/golem_activity.py:136 #: selection:golem.activity,weekday:0 #, python-format msgid "Wednesday" diff --git a/golem_activity/models/golem_activity.py b/golem_activity/models/golem_activity.py index 750e97b..bb25069 100644 --- a/golem_activity/models/golem_activity.py +++ b/golem_activity/models/golem_activity.py @@ -118,7 +118,7 @@ class GolemActivity(models.Model): raise models.ValidationError(msg) if activity.season_id.date_end < activity.date_stop: msg = _(u'Activity end date can not be set after ' - 'linked season start.') + 'linked season end.') raise models.ValidationError(msg) @api.onchange('season_id') -- 2.47.2