Maintainers
This module is maintained by the OCA.
- -
-
+
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.
diff --git a/hr_holidays_public/tests/test_holidays_public.py b/hr_holidays_public/tests/test_holidays_public.py index e985b103..0bbea38a 100644 --- a/hr_holidays_public/tests/test_holidays_public.py +++ b/hr_holidays_public/tests/test_holidays_public.py @@ -19,7 +19,6 @@ def setUpClass(cls): cls.holiday_model_line = cls.env["hr.holidays.public.line"] cls.employee_model = cls.env["hr.employee"] cls.wizard_next_year = cls.env["public.holidays.next.year.wizard"] - cls.leave_model = cls.env["hr.leave"] # Remove possibly existing public holidays that would interfer. cls.holiday_model_line.search([]).unlink() @@ -209,7 +208,8 @@ def assertPublicHolidayIsUnusualDay( self, expected, country_id=None, state_ids=False ): self.assertFalse( - self.leave_model.with_user(self.env.ref("base.user_demo").id) + self.env["hr.leave"] + .with_user(self.env.ref("base.user_demo").id) .get_unusual_days("2019-07-01", date_to="2019-07-31") .get("2019-07-30", False) ) @@ -223,22 +223,12 @@ def assertPublicHolidayIsUnusualDay( } ) self.assertEqual( - self.leave_model.with_user( - self.env.ref("base.user_demo").id - ).get_unusual_days("2019-07-01", date_to="2019-07-31")["2019-07-30"], + self.env["hr.leave"] + .with_user(self.env.ref("base.user_demo").id) + .get_unusual_days("2019-07-01", date_to="2019-07-31")["2019-07-30"], expected, ) - def test_public_holidays_context(self): - self.env.ref("base.user_demo").employee_id.address_id.country_id = False - self.leave_model = self.leave_model.with_context(employee_id=self.employee.id) - self.assertPublicHolidayIsUnusualDay( - True, - country_id=self.env.ref( - "base.user_demo" - ).employee_id.address_id.country_id.id, - ) - def test_get_unusual_days_return_public_holidays_same_country(self): self.env.ref("base.user_demo").employee_id.address_id.state_id = False self.env.company.state_id = False diff --git a/hr_holidays_public_city/README.rst b/hr_holidays_public_city/README.rst index c9e6a65b..67bc6cc7 100644 --- a/hr_holidays_public_city/README.rst +++ b/hr_holidays_public_city/README.rst @@ -7,7 +7,7 @@ HR Holidays Public City !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:f51266f14717ae02cc251ea6be1b8d5d865f7c811e295bf62cefbaa8072a6a81 + !! source digest: sha256:556afea47f505328aa6542aac639bfaffe7cdafcc6c579d7397b34f63b26a0c4 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/hr_holidays_public_city/__manifest__.py b/hr_holidays_public_city/__manifest__.py index 3d205e35..c97de6d2 100644 --- a/hr_holidays_public_city/__manifest__.py +++ b/hr_holidays_public_city/__manifest__.py @@ -3,7 +3,7 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { "name": "HR Holidays Public City", - "version": "16.0.2.0.1", + "version": "16.0.2.0.0", "category": "Tools", "website": "https://github.com/OCA/hr-holidays", "author": "Tecnativa, Odoo Community Association (OCA)", diff --git a/hr_holidays_public_city/models/hr_leave.py b/hr_holidays_public_city/models/hr_leave.py index a5996ae4..361470ad 100644 --- a/hr_holidays_public_city/models/hr_leave.py +++ b/hr_holidays_public_city/models/hr_leave.py @@ -10,15 +10,8 @@ def _get_domain_from_get_unusual_days(self, date_from, date_to=None): domain = super()._get_domain_from_get_unusual_days( date_from=date_from, date_to=date_to ) - # Use the employee of the user or the one who has the context - employee_id = self.env.context.get("employee_id", False) - employee = ( - self.env["hr.employee"].browse(employee_id) - if employee_id - else self.env.user.employee_id - ) # Add city domain - city_id = employee.address_id.city_id.id + city_id = self.env.user.employee_id.address_id.city_id.id if not city_id: city_id = self.env.company.partner_id.city_id.id or False if city_id: diff --git a/hr_holidays_public_city/static/description/index.html b/hr_holidays_public_city/static/description/index.html index 80d24ee2..76ea0dcc 100644 --- a/hr_holidays_public_city/static/description/index.html +++ b/hr_holidays_public_city/static/description/index.html @@ -8,11 +8,10 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ +:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. -Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -275,7 +274,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: gray; } /* line numbers */ +pre.code .ln { color: grey; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -301,7 +300,7 @@ span.pre { white-space: pre } -span.problematic, pre.problematic { +span.problematic { color: red } span.section-subtitle { @@ -367,7 +366,7 @@HR Holidays Public City
!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:f51266f14717ae02cc251ea6be1b8d5d865f7c811e295bf62cefbaa8072a6a81 +!! source digest: sha256:556afea47f505328aa6542aac639bfaffe7cdafcc6c579d7397b34f63b26a0c4 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
This module adds the cities at the public vacation line level as an extra discriminant.
@@ -412,9 +411,7 @@Contributors
Maintainers
This module is maintained by the OCA.
- -
-
+
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.
diff --git a/hr_holidays_public_city/tests/test_holidays_public.py b/hr_holidays_public_city/tests/test_holidays_public.py index 34b24678..0aa8bcfb 100644 --- a/hr_holidays_public_city/tests/test_holidays_public.py +++ b/hr_holidays_public_city/tests/test_holidays_public.py @@ -29,7 +29,8 @@ def assertPublicHolidayIsUnusualDay( self, expected, country_id=None, state_ids=False, city_ids=False ): self.assertFalse( - self.leave_model.with_user(self.env.ref("base.user_demo").id) + self.env["hr.leave"] + .with_user(self.env.ref("base.user_demo").id) .get_unusual_days("2019-07-01", date_to="2019-07-31") .get("2019-07-30", False) ) @@ -44,29 +45,12 @@ def assertPublicHolidayIsUnusualDay( } ) self.assertEqual( - self.leave_model.with_user( - self.env.ref("base.user_demo").id - ).get_unusual_days("2019-07-01", date_to="2019-07-31")["2019-07-30"], + self.env["hr.leave"] + .with_user(self.env.ref("base.user_demo").id) + .get_unusual_days("2019-07-01", date_to="2019-07-31")["2019-07-30"], expected, ) - def test_public_holidays_context(self): - self.env.ref("base.user_demo").employee_id.address_id.country_id = False - self.env.ref("base.user_demo").employee_id.address_id.state_id = False - self.env.ref("base.user_demo").employee_id.address_id.city_id = False - self.employee.address_id.country_id = self.env.ref("base.us") - self.employee.address_id.state_id = self.env.ref("base.state_us_4") - self.employee.address_id.city_id = self.us_city_a - self.leave_model = self.leave_model.with_context(employee_id=self.employee.id) - self.assertPublicHolidayIsUnusualDay( - True, - country_id=self.env.ref( - "base.user_demo" - ).employee_id.address_id.country_id.id, - state_ids=[(6, 0, [self.employee.address_id.state_id.id])], - city_ids=[(6, 0, [self.employee.address_id.city_id.id])], - ) - def test_get_unusual_days_return_public_holidays_same_state_same_city(self): demo_user_empl_addr = self.env.ref("base.user_demo").employee_id.address_id demo_user_empl_addr.country_id = self.env.ref("base.us") 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
+
+
+
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 Leaves Geographic
+ + +
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 +
- Usage +
- Bug Tracker +
- Credits + +
+
+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:
+-
+
- Go to Time Off app > Configuration > Public Holidays +
- Create a Public Holiday without State with name Local Holiday +
- Create an Employee 1 and set his Work Address in the same State +than your Local Holiday +
- Create an Employee 2 and set his Work Address in other State than +your Local Holiday +
- Go to Time Off > Overview and check the grey background is only on +Employee 1 on the days used in Local Holiday +
- Create a Time Off for Employee 1 that involves Local Holiday and +check the days used are computed correctly +
- 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) +
- 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.
+ +
+
+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:
+
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.
+