-
-
Notifications
You must be signed in to change notification settings - Fork 158
[17.0][ADD]hr_holidays_approval_split #243
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
GuillermoNforgeflow
wants to merge
1
commit into
OCA:17.0
Choose a base branch
from
ForgeFlow:17.0-add-hr_holidays_approvals
base: 17.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| ======================= | ||
| Time Off Approval Split | ||
| ======================= | ||
|
|
||
| .. | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! This file is generated by oca-gen-addon-readme !! | ||
| !! changes will be overwritten. !! | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! source digest: sha256:7c25656dd529c1d0649bd3ed106831090c04f8e8dee7e83c0f420977219b59b5 | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
|
|
||
| .. |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/17.0/hr_holidays_approval_split | ||
| :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-17-0/hr-holidays-17-0-hr_holidays_approval_split | ||
| :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=17.0 | ||
| :alt: Try me on Runboat | ||
|
|
||
| |badge1| |badge2| |badge3| |badge4| |badge5| | ||
|
|
||
| This module introduces a new field validation_type_split in Time Off | ||
| Types to define whether approval is required for hour-based requests, | ||
| day-based requests, or both. | ||
|
|
||
| **Table of contents** | ||
|
|
||
| .. contents:: | ||
| :local: | ||
|
|
||
| Usage | ||
| ===== | ||
|
|
||
| 1. create a Time Off request using a Time Off Type that requires | ||
| validation by an Officer. | ||
| 2. Depending on the value selected in the Approval Type field, the | ||
| system will determine whether approval is required for hour-based or | ||
| day-based requests. | ||
| 3. If the request type does not require approval according to this | ||
| configuration, the leave will be automatically confirmed and | ||
| validated. | ||
|
|
||
| Bug Tracker | ||
| =========== | ||
|
|
||
| Bugs are tracked on `GitHub Issues <https://github.com/OCA/hr-holidays/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 <https://github.com/OCA/hr-holidays/issues/new?body=module:%20hr_holidays_approval_split%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_. | ||
|
|
||
| Do not contact contributors directly about support or help with technical issues. | ||
|
|
||
| Credits | ||
| ======= | ||
|
|
||
| Authors | ||
| ------- | ||
|
|
||
| * ForgeFlow | ||
|
|
||
| Contributors | ||
| ------------ | ||
|
|
||
| - `ForgeFlow <https://www.forgeflow.com>`__: | ||
|
|
||
| - Guillermo Navas <guillermo.navas@forgeflow.com> | ||
|
|
||
| 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 <https://github.com/OCA/hr-holidays/tree/17.0/hr_holidays_approval_split>`_ project on GitHub. | ||
|
|
||
| You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| from . import models |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| # Copyright 2026 ForgeFlow S.L. (https://www.forgeflow.com) | ||
| # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). | ||
| { | ||
| "name": "Time Off Approval Split", | ||
| "summary": """ | ||
| Allow configuring approval requirements separately for hour-based and | ||
| day-based time off requests. | ||
| """, | ||
| "category": "Human Resources/Time Off", | ||
| "version": "17.0.1.0.0", | ||
| "license": "AGPL-3", | ||
| "author": "ForgeFlow, Odoo Community Association (OCA)", | ||
| "website": "https://github.com/OCA/hr-holidays", | ||
| "contributors": [ | ||
| "Guillermo Navas <guillermo.navas@forgeflow.com>", | ||
| ], | ||
| "depends": ["hr_holidays"], | ||
| "data": [ | ||
| "views/hr_leave_type_views.xml", | ||
| ], | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| from . import hr_leave_type | ||
| from . import hr_leave |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| from odoo import _, api, models | ||
|
|
||
|
|
||
| class HolidaysRequest(models.Model): | ||
| _inherit = "hr.leave" | ||
|
|
||
| @api.model_create_multi | ||
| def create(self, vals_list): | ||
| holidays = super().create(vals_list) | ||
|
|
||
| auto_validate = holidays.filtered( | ||
| lambda h: ( | ||
| h.holiday_status_id.leave_validation_type != "no_validation" | ||
| and ( | ||
| ( | ||
| h.holiday_status_id.validation_type_split == "hours" | ||
| and not h.request_unit_hours | ||
| and not h.request_unit_half | ||
| ) | ||
| or ( | ||
| h.holiday_status_id.validation_type_split == "days" | ||
| and (h.request_unit_hours or h.request_unit_half) | ||
| ) | ||
| ) | ||
| ) | ||
| ) | ||
|
GuillermoNforgeflow marked this conversation as resolved.
|
||
|
|
||
| for holiday in auto_validate: | ||
| # As done in core, we use sudo() as the user might not have the | ||
| # rights when creating the leave | ||
| # https://github.com/odoo/odoo/blob/97b60952d59a57aba12b048cb4da4f41d85d2ea2/addons/hr_holidays/models/hr_leave.py#L978-L980 | ||
| holiday.sudo().action_validate() | ||
| holiday.sudo().message_subscribe( | ||
| partner_ids=holiday._get_responsible_for_approval().partner_id.ids | ||
| ) | ||
| holiday.sudo().message_post( | ||
| body=_("The time off has been automatically approved"), | ||
| subtype_xmlid="mail.mt_comment", | ||
| ) | ||
|
GuillermoNforgeflow marked this conversation as resolved.
|
||
|
|
||
| return holidays | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| from odoo import fields, models | ||
|
|
||
|
|
||
| class HrLeaveType(models.Model): | ||
| _inherit = "hr.leave.type" | ||
|
|
||
| validation_type_split = fields.Selection( | ||
| [ | ||
| ("both", "Hours and Days require approval"), | ||
| ("hours", "Only Hours require approval"), | ||
| ("days", "Only Days require approval"), | ||
| ], | ||
| string="Approval Type", | ||
| default="both", | ||
| help=""" | ||
| Define whether approval is required for hour-based requests, | ||
| day-based requests or both. | ||
| """, | ||
| ) | ||
|
GuillermoNforgeflow marked this conversation as resolved.
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| [build-system] | ||
| requires = ["whool"] | ||
| build-backend = "whool.buildapi" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| - [ForgeFlow](https://www.forgeflow.com): | ||
| - Guillermo Navas \<<guillermo.navas@forgeflow.com>\> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| This module introduces a new field validation_type_split in Time Off Types | ||
| to define whether approval is required for hour-based requests, day-based | ||
| requests, or both. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| 1. create a Time Off request using a Time Off Type that requires validation by an Officer. | ||
| 2. Depending on the value selected in the Approval Type field, the system will determine | ||
| whether approval is required for hour-based or day-based requests. | ||
| 3. If the request type does not require approval according to this configuration, the leave | ||
| will be automatically confirmed and validated. |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.