diff --git a/golem_activity/i18n/fr.po b/golem_activity/i18n/fr.po index d584572..2035669 100644 --- a/golem_activity/i18n/fr.po +++ b/golem_activity/i18n/fr.po @@ -256,8 +256,8 @@ msgid "End date" msgstr "Date de fin" #. module: golem_activity -#: field:golem.activity,hour_end:0 -msgid "End time" +#: field:golem.activity,hour_stop:0 +msgid "Stop time" msgstr "Heure de fin" #. module: golem_activity diff --git a/golem_activity/i18n/golem_activity.pot b/golem_activity/i18n/golem_activity.pot index ae9a329..d2aa18f 100644 --- a/golem_activity/i18n/golem_activity.pot +++ b/golem_activity/i18n/golem_activity.pot @@ -254,8 +254,8 @@ msgid "End date" msgstr "" #. module: golem_activity -#: field:golem.activity,hour_end:0 -msgid "End time" +#: field:golem.activity,hour_stop:0 +msgid "Stop time" msgstr "" #. module: golem_activity diff --git a/golem_activity/models/golem_activity.py b/golem_activity/models/golem_activity.py index 7077b8c..f6ee169 100644 --- a/golem_activity/models/golem_activity.py +++ b/golem_activity/models/golem_activity.py @@ -120,20 +120,20 @@ class GolemActivity(models.Model): ('sat', _('Saturday')), ('sun', _('Sunday'))], copy=False) hour_start = fields.Float('Start time', copy=False) - hour_end = fields.Float('End time', copy=False) + hour_stop = fields.Float('Stop time', copy=False) @api.onchange('hour_start') def onchange_hour_start(self): """ Sets end hour to start hour if no start hour """ for s in self: - if s.hour_start and not s.hour_end: - s.hour_end = s.hour_start + 1 + if s.hour_start and not s.hour_stop: + s.hour_stop = s.hour_start + 1 - @api.constrains('hour_start', 'hour_end') + @api.constrains('hour_start', 'hour_stop') def _check_hour_period(self): """ Check if end hour if after start hour """ for s in self: - if s.hour_start > s.hour_end: + if s.hour_start > s.hour_stop: raise models.ValidationError(_('Start of the period cannot be ' 'after end of the period.')) diff --git a/golem_activity/views/golem_activity_view.xml b/golem_activity/views/golem_activity_view.xml index ddcdd65..265b5af 100644 --- a/golem_activity/views/golem_activity_view.xml +++ b/golem_activity/views/golem_activity_view.xml @@ -57,7 +57,7 @@ along with this program. If not, see . attrs="{'invisible': [('is_recurrent', '=', False)]}" /> -