[16.0] [ADD] volunteer_holiday by Genepi314 · Pull Request #578 · beescoop/Obeesdoo

Genepi314 · 2026-03-02T10:38:26Z

Description

Add holidays for companies and leaves for volunteers.

Odoo task (if applicable)

Checklist before approval

Tests are present (or not needed).
Credits/copyright have been changed correctly.
Change log snippet is present.
(If a new module) Moving this to OCA has been considered.

…for _cancel_holiday_shift(), draft for test_company_holiday

… draft unit tests

volunteer_holiday/models/volunteer_company_holiday.py

remytms · 2026-03-02T14:33:08Z

volunteer_holiday/models/volunteer_company_holiday.py

+        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


Simply write:

Suggested change

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

)

)

Ok, I didn't know about this simplified syntax. It is done.

… some changes to access rights.

…company.

…pany present but hideable in all views.

… leaves.

…e type.

remytms

First partial review.

remytms · 2026-03-09T17:49:09Z

volunteer_holiday/controllers/__init__.py

@@ -0,0 +1 @@
+from . import controllers


You should remove the controllers directory if your have nothing more than the __init__.py file in it.

remytms · 2026-03-09T17:50:08Z

volunteer_holiday/data/cron.xml

+    <!-- Après test, passer en noupdate=1 -->
+    <record id="ir_cron_cancel_holiday_shift" model="ir.cron">
+        <field name="name">Cancel Generated Shifts During Company 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>


Apply your comment here. :)

remytms · 2026-03-09T18:23:50Z

volunteer_holiday/demo/volunteer_company_holiday_demo.xml

+        <field name="name">Christmas Holidays</field>
+        <field
+            name="start_date"
+            eval="(datetime.today().replace(month=12, day=24)).strftime('%Y-%m-%d')"


Starting with python 3.9 (odoo 16.0 uses 3.10), prefer using isformat() instead of strftime for standard iso formatting.

See method here.

After some tests on these cases, neither strftime() nor isoformat() seems to be required. On my side, loading works fine without any formatting. That said, I'm not sure of all the details behind it.

remytms · 2026-03-09T18:24:05Z

volunteer_holiday/demo/volunteer_company_holiday_demo.xml

+        />
+        <field
+            name="end_date"
+            eval="(datetime.today().replace(month=12, day=25)).strftime('%Y-%m-%d')"


isoformat()

remytms · 2026-03-09T18:24:18Z

volunteer_holiday/demo/volunteer_company_holiday_demo.xml

+        <field name="name">Store Inventory</field>
+        <field
+            name="start_date"
+            eval="(datetime.today().replace(month=7, day=1)).strftime('%Y-%m-%d')"


remytms · 2026-03-09T18:36:50Z

volunteer_holiday/models/volunteer_company_holiday.py

+    # Retirer la limite de temps, regarder les shifts futurs
+    def _cancel_holiday_shift(self, time_in_months=3):


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.

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.

remytms · 2026-03-09T18:43:34Z

volunteer_holiday/models/volunteer_company_holiday.py

+        # Create dictionary key-company for list of values-shifts
+        shifts_by_company = {}
+        for shift in confirmed_future_generated_shifts_in_range:
+            shifts_by_company.setdefault(shift.company_id, []).append(shift)


Just order them by company_id when using the search() method.

Also, as there is less holiday than shifts, it’s better to do so with holiday, or even fetch holiday for the company when needed.

remytms · 2026-03-09T18:51:27Z

volunteer_holiday/models/volunteer_company_holiday.py

+        for holiday in future_company_holidays_in_range:
+            same_company_shifts = shifts_by_company.get(holiday.company_id, [])
+            for shift in same_company_shifts:
+                if shift.state != "canceled" and self._shift_covers_holiday(
+                    shift.start_time,
+                    shift.end_time,
+                    holiday.start_date,
+                    holiday.end_date,
+                ):
+                    shift.sudo().write(
+                        {
+                            "stage_id": self.env.ref(
+                                "volunteer.volunteer_shift_stage_canceled"
+                            ).id
+                        }
+                    )


If your shifts are ordered by company_id, you can use itertools.groupby() to iterate through all the shifts, company by company. Then you can fetch the holiday of the comany, each time you face a new company.

Using itertools.groupby() is more efficient for such a task.

remytms · 2026-03-09T18:55:22Z

volunteer_holiday/models/volunteer_volunteer.py

+    volunteer_leave_ids = fields.One2many(
+        comodel_name="volunteer.volunteer.leave",
+        inverse_name="volunteer_id",
+        string="Leave",


Here for the user interface you can use plural form.

Suggested change

string="Leave",

string="Leaves",

remytms · 2026-03-09T18:57:05Z

volunteer_holiday/models/volunteer_volunteer_leave.py

+class VolunteerVolunteerLeave(models.Model):
+    _name = "volunteer.volunteer.leave"
+    _description = "Volunteer Leave"
+    _order = "start_date"


Suggested change

_order = "start_date"

_order = "start_date desc, volunteer_id, id"

Same as for company.holiday.

…or now commented).

…n to volunteers, corrected README.

…guration in General settings, views, test, and corrected views for company holidays and volunteer leaves.

…d volunteer_company_holiday updated.

Genepi314 added 4 commits February 19, 2026 10:58

added volunteer_company_holiday, extended recurrent_generator, draft …

a6b1a6d

…for _cancel_holiday_shift(), draft for test_company_holiday

cancel holiday shift operational, still lacks company implementation,…

fe0dfa4

… draft unit tests

commit before switching branch

79748ee

draft test_cancel_holiday_shift with company + correct README

e7198ae

github-grap-bot added the needs review label Mar 2, 2026

remytms changed the title ~~16.0 add volunteer holiday~~ [16.0] [ADD] volunteer_holiday Mar 2, 2026

remytms reviewed Mar 2, 2026

View reviewed changes

Genepi314 added 10 commits March 3, 2026 10:03

Add models and views for volunteer leaves, volunteer leave types, and…

acc87b7

… some changes to access rights.

Refacto _cancel_holiday_shift, now using a dictionary and filters by …

a584534

…company.

Add tracking to is_maintained_during_holiday (bool) in generator.

130eeb9

Add freezegun for test_company_holiday

5218d91

Syntax and decorator fixes in volunteer_company_holidayù

642f6cf

Add company for volunteer_leave, record rules for all models, row com…

be54c46

…pany present but hideable in all views.

Add cron and function to cancel volunteer participations during their…

57a9f43

… leaves.

small fix _cancel_volunteer_leave_participation().

5e83781

Add test for _cancel_volunteer_leave_participation().

e260401

Add demo data for company holiday, volunteer leave and volunteer leav…

8488f36

…e type.

remytms requested changes Mar 9, 2026

View reviewed changes

Genepi314 added 5 commits March 10, 2026 09:08

draft new function to uncancel shifts in volunteer_company_holiday (f…

15a6db1

…or now commented).

removed copy of method in volunteer_leave, add config for notificatio…

e9688bd

…n to volunteers, corrected README.

Add method to send notification for end of volunteer leave, add confi…

8b1dc76

…guration in General settings, views, test, and corrected views for company holidays and volunteer leaves.

add badge on shift form view if on holiday, models volunteer_shift an…

6992be1

…d volunteer_company_holiday updated.

Changed time range to 12 months, for demonstration purpose.

432576c

		# Retirer la limite de temps, regarder les shifts futurs
		def _cancel_holiday_shift(self, time_in_months=3):

	_order = "start_date"
	_order = "start_date desc, volunteer_id, id"

Conversation

Genepi314 commented Mar 2, 2026

Description

Odoo task (if applicable)

Checklist before approval

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

remytms left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants