Elabore/hr-tools
9
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

16.0-planning_and_public_holidays #15

Merged
laetitiadacosta merged 4 commits from 16.0-planning_and_public_holidays into 16.0 2025-12-15 11:20:12 +00:00
Conversation 3 Commits 4 Files Changed 13 +293 -106
laetitiadacosta commented 2025-12-11 08:27:20 +00:00
Owner
Copy Link
No description provided.
laetitiadacosta added 4 commits 2025-12-11 08:27:21 +00:00
[REF]hr_timesheet_sheet_usability_misc: rename hr_timesheet_sheet_usability in hr_timesheet_sheet_usability_misc because hr_timesheet_sheet_usability already exists in acsone repos 67b18277c1
[IMP]hr_employee_stats_sheet: add dependencies to hr_timesheet_sheet_usability_misc and hr_timesheet_sheet_usability_akretion for better usability d2301b765e
[FIX]hr_employee_stats_sheet:fix identification of public holidays according to employee TZ 5b103056d6
[IMP]hr_employee_stats_sheet:add dependecie to hr_employee_calendar_planning and identifies the planning using by a employee during a time period
Some checks failed
pre-commit / pre-commit (pull_request) Failing after 1m29s
Details
dfd5f26e95
mondot requested changes 2025-12-11 09:21:26 +00:00
Dismissed
hr_employee_stats_sheet/models/hr_employee_stats.py Outdated
@@ -174,0 +193,4 @@
)
if not public_holidays:
return False
ph = public_holidays[0]
mondot commented 2025-12-11 09:00:53 +00:00
Owner
Copy Link

if len(public_holidays) > 1:
raise UserError("un msg bien clair pour que le client nous contacte et qu'on corrige le soucis")

if len(public_holidays) > 1: raise UserError("un msg bien clair pour que le client nous contacte et qu'on corrige le soucis")
laetitiadacosta commented 2025-12-11 15:51:25 +00:00
Author
Owner
Copy Link

après vérification _get_public_holidays, on n'a effectivement pas censé avoir plusieurs jours fériés pour un meme calendrier, mais par sécurité j'ai ajouté

if len(public_holidays) > 1: raise UserError( _("Several holidays have been found ont he date '%s'. Please correct the anomaly before continuing.") % self.date )

après vérification _get_public_holidays, on n'a effectivement pas censé avoir plusieurs jours fériés pour un meme calendrier, mais par sécurité j'ai ajouté ` if len(public_holidays) > 1: raise UserError( _("Several holidays have been found ont he date '%s'. Please correct the anomaly before continuing.") % self.date ) `
👍 1
mondot marked this conversation as resolved
hr_employee_stats_sheet/models/hr_timesheet_sheet.py Outdated
@@ -115,3 +103,1 @@
],
)
return contracts
# def _get_calendar_in_progress_during_timesheet_time_period(self):
mondot commented 2025-12-11 09:05:52 +00:00
Owner
Copy Link

parties commentées à supprimer

parties commentées à supprimer
laetitiadacosta commented 2025-12-11 15:51:36 +00:00
Author
Owner
Copy Link

fait

fait
mondot marked this conversation as resolved
hr_employee_stats_sheet/tests/test_employee_stats.py Outdated
@@ -239,2 +230,2 @@
recovery_allocation = self.env["hr.leave.allocation"].search([("timesheet_sheet_id","=",timesheet_sheet_1.id)])
self.assertEqual(len(recovery_allocation), 1, "There should be one recovery")
#create stats during period of full time calendar for the employee
timesheet_sheet = self.env['hr_timesheet.sheet'].create({
mondot commented 2025-12-11 09:21:22 +00:00
Owner
Copy Link

on peut aussi ajouter un test qui fait :

je suis à 35h
j'ai des temps
je génère des recups

je passe à 32h
j'ai des nouveaux temps
je génère des recups

je m'assure que les récups sur 35h n'ont pas été modifiées, et que les récups sur 32h sont corrects.

on peut aussi ajouter un test qui fait : je suis à 35h j'ai des temps je génère des recups je passe à 32h j'ai des nouveaux temps je génère des recups je m'assure que les récups sur 35h n'ont pas été modifiées, et que les récups sur 32h sont corrects.
laetitiadacosta commented 2025-12-11 15:51:40 +00:00
Author
Owner
Copy Link

fait

fait
mondot marked this conversation as resolved
hr_employee_stats_sheet/tests/test_employee_stats.py Outdated
@@ -245,0 +260,4 @@
self.env["resource.calendar.leaves"].create(
{
"name": "1 mai 2025",
"date_from": datetime(2025,4,30,22,0,0),
mondot commented 2025-12-11 08:59:46 +00:00
Owner
Copy Link

Dans l'idéal il faudrait reproduire la situation où on ajoute le 1er mai de minuit à minuit et avec le jeu des timezones ça crée un resource.calendar.leaves de 22h à 22h.

Si trop compliqué, on ajoute seulement un commentaire

Dans l'idéal il faudrait reproduire la situation où on ajoute le 1er mai de minuit à minuit et avec le jeu des timezones ça crée un resource.calendar.leaves de 22h à 22h. Si trop compliqué, on ajoute seulement un commentaire
laetitiadacosta commented 2025-12-11 15:51:52 +00:00
Author
Owner
Copy Link

j'ai ajouté des commentaires

j'ai ajouté des commentaires
mondot marked this conversation as resolved
mondot reviewed 2025-12-11 09:26:40 +00:00
hr_employee_stats_sheet/models/hr_employee.py Outdated
@@ -0,0 +33,4 @@
elif calendars and calendars[0].calendar_id:
return calendars[0].calendar_id
# if no hr_employee_calendar found, use employee resource_calendar_id
elif self.resource_calendar_id:
mondot commented 2025-12-11 09:26:40 +00:00
Owner
Copy Link

est-ce que ce if est encore pertinent ?

est-ce que ce if est encore pertinent ?
laetitiadacosta commented 2025-12-11 15:52:36 +00:00
Author
Owner
Copy Link

Effectivement avec la dépendance à hr_employee_planning_calendar, le self.resource_calendar_id n'est plus utile

Effectivement avec la dépendance à hr_employee_planning_calendar, le self.resource_calendar_id n'est plus utile
mondot marked this conversation as resolved
laetitiadacosta added 2 commits 2025-12-11 12:01:45 +00:00
[IMP]hr_employee_stats_sheet:add dependecie to hr_employee_calendar_planning and identifies the planning using by a employee during a time period
Some checks failed
pre-commit / pre-commit (pull_request) Failing after 1m29s
Details
dfd5f26e95
[IMP]hr_employee_stats_sheet:add dependecie to hr_employee_calendar_planning and identifies the planning using by a employee during a time period
Some checks failed
pre-commit / pre-commit (pull_request) Failing after 1m31s
Details
231d0d892d
laetitiadacosta added 2 commits 2025-12-11 15:07:24 +00:00
[IMP]hr_employee_stats_sheet:add dependecie to hr_employee_calendar_planning and identifies the planning using by a employee during a time period
Some checks failed
pre-commit / pre-commit (pull_request) Failing after 1m31s
Details
231d0d892d
[IMP]hr_employee_stats_sheet:add dependecie to hr_employee_calendar_planning and identifies the planning using by a employee during a time period
Some checks failed
pre-commit / pre-commit (pull_request) Failing after 1m32s
Details
f91aac7cc8
laetitiadacosta added 2 commits 2025-12-11 15:49:46 +00:00
[IMP]hr_employee_stats_sheet:add dependecie to hr_employee_calendar_planning and identifies the planning using by a employee during a time period
Some checks failed
pre-commit / pre-commit (pull_request) Failing after 1m32s
Details
f91aac7cc8
[IMP]hr_employee_stats_sheet:add dependecie to hr_employee_calendar_planning and identifies the planning using by a employee during a time period
Some checks failed
pre-commit / pre-commit (pull_request) Failing after 1m30s
Details
8ac80079a0
mondot approved these changes 2025-12-11 16:50:24 +00:00
mondot left a comment
Owner
Copy Link

Good job 😃

Good job 😃
laetitiadacosta merged commit 8ac80079a0 into 16.0 2025-12-15 11:20:12 +00:00
laetitiadacosta deleted branch 16.0-planning_and_public_holidays 2025-12-15 11:20:12 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
mondot
Labels
Clear labels
bug
Something isn't working
documentation
Improvements or additions to documentation
duplicate
This issue or pull request already exists
enhancement
New feature or request
good first issue
Good for newcomers
help wanted
Extra attention is needed
invalid
This doesn't seem right
question
Further information is requested
wontfix
This will not be worked on
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
admin borisgallet elabore_bot elabore_vps laetitiadacosta mathieusarrasin mondot stephansainleger vlab
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Elabore/hr-tools#15
No description provided.
Delete Branch "16.0-planning_and_public_holidays"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?