-
Notifications
You must be signed in to change notification settings - Fork 41
[16.0] [ADD] volunteer_holiday #578
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
base: 16.0
Are you sure you want to change the base?
Changes from 4 commits
a6b1a6d
fe0dfa4
79748ee
e7198ae
acc87b7
a584534
130eeb9
5218d91
642f6cf
be54c46
57a9f43
5e83781
e260401
8488f36
15a6db1
e9688bd
8b1dc76
6992be1
432576c
e8b3d46
bfdcddf
396fddf
52f09f1
7896929
ec5a3f7
15601c2
e2e9486
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| ../../../../volunteer_holiday |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| import setuptools | ||
|
|
||
| setuptools.setup( | ||
| setup_requires=['setuptools-odoo'], | ||
| odoo_addon=True, | ||
| ) |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| ================= | ||
| Volunteer Holiday | ||
| ================= | ||
|
|
||
| .. | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! This file is generated by oca-gen-addon-readme !! | ||
| !! changes will be overwritten. !! | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! source digest: sha256:d68150a24904527787d7cde7a5cb68c88f101992b43ec7c25f9a3450eb8d6184 | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
|
|
||
| .. |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-beescoop%2FObeesdoo-lightgray.png?logo=github | ||
| :target: https://github.com/beescoop/Obeesdoo/tree/16.0/volunteer_holiday | ||
| :alt: beescoop/Obeesdoo | ||
|
|
||
| |badge1| |badge2| |badge3| | ||
|
|
||
| Add volunteer and company holidays to volunteer app, and manage shifts and generators accordingly. | ||
|
|
||
| **Table of contents** | ||
|
|
||
| .. contents:: | ||
| :local: | ||
|
|
||
| Bug Tracker | ||
| =========== | ||
|
|
||
| Bugs are tracked on `GitHub Issues <https://github.com/beescoop/Obeesdoo/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/beescoop/Obeesdoo/issues/new?body=module:%20volunteer_holiday%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. | ||
|
|
||
| Credits | ||
| ======= | ||
|
|
||
| Authors | ||
| ~~~~~~~ | ||
|
|
||
| * Coop IT Easy SC | ||
|
|
||
| Contributors | ||
| ~~~~~~~~~~~~ | ||
|
|
||
| * `Coop IT Easy SC <https://coopiteasy.be>`_: | ||
|
|
||
| * Geneviève Ernould | ||
|
|
||
| Maintainers | ||
| ~~~~~~~~~~~ | ||
|
|
||
| This module is part of the `beescoop/Obeesdoo <https://github.com/beescoop/Obeesdoo/tree/16.0/volunteer_holiday>`_ project on GitHub. | ||
|
|
||
| You are welcome to contribute. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # SPDX-FileCopyrightText: 2025 Coop IT Easy SC | ||
| # | ||
| # SPDX-License-Identifier: AGPL-3.0-or-later | ||
|
|
||
| from . import models |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # SPDX-FileCopyrightText: 2026 Coop IT Easy SC | ||
| # | ||
| # SPDX-License-Identifier: AGPL-3.0-or-later | ||
|
|
||
| { | ||
| "name": "Volunteer Holiday", | ||
| "summary": "Add holidays for companies and volunteers", | ||
| "version": "16.0.0.5.0", | ||
| "category": "Volunteer management", | ||
| "website": "https://github.com/beescoop/Obeesdoo", | ||
| "author": "Coop IT Easy SC", | ||
| "license": "AGPL-3", | ||
| "application": False, | ||
| "depends": ["base", "volunteer", "mail"], | ||
| "data": [ | ||
| "data/cron.xml", | ||
| "security/ir.model.access.csv", | ||
| "views/volunteer_shift_generator_views.xml", | ||
| "views/volunteer_company_holiday_view.xml", | ||
| "views/volunteer_menu.xml", | ||
| ], | ||
| "demo": [], | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| from . import controllers | ||
remytms marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?xml version="1.0" encoding="utf-8" ?> | ||
| <!-- | ||
| SPDX-FileCopyrightText: 2025 Coop IT Easy SC | ||
|
|
||
| SPDX-License-Identifier: AGPL-3.0-or-later | ||
| --> | ||
| <odoo> | ||
| <!-- Après test, passer en noupdate=1 --> | ||
| <record id="ir_cron_cancel_holiday_shifts" model="ir.cron"> | ||
| <field name="name">Cancel generated shifts during holidays</field> | ||
| <field name="model_id" ref="model_volunteer_company_holiday" /> | ||
| <field name="state">code</field> | ||
| <field name="code">model._cancel_holiday_shift()</field> | ||
| <field name="interval_number">24</field> | ||
| <field name="interval_type">hours</field> | ||
| <field name="numbercall">-1</field> | ||
| <field name="doall" eval="False" /> | ||
| </record> | ||
| </odoo> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <odoo> | ||
| <data> | ||
| <!-- | ||
| <record id="object0" model="volunteer_holiday.volunteer_holiday"> | ||
| <field name="name">Object 0</field> | ||
| <field name="value">0</field> | ||
| </record> | ||
|
|
||
| <record id="object1" model="volunteer_holiday.volunteer_holiday"> | ||
| <field name="name">Object 1</field> | ||
| <field name="value">10</field> | ||
| </record> | ||
|
|
||
| <record id="object2" model="volunteer_holiday.volunteer_holiday"> | ||
| <field name="name">Object 2</field> | ||
| <field name="value">20</field> | ||
| </record> | ||
|
|
||
| <record id="object3" model="volunteer_holiday.volunteer_holiday"> | ||
| <field name="name">Object 3</field> | ||
| <field name="value">30</field> | ||
| </record> | ||
|
|
||
| <record id="object4" model="volunteer_holiday.volunteer_holiday"> | ||
| <field name="name">Object 4</field> | ||
| <field name="value">40</field> | ||
| </record> | ||
| --> | ||
| </data> | ||
| </odoo> |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| # SPDX-FileCopyrightText: 2025 Coop IT Easy SC | ||
| # | ||
| # SPDX-License-Identifier: AGPL-3.0-or-later | ||
|
|
||
| from . import volunteer_company_holiday | ||
| from . import volunteer_shift_recurrent_generator |
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,114 @@ | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| # SPDX-FileCopyrightText: 2025 Coop IT Easy SC | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| # | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| # SPDX-License-Identifier: AGPL-3.0-or-later | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| from datetime import date, datetime | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| from dateutil.relativedelta import relativedelta | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| from odoo import fields, models | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| class VolunteerCompanyHoliday(models.Model): | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| _name = "volunteer.company.holiday" | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| _description = "Company Holidays" | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| _order = "start_date" | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| _order = "start_date" | |
| _order = "start_date desc, company_id, id" |
Setting a default _order has a cost and it default to id. But I understand that most recent holliday should be shown on top (so use desc).
Also, start_date is not a unique field (several records can have the same value), so you need to specify other fields to order them correctly. Here in my suggestion, company_id is not needed, but id at the end is mandatory to be sure that we can correctly order all element.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
up for this comment.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, thanks. I left start_date with no desc, because otherwise you would see company holidays in one year before the ones in one month for example. But I changed company_id and id.
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that you should apply your comment, and remove the time limit. Just check all shifts, and see if they are overlapping a holiday.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that for now it’s ok if the method starts at now() and all future shifts.
Because, we don’t want to change the past.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just corrected it in the the commit "Refactor _cancel_holiday_shift..."
remytms marked this conversation as resolved.
Show resolved
Hide resolved
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Simply write:
| if ( | |
| ( | |
| shift_start_date >= holiday_start_date | |
| and shift_start_date <= holiday_end_date | |
| ) | |
| or ( | |
| shift_end_date >= holiday_start_date | |
| and shift_start_date <= holiday_end_date | |
| ) | |
| or ( | |
| shift_start_date <= holiday_start_date | |
| and shift_end_date >= holiday_end_date | |
| ) | |
| ): | |
| return True | |
| return ( | |
| ( | |
| shift_start_date >= holiday_start_date | |
| and shift_start_date <= holiday_end_date | |
| ) | |
| or ( | |
| shift_end_date >= holiday_start_date | |
| and shift_start_date <= holiday_end_date | |
| ) | |
| or ( | |
| shift_start_date <= holiday_start_date | |
| and shift_end_date >= holiday_end_date | |
| ) | |
| ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I didn't know about this simplified syntax. It is done.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| # SPDX-FileCopyrightText: 2026 Coop IT Easy SC | ||
| # | ||
| # SPDX-License-Identifier: AGPL-3.0-or-later | ||
|
|
||
| from odoo import fields, models | ||
|
|
||
|
|
||
| class VolunteerShiftRecurrentGenerator(models.Model): | ||
| _inherit = "volunteer.shift.recurrent.generator" | ||
|
|
||
| is_maintained_during_holiday = fields.Boolean("Maintain During Holidays") |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| * `Coop IT Easy SC <https://coopiteasy.be>`_: | ||
|
|
||
| * Geneviève Ernould |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Add volunteer and company holidays to volunteer app, and manage shifts and generators accordingly. |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink | ||
| access_company_holiday_user,CompanyHolidayUser,model_volunteer_company_holiday,volunteer.volunteer_group_user,1,0,0,0 | ||
| access_company_holiday_manager,CompanyHolidayManager,model_volunteer_company_holiday,volunteer.volunteer_group_manager,1,1,0,0 | ||
| access_company_holiday_admin,CompanyHolidayAdmin,model_volunteer_company_holiday,volunteer.volunteer_group_admin,1,1,1,1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.