From 1824c91bfaed09c7471aa26d434c6b3f56811cd8 Mon Sep 17 00:00:00 2001 From: Eduardo De Miguel Date: Thu, 1 Aug 2024 12:18:03 +0200 Subject: [PATCH] [ADD] resource_leaves_geographic --- resource_leaves_geographic/README.rst | 139 +++++ resource_leaves_geographic/__init__.py | 1 + resource_leaves_geographic/__manifest__.py | 23 + resource_leaves_geographic/i18n/es.po | 38 ++ .../i18n/resource_leaves_geographic.pot | 36 ++ resource_leaves_geographic/models/__init__.py | 3 + .../models/hr_employee.py | 51 ++ .../models/resource_calendar.py | 82 +++ .../models/resource_calendar_leaves.py | 14 + resource_leaves_geographic/readme/CONTEXT.md | 3 + .../readme/CONTRIBUTORS.md | 1 + .../readme/DESCRIPTION.md | 7 + resource_leaves_geographic/readme/USAGE.md | 12 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 475 ++++++++++++++++++ resource_leaves_geographic/tests/__init__.py | 1 + .../tests/test_resource_calendar_leaves.py | 88 ++++ .../views/resource_calendar_leaves_views.xml | 56 +++ .../odoo/addons/resource_leaves_geographic | 1 + setup/resource_leaves_geographic/setup.py | 6 + 20 files changed, 1037 insertions(+) create mode 100644 resource_leaves_geographic/README.rst create mode 100644 resource_leaves_geographic/__init__.py create mode 100644 resource_leaves_geographic/__manifest__.py create mode 100644 resource_leaves_geographic/i18n/es.po create mode 100644 resource_leaves_geographic/i18n/resource_leaves_geographic.pot create mode 100644 resource_leaves_geographic/models/__init__.py create mode 100644 resource_leaves_geographic/models/hr_employee.py create mode 100644 resource_leaves_geographic/models/resource_calendar.py create mode 100644 resource_leaves_geographic/models/resource_calendar_leaves.py create mode 100644 resource_leaves_geographic/readme/CONTEXT.md create mode 100644 resource_leaves_geographic/readme/CONTRIBUTORS.md create mode 100644 resource_leaves_geographic/readme/DESCRIPTION.md create mode 100644 resource_leaves_geographic/readme/USAGE.md create mode 100644 resource_leaves_geographic/static/description/icon.png create mode 100644 resource_leaves_geographic/static/description/index.html create mode 100644 resource_leaves_geographic/tests/__init__.py create mode 100644 resource_leaves_geographic/tests/test_resource_calendar_leaves.py create mode 100644 resource_leaves_geographic/views/resource_calendar_leaves_views.xml create mode 120000 setup/resource_leaves_geographic/odoo/addons/resource_leaves_geographic create mode 100644 setup/resource_leaves_geographic/setup.py diff --git a/resource_leaves_geographic/README.rst b/resource_leaves_geographic/README.rst new file mode 100644 index 00000000..3d500ce3 --- /dev/null +++ b/resource_leaves_geographic/README.rst @@ -0,0 +1,139 @@ +========================== +Resource Leaves Geographic +========================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:e5409e484959f22489b0c0976ce8231c697b28572e9d29285501c0e20bc49179 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png + :target: https://odoo-community.org/page/development-status + :alt: Alpha +.. |badge2| image:: https://img.shields.io/badge/licence-LGPL--3-blue.png + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-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/resource_leaves_geographic + :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-resource_leaves_geographic + :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| + +This module extends the functionality of Public Holidays to support +States and allow you to define Local Holidays more easily in the Company +Calendar. + +Shows on Time Off all the holidays (with/without State) in the Public +Holidays section. Public Holidays (without State) always will have grey +background. Local holidays displayed with a grey background in the +calendar view belong to the Employee currently viewing the calendar or +to the single Employee selected from the Employee Form view. + +This module is compatible with Attendances and Contracts (but those +modules are not required). + +.. IMPORTANT:: + This is an alpha version, the data model and design can change at any time without warning. + Only for development or testing purpose, do not use in production. + `More details on development status `_ + +**Table of contents** + +.. contents:: + :local: + +Use Cases / Context +=================== + +This module was developed because in order to differentiate local +Employee holidays, they must be added to their calendars instead of +being able to mark them on the general company calendar. + +This will be useful for you if you want to be able to create holidays by +State in the company calendar and have them automatically applied to all +employees based on their workplace. + +Usage +===== + +To use this module, you need to: + +1. Go to Time Off app > Configuration > Public Holidays +2. Create a Public Holiday without State with name *Local Holiday* +3. Create an *Employee 1* and set his Work Address in the same State + than your *Local Holiday* +4. Create an *Employee 2* and set his Work Address in other State than + your *Local Holiday* +5. Go to Time Off > Overview and check the grey background is only on + *Employee 1* on the days used in *Local Holiday* +6. Create a Time Off for *Employee 1* that involves *Local Holiday* and + check the days used are computed correctly +7. Create a Time Off for *Employee 2* that involves *Local Holiday* and + check the days used are computed correctly (more days than the Time + Off of *Employee 1*) +8. Check both Employee Calendar views from the Employee form to view the + grey background on Local and Public Holidays. + +If you have installed Attendances and Contracts apps, and create +attenances for both employees on the *Local Holiday* you can also check +Extra Hours are computed correctly in both employees. + +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 +------- + +* Moduon + +Contributors +------------ + +- Eduardo de Miguel (`Moduon `__) + +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. + +.. |maintainer-Shide| image:: https://github.com/Shide.png?size=40px + :target: https://github.com/Shide + :alt: Shide +.. |maintainer-rafaelbn| image:: https://github.com/rafaelbn.png?size=40px + :target: https://github.com/rafaelbn + :alt: rafaelbn + +Current `maintainers `__: + +|maintainer-Shide| |maintainer-rafaelbn| + +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/resource_leaves_geographic/__init__.py b/resource_leaves_geographic/__init__.py new file mode 100644 index 00000000..0650744f --- /dev/null +++ b/resource_leaves_geographic/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/resource_leaves_geographic/__manifest__.py b/resource_leaves_geographic/__manifest__.py new file mode 100644 index 00000000..8e88da1b --- /dev/null +++ b/resource_leaves_geographic/__manifest__.py @@ -0,0 +1,23 @@ +# Copyright 2024 Moduon Team S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0) + +{ + "name": "Resource Leaves Geographic", + "summary": "Add geographic State to Resource Calendar Leaves", + "version": "16.0.1.0.0", + "development_status": "Alpha", + "category": "Human Resources/Time Off", + "website": "https://github.com/OCA/hr-holidays", + "author": "Moduon, Odoo Community Association (OCA)", + "maintainers": ["Shide", "rafaelbn"], + "license": "LGPL-3", + "application": False, + "installable": True, + "depends": [ + "resource", + "hr_holidays", + ], + "data": [ + "views/resource_calendar_leaves_views.xml", + ], +} diff --git a/resource_leaves_geographic/i18n/es.po b/resource_leaves_geographic/i18n/es.po new file mode 100644 index 00000000..c1b0a707 --- /dev/null +++ b/resource_leaves_geographic/i18n/es.po @@ -0,0 +1,38 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * resource_leaves_geographic +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-07-31 07:50+0000\n" +"PO-Revision-Date: 2024-07-31 09:52+0200\n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 3.4.4\n" + +#. module: resource_leaves_geographic +#: model:ir.model,name:resource_leaves_geographic.model_resource_calendar_leaves +msgid "Resource Time Off Detail" +msgstr "Detalle de las ausencias del recurso" + +#. module: resource_leaves_geographic +#: model:ir.model,name:resource_leaves_geographic.model_resource_calendar +msgid "Resource Working Time" +msgstr "Tiempo de Trabajo de Recursos" + +#. module: resource_leaves_geographic +#: model:ir.model.fields,field_description:resource_leaves_geographic.field_resource_calendar_leaves__state_ids +msgid "States" +msgstr "Estados" + +#. module: resource_leaves_geographic +#: model:ir.model.fields,help:resource_leaves_geographic.field_resource_calendar_leaves__state_ids +msgid "States for which this leave is applicable" +msgstr "Estados para los que se aplica esta ausencia" diff --git a/resource_leaves_geographic/i18n/resource_leaves_geographic.pot b/resource_leaves_geographic/i18n/resource_leaves_geographic.pot new file mode 100644 index 00000000..84b74a77 --- /dev/null +++ b/resource_leaves_geographic/i18n/resource_leaves_geographic.pot @@ -0,0 +1,36 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * resource_leaves_geographic +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 16.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-07-31 07:50+0000\n" +"PO-Revision-Date: 2024-07-31 07:50+0000\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: resource_leaves_geographic +#: model:ir.model,name:resource_leaves_geographic.model_resource_calendar_leaves +msgid "Resource Time Off Detail" +msgstr "" + +#. module: resource_leaves_geographic +#: model:ir.model,name:resource_leaves_geographic.model_resource_calendar +msgid "Resource Working Time" +msgstr "" + +#. module: resource_leaves_geographic +#: model:ir.model.fields,field_description:resource_leaves_geographic.field_resource_calendar_leaves__state_ids +msgid "States" +msgstr "" + +#. module: resource_leaves_geographic +#: model:ir.model.fields,help:resource_leaves_geographic.field_resource_calendar_leaves__state_ids +msgid "States for which this leave is applicable" +msgstr "" diff --git a/resource_leaves_geographic/models/__init__.py b/resource_leaves_geographic/models/__init__.py new file mode 100644 index 00000000..0e5f0e25 --- /dev/null +++ b/resource_leaves_geographic/models/__init__.py @@ -0,0 +1,3 @@ +from . import resource_calendar_leaves +from . import resource_calendar +from . import hr_employee diff --git a/resource_leaves_geographic/models/hr_employee.py b/resource_leaves_geographic/models/hr_employee.py new file mode 100644 index 00000000..839077f9 --- /dev/null +++ b/resource_leaves_geographic/models/hr_employee.py @@ -0,0 +1,51 @@ +# Copyright 2024 Moduon Team S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0) + +from datetime import datetime, time + +from dateutil.rrule import DAILY, rrule +from pytz import UTC + +from odoo import fields, models + + +class HrEmployee(models.Model): + _inherit = "hr.employee" + + def _get_unusual_days(self, date_from, date_to=None): + """Get the geographical unusual days belongs to employees""" + res = super()._get_unusual_days(date_from, date_to=date_to) + + def dt_combiner(dt, tx): + """Return a datetime object with the date converted to datetime + + :param dt: date string + :param tx: time.min or time.max + """ + return datetime.combine(fields.Date.from_string(dt), tx).replace(tzinfo=UTC) + + calendars = ( + self.mapped("resource_calendar_id") or self.env.company.resource_calendar_id + ) + state_interval_map = calendars._get_general_time_off_intervals_by_state( + domain=[ + ("state_ids", "in", self.mapped("address_id.state_id").ids), + ("date_from", "<=", dt_combiner(date_to, time.max)), + ("date_to", ">=", dt_combiner(date_from, time.min)), + ], + any_calendar=False, + ) + local_leave_days = set() + for state_interval_map in state_interval_map.values(): + for start, end, _rcl in state_interval_map: + local_leave_days.update( + { + fields.Date.to_string(day.date()) + for day in rrule(DAILY, start.date(), until=end.date()) + } + ) + + for day in res.keys(): + if day in local_leave_days: + res[day] = True + return res diff --git a/resource_leaves_geographic/models/resource_calendar.py b/resource_leaves_geographic/models/resource_calendar.py new file mode 100644 index 00000000..06a1a254 --- /dev/null +++ b/resource_leaves_geographic/models/resource_calendar.py @@ -0,0 +1,82 @@ +# Copyright 2024 Moduon Team S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0) + +from collections import defaultdict + +from odoo import models + +from odoo.addons.resource.models.resource import Intervals, make_aware + + +class ResourceCalendar(models.Model): + _inherit = "resource.calendar" + + def _get_general_time_off_intervals_by_state(self, domain=None, any_calendar=False): + """Get a map of State to Intervals of leaves for the given domain.""" + domain = domain or [] + # Respect the any_calendar option + if not any_calendar: + domain = [("calendar_id", "in", self.ids + [False])] + domain + # Ensure that the leaves are not related to a specific resource + domain = [("resource_id", "=", False)] + domain + # Iterate all matching leaves + state_interval_map = defaultdict(Intervals) + for res_cal_leave in self.env["resource.calendar.leaves"].search(domain): + dttf, _f = make_aware(res_cal_leave.date_from) + dttt, _f = make_aware(res_cal_leave.date_to) + # Add the interval to the corresponding State or False if no state + if res_cal_leave.state_ids: + for state in res_cal_leave.state_ids: + state_interval_map[state.id] |= Intervals( + [(dttf, dttt, res_cal_leave)] + ) + else: + state_interval_map[False] |= Intervals([(dttf, dttt, res_cal_leave)]) + return state_interval_map + + def _leave_intervals_batch( + self, start_dt, end_dt, resources=None, domain=None, tz=None, any_calendar=False + ): + # All interval batches (with/out State) + res = super()._leave_intervals_batch( + start_dt, + end_dt, + resources=resources, + domain=domain, + tz=tz, + any_calendar=any_calendar, + ) + # Overwrite the result if resources are specified, but only with + # the global leaves (skipping the local leaves) using the domain + for resource in resources or []: + res.update( + super()._leave_intervals_batch( + start_dt, + end_dt, + resources=resource, + domain=[("state_ids", "=", False)], # Force global leaves + tz=tz, + any_calendar=any_calendar, + ) + ) + # Get Local interval batches by State + state_interval_map = self._get_general_time_off_intervals_by_state( + domain=domain, any_calendar=any_calendar + ) + # Post-process generated intervals + for resource_id in res.keys(): + if not resource_id: + # If no resource is specified, only consider Global leaves + res[resource_id] = state_interval_map[False] + else: + # If resource is specified, add Local Leaves to the result if + # the State of its Work Address has Local leaves + resource_state_id = ( + self.env["hr.employee"] + .sudo() + .search([("resource_id", "=", resource_id)], limit=1) + .address_id.state_id.id + ) + if resource_state_id in state_interval_map: + res[resource_id] |= state_interval_map[resource_state_id] + return res diff --git a/resource_leaves_geographic/models/resource_calendar_leaves.py b/resource_leaves_geographic/models/resource_calendar_leaves.py new file mode 100644 index 00000000..2844d2cc --- /dev/null +++ b/resource_leaves_geographic/models/resource_calendar_leaves.py @@ -0,0 +1,14 @@ +# Copyright 2024 Moduon Team S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0) + +from odoo import fields, models + + +class ResourceCalendarLeaves(models.Model): + _inherit = "resource.calendar.leaves" + + state_ids = fields.Many2many( + comodel_name="res.country.state", + string="States", + help="States for which this leave is applicable", + ) diff --git a/resource_leaves_geographic/readme/CONTEXT.md b/resource_leaves_geographic/readme/CONTEXT.md new file mode 100644 index 00000000..6f20b910 --- /dev/null +++ b/resource_leaves_geographic/readme/CONTEXT.md @@ -0,0 +1,3 @@ +This module was developed because in order to differentiate local Employee holidays, they must be added to their calendars instead of being able to mark them on the general company calendar. + +This will be useful for you if you want to be able to create holidays by State in the company calendar and have them automatically applied to all employees based on their workplace. diff --git a/resource_leaves_geographic/readme/CONTRIBUTORS.md b/resource_leaves_geographic/readme/CONTRIBUTORS.md new file mode 100644 index 00000000..290347f4 --- /dev/null +++ b/resource_leaves_geographic/readme/CONTRIBUTORS.md @@ -0,0 +1 @@ +- Eduardo de Miguel ([Moduon](https://www.moduon.team/)) diff --git a/resource_leaves_geographic/readme/DESCRIPTION.md b/resource_leaves_geographic/readme/DESCRIPTION.md new file mode 100644 index 00000000..e28a2185 --- /dev/null +++ b/resource_leaves_geographic/readme/DESCRIPTION.md @@ -0,0 +1,7 @@ +This module extends the functionality of Public Holidays to support States and allow you to define Local Holidays more easily in the Company Calendar. + +Shows on Time Off all the holidays (with/without State) in the Public Holidays section. +Public Holidays (without State) always will have grey background. +Local holidays displayed with a grey background in the calendar view belong to the Employee currently viewing the calendar or to the single Employee selected from the Employee Form view. + +This module is compatible with Attendances and Contracts (but those modules are not required). diff --git a/resource_leaves_geographic/readme/USAGE.md b/resource_leaves_geographic/readme/USAGE.md new file mode 100644 index 00000000..bc9b6bec --- /dev/null +++ b/resource_leaves_geographic/readme/USAGE.md @@ -0,0 +1,12 @@ +To use this module, you need to: + +1. Go to Time Off app > Configuration > Public Holidays +2. Create a Public Holiday without State with name *Local Holiday* +3. Create an *Employee 1* and set his Work Address in the same State than your *Local Holiday* +4. Create an *Employee 2* and set his Work Address in other State than your *Local Holiday* +5. Go to Time Off > Overview and check the grey background is only on *Employee 1* on the days used in *Local Holiday* +6. Create a Time Off for *Employee 1* that involves *Local Holiday* and check the days used are computed correctly +7. Create a Time Off for *Employee 2* that involves *Local Holiday* and check the days used are computed correctly (more days than the Time Off of *Employee 1*) +8. Check both Employee Calendar views from the Employee form to view the grey background on Local and Public Holidays. + +If you have installed Attendances and Contracts apps, and create attenances for both employees on the *Local Holiday* you can also check Extra Hours are computed correctly in both employees. diff --git a/resource_leaves_geographic/static/description/icon.png b/resource_leaves_geographic/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/resource_leaves_geographic/static/description/index.html b/resource_leaves_geographic/static/description/index.html new file mode 100644 index 00000000..59a75c91 --- /dev/null +++ b/resource_leaves_geographic/static/description/index.html @@ -0,0 +1,475 @@ + + + + + +Resource Leaves Geographic + + + +
+

Resource Leaves Geographic

+ + +

Alpha License: LGPL-3 OCA/hr-holidays Translate me on Weblate Try me on Runboat

+

This module extends the functionality of Public Holidays to support +States and allow you to define Local Holidays more easily in the Company +Calendar.

+

Shows on Time Off all the holidays (with/without State) in the Public +Holidays section. Public Holidays (without State) always will have grey +background. Local holidays displayed with a grey background in the +calendar view belong to the Employee currently viewing the calendar or +to the single Employee selected from the Employee Form view.

+

This module is compatible with Attendances and Contracts (but those +modules are not required).

+
+

Important

+

This is an alpha version, the data model and design can change at any time without warning. +Only for development or testing purpose, do not use in production. +More details on development status

+
+

Table of contents

+ +
+

Use Cases / Context

+

This module was developed because in order to differentiate local +Employee holidays, they must be added to their calendars instead of +being able to mark them on the general company calendar.

+

This will be useful for you if you want to be able to create holidays by +State in the company calendar and have them automatically applied to all +employees based on their workplace.

+
+
+

Usage

+

To use this module, you need to:

+
    +
  1. Go to Time Off app > Configuration > Public Holidays
    2. +
  2. Create a Public Holiday without State with name Local Holiday
    3. +
  3. Create an Employee 1 and set his Work Address in the same State +than your Local Holiday
    4. +
  4. Create an Employee 2 and set his Work Address in other State than +your Local Holiday
    5. +
  5. Go to Time Off > Overview and check the grey background is only on +Employee 1 on the days used in Local Holiday
    6. +
  6. Create a Time Off for Employee 1 that involves Local Holiday and +check the days used are computed correctly
    7. +
  7. Create a Time Off for Employee 2 that involves Local Holiday and +check the days used are computed correctly (more days than the Time +Off of Employee 1)
    8. +
  8. Check both Employee Calendar views from the Employee form to view the +grey background on Local and Public Holidays.
    9. +
+

If you have installed Attendances and Contracts apps, and create +attenances for both employees on the Local Holiday you can also check +Extra Hours are computed correctly in both employees.

+
+
+

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

+
    +
  • Moduon
    • +
+
+
+

Contributors

+
    +
  • Eduardo de Miguel (Moduon)
    • +
+
+
+

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.

+

Current maintainers:

+

Shide rafaelbn

+

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/resource_leaves_geographic/tests/__init__.py b/resource_leaves_geographic/tests/__init__.py new file mode 100644 index 00000000..314fcd3e --- /dev/null +++ b/resource_leaves_geographic/tests/__init__.py @@ -0,0 +1 @@ +from . import test_resource_calendar_leaves diff --git a/resource_leaves_geographic/tests/test_resource_calendar_leaves.py b/resource_leaves_geographic/tests/test_resource_calendar_leaves.py new file mode 100644 index 00000000..7caba496 --- /dev/null +++ b/resource_leaves_geographic/tests/test_resource_calendar_leaves.py @@ -0,0 +1,88 @@ +# Copyright 2024 Moduon Team S.L. +# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl-3.0) + +from odoo.tests.common import TransactionCase + +from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT + + +class TestResourceCalendarLeaves(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.env = cls.env(context=dict(cls.env.context, **DISABLED_MAIL_CONTEXT)) + cls.trcl_State = cls.env["res.country.state"].create( + { + "name": "TRCL State", + "code": "TRCL", + "country_id": cls.env.user.company_id.country_id.id, + } + ) + cls.partner = cls.env["res.partner"].create({"name": "TRCL Partner"}) + cls.employee = cls.env["hr.employee"].create( + {"name": "TRCL Employee 1", "address_id": cls.partner.id} + ) + cls.global_leave = cls.env["resource.calendar.leaves"].create( + { + "name": "Global Leave", + "date_from": "2024-07-01 00:00:00", + "date_to": "2024-07-01 23:59:59", + "state_ids": None, + } + ) + cls.local_leave = cls.env["resource.calendar.leaves"].create( + { + "name": "Local Leave", + "date_from": "2024-07-02 00:00:00", + "date_to": "2024-07-02 23:59:59", + "state_ids": [(6, 0, cls.trcl_State.ids)], + } + ) + cls.timeoff_type = cls.env["hr.leave.type"].create( + { + "name": "TRCL Time Off", + "leave_validation_type": "no_validation", + "requires_allocation": "no", + } + ) + + def _create_leave(self): + leave = self.env["hr.leave"].create( + { + "name": "TRCL Leave", + "date_from": "2024-06-28 00:00:00", + "date_to": "2024-07-02 23:59:59", + "employee_id": self.employee.id, + "holiday_status_id": self.timeoff_type.id, + } + ) + if leave.state != "validate": + leave.action_confirm() + self.assertEqual(leave.state, "validate") + return leave + + def test_leave_partner_without_state(self): + leave = self._create_leave() + # Leave does not take in consideration State + self.assertEqual(leave.number_of_days_display, 2.0) + + def test_leave_partner_with_state(self): + self.partner.state_id = self.trcl_State.id + leave = self._create_leave() + # Leave takes in consideration State + self.assertEqual(leave.number_of_days_display, 1.0) + + def test_unusual_days_without_state(self): + unusual_days = self.employee._get_unusual_days( + "2024-07-01", date_to="2024-07-02" + ) + self.assertTrue(unusual_days["2024-07-01"]) + self.assertFalse(unusual_days["2024-07-02"]) + + def test_unusual_days_with_state(self): + self.partner.state_id = self.trcl_State.id + unusual_days = self.employee._get_unusual_days( + "2024-07-01", date_to="2024-07-02" + ) + self.assertTrue(unusual_days["2024-07-01"]) + self.assertTrue(unusual_days["2024-07-02"]) diff --git a/resource_leaves_geographic/views/resource_calendar_leaves_views.xml b/resource_leaves_geographic/views/resource_calendar_leaves_views.xml new file mode 100644 index 00000000..426869fa --- /dev/null +++ b/resource_leaves_geographic/views/resource_calendar_leaves_views.xml @@ -0,0 +1,56 @@ + + + + + resource.calendar.leaves.state.tree + resource.calendar.leaves + + + + + + + + + + resource.calendar.leaves.state.form + resource.calendar.leaves + + + + + + + + + + resource.calendar.leaves.state.calendar + resource.calendar.leaves + + + + + + + + + + resource.calendar.leaves.state.search + resource.calendar.leaves + + + + + + + + diff --git a/setup/resource_leaves_geographic/odoo/addons/resource_leaves_geographic b/setup/resource_leaves_geographic/odoo/addons/resource_leaves_geographic new file mode 120000 index 00000000..b911fd35 --- /dev/null +++ b/setup/resource_leaves_geographic/odoo/addons/resource_leaves_geographic @@ -0,0 +1 @@ +../../../../resource_leaves_geographic \ No newline at end of file diff --git a/setup/resource_leaves_geographic/setup.py b/setup/resource_leaves_geographic/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/resource_leaves_geographic/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)