-
Notifications
You must be signed in to change notification settings - Fork 1
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
[16.0][ADD] hr_timesheet_overtime_rate_holidays #34
Open
carmenbianca
wants to merge
6
commits into
16.0
Choose a base branch
from
16.0-add-holiday-compat
base: 16.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains 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
carmenbianca
commented
Jun 21, 2024
carmenbianca
force-pushed
the
16.0-add-holiday-compat
branch
from
June 28, 2024 14:27
7fa4bc0
to
c6568e6
Compare
Signed-off-by: Carmen Bianca BAKKER <carmen@coopiteasy.be>
This functionality was completely unlinked from the rest of hr_timesheet_overtime. I would have done this in two commits, but then the files wouldn't move over cleanly, losing history. Signed-off-by: Carmen Bianca BAKKER <carmen@coopiteasy.be>
Signed-off-by: Carmen Bianca BAKKER <carmen@coopiteasy.be>
Signed-off-by: Carmen Bianca BAKKER <carmen@coopiteasy.be>
carmenbianca
force-pushed
the
16.0-add-holiday-compat
branch
from
July 18, 2024 11:58
c6568e6
to
674fbb0
Compare
carmenbianca
force-pushed
the
16.0-add-holiday-compat
branch
3 times, most recently
from
July 18, 2024 12:26
2d85032
to
da0229e
Compare
carmenbianca
changed the title
[16.0][ADD] hr_timesheet_overtime_holidays
[16.0][ADD] hr_timesheet_overtime_rate_holidays
Jul 18, 2024
4 tasks
…pi.model method This makes it easier to extend with additional available information on the record. Signed-off-by: Carmen Bianca BAKKER <carmen@coopiteasy.be>
carmenbianca
force-pushed
the
16.0-add-holiday-compat
branch
from
July 18, 2024 13:20
da0229e
to
9d1f6b8
Compare
huguesdk
requested changes
Aug 30, 2024
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.
(only reviewed the last commit, the rest will go in #41.)
slight (cosmetic) changes needed, otherwise lgtm.
I really dislike writing Odoo tests. They take so so so so long to write, building a global state like a house of cards. Signed-off-by: Carmen Bianca BAKKER <carmen@coopiteasy.be>
carmenbianca
force-pushed
the
16.0-add-holiday-compat
branch
from
October 11, 2024 08:32
9d1f6b8
to
f4f11e3
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Don't apply overtime on timesheets made by holidays.
Based on top of #41
Odoo task (if applicable)
T12628
Checklist before approval