[17.0][ADD] project_timesheet_holidays_contract
#1290
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
vvrossem
approved these changes
Jul 29, 2024
project_timesheet_holidays_contract/tests/test_hr_employee_calendar.py
Outdated
Show resolved
Hide resolved
project_timesheet_holidays_contract/tests/test_hr_leave_days_timesheet.py
Outdated
Show resolved
Hide resolved
yankinmax
force-pushed
the
add-project_timesheet_holidays_contract
branch
from
e6804d5
to
fe6f507
Compare
imlopes
approved these changes
Sep 6, 2024
SilvioC2C
suggested changes
Sep 6, 2024
yankinmax
force-pushed
the
add-project_timesheet_holidays_contract
branch
from
fe6f507
to
4214bf0
Compare
SilvioC2C
suggested changes
Sep 9, 2024
yankinmax
force-pushed
the
add-project_timesheet_holidays_contract
branch
from
4214bf0
to
4c78005
Compare
|
@SilvioC2C PR is updated, thanks for the perfect suggestions. |
SilvioC2C
approved these changes
Sep 9, 2024
yankinmax
force-pushed
the
add-project_timesheet_holidays_contract
branch
from
f2bfc8d
to
81c88c6
Compare
Comment on lines
+31
to
+32
| Module allows to take into account employee contract along with provided | ||
| end date when timesheet on time off. |
There was a problem hiding this comment.
IMO you could develop a bit more how this works, because after reading it twice, I'm still not sure what the module does.
Comment on lines
+39
to
+44
| # If only one contract, return it regardless of its state | ||
| if len(contracts) == 1: | ||
| return contracts[0].resource_calendar_id | ||
|
|
||
| # Filter out cancelled contracts if there are multiple contracts | ||
| valid_contracts = contracts.filtered(lambda c: c.state != "cancel") |
There was a problem hiding this comment.
So in case there's only one contract that is canceled, it still must be used? 🤨
| self = self.with_context(date_to=to_datetime) | ||
|
|
||
| result = {} | ||
| for employee in self: |
There was a problem hiding this comment.
For all these functions, wouldn't grouping employees by calendar improve perf instead of iterating through all the employees?
simahawk
requested changes
Sep 9, 2024
| @@ -0,0 +1 @@ | |||
| Module allows to take into account employee contract along with provided end date when timesheet on time off. | |||
SilvioC2C
reviewed
Oct 28, 2024
Comment on lines
+24
to
+44
| contracts = ( | ||
| self.sudo() | ||
| .with_context(active_test=True) | ||
| .env["hr.contract"] | ||
| .search( | ||
| [ | ||
| ("employee_id", "=", self.id), | ||
| ("date_start", "<=", date_from), | ||
| "|", | ||
| ("date_end", ">=", date_to), | ||
| ("date_end", "=", False), | ||
| ] | ||
| ) | ||
| ) | ||
|
|
||
| # If only one contract, return it regardless of its state | ||
| if len(contracts) == 1: | ||
| return contracts[0].resource_calendar_id | ||
|
|
||
| # Filter out cancelled contracts if there are multiple contracts | ||
| valid_contracts = contracts.filtered(lambda c: c.state != "cancel") |
There was a problem hiding this comment.
I tested this w/ Odoo standard code, and I think states are not handled correctly.
Contracts can be differentiated in these macro-groups:
state == 'close': the contract is considered as expired for the employeestate == 'cancel': the contract is considered as cancelled for the employeestate == 'open' and kanban_state != 'blocked': the contract is considered as running for the employeestate == 'open' and kanban_state == 'blocked': the contract is considered as running for the employee, but will be closed as soon as the end date is reachedstate == 'draft' and kanban_state != 'done': the contract is not running for the employeestate == 'draft' and kanban_state == 'done': the contract is not running for the employee, but will be moved to "open" as soon as the contract's start date is met
This is something that should be taken into account when retrieving the employee's contract, and therefore its calendar.
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.
Module allows to take into account employee contract along with provided end date when timesheet on time off.