-
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: Add hours_worked field #41
base: 16.0
Are you sure you want to change the base?
Conversation
Signed-off-by: Carmen Bianca BAKKER <[email protected]>
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 <[email protected]>
Signed-off-by: Carmen Bianca BAKKER <[email protected]>
Signed-off-by: Carmen Bianca BAKKER <[email protected]>
df0bc5c
to
90d017e
Compare
@huguesdk ready for review |
…pi.model method This makes it easier to extend with additional available information on the record. Signed-off-by: Carmen Bianca BAKKER <[email protected]>
a111618
to
22179d1
Compare
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.
great work! almost there.
note that the hours_worked
field doesn’t appear in the timesheet lines of tasks (on the task form). i think that this should be added.
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.
since this module doesn’t depend on hr_timesheet_overtime
, shouldn’t it be named something like hr_timesheet_worktime_rate
? all its ui mentions “overtime rate”, though.
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.
You're technically right, but this would require more refactoring and migration scripts. I propose we don't do this because there is no real need for this at the moment.
No functional differences; code is a little prettier. Signed-off-by: Carmen Bianca BAKKER <[email protected]>
8e9dc38
to
509de5b
Compare
By decreasing the priority, we make sure that hours_worked is as close to unit_amount as possible. Signed-off-by: Carmen Bianca BAKKER <[email protected]>
Signed-off-by: Carmen Bianca BAKKER <[email protected]>
2136f92
to
faf9def
Compare
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.
yay, lgtm! 🎉
Description
This should hopefully fix the problem described in #33 (comment)
I'm not 100% about this PR at time of writing:
I feel like everything related to different rates on certain days is not at all related to the rest of this module. This is a part of that. Maybe it should be factored out?Done.Odoo task (if applicable)
T12629
Checklist before approval