[12.0][FIX] hr_holidays: Re-assign holidays to resource.calendar.leaves #2352
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
pedrobaeza
changed the title
MiquelRForgeFlow
approved these changes
Jun 17, 2020
Member
Author
|
/ocabot merge nobump |
Contributor
|
What a great day to merge this nice PR. Let's do it! |
Contributor
|
@pedrobaeza your merge command was aborted due to failed check(s), which you can inspect on this commit of 12.0-ocabot-merge-pr-2352-by-pedrobaeza-bump-nobump. After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red. |
They were disconnected due to the column renaming, but can't be done before or we will get a FK constraint error.
pedrobaeza
force-pushed
the
12.0-hr_holidays-rcl_holiday_id
branch
from
c4bb5c5 to
7547a1a
Compare
Member
Author
|
/ocabot merge nobump |
Contributor
|
Hey, thanks for contributing! Proceeding to merge this for you. |
Contributor
|
Congratulations, your PR was merged at 4573ba2. Thanks a lot for contributing to OCA. ❤️ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
They were disconnected due to the column renaming, but can't be done before or we will get a FK constraint error.
@Tecnativa TT24299