Skip to content

Commit

Permalink
[MIG] hr_leave_custom_hour_interval: Migration to 16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
luisDIXMIT committed Jul 5, 2024
1 parent 32ca484 commit ffcc930
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 34 deletions.
25 changes: 16 additions & 9 deletions hr_leave_custom_hour_interval/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ Custom Hour Interval for Holidays
: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/15.0/hr_leave_custom_hour_interval
:target: https://github.com/OCA/hr-holidays/tree/16.0/hr_leave_custom_hour_interval
: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-15-0/hr-holidays-15-0-hr_leave_custom_hour_interval
:target: https://translation.odoo-community.org/projects/hr-holidays-16-0/hr-holidays-16-0-hr_leave_custom_hour_interval
: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=15.0
: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|
Expand All @@ -35,23 +35,30 @@ This module allows to create time off requests using custom hours with float fie
.. contents::
:local:

Configuration
=============

To configure the module in order to use the custom hours with float fields, you need to:

1. Go to Time Off > Configuration > Time Off Types
2. Create a "Hours Time Off" Time Off Type and set "Take Time Off in" field to "Hours".

Usage
=====

To use this module, you need to:

#. Go to Time Off > Configuration > Time Off Types
#. Create a "Hours Time Off" Time Off Type and select "Custom Hours"
#. Go to My Time Off > Time Off Requests
#. Create a Time Off Request with the Time Off Type previously created
#. Go to Time Off > My Time Off > My Time Off
#. Create a Time Off Request with the Time Off Type previously created and set "Custom Hours" check box.
#. Set the custom hours in the fields that will appear below the setted check box.

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_leave_custom_hour_interval%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/hr-holidays/issues/new?body=module:%20hr_leave_custom_hour_interval%0Aversion:%2016.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.

Expand Down Expand Up @@ -83,6 +90,6 @@ 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/15.0/hr_leave_custom_hour_interval>`_ project on GitHub.
This module is part of the `OCA/hr-holidays <https://github.com/OCA/hr-holidays/tree/16.0/hr_leave_custom_hour_interval>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
2 changes: 1 addition & 1 deletion hr_leave_custom_hour_interval/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": "Custom Hour Interval for Holidays",
"summary": """
Edit start and end of leaves using time intervals""",
"version": "15.0.1.0.0",
"version": "16.0.1.0.0",
"license": "AGPL-3",
"author": "Creu Blanca,Odoo Community Association (OCA)",
"website": "https://github.com/OCA/hr-holidays",
Expand Down
4 changes: 4 additions & 0 deletions hr_leave_custom_hour_interval/readme/CONFIGURE.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
To configure the module in order to use the custom hours with float fields, you need to:

1. Go to Time Off > Configuration > Time Off Types
2. Create a "Hours Time Off" Time Off Type and set "Take Time Off in" field to "Hours".
7 changes: 3 additions & 4 deletions hr_leave_custom_hour_interval/readme/USAGE.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
To use this module, you need to:

#. Go to Time Off > Configuration > Time Off Types
#. Create a "Hours Time Off" Time Off Type and select "Custom Hours"
#. Go to My Time Off > Time Off Requests
#. Create a Time Off Request with the Time Off Type previously created
#. Go to Time Off > My Time Off > My Time Off
#. Create a Time Off Request with the Time Off Type previously created and set "Custom Hours" check box.
#. Set the custom hours in the fields that will appear below the setted check box.
47 changes: 27 additions & 20 deletions hr_leave_custom_hour_interval/static/description/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
Expand Down Expand Up @@ -369,49 +368,57 @@ <h1 class="title">Custom Hour Interval for Holidays</h1>
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:a84caeece078676af0eb42ef9a6088ad699fd9ad42e802512c6ff75083afb7f0
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/hr-holidays/tree/15.0/hr_leave_custom_hour_interval"><img alt="OCA/hr-holidays" src="https://img.shields.io/badge/github-OCA%2Fhr--holidays-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-holidays-15-0/hr-holidays-15-0-hr_leave_custom_hour_interval"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/hr-holidays&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/hr-holidays/tree/16.0/hr_leave_custom_hour_interval"><img alt="OCA/hr-holidays" src="https://img.shields.io/badge/github-OCA%2Fhr--holidays-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-holidays-16-0/hr-holidays-16-0-hr_leave_custom_hour_interval"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/hr-holidays&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module allows to create time off requests using custom hours with float fields.</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
<li><a class="reference internal" href="#usage" id="toc-entry-1">Usage</a></li>
<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="toc-entry-5">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
<li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li>
<li><a class="reference internal" href="#usage" id="toc-entry-2">Usage</a></li>
<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
</ul>
</li>
</ul>
</div>
<div class="section" id="configuration">
<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
<p>To configure the module in order to use the custom hours with float fields, you need to:</p>
<ol class="arabic simple">
<li>Go to Time Off &gt; Configuration &gt; Time Off Types</li>
<li>Create a “Hours Time Off” Time Off Type and set “Take Time Off in” field to “Hours”.</li>
</ol>
</div>
<div class="section" id="usage">
<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
<p>To use this module, you need to:</p>
<ol class="arabic simple">
<li>Go to Time Off &gt; Configuration &gt; Time Off Types</li>
<li>Create a “Hours Time Off” Time Off Type and select “Custom Hours”</li>
<li>Go to My Time Off &gt; Time Off Requests</li>
<li>Create a Time Off Request with the Time Off Type previously created</li>
<li>Go to Time Off &gt; My Time Off &gt; My Time Off</li>
<li>Create a Time Off Request with the Time Off Type previously created and set “Custom Hours” check box.</li>
<li>Set the custom hours in the fields that will appear below the setted check box.</li>
</ol>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/hr-holidays/issues">GitHub Issues</a>.
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
<a class="reference external" href="https://github.com/OCA/hr-holidays/issues/new?body=module:%20hr_leave_custom_hour_interval%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/hr-holidays/issues/new?body=module:%20hr_leave_custom_hour_interval%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
<div class="section" id="authors">
<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
<ul class="simple">
<li>Creu Blanca</li>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
<ul class="simple">
<li><dl class="first docutils">
<dt>Creu Blanca</dt>
Expand All @@ -425,13 +432,13 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
</ul>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<p>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.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/hr-holidays/tree/15.0/hr_leave_custom_hour_interval">OCA/hr-holidays</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/hr-holidays/tree/16.0/hr_leave_custom_hour_interval">OCA/hr-holidays</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions hr_leave_custom_hour_interval/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from . import test_hr_leave
40 changes: 40 additions & 0 deletions hr_leave_custom_hour_interval/tests/test_hr_leave.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
from odoo.tests.common import TransactionCase


class TestHrLeave(TransactionCase):
def setUp(self):
super().setUp()
self.hr_leave_type = self.env["hr.leave.type"].create(
{
"name": "Test Leave Type",
"leave_validation_type": "manager",
"requires_allocation": "no",
"request_unit": "hour",
"time_type": "leave",
}
)

self.employee = self.env["hr.employee"].create(
{
"name": "Test Employee",
}
)

self.HrLeave = self.env["hr.leave"]

def test_compute_custom_hours(self):
hr_leave = self.HrLeave.create(
{
"holiday_type": "employee",
"employee_id": self.employee.id,
"holiday_status_id": self.hr_leave_type.id,
"request_unit_hours": True,
"request_date_from": "2024-07-01",
"request_time_hour_from": 10.0,
"request_time_hour_to": 10.5,
}
)

hr_leave._compute_date_from_to()

self.assertEqual(hr_leave.number_of_hours_display, 0.5)

0 comments on commit ffcc930

Please sign in to comment.