[FW][FIX] resource,hr: fix some issues with flexible resources/employees #203358
Conversation
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
|
|
robodoo
added
forwardport
|
@xavierbol @tivisse cherrypicking of pull request #203253 failed. stdout: Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?). In the former case, you may want to edit this PR message as well. More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port |
|
Hello @xavierbol Feel free to solve the conflict when you got some time. Thanks :) |
Before this commit, when the user sets a working schedule to an employee and convert that working schedule into a flexible working schedule, the employee is not considered as working with flexible hours. This commit makes sure the `_compute_is_flexible` method defined in `hr.employee` model is triggered when the `flexible_hours` field of the working schedule linked to the employee is altered. Steps to reproduce the issue: ----------------------------- 0. Install Attendance app (`hr_attendance` module). 1. Set a working schedule A to employee E 2. Go to the form view of the working schedule A and check `Flexible Hours` field to convert the working schedule as flexible working schedule. 3. Go to Attendance app Expected Behavior: ----------------- The Attendance app should loaded without any issue. Current Behavior: ---------------- A traceback is occurred saying we have a division by zero. opw-4492625
xavierbol
force-pushed
the
saas-18.1-18.0-attendance-fix-xbo-425248-fw
branch
from
fa7465c to
0069091
Compare
|
The first commit has been moved in #202849 to merge as quicker as possible the second commit which is more important for the customers. |
robodoo
pushed a commit
that referenced
this pull request
Mar 26, 2025
Before this commit, when the user sets a working schedule to an employee and convert that working schedule into a flexible working schedule, the employee is not considered as working with flexible hours. This commit makes sure the `_compute_is_flexible` method defined in `hr.employee` model is triggered when the `flexible_hours` field of the working schedule linked to the employee is altered. Steps to reproduce the issue: ----------------------------- 0. Install Attendance app (`hr_attendance` module). 1. Set a working schedule A to employee E 2. Go to the form view of the working schedule A and check `Flexible Hours` field to convert the working schedule as flexible working schedule. 3. Go to Attendance app Expected Behavior: ----------------- The Attendance app should loaded without any issue. Current Behavior: ---------------- A traceback is occurred saying we have a division by zero. opw-4492625 closes #203358 Related: odoo/enterprise#82125 Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com> Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
This was referenced Mar 26, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
[FIX] resource: make sure flexible resource don't use attendances
This commit makes sure the resource calendar attendance is not used for
a flexible resource even if that resource has a working schedule
with hours per day equals to 0 hour.
Remark: this fix has been moved in #202849
[FIX] hr: recompute is_flexible when working schedule becomes flexible
Before this commit, when the user sets a working schedule to an employee
and convert that working schedule into a flexible working schedule, the
employee is not considered as working with flexible hours.
This commit makes sure the
_compute_is_flexiblemethod defined inhr.employeemodel is triggered when theflexible_hoursfield of theworking schedule linked to the employee is altered.
Steps to reproduce the issue:
hr_attendancemodule).Flexible Hoursfield to convert the working schedule as flexible workingschedule.
Expected Behavior:
The Attendance app should loaded without any issue.
Current Behavior:
A traceback is occurred saying we have a division by zero.
opw-4492625
Forward-Port-Of: #203253