Skip to content

[FW][FIX] project_timesheet_holidays: restore public holiday timesheets a…#153273

Closed
fw-bot wants to merge 1 commit intoodoo:masterfrom
odoo-dev:master-16.0-opw-3550523-project-timesheet-holidays-fix-restore-global-leave-on-refuse-sigo-w0CN-fw
Closed

[FW][FIX] project_timesheet_holidays: restore public holiday timesheets a…#153273
fw-bot wants to merge 1 commit intoodoo:masterfrom
odoo-dev:master-16.0-opw-3550523-project-timesheet-holidays-fix-restore-global-leave-on-refuse-sigo-w0CN-fw

Conversation

@fw-bot
Copy link
Copy Markdown
Contributor

@fw-bot fw-bot commented Feb 8, 2024

…fter refusal

Before this commit, if a public holiday was created on dates overlapping an existing validated leave, the timesheet entries for the public holiday would not be created as they already existed for the leave. If the leave was then refused or cancelled, the timesheet records linked to it would be removed and the employee would have missing timesheet entries for the public holiday.

This commit fixes this behavior by recreating the public holiday timesheet records for the affected employees when refusing their leave.

opw-3550523

linked to com: #145522

Forward-Port-Of: #153118
Forward-Port-Of: #151522

…fter refusal

Before this commit, if a public holiday was created on dates overlapping
an existing validated leave, the timesheet entries for the public
holiday would not be created as they already existed for the leave. If
the leave was then refused or cancelled, the timesheet records linked to
it would be removed and the employee would have missing timesheet
entries for the public holiday.

This commit fixes this behavior by recreating the public holiday
timesheet records for the affected employees when refusing their leave.

opw-3550523

linked to com: odoo#145522

X-original-commit: 5eb6054
@robodoo robodoo added the forwardport This PR was created by @fw-bot label Feb 8, 2024
@robodoo
Copy link
Copy Markdown
Contributor

robodoo commented Feb 8, 2024

Pull request status dashboard.

@fw-bot
Copy link
Copy Markdown
Contributor Author

fw-bot commented Feb 8, 2024

@goffauxs @xavierbol this PR targets master and is the last of the forward-port chain containing:

To merge the full chain, use

@fw-bot r+

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@fw-bot
Copy link
Copy Markdown
Contributor Author

fw-bot commented Feb 8, 2024

@goffauxs @xavierbol ci/style failed on this forward-port PR

@fw-bot
Copy link
Copy Markdown
Contributor Author

fw-bot commented Feb 8, 2024

@goffauxs @xavierbol ci/security failed on this forward-port PR

@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label Feb 8, 2024
@xavierbol
Copy link
Copy Markdown
Contributor

fw-bot r+

robodoo pushed a commit that referenced this pull request Feb 10, 2024
…fter refusal

Before this commit, if a public holiday was created on dates overlapping
an existing validated leave, the timesheet entries for the public
holiday would not be created as they already existed for the leave. If
the leave was then refused or cancelled, the timesheet records linked to
it would be removed and the employee would have missing timesheet
entries for the public holiday.

This commit fixes this behavior by recreating the public holiday
timesheet records for the affected employees when refusing their leave.

opw-3550523

linked to com: #145522

closes #153273

X-original-commit: 5eb6054
Signed-off-by: Xavier Bol (xbo) <xbo@odoo.com>
@robodoo robodoo closed this Feb 10, 2024
@robodoo robodoo added the 17.2 label Feb 10, 2024
@fw-bot fw-bot deleted the master-16.0-opw-3550523-project-timesheet-holidays-fix-restore-global-leave-on-refuse-sigo-w0CN-fw branch February 24, 2024 10:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

17.2 forwardport This PR was created by @fw-bot OE the report is linked to a support ticket (opw-...)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants