diff --git a/hr_holidays_auto_extend/README.rst b/hr_holidays_auto_extend/README.rst new file mode 100644 index 00000000..54233549 --- /dev/null +++ b/hr_holidays_auto_extend/README.rst @@ -0,0 +1,87 @@ +======================= +Hr Holidays Auto Extend +======================= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:00afe160865b13f5c2f5f4032e011cd1bb43e32a86dfbe8c57308679759017b8 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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--holidays-lightgray.png?logo=github + :target: https://github.com/OCA/hr-holidays/tree/16.0/hr_holidays_auto_extend + :alt: OCA/hr-holidays +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/hr-holidays-16-0/hr-holidays-16-0-hr_holidays_auto_extend + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/hr-holidays&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +With this module, we will be able to extend automatically a leave when the period is reached. + +This might be necessary for leaves without a clear return date for the employee. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +* Access leave types and mark it as "Auto extendable" +* When the manager approves the leave, the "Auto extendable" check will be marked +* When we decide that the leave is no longer extendable, we can uncheck it. +* + +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 to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* CreuBlanca + +Contributors +~~~~~~~~~~~~ + +* Enric Tobella +* + +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-holidays `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/hr_holidays_auto_extend/__init__.py b/hr_holidays_auto_extend/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/hr_holidays_auto_extend/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/hr_holidays_auto_extend/__manifest__.py b/hr_holidays_auto_extend/__manifest__.py new file mode 100644 index 00000000..f460ac5a --- /dev/null +++ b/hr_holidays_auto_extend/__manifest__.py @@ -0,0 +1,22 @@ +# Copyright 2023 CreuBlanca +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Hr Holidays Auto Extend", + "summary": """ + Allow to extend some kind of holidays""", + "version": "16.0.1.0.0", + "license": "AGPL-3", + "author": "CreuBlanca,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/hr-holidays", + "depends": [ + "hr_holidays", + ], + "data": [ + "views/hr_leave.xml", + "views/hr_leave_type.xml", + "data/cron.xml", + "data/mail.xml", + ], + "demo": [], +} diff --git a/hr_holidays_auto_extend/data/cron.xml b/hr_holidays_auto_extend/data/cron.xml new file mode 100644 index 00000000..42a4e3f9 --- /dev/null +++ b/hr_holidays_auto_extend/data/cron.xml @@ -0,0 +1,13 @@ + + + + Holidays: Auto extend + + 1 + days + -1 + + code + model._cron_auto_extend() + + diff --git a/hr_holidays_auto_extend/data/mail.xml b/hr_holidays_auto_extend/data/mail.xml new file mode 100644 index 00000000..a09ef47f --- /dev/null +++ b/hr_holidays_auto_extend/data/mail.xml @@ -0,0 +1,11 @@ + + + + Leave cannot be extended due to overlapping + note + default + hr.leave + fa-tasks + 0 + + diff --git a/hr_holidays_auto_extend/i18n/hr_holidays_auto_extend.pot b/hr_holidays_auto_extend/i18n/hr_holidays_auto_extend.pot new file mode 100644 index 00000000..84b63aba --- /dev/null +++ b/hr_holidays_auto_extend/i18n/hr_holidays_auto_extend.pot @@ -0,0 +1,76 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_holidays_auto_extend +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.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_auto_extend +#: model:ir.model.fields,field_description:hr_holidays_auto_extend.field_hr_leave__auto_extend +#: model:ir.model.fields,field_description:hr_holidays_auto_extend.field_hr_leave_type__auto_extend +msgid "Auto Extend" +msgstr "" + +#. module: hr_holidays_auto_extend +#: model:ir.model.fields,field_description:hr_holidays_auto_extend.field_hr_leave__auto_extend_period +#: model:ir.model.fields,field_description:hr_holidays_auto_extend.field_hr_leave_type__auto_extend_period +msgid "Auto Extend Period" +msgstr "" + +#. module: hr_holidays_auto_extend +#: model:ir.model.fields,field_description:hr_holidays_auto_extend.field_hr_leave__auto_extend_type +msgid "Auto extend type" +msgstr "" + +#. module: hr_holidays_auto_extend +#: model:ir.model.fields,field_description:hr_holidays_auto_extend.field_hr_leave__display_name +#: model:ir.model.fields,field_description:hr_holidays_auto_extend.field_hr_leave_type__display_name +msgid "Display Name" +msgstr "" + +#. module: hr_holidays_auto_extend +#: model:ir.actions.server,name:hr_holidays_auto_extend.auto_extend_cron_ir_actions_server +#: model:ir.cron,cron_name:hr_holidays_auto_extend.auto_extend_cron +#: model:ir.cron,name:hr_holidays_auto_extend.auto_extend_cron +msgid "Holidays: Auto extend" +msgstr "" + +#. module: hr_holidays_auto_extend +#: model:ir.model.fields,field_description:hr_holidays_auto_extend.field_hr_leave__id +#: model:ir.model.fields,field_description:hr_holidays_auto_extend.field_hr_leave_type__id +msgid "ID" +msgstr "" + +#. module: hr_holidays_auto_extend +#: model:ir.model.fields,field_description:hr_holidays_auto_extend.field_hr_leave____last_update +#: model:ir.model.fields,field_description:hr_holidays_auto_extend.field_hr_leave_type____last_update +msgid "Last Modified on" +msgstr "" + +#. module: hr_holidays_auto_extend +#: model:mail.activity.type,name:hr_holidays_auto_extend.mail_activity_error_auto_extend +msgid "Leave cannot be extended due to overlapping" +msgstr "" + +#. module: hr_holidays_auto_extend +#: model:ir.model,name:hr_holidays_auto_extend.model_hr_leave +msgid "Time Off" +msgstr "" + +#. module: hr_holidays_auto_extend +#: model:ir.model,name:hr_holidays_auto_extend.model_hr_leave_type +msgid "Time Off Type" +msgstr "" + +#. module: hr_holidays_auto_extend +#: model:mail.activity.type,summary:hr_holidays_auto_extend.mail_activity_error_auto_extend +msgid "note" +msgstr "" diff --git a/hr_holidays_auto_extend/models/__init__.py b/hr_holidays_auto_extend/models/__init__.py new file mode 100644 index 00000000..7c444ff5 --- /dev/null +++ b/hr_holidays_auto_extend/models/__init__.py @@ -0,0 +1,2 @@ +from . import hr_leave_type +from . import hr_leave diff --git a/hr_holidays_auto_extend/models/hr_leave.py b/hr_holidays_auto_extend/models/hr_leave.py new file mode 100644 index 00000000..d95fcc47 --- /dev/null +++ b/hr_holidays_auto_extend/models/hr_leave.py @@ -0,0 +1,79 @@ +# Copyright 2023 CreuBlanca +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from datetime import timedelta + +from odoo import api, fields, models + + +class HrLeave(models.Model): + _inherit = "hr.leave" + + auto_extend_type = fields.Boolean( + related="holiday_status_id.auto_extend", string="Auto extend type" + ) + auto_extend = fields.Boolean( + compute="_compute_auto_extend", store=True, readonly=False + ) + auto_extend_period = fields.Integer( + compute="_compute_auto_extend", store=True, readonly=False + ) + + def _check_date_state(self): + if not self.env.context.get("__no_check_state_date"): + super()._check_date_state() + return + + def _get_number_of_days(self, date_from, date_to, employee_id): + """Returns a float equals to the timedelta between two dates given as string. + We need to modify in order to add the compute_leaves = False + """ + if not self.env.context.get("__no_check_state_date") or not employee_id: + return super()._get_number_of_days(date_from, date_to, employee_id) + employee = self.env["hr.employee"].browse(employee_id) + return employee._get_work_days_data_batch( + date_from, date_to, compute_leaves=False + )[employee.id] + + @api.depends("holiday_status_id") + def _compute_auto_extend(self): + for record in self: + record.auto_extend = record.holiday_status_id.auto_extend + record.auto_extend_period = record.holiday_status_id.auto_extend_period + + def _cron_auto_extend_domain(self): + return [ + ("request_date_to", "<=", fields.Date.today()), + ("auto_extend", "=", True), + ("auto_extend_period", ">", 0), + ("state", "=", "validate"), + ] + + def _cron_auto_extend(self): + leaves = self.search(self._cron_auto_extend_domain()) + for leave in leaves.with_context(__no_check_state_date=True): + request_date_to = leave.request_date_to + timedelta( + days=leave.auto_extend_period + ) + domain = [ + ("date_from", "<", request_date_to), + ("date_from", ">", leave.date_from), + ("employee_id", "=", leave.employee_id.id), + ("id", "!=", leave.id), + ("state", "not in", ["cancel", "refuse"]), + ] + if self.search(domain, limit=1): + leave.auto_extend = False + leave.activity_schedule( + "hr_holidays_auto_extend.mail_activity_error_auto_extend", + ) + continue + vals = {"request_date_to": request_date_to} + vals.update( + leave.onchange(vals, ["request_date_to"], leave._onchange_spec())[ + "value" + ] + ) + leave.write(vals) + leave._remove_resource_leave() + leave._create_resource_leave() diff --git a/hr_holidays_auto_extend/models/hr_leave_type.py b/hr_holidays_auto_extend/models/hr_leave_type.py new file mode 100644 index 00000000..0fed4e25 --- /dev/null +++ b/hr_holidays_auto_extend/models/hr_leave_type.py @@ -0,0 +1,11 @@ +# Copyright 2023 CreuBlanca +# 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" + + auto_extend = fields.Boolean() + auto_extend_period = fields.Integer(default=7) diff --git a/hr_holidays_auto_extend/readme/CONTRIBUTORS.rst b/hr_holidays_auto_extend/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..e084beee --- /dev/null +++ b/hr_holidays_auto_extend/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Enric Tobella +* diff --git a/hr_holidays_auto_extend/readme/DESCRIPTION.rst b/hr_holidays_auto_extend/readme/DESCRIPTION.rst new file mode 100644 index 00000000..2d631369 --- /dev/null +++ b/hr_holidays_auto_extend/readme/DESCRIPTION.rst @@ -0,0 +1,3 @@ +With this module, we will be able to extend automatically a leave when the period is reached. + +This might be necessary for leaves without a clear return date for the employee. diff --git a/hr_holidays_auto_extend/readme/USAGE.rst b/hr_holidays_auto_extend/readme/USAGE.rst new file mode 100644 index 00000000..b4d00c1e --- /dev/null +++ b/hr_holidays_auto_extend/readme/USAGE.rst @@ -0,0 +1,4 @@ +* Access leave types and mark it as "Auto extendable" +* When the manager approves the leave, the "Auto extendable" check will be marked +* When we decide that the leave is no longer extendable, we can uncheck it. +* diff --git a/hr_holidays_auto_extend/static/description/icon.png b/hr_holidays_auto_extend/static/description/icon.png new file mode 100644 index 00000000..3a0328b5 Binary files /dev/null and b/hr_holidays_auto_extend/static/description/icon.png differ diff --git a/hr_holidays_auto_extend/static/description/index.html b/hr_holidays_auto_extend/static/description/index.html new file mode 100644 index 00000000..7cfcdae2 --- /dev/null +++ b/hr_holidays_auto_extend/static/description/index.html @@ -0,0 +1,432 @@ + + + + + +Hr Holidays Auto Extend + + + +
+

Hr Holidays Auto Extend

+ + +

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

+

With this module, we will be able to extend automatically a leave when the period is reached.

+

This might be necessary for leaves without a clear return date for the employee.

+

Table of contents

+ +
+

Usage

+
    +
  • Access leave types and mark it as “Auto extendable”
    • +
  • When the manager approves the leave, the “Auto extendable” check will be marked
    • +
  • When we decide that the leave is no longer extendable, we can uncheck it.
    • +
  • +
+
+
+

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 to smash it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • CreuBlanca
    • +
+
+
+

Contributors

+
    +
  • Enric Tobella
    • +
  • +
+
+
+

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-holidays project on GitHub.

+

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

+
+
+
+ + diff --git a/hr_holidays_auto_extend/tests/__init__.py b/hr_holidays_auto_extend/tests/__init__.py new file mode 100644 index 00000000..18ea4c09 --- /dev/null +++ b/hr_holidays_auto_extend/tests/__init__.py @@ -0,0 +1 @@ +from . import test_extend diff --git a/hr_holidays_auto_extend/tests/test_extend.py b/hr_holidays_auto_extend/tests/test_extend.py new file mode 100644 index 00000000..b80b0548 --- /dev/null +++ b/hr_holidays_auto_extend/tests/test_extend.py @@ -0,0 +1,124 @@ +# Copyright 2023 CreuBlanca +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from datetime import timedelta + +from odoo import fields +from odoo.tests.common import Form + +from odoo.addons.hr_holidays.tests.common import TestHrHolidaysCommon + + +class TestExtend(TestHrHolidaysCommon): + def test_time_type(self): + leave_type = self.env["hr.leave.type"].create( + { + "name": "Paid Time Off", + "time_type": "leave", + "auto_extend": True, + } + ) + date_to = fields.Date.today() - timedelta(days=2) + f = Form( + self.env["hr.leave"].with_context( + default_employee_id=self.env["hr.employee"] + .browse(self.employee_hruser_id) + .id + ) + ) + f.name = "Doctor Appointment" + f.holiday_status_id = leave_type + f.request_date_from = fields.Date.today() - timedelta(days=5) + f.request_date_to = date_to + leave_1 = f.save() + self.assertEqual(leave_1.request_date_to, date_to) + self.env["hr.leave"]._cron_auto_extend() + self.assertEqual(leave_1.request_date_to, date_to) + leave_1.action_approve() + self.assertEqual(leave_1.request_date_to, date_to) + self.assertEqual( + self.env["resource.calendar.leaves"] + .search([("holiday_id", "=", leave_1.id)]) + .time_type, + "leave", + ) + self.env["hr.leave"]._cron_auto_extend() + self.assertEqual(leave_1.request_date_to, date_to + timedelta(days=7)) + + def test_extend_overlap(self): + leave_type = self.env["hr.leave.type"].create( + { + "name": "Paid Time Off", + "time_type": "leave", + "auto_extend": True, + } + ) + leave_type_02 = self.env["hr.leave.type"].create( + { + "name": "Another leave type", + "time_type": "leave", + } + ) + date_to = fields.Date.today() - timedelta(days=2) + f = Form( + self.env["hr.leave"].with_context( + default_employee_id=self.env["hr.employee"] + .browse(self.employee_hruser_id) + .id + ) + ) + f.name = "Doctor Appointment" + f.holiday_status_id = leave_type + f.request_date_from = fields.Date.today() - timedelta(days=5) + f.request_date_to = date_to + leave_1 = f.save() + + f2 = Form( + self.env["hr.leave"].with_context( + default_employee_id=self.env["hr.employee"] + .browse(self.employee_hruser_id) + .id + ) + ) + f2.name = "Doctor Appointment" + f2.holiday_status_id = leave_type_02 + f2.request_date_from = fields.Date.today() - timedelta(days=1) + f2.request_date_to = fields.Date.today() + leave_2 = f2.save() + self.assertTrue(leave_1.auto_extend) + self.assertFalse(leave_2.auto_extend) + leave_1.action_approve() + leave_2.action_approve() + self.assertTrue(leave_1.auto_extend) + self.assertFalse(leave_1.activity_ids) + self.env["hr.leave"]._cron_auto_extend() + leave_1.flush_recordset() + leave_1.invalidate_recordset() + self.assertFalse(leave_1.auto_extend) + self.assertTrue(leave_1.activity_ids) + + def test_check_date_state(self): + leave_type = self.env["hr.leave.type"].create( + { + "name": "Paid Time Off", + "time_type": "leave", + "auto_extend": True, + } + ) + leave = ( + self.env["hr.leave"] + .with_context(__no_check_state_date=True) + .create( + { + "name": "Doctor Appointment", + "employee_id": self.employee_hruser_id, + "holiday_status_id": leave_type.id, + "request_date_from": fields.Date.today() - timedelta(days=5), + "request_date_to": fields.Date.today() - timedelta(days=2), + } + ) + ) + + res = leave._check_date_state() + + self.assertEqual(res, None) diff --git a/hr_holidays_auto_extend/views/hr_leave.xml b/hr_holidays_auto_extend/views/hr_leave.xml new file mode 100644 index 00000000..01eb3068 --- /dev/null +++ b/hr_holidays_auto_extend/views/hr_leave.xml @@ -0,0 +1,30 @@ + + + + + + hr.leave.form (in hr_holidays_auto_extend) + hr.leave + + + + + + + + + + + + + diff --git a/hr_holidays_auto_extend/views/hr_leave_type.xml b/hr_holidays_auto_extend/views/hr_leave_type.xml new file mode 100644 index 00000000..7debdce2 --- /dev/null +++ b/hr_holidays_auto_extend/views/hr_leave_type.xml @@ -0,0 +1,23 @@ + + + + + + hr.leave.type.form (in hr_holidays_auto_extend) + hr.leave.type + + + + + + + + + + + + diff --git a/setup/hr_holidays_auto_extend/odoo/addons/hr_holidays_auto_extend b/setup/hr_holidays_auto_extend/odoo/addons/hr_holidays_auto_extend new file mode 120000 index 00000000..b8c1a9c0 --- /dev/null +++ b/setup/hr_holidays_auto_extend/odoo/addons/hr_holidays_auto_extend @@ -0,0 +1 @@ +../../../../hr_holidays_auto_extend \ No newline at end of file diff --git a/setup/hr_holidays_auto_extend/setup.py b/setup/hr_holidays_auto_extend/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/hr_holidays_auto_extend/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)