-
Notifications
You must be signed in to change notification settings - Fork 10.6k
[FW][ADD] Time Off: Adding new doc #7520
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
@larm-odoo @samueljlieber cherrypicking of pull request #7301 failed. stdout: stderr: 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 |
0453f3b to
99da7d1
Compare
|
@samueljlieber I think I fixed it and it's good to go! =) |
samueljlieber
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @larm-odoo! Thank you for resolving the conflicts here! You have it 90% correct, there were two issues that I explained below.
When resolving merge conflicts on FWPs, its a good idea to open the previous version and FWP version of the doc(s) on GitHub to reference the changes being made in your conflict resolution. 🙂
I will push up a commit after this review to fix these two items, and then complete the merge for the FWPs.
X-original-commit: 572a54b
99da7d1 to
3aa2f70
Compare
|
@robodoo r+ |
closes #7520 X-original-commit: 572a54b Signed-off-by: Samuel Lieber (sali) <[email protected]>
No documentation exists for Time Off. Forward port this to V 16 and 17, then targeted edits can be made.
Forward-Port-Of: #7301