-
-
Notifications
You must be signed in to change notification settings - Fork 664
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
7.0 - [ADD] Worked Days from Timesheet with Activities #76
Merged
pedrobaeza
merged 5 commits into
OCA:7.0
from
savoirfairelinux:7.0-ddufresne-worked_days_activities_from_timesheet
Jun 2, 2015
Merged
7.0 - [ADD] Worked Days from Timesheet with Activities #76
pedrobaeza
merged 5 commits into
OCA:7.0
from
savoirfairelinux:7.0-ddufresne-worked_days_activities_from_timesheet
Jun 2, 2015
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
c5ec55f
to
de1892d
Compare
@max3903 The needs fixing label can be removed here. |
👍 |
de1892d
to
b0bc27c
Compare
e23d893
to
f8ec250
Compare
timesheet is completed. """ | ||
if not ( | ||
employee.contract_id.salary_computation_method == 'wage' | ||
and context.get('payslip_run_id') |
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.
The context can still be equal to None
here.
2 issues with non-initialized contexts notwithstanding, LGTM 👍 |
Okay, LGTM 👍 |
👍 |
pedrobaeza
added a commit
that referenced
this pull request
Jun 2, 2015
…s_activities_from_timesheet 7.0 - [ADD] Worked Days from Timesheet with Activities
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.
This module improves import_worked_days_from_timesheet by adding the activity, date_from, date_to and hourly_rate fields to worked days.