From 76ce07c76ee832462a1f64b6acb85c98bc911cb4 Mon Sep 17 00:00:00 2001 From: Andrea Stirpe Date: Mon, 29 Apr 2019 11:31:57 +0200 Subject: [PATCH 01/12] [ADD] hr_holidays_leave_repeated (#581) --- hr_holidays_leave_repeated/README.rst | 86 ++++ hr_holidays_leave_repeated/__init__.py | 3 + hr_holidays_leave_repeated/__manifest__.py | 20 + .../i18n/hr_holidays_leave_repeated.pot | 117 +++++ hr_holidays_leave_repeated/i18n/nl.po | 136 ++++++ hr_holidays_leave_repeated/models/__init__.py | 4 + hr_holidays_leave_repeated/models/hr_leave.py | 139 ++++++ .../models/hr_leave_type.py | 10 + .../readme/CONFIGURE.rst | 1 + .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 1 + hr_holidays_leave_repeated/readme/USAGE.rst | 4 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 436 ++++++++++++++++++ hr_holidays_leave_repeated/tests/__init__.py | 3 + .../tests/test_holidays_leave_repeated.py | 233 ++++++++++ hr_holidays_leave_repeated/views/hr_leave.xml | 18 + .../views/hr_leave_type.xml | 14 + 18 files changed, 1226 insertions(+) create mode 100644 hr_holidays_leave_repeated/README.rst create mode 100644 hr_holidays_leave_repeated/__init__.py create mode 100644 hr_holidays_leave_repeated/__manifest__.py create mode 100644 hr_holidays_leave_repeated/i18n/hr_holidays_leave_repeated.pot create mode 100644 hr_holidays_leave_repeated/i18n/nl.po create mode 100644 hr_holidays_leave_repeated/models/__init__.py create mode 100644 hr_holidays_leave_repeated/models/hr_leave.py create mode 100644 hr_holidays_leave_repeated/models/hr_leave_type.py create mode 100644 hr_holidays_leave_repeated/readme/CONFIGURE.rst create mode 100644 hr_holidays_leave_repeated/readme/CONTRIBUTORS.rst create mode 100644 hr_holidays_leave_repeated/readme/DESCRIPTION.rst create mode 100644 hr_holidays_leave_repeated/readme/USAGE.rst create mode 100644 hr_holidays_leave_repeated/static/description/icon.png create mode 100644 hr_holidays_leave_repeated/static/description/index.html create mode 100644 hr_holidays_leave_repeated/tests/__init__.py create mode 100644 hr_holidays_leave_repeated/tests/test_holidays_leave_repeated.py create mode 100644 hr_holidays_leave_repeated/views/hr_leave.xml create mode 100644 hr_holidays_leave_repeated/views/hr_leave_type.xml diff --git a/hr_holidays_leave_repeated/README.rst b/hr_holidays_leave_repeated/README.rst new file mode 100644 index 00000000..894458ff --- /dev/null +++ b/hr_holidays_leave_repeated/README.rst @@ -0,0 +1,86 @@ +========================== +HR Holidays leave repeated +========================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fhr-lightgray.png?logo=github + :target: https://github.com/OCA/hr/tree/12.0/hr_holidays_leave_repeated + :alt: OCA/hr +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/hr-12-0/hr-12-0-hr_holidays_leave_repeated + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/116/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to create periodical leaves. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +#. Set a particular leave type with flag Repeat set to True. + +Usage +===== + +#. Create a leave request, selecting the leave type having flag Repeat set to True. +#. Set the 'Repeat Mode' field to 'Number of Times'. Set the proper values for 'Repeat Every' and 'Repeat # times'. +#. Alternatively set the 'Repeat Mode' field to 'End Date', then set 'Repeat Every' and 'Repeat End Date'. +#. Create (save) the leave request. All the periodical leave requests are automatically created. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Onestein + +Contributors +~~~~~~~~~~~~ + +* Andrea Stirpe + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/hr `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/hr_holidays_leave_repeated/__init__.py b/hr_holidays_leave_repeated/__init__.py new file mode 100644 index 00000000..31660d6a --- /dev/null +++ b/hr_holidays_leave_repeated/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import models diff --git a/hr_holidays_leave_repeated/__manifest__.py b/hr_holidays_leave_repeated/__manifest__.py new file mode 100644 index 00000000..9d45b1b2 --- /dev/null +++ b/hr_holidays_leave_repeated/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright 2016-2019 Onestein () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + 'name': 'HR Holidays leave repeated', + 'summary': 'Define periodical leaves', + 'author': 'Onestein, Odoo Community Association (OCA)', + 'website': 'https://github.com/OCA/hr/', + 'category': 'Human Resources', + 'version': '12.0.1.0.0', + 'license': 'AGPL-3', + 'depends': [ + 'hr_holidays', + ], + 'data': [ + 'views/hr_leave_type.xml', + 'views/hr_leave.xml', + ], + 'installable': True, +} diff --git a/hr_holidays_leave_repeated/i18n/hr_holidays_leave_repeated.pot b/hr_holidays_leave_repeated/i18n/hr_holidays_leave_repeated.pot new file mode 100644 index 00000000..2b192c9b --- /dev/null +++ b/hr_holidays_leave_repeated/i18n/hr_holidays_leave_repeated.pot @@ -0,0 +1,117 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_leave_repeated +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_mode:0 +msgid "End Date" +msgstr "" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_every:0 +msgid "Every four weeks" +msgstr "" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_every:0 +msgid "Every two weeks" +msgstr "" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_every:0 +msgid "Every week" +msgstr "" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_every:0 +msgid "Every workday" +msgstr "" + +#. module: hr_holidays_leave_repeated +#: model:ir.model,name:hr_holidays_leave_repeated.model_hr_leave +msgid "Leave" +msgstr "" + +#. module: hr_holidays_leave_repeated +#: model:ir.model,name:hr_holidays_leave_repeated.model_hr_leave_type +msgid "Leave Type" +msgstr "" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_mode:0 +msgid "Number of Times" +msgstr "" + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:135 +#, python-format +msgid "Please set a positive amount of repetitions." +msgstr "" + +#. module: hr_holidays_leave_repeated +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave__holiday_type_repeat +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave_type__repeat +msgid "Repeat" +msgstr "" + +#. module: hr_holidays_leave_repeated +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave__repeat_limit +msgid "Repeat # times" +msgstr "" + +#. module: hr_holidays_leave_repeated +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave__repeat_end_date +msgid "Repeat End Date" +msgstr "" + +#. module: hr_holidays_leave_repeated +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave__repeat_every +msgid "Repeat Every" +msgstr "" + +#. module: hr_holidays_leave_repeated +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave__repeat_mode +msgid "Repeat Mode" +msgstr "" + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:139 +#, python-format +msgid "The Repeat End Date cannot be in the past" +msgstr "" + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:58 +#, python-format +msgid "The repetition is based on workdays: the duration of the leave request must not exceed 1 day." +msgstr "" + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:76 +#, python-format +msgid "The repetition is every four weeks: the duration of the leave request must not exceed 28 days." +msgstr "" + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:70 +#, python-format +msgid "The repetition is every two weeks: the duration of the leave request must not exceed 2 weeks." +msgstr "" + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:64 +#, python-format +msgid "The repetition is every week: the duration of the leave request must not exceed 1 week." +msgstr "" + diff --git a/hr_holidays_leave_repeated/i18n/nl.po b/hr_holidays_leave_repeated/i18n/nl.po new file mode 100644 index 00000000..14c5bd49 --- /dev/null +++ b/hr_holidays_leave_repeated/i18n/nl.po @@ -0,0 +1,136 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_leave_repeated +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-04-18 12:00+0000\n" +"PO-Revision-Date: 2019-04-18 14:08+0200\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: \n" +"X-Generator: Poedit 2.2.1\n" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_mode:0 +msgid "End Date" +msgstr "Einddatum" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_every:0 +msgid "Every four weeks" +msgstr "Elke vier weken" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_every:0 +msgid "Every two weeks" +msgstr "Elke twee weken" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_every:0 +msgid "Every week" +msgstr "Elke week" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_every:0 +msgid "Every workday" +msgstr "Elke werkdag" + +#. module: hr_holidays_leave_repeated +#: model:ir.model,name:hr_holidays_leave_repeated.model_hr_leave +msgid "Leave" +msgstr "Verlof" + +#. module: hr_holidays_leave_repeated +#: model:ir.model,name:hr_holidays_leave_repeated.model_hr_leave_type +msgid "Leave Type" +msgstr "Verlofsoort" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_mode:0 +msgid "Number of Times" +msgstr "Aantal herhalingen" + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:135 +#, python-format +msgid "Please set a positive amount of repetitions." +msgstr "Stel een positief aantal herhaling in." + +#. module: hr_holidays_leave_repeated +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave__holiday_type_repeat +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave_type__repeat +msgid "Repeat" +msgstr "Herhaal" + +#. module: hr_holidays_leave_repeated +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave__repeat_limit +msgid "Repeat # times" +msgstr "Aantal keer herhalen" + +#. module: hr_holidays_leave_repeated +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave__repeat_end_date +msgid "Repeat End Date" +msgstr "Herhaal einddatum" + +#. module: hr_holidays_leave_repeated +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave__repeat_every +msgid "Repeat Every" +msgstr "Herhaal iedere" + +#. module: hr_holidays_leave_repeated +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave__repeat_mode +msgid "Repeat Mode" +msgstr "Herhaal modus" + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:139 +#, python-format +msgid "The Repeat End Date cannot be in the past" +msgstr "De herhaal einddatum kan niet in het verlegen liggen" + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:58 +#, python-format +msgid "" +"The repetition is based on workdays: the duration of the leave request must " +"not exceed 1 day." +msgstr "" +"De herhaling is gebaseerd op werkdagen: het verlof mag niet langer zijn dan " +"1 dag." + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:76 +#, python-format +msgid "" +"The repetition is every four weeks: the duration of the leave request must " +"not exceed 28 days." +msgstr "" +"De herhaling is gebaseerd op elke 4 weken: het verlof mag niet langer zijn " +"dan 28 dagen." + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:70 +#, python-format +msgid "" +"The repetition is every two weeks: the duration of the leave request must " +"not exceed 2 weeks." +msgstr "" +"De herhaling is gebaseerd op elke 2 weken: het verlof mag niet langer zijn " +"dan 2 weken." + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:64 +#, python-format +msgid "" +"The repetition is every week: the duration of the leave request must not " +"exceed 1 week." +msgstr "" +"De herhaling is gebaseerd op elke week: het verlof mag niet langer zijn dan " +"1 week." diff --git a/hr_holidays_leave_repeated/models/__init__.py b/hr_holidays_leave_repeated/models/__init__.py new file mode 100644 index 00000000..dfb1fb48 --- /dev/null +++ b/hr_holidays_leave_repeated/models/__init__.py @@ -0,0 +1,4 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import hr_leave +from . import hr_leave_type diff --git a/hr_holidays_leave_repeated/models/hr_leave.py b/hr_holidays_leave_repeated/models/hr_leave.py new file mode 100644 index 00000000..690e3515 --- /dev/null +++ b/hr_holidays_leave_repeated/models/hr_leave.py @@ -0,0 +1,139 @@ +# Copyright 2016-2019 Onestein () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from dateutil.relativedelta import relativedelta + +from odoo import _, api, fields, models +from odoo.exceptions import UserError, ValidationError + + +class HrLeave(models.Model): + _inherit = 'hr.leave' + + repeat_every = fields.Selection([ + ('workday', 'Every workday'), + ('week', 'Every week'), + ('biweek', 'Every two weeks'), + ('month', 'Every four weeks') + ]) + repeat_mode = fields.Selection([ + ('times', 'Number of Times'), + ('date', 'End Date'), + ], default='times') + holiday_type_repeat = fields.Boolean(related='holiday_status_id.repeat') + repeat_limit = fields.Integer(default=1, string='Repeat # times') + repeat_end_date = fields.Date(default=lambda self: fields.Date.today()) + + @api.model + def _update_repeated_workday_dates(self, employee, from_dt, to_dt, days): + user = self.env.user + calendar = employee.resource_calendar_id + orig_from_dt = fields.Datetime.context_timestamp(user, from_dt) + orig_to_dt = fields.Datetime.context_timestamp(user, to_dt) + work_hours = calendar.get_work_hours_count( + from_dt, to_dt, compute_leaves=False) + while work_hours: + from_dt = from_dt + relativedelta(days=days) + to_dt = to_dt + relativedelta(days=days) + + new_work_hours = calendar.get_work_hours_count( + from_dt, to_dt, compute_leaves=True) + if new_work_hours and work_hours <= new_work_hours: + break + + user_from_dt = fields.Datetime.context_timestamp(user, from_dt) + user_to_dt = fields.Datetime.context_timestamp(user, to_dt) + from_dt = from_dt - user_from_dt.tzinfo._utcoffset + from_dt = from_dt + orig_from_dt.tzinfo._utcoffset + to_dt = to_dt - user_to_dt.tzinfo._utcoffset + to_dt = to_dt + orig_to_dt.tzinfo._utcoffset + + return from_dt, to_dt + + @api.model + def _get_repeated_vals_dict(self): + return { + 'workday': { + 'days': 1, + 'user_error_msg': _( + 'The repetition is based on workdays: the duration of ' + 'the leave request must not exceed 1 day.') + }, + 'week': { + 'days': 7, + 'user_error_msg': _( + 'The repetition is every week: the duration of the ' + 'leave request must not exceed 1 week.') + }, + 'biweek': { + 'days': 14, + 'user_error_msg': _( + 'The repetition is every two weeks: the duration of the ' + 'leave request must not exceed 2 weeks.') + }, + 'month': { + 'days': 28, + 'user_error_msg': _( + 'The repetition is every four weeks: the duration of the ' + 'leave request must not exceed 28 days.') + } + } + + @api.model + def _update_repeated_leave_vals(self, vals, employee): + vals_dict = self._get_repeated_vals_dict() + param_dict = vals_dict[vals.get('repeat_every')] + from_dt = fields.Datetime.from_string(vals.get('date_from')) + to_dt = fields.Datetime.from_string(vals.get('date_to')) + end_date = fields.Datetime.from_string(vals.get('repeat_end_date')) + + if (to_dt - from_dt).days > param_dict['days']: + raise UserError(param_dict['user_error_msg']) + + from_dt, to_dt = self._update_repeated_workday_dates( + employee, from_dt, to_dt, param_dict['days']) + + vals['request_date_from'] = vals['date_from'] = from_dt + vals['request_date_to'] = vals['date_to'] = to_dt + vals['repeat_end_date'] = end_date + return vals + + @api.model + def create_repeated_handler(self, vals, employee): + def _check_repeating(count, vals): + repeat_mode = vals.get('repeat_mode', 'times') + if repeat_mode == 'times' and count < vals.get('repeat_limit', 0): + return True + repeat_end_date = vals.get('repeat_end_date', fields.Date.today()) + if repeat_mode == 'date' and vals['date_to'] <= repeat_end_date: + return True + return False + + count = 1 + vals = self._update_repeated_leave_vals(vals, employee) + while _check_repeating(count, vals): + self.with_context(skip_create_handler=True).create(vals) + count += 1 + vals = self._update_repeated_leave_vals(vals, employee) + + @api.model + def create(self, vals): + res = super().create(vals) + skip_create_handler = self.env.context.get('skip_create_handler') + all_vals_set = vals.get('repeat_every') and vals.get('repeat_mode') + if not skip_create_handler and all_vals_set: + employee = self.env['hr.employee'].browse(vals.get('employee_id')) + if employee.resource_calendar_id: + self.create_repeated_handler(vals, employee) + return res + + @api.constrains('repeat_limit', 'repeat_end_date') + def _check_repeat_limit(self): + for record in self: + if record.repeat_mode == 'times' and record.repeat_limit < 0: + raise ValidationError( + _('Please set a positive amount of repetitions.')) + if record.repeat_mode == 'date' \ + and record.repeat_end_date < fields.Date.today(): + raise ValidationError( + _('The Repeat End Date cannot be in the past')) diff --git a/hr_holidays_leave_repeated/models/hr_leave_type.py b/hr_holidays_leave_repeated/models/hr_leave_type.py new file mode 100644 index 00000000..194f9245 --- /dev/null +++ b/hr_holidays_leave_repeated/models/hr_leave_type.py @@ -0,0 +1,10 @@ +# Copyright 2016-2019 Onestein () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class HrLeaveType(models.Model): + _inherit = 'hr.leave.type' + + repeat = fields.Boolean() diff --git a/hr_holidays_leave_repeated/readme/CONFIGURE.rst b/hr_holidays_leave_repeated/readme/CONFIGURE.rst new file mode 100644 index 00000000..217b3d94 --- /dev/null +++ b/hr_holidays_leave_repeated/readme/CONFIGURE.rst @@ -0,0 +1 @@ +#. Set a particular leave type with flag Repeat set to True. diff --git a/hr_holidays_leave_repeated/readme/CONTRIBUTORS.rst b/hr_holidays_leave_repeated/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..4518218c --- /dev/null +++ b/hr_holidays_leave_repeated/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Andrea Stirpe diff --git a/hr_holidays_leave_repeated/readme/DESCRIPTION.rst b/hr_holidays_leave_repeated/readme/DESCRIPTION.rst new file mode 100644 index 00000000..9cb37c13 --- /dev/null +++ b/hr_holidays_leave_repeated/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allows to create periodical leaves. diff --git a/hr_holidays_leave_repeated/readme/USAGE.rst b/hr_holidays_leave_repeated/readme/USAGE.rst new file mode 100644 index 00000000..43511230 --- /dev/null +++ b/hr_holidays_leave_repeated/readme/USAGE.rst @@ -0,0 +1,4 @@ +#. Create a leave request, selecting the leave type having flag Repeat set to True. +#. Set the 'Repeat Mode' field to 'Number of Times'. Set the proper values for 'Repeat Every' and 'Repeat # times'. +#. Alternatively set the 'Repeat Mode' field to 'End Date', then set 'Repeat Every' and 'Repeat End Date'. +#. Create (save) the leave request. All the periodical leave requests are automatically created. diff --git a/hr_holidays_leave_repeated/static/description/icon.png b/hr_holidays_leave_repeated/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/hr_holidays_leave_repeated/static/description/index.html b/hr_holidays_leave_repeated/static/description/index.html new file mode 100644 index 00000000..117a3876 --- /dev/null +++ b/hr_holidays_leave_repeated/static/description/index.html @@ -0,0 +1,436 @@ + + + + + + +HR Holidays leave repeated + + + +
+

HR Holidays leave repeated

+ + +

Beta License: AGPL-3 OCA/hr Translate me on Weblate Try me on Runbot

+

This module allows to create periodical leaves.

+

Table of contents

+ +
+

Configuration

+
    +
  1. Set a particular leave type with flag Repeat set to True.
    2. +
+
+
+

Usage

+
    +
  1. Create a leave request, selecting the leave type having flag Repeat set to True.
    2. +
  2. Set the ‘Repeat Mode’ field to ‘Number of Times’. Set the proper values for ‘Repeat Every’ and ‘Repeat # times’.
    3. +
  3. Alternatively set the ‘Repeat Mode’ field to ‘End Date’, then set ‘Repeat Every’ and ‘Repeat End Date’.
    4. +
  4. Create (save) the leave request. All the periodical leave requests are automatically created.
    5. +
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Onestein
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/hr project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/hr_holidays_leave_repeated/tests/__init__.py b/hr_holidays_leave_repeated/tests/__init__.py new file mode 100644 index 00000000..f79b967b --- /dev/null +++ b/hr_holidays_leave_repeated/tests/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import test_holidays_leave_repeated diff --git a/hr_holidays_leave_repeated/tests/test_holidays_leave_repeated.py b/hr_holidays_leave_repeated/tests/test_holidays_leave_repeated.py new file mode 100644 index 00000000..bc27f239 --- /dev/null +++ b/hr_holidays_leave_repeated/tests/test_holidays_leave_repeated.py @@ -0,0 +1,233 @@ +# Copyright 2016-2019 Onestein () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from datetime import datetime, timedelta +from odoo.tests import common +from odoo.exceptions import ValidationError, UserError + + +class TestHolidaysLeaveRepeated(common.TransactionCase): + def setUp(self): + super().setUp() + + self.date_start = datetime(2016, 12, 5, 8, 0, 0, 0) + self.date_end = datetime(2016, 12, 5, 18, 0, 0, 0) + + self.calendar = self.env['resource.calendar'].create({ + 'name': 'Calendar 1', + }) + + for i in range(0, 7): + self.env['resource.calendar.attendance'].create({ + 'name': 'Day ' + str(i), + 'dayofweek': str(i), + 'hour_from': 8.0, + 'hour_to': 16.0, + 'calendar_id': self.calendar.id, + }) + + self.employee_1 = self.env['hr.employee'].create({ + 'name': 'Employee 1', + 'resource_calendar_id': self.calendar.id, + }) + self.employee_2 = self.env['hr.employee'].create({ + 'name': 'Employee 2', + 'resource_calendar_id': self.calendar.id, + }) + self.employee_3 = self.env['hr.employee'].create({ + 'name': 'Employee 3', + 'resource_calendar_id': self.calendar.id, + }) + self.employee_4 = self.env['hr.employee'].create({ + 'name': 'Employee 4', + 'resource_calendar_id': self.calendar.id, + }) + self.employee_5 = self.env['hr.employee'].create({ + 'name': 'Failing Employee', + 'resource_calendar_id': self.calendar.id, + }) + + self.status_1 = self.env['hr.leave.type'].create({ + 'name': 'Repeating Status', + 'repeat': True, + }) + + self.leave_1 = self.env['hr.leave'].create({ + 'holiday_status_id': self.status_1.id, + 'holiday_type': 'employee', + 'repeat_every': 'workday', + 'repeat_mode': 'times', + 'repeat_limit': 5, + 'date_from': self.date_start, + 'date_to': self.date_end, + 'employee_id': self.employee_1.id, + }) + self.leave_2 = self.env['hr.leave'].create({ + 'holiday_status_id': self.status_1.id, + 'holiday_type': 'employee', + 'repeat_every': 'week', + 'repeat_mode': 'times', + 'repeat_limit': 4, + 'date_from': self.date_start, + 'date_to': self.date_end, + 'employee_id': self.employee_2.id, + }) + self.leave_3 = self.env['hr.leave'].create({ + 'holiday_status_id': self.status_1.id, + 'holiday_type': 'employee', + 'repeat_every': 'biweek', + 'repeat_mode': 'times', + 'repeat_limit': 3, + 'date_from': self.date_start, + 'date_to': self.date_end, + 'employee_id': self.employee_3.id, + }) + self.leave_4 = self.env['hr.leave'].create({ + 'holiday_status_id': self.status_1.id, + 'holiday_type': 'employee', + 'repeat_every': 'month', + 'repeat_mode': 'times', + 'repeat_limit': 2, + 'date_from': self.date_start, + 'date_to': self.date_end, + 'employee_id': self.employee_4.id, + }) + + def test_01_count_repetitions(self): + + leave_1_list = self.env['hr.leave'].search([ + ('holiday_status_id', '=', self.status_1.id), + ('employee_id', '=', self.employee_1.id)]) + leave_2_list = self.env['hr.leave'].search([ + ('holiday_status_id', '=', self.status_1.id), + ('employee_id', '=', self.employee_2.id)]) + leave_3_list = self.env['hr.leave'].search([ + ('holiday_status_id', '=', self.status_1.id), + ('employee_id', '=', self.employee_3.id)]) + leave_4_list = self.env['hr.leave'].search([ + ('holiday_status_id', '=', self.status_1.id), + ('employee_id', '=', self.employee_4.id)]) + + self.assertEqual(len(leave_1_list), 5) + self.assertEqual(len(leave_2_list), 4) + self.assertEqual(len(leave_3_list), 3) + self.assertEqual(len(leave_4_list), 2) + + def test_02_workdays(self): + for i in range(0, 5): + check_from = self.date_start + timedelta(days=i) + check_to = self.date_end + timedelta(days=i) + leaves = self.env['hr.leave'].search([ + ('holiday_status_id', '=', self.status_1.id), + ('employee_id', '=', self.employee_1.id), + ('date_from', '=', check_from), + ('date_to', '=', check_to) + ]) + self.assertEqual(len(leaves), 1) + + def test_03_weeks(self): + + for i in range(0, 4): + check_from = self.date_start + timedelta(days=i * 7) + check_to = self.date_end + timedelta(days=i * 7) + leaves = self.env['hr.leave'].search( + [('holiday_status_id', '=', self.status_1.id), + ('employee_id', '=', self.employee_2.id), + ('date_from', '=', check_from), + ('date_to', '=', check_to)] + ) + self.assertEqual(len(leaves), 1) + + def test_04_biweeks(self): + for i in range(0, 3): + check_from = self.date_start + timedelta(days=i * 14) + check_to = self.date_end + timedelta(days=i * 14) + leaves = self.env['hr.leave'].search( + [('holiday_status_id', '=', self.status_1.id), + ('employee_id', '=', self.employee_3.id), + ('date_from', '=', check_from), + ('date_to', '=', check_to)] + ) + self.assertEqual(len(leaves), 1) + + def test_05_months(self): + for i in range(0, 2): + check_from = self.date_start + timedelta(days=i * 28) + check_to = self.date_end + timedelta(days=i * 28) + leaves = self.env['hr.leave'].search([ + ('holiday_status_id', '=', self.status_1.id), + ('employee_id', '=', self.employee_4.id), + ('date_from', '=', check_from), + ('date_to', '=', check_to) + ]) + self.assertEqual(len(leaves), 1) + + def test_06_check_dates(self): + with self.assertRaises(ValidationError): + self.env['hr.leave'].create({ + 'holiday_status_id': self.status_1.id, + 'holiday_type': 'employee', + 'repeat_every': 'workday', + 'repeat_limit': -1, + 'date_from': self.date_start, + 'date_to': self.date_end, + 'employee_id': self.employee_5.id, + }) + + def test_07_check_dates(self): + date_start = datetime(2019, 2, 18, 8, 0, 0, 0) + date_end = datetime(2019, 2, 20, 18, 0, 0, 0) + with self.assertRaises(UserError): + self.env['hr.leave'].create({ + 'holiday_status_id': self.status_1.id, + 'holiday_type': 'employee', + 'repeat_every': 'workday', + 'repeat_mode': 'times', + 'repeat_limit': 5, + 'date_from': date_start, + 'date_to': date_end, + 'employee_id': self.employee_5.id, + }) + + def test_08_workdays_with_weekend(self): + date_start = datetime(2019, 3, 1, 8, 0, 0, 0) + date_end = datetime(2019, 3, 1, 18, 0, 0, 0) + self.env['hr.leave'].create({ + 'holiday_status_id': self.status_1.id, + 'holiday_type': 'employee', + 'repeat_every': 'workday', + 'repeat_mode': 'times', + 'repeat_limit': 5, + 'date_from': date_start, + 'date_to': date_end, + 'employee_id': self.employee_1.id, + }) + for i in range(0, 7): + datetime_from = date_start + timedelta(days=i) + datetime_to = date_end + timedelta(days=i) + leaves = self.env['hr.leave'].search([ + ('holiday_status_id', '=', self.status_1.id), + ('employee_id', '=', self.employee_1.id), + ('date_from', '=', datetime_from), + ('date_to', '=', datetime_to) + ]) + if datetime_from.weekday() < 5: # is a weekday + self.assertEqual(len(leaves), 1) + else: # is weekend + self.assertEqual(len(leaves), 0) + + def test_09_check_repeat_end_date(self): + old_date = datetime(2019, 3, 18, 8, 0, 0, 0) + date_start = datetime(2019, 2, 18, 8, 0, 0, 0) + date_end = datetime(2019, 2, 18, 18, 0, 0, 0) + with self.assertRaises(ValidationError): + self.env['hr.leave'].create({ + 'holiday_status_id': self.status_1.id, + 'holiday_type': 'employee', + 'repeat_every': 'workday', + 'repeat_mode': 'date', + 'repeat_end_date': old_date, + 'date_from': date_start, + 'date_to': date_end, + 'employee_id': self.employee_5.id, + }) diff --git a/hr_holidays_leave_repeated/views/hr_leave.xml b/hr_holidays_leave_repeated/views/hr_leave.xml new file mode 100644 index 00000000..864de744 --- /dev/null +++ b/hr_holidays_leave_repeated/views/hr_leave.xml @@ -0,0 +1,18 @@ + + + + + hr.leave + + + + + + + + + + + + + diff --git a/hr_holidays_leave_repeated/views/hr_leave_type.xml b/hr_holidays_leave_repeated/views/hr_leave_type.xml new file mode 100644 index 00000000..967eda5a --- /dev/null +++ b/hr_holidays_leave_repeated/views/hr_leave_type.xml @@ -0,0 +1,14 @@ + + + + + hr.leave.type + + + + + + + + + From 82db19db481240efe13db9ae56db880b3bb1d216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Allard?= Date: Thu, 23 May 2019 20:05:46 +0000 Subject: [PATCH 02/12] Added translation using Weblate (French) --- hr_holidays_leave_repeated/i18n/fr.po | 127 ++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 hr_holidays_leave_repeated/i18n/fr.po diff --git a/hr_holidays_leave_repeated/i18n/fr.po b/hr_holidays_leave_repeated/i18n/fr.po new file mode 100644 index 00000000..5cd34180 --- /dev/null +++ b/hr_holidays_leave_repeated/i18n/fr.po @@ -0,0 +1,127 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_leave_repeated +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2019-05-23 20:19+0000\n" +"Last-Translator: Kévin Allard \n" +"Language-Team: none\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 3.6.1\n" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_mode:0 +msgid "End Date" +msgstr "Date de fin" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_every:0 +msgid "Every four weeks" +msgstr "Toutes les quatre semaines" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_every:0 +msgid "Every two weeks" +msgstr "Toutes les deux semaines" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_every:0 +msgid "Every week" +msgstr "Toutes les semaines" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_every:0 +msgid "Every workday" +msgstr "Chaque jour travaillé" + +#. module: hr_holidays_leave_repeated +#: model:ir.model,name:hr_holidays_leave_repeated.model_hr_leave +msgid "Leave" +msgstr "Congé" + +#. module: hr_holidays_leave_repeated +#: model:ir.model,name:hr_holidays_leave_repeated.model_hr_leave_type +msgid "Leave Type" +msgstr "Type de congé" + +#. module: hr_holidays_leave_repeated +#: selection:hr.leave,repeat_mode:0 +msgid "Number of Times" +msgstr "Nombre de fois" + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:135 +#, fuzzy, python-format +msgid "Please set a positive amount of repetitions." +msgstr "Veuillez définir un nombre de répétitions positif." + +#. module: hr_holidays_leave_repeated +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave__holiday_type_repeat +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave_type__repeat +msgid "Repeat" +msgstr "Répeter" + +#. module: hr_holidays_leave_repeated +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave__repeat_limit +msgid "Repeat # times" +msgstr "Répéter # fois" + +#. module: hr_holidays_leave_repeated +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave__repeat_end_date +msgid "Repeat End Date" +msgstr "Répéter la date de fin" + +#. module: hr_holidays_leave_repeated +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave__repeat_every +msgid "Repeat Every" +msgstr "Répéter chaque" + +#. module: hr_holidays_leave_repeated +#: model:ir.model.fields,field_description:hr_holidays_leave_repeated.field_hr_leave__repeat_mode +msgid "Repeat Mode" +msgstr "Mode de répétition" + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:139 +#, python-format +msgid "The Repeat End Date cannot be in the past" +msgstr "La date de fin de répétition ne peut pas être dans le passé" + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:58 +#, python-format +msgid "The repetition is based on workdays: the duration of the leave request must not exceed 1 day." +msgstr "" +"La répétition est basée sur les jours ouvrables : la durée de la demande de " +"congé ne doit pas dépasser 1 jour." + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:76 +#, python-format +msgid "The repetition is every four weeks: the duration of the leave request must not exceed 28 days." +msgstr "" +"La répétition a lieu toutes les quatre semaines : la durée de la demande de " +"congé ne doit pas dépasser 28 jours." + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:70 +#, python-format +msgid "The repetition is every two weeks: the duration of the leave request must not exceed 2 weeks." +msgstr "" +"La répétition a lieu toutes les deux semaines : la durée de la demande de " +"congé ne doit pas dépasser 2 semaines." + +#. module: hr_holidays_leave_repeated +#: code:addons/hr_holidays_leave_repeated/models/hr_leave.py:64 +#, python-format +msgid "The repetition is every week: the duration of the leave request must not exceed 1 week." +msgstr "" +"La répétition est hebdomadaire : la durée de la demande de congé ne doit pas " +"dépasser 1 semaine." From f803796afebc40751c597d77c3337ee1ade8d24c Mon Sep 17 00:00:00 2001 From: Jaime Arroyo Date: Tue, 25 Jun 2019 13:36:58 +0200 Subject: [PATCH 03/12] [12.0][FIX] Travis Failing Holidays Leave Type Validity --- hr_holidays_leave_repeated/__manifest__.py | 25 +- hr_holidays_leave_repeated/models/hr_leave.py | 132 +++---- .../models/hr_leave_type.py | 2 +- .../static/description/index.html | 2 +- .../tests/test_holidays_leave_repeated.py | 347 ++++++++++-------- hr_holidays_leave_repeated/views/hr_leave.xml | 26 +- .../views/hr_leave_type.xml | 8 +- 7 files changed, 292 insertions(+), 250 deletions(-) diff --git a/hr_holidays_leave_repeated/__manifest__.py b/hr_holidays_leave_repeated/__manifest__.py index 9d45b1b2..380f9dc2 100644 --- a/hr_holidays_leave_repeated/__manifest__.py +++ b/hr_holidays_leave_repeated/__manifest__.py @@ -2,19 +2,14 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { - 'name': 'HR Holidays leave repeated', - 'summary': 'Define periodical leaves', - 'author': 'Onestein, Odoo Community Association (OCA)', - 'website': 'https://github.com/OCA/hr/', - 'category': 'Human Resources', - 'version': '12.0.1.0.0', - 'license': 'AGPL-3', - 'depends': [ - 'hr_holidays', - ], - 'data': [ - 'views/hr_leave_type.xml', - 'views/hr_leave.xml', - ], - 'installable': True, + "name": "HR Holidays leave repeated", + "summary": "Define periodical leaves", + "author": "Onestein, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/hr/", + "category": "Human Resources", + "version": "12.0.1.0.0", + "license": "AGPL-3", + "depends": ["hr_holidays",], + "data": ["views/hr_leave_type.xml", "views/hr_leave.xml",], + "installable": True, } diff --git a/hr_holidays_leave_repeated/models/hr_leave.py b/hr_holidays_leave_repeated/models/hr_leave.py index 690e3515..453fac03 100644 --- a/hr_holidays_leave_repeated/models/hr_leave.py +++ b/hr_holidays_leave_repeated/models/hr_leave.py @@ -8,20 +8,21 @@ class HrLeave(models.Model): - _inherit = 'hr.leave' - - repeat_every = fields.Selection([ - ('workday', 'Every workday'), - ('week', 'Every week'), - ('biweek', 'Every two weeks'), - ('month', 'Every four weeks') - ]) - repeat_mode = fields.Selection([ - ('times', 'Number of Times'), - ('date', 'End Date'), - ], default='times') - holiday_type_repeat = fields.Boolean(related='holiday_status_id.repeat') - repeat_limit = fields.Integer(default=1, string='Repeat # times') + _inherit = "hr.leave" + + repeat_every = fields.Selection( + [ + ("workday", "Every workday"), + ("week", "Every week"), + ("biweek", "Every two weeks"), + ("month", "Every four weeks"), + ] + ) + repeat_mode = fields.Selection( + [("times", "Number of Times"), ("date", "End Date"),], default="times" + ) + holiday_type_repeat = fields.Boolean(related="holiday_status_id.repeat") + repeat_limit = fields.Integer(default=1, string="Repeat # times") repeat_end_date = fields.Date(default=lambda self: fields.Date.today()) @api.model @@ -30,14 +31,14 @@ def _update_repeated_workday_dates(self, employee, from_dt, to_dt, days): calendar = employee.resource_calendar_id orig_from_dt = fields.Datetime.context_timestamp(user, from_dt) orig_to_dt = fields.Datetime.context_timestamp(user, to_dt) - work_hours = calendar.get_work_hours_count( - from_dt, to_dt, compute_leaves=False) + work_hours = calendar.get_work_hours_count(from_dt, to_dt, compute_leaves=False) while work_hours: from_dt = from_dt + relativedelta(days=days) to_dt = to_dt + relativedelta(days=days) new_work_hours = calendar.get_work_hours_count( - from_dt, to_dt, compute_leaves=True) + from_dt, to_dt, compute_leaves=True + ) if new_work_hours and work_hours <= new_work_hours: break @@ -53,59 +54,64 @@ def _update_repeated_workday_dates(self, employee, from_dt, to_dt, days): @api.model def _get_repeated_vals_dict(self): return { - 'workday': { - 'days': 1, - 'user_error_msg': _( - 'The repetition is based on workdays: the duration of ' - 'the leave request must not exceed 1 day.') + "workday": { + "days": 1, + "user_error_msg": _( + "The repetition is based on workdays: the duration of " + "the leave request must not exceed 1 day." + ), }, - 'week': { - 'days': 7, - 'user_error_msg': _( - 'The repetition is every week: the duration of the ' - 'leave request must not exceed 1 week.') + "week": { + "days": 7, + "user_error_msg": _( + "The repetition is every week: the duration of the " + "leave request must not exceed 1 week." + ), }, - 'biweek': { - 'days': 14, - 'user_error_msg': _( - 'The repetition is every two weeks: the duration of the ' - 'leave request must not exceed 2 weeks.') + "biweek": { + "days": 14, + "user_error_msg": _( + "The repetition is every two weeks: the duration of the " + "leave request must not exceed 2 weeks." + ), + }, + "month": { + "days": 28, + "user_error_msg": _( + "The repetition is every four weeks: the duration of the " + "leave request must not exceed 28 days." + ), }, - 'month': { - 'days': 28, - 'user_error_msg': _( - 'The repetition is every four weeks: the duration of the ' - 'leave request must not exceed 28 days.') - } } @api.model def _update_repeated_leave_vals(self, vals, employee): vals_dict = self._get_repeated_vals_dict() - param_dict = vals_dict[vals.get('repeat_every')] - from_dt = fields.Datetime.from_string(vals.get('date_from')) - to_dt = fields.Datetime.from_string(vals.get('date_to')) - end_date = fields.Datetime.from_string(vals.get('repeat_end_date')) + param_dict = vals_dict[vals.get("repeat_every")] + from_dt = fields.Datetime.from_string(vals.get("date_from")) + to_dt = fields.Datetime.from_string(vals.get("date_to")) + end_date = fields.Datetime.from_string(vals.get("repeat_end_date")) - if (to_dt - from_dt).days > param_dict['days']: - raise UserError(param_dict['user_error_msg']) + if (to_dt - from_dt).days > param_dict["days"]: + raise UserError(param_dict["user_error_msg"]) from_dt, to_dt = self._update_repeated_workday_dates( - employee, from_dt, to_dt, param_dict['days']) + employee, from_dt, to_dt, param_dict["days"] + ) - vals['request_date_from'] = vals['date_from'] = from_dt - vals['request_date_to'] = vals['date_to'] = to_dt - vals['repeat_end_date'] = end_date + vals["request_date_from"] = vals["date_from"] = from_dt + vals["request_date_to"] = vals["date_to"] = to_dt + vals["repeat_end_date"] = end_date return vals @api.model def create_repeated_handler(self, vals, employee): def _check_repeating(count, vals): - repeat_mode = vals.get('repeat_mode', 'times') - if repeat_mode == 'times' and count < vals.get('repeat_limit', 0): + repeat_mode = vals.get("repeat_mode", "times") + if repeat_mode == "times" and count < vals.get("repeat_limit", 0): return True - repeat_end_date = vals.get('repeat_end_date', fields.Date.today()) - if repeat_mode == 'date' and vals['date_to'] <= repeat_end_date: + repeat_end_date = vals.get("repeat_end_date", fields.Date.today()) + if repeat_mode == "date" and vals["date_to"] <= repeat_end_date: return True return False @@ -119,21 +125,21 @@ def _check_repeating(count, vals): @api.model def create(self, vals): res = super().create(vals) - skip_create_handler = self.env.context.get('skip_create_handler') - all_vals_set = vals.get('repeat_every') and vals.get('repeat_mode') + skip_create_handler = self.env.context.get("skip_create_handler") + all_vals_set = vals.get("repeat_every") and vals.get("repeat_mode") if not skip_create_handler and all_vals_set: - employee = self.env['hr.employee'].browse(vals.get('employee_id')) + employee = self.env["hr.employee"].browse(vals.get("employee_id")) if employee.resource_calendar_id: self.create_repeated_handler(vals, employee) return res - @api.constrains('repeat_limit', 'repeat_end_date') + @api.constrains("repeat_limit", "repeat_end_date") def _check_repeat_limit(self): for record in self: - if record.repeat_mode == 'times' and record.repeat_limit < 0: - raise ValidationError( - _('Please set a positive amount of repetitions.')) - if record.repeat_mode == 'date' \ - and record.repeat_end_date < fields.Date.today(): - raise ValidationError( - _('The Repeat End Date cannot be in the past')) + if record.repeat_mode == "times" and record.repeat_limit < 0: + raise ValidationError(_("Please set a positive amount of repetitions.")) + if ( + record.repeat_mode == "date" + and record.repeat_end_date < fields.Date.today() + ): + raise ValidationError(_("The Repeat End Date cannot be in the past")) diff --git a/hr_holidays_leave_repeated/models/hr_leave_type.py b/hr_holidays_leave_repeated/models/hr_leave_type.py index 194f9245..8b7f7219 100644 --- a/hr_holidays_leave_repeated/models/hr_leave_type.py +++ b/hr_holidays_leave_repeated/models/hr_leave_type.py @@ -5,6 +5,6 @@ class HrLeaveType(models.Model): - _inherit = 'hr.leave.type' + _inherit = "hr.leave.type" repeat = fields.Boolean() diff --git a/hr_holidays_leave_repeated/static/description/index.html b/hr_holidays_leave_repeated/static/description/index.html index 117a3876..b0ab678a 100644 --- a/hr_holidays_leave_repeated/static/description/index.html +++ b/hr_holidays_leave_repeated/static/description/index.html @@ -3,7 +3,7 @@ - + HR Holidays leave repeated