Skip to content
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

Conversation

ghost
Copy link

@ghost ghost commented Feb 16, 2015

This module improves import_worked_days_from_timesheet by adding the activity, date_from, date_to and hourly_rate fields to worked days.

@max3903 max3903 mentioned this pull request Feb 16, 2015
7 tasks
@max3903 max3903 added this to the 7.0 milestone Feb 17, 2015
@ghost ghost force-pushed the 7.0-ddufresne-worked_days_activities_from_timesheet branch from c5ec55f to de1892d Compare March 20, 2015 14:29
@coveralls
Copy link

Coverage Status

Coverage increased (+0.41%) to 32.09% when pulling de1892d on savoirfairelinux:7.0-ddufresne-worked_days_activities_from_timesheet into 563ed29 on OCA:7.0.

@ghost
Copy link
Author

ghost commented Mar 26, 2015

@max3903 The needs fixing label can be removed here.

@max3903
Copy link
Sponsor Member

max3903 commented Apr 6, 2015

👍

@ghost ghost force-pushed the 7.0-ddufresne-worked_days_activities_from_timesheet branch from de1892d to b0bc27c Compare April 23, 2015 18:46
@ghost ghost force-pushed the 7.0-ddufresne-worked_days_activities_from_timesheet branch from e23d893 to f8ec250 Compare May 24, 2015 18:43
timesheet is completed. """
if not (
employee.contract_id.salary_computation_method == 'wage'
and context.get('payslip_run_id')

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.

@mdietrichc2c
Copy link

2 issues with non-initialized contexts notwithstanding, LGTM 👍

@mdietrichc2c
Copy link

Okay, LGTM 👍

@charbeljc
Copy link

👍

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
@pedrobaeza pedrobaeza merged commit 2250566 into OCA:7.0 Jun 2, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants