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.

Sign up for GitHub

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

Jump to bottom

16.0 mig hr timesheet overtime #31

Merged
merged 97 commits into from
Jun 6, 2024
Merged

16.0 mig hr timesheet overtime #31

merged 97 commits into from
Jun 6, 2024

Conversation

robinkeunen
Copy link
Member

Description

Odoo task (if applicable)

https://gestion.coopiteasy.be/web#id=11258&action=475&active_id=492&model=project.task&view_type=form&menu_id=

Checklist before approval

  • Tests are present (or not needed).
  • Credits/copyright have been changed correctly.
  • Change log snippet is present.
  • (If a new module) Moving this to OCA has been considered.

oca-ci and others added 30 commits January 26, 2024 18:09
@robinkeunen
[UPD] Update hr_timesheet_sheet_current.pot
01b00af
@github-grap-bot @robinkeunen
[BOT] post-merge updates
2d958b1
@carmenbianca @robinkeunen
[ADD] hr_timesheet_project_prevent_creation
5e31f3c 
Signed-off-by: Carmen Bianca Bakker <[email protected]>
@robinkeunen
[UPD] Update hr_timesheet_project_prevent_creation.pot
7291a48
@github-grap-bot @robinkeunen
[UPD] README.rst
24ff2b0
@victor-champonnois @robinkeunen
[IMP] hr_timesheet_project_prevent_creation: black, isort, prettier
a439104
@victor-champonnois @robinkeunen
[MIG] hr_timesheet_project_prevent_creation: Migration to 13.0
cca63db
@victor-champonnois @robinkeunen
[MIG] hr_timesheet_project_prevent_creation: Migration to 14.0
5c85277
@victor-champonnois @robinkeunen
[MIG] hr_timesheet_project_prevent_creation: Migration to 15.0
8044736
@victor-champonnois @robinkeunen
[MIG] hr_timesheet_project_prevent_creation: Migration to 16.0
5d7ccd5
@robinkeunen
[UPD] Update hr_timesheet_project_prevent_creation.pot
a824e7f
@github-grap-bot @robinkeunen
[BOT] post-merge updates
b8596f2
@vvrossem @robinkeunen
[WIP] hr_timesheet_overtime
c66e23a
@vvrossem @robinkeunen
[WIP] hr_timesheet_overtime
91a0881
@vvrossem @robinkeunen
[FIX] hr_timesheet_overtime / expected singleton
b84ca62
@vvrossem @robinkeunen
[ADD] hr_timesheet_overtime : compute datetime
d7d0492
@vvrossem @robinkeunen
[REM] hr_timesheet_overtime : unused test
79a07a4
@vvrossem @robinkeunen
[FIX] hr_timesheet_overtime : timesheet_overtime initial amount
4751964
@vvrossem @robinkeunen
[IMP] hr_timesheet_overtime : limit view to group_hr_user
611facd
@vvrossem @robinkeunen
[ADD] hr_timesheet_overtime : timesheet_overtime in list/tree view
1981f6a
@vvrossem @robinkeunen
[REF] hr_timesheet_overtime : minor changes
b683432
@vvrossem @robinkeunen
[FIX] hr_timesheet_overtime : correct use of @api.depends
518ff39
@vvrossem @robinkeunen
[ADD] hr_timesheet_overtime: unit tests
1e2a435
@vvrossem @robinkeunen
[IMP] hr_timesheet_overtime: black formatter
388bba5
@vvrossem @robinkeunen
[FIX] hr_timesheet_overtime: @api.depends
231171e 
+ added `help` info
@vvrossem @robinkeunen
[ADD] hr_timesheet_overtime: readonly total_overtime
34f0052
@robinkeunen
[FIX] hr_timesheet_overtime: timesheet_overtime computation
cf395a6 
Computations should take into account the days at which the worker was supposed to work on
@robinkeunen
[FIX] hr_timesheet_overtime: total overtime is computed over employee
3126cf1
@robinkeunen
[IMP] hr_timesheet_overtime: oca conventions
31032d5
@robinkeunen
[REF] hr_timesheet_overtime: flake 8
a4bb901
@robinkeunen robinkeunen force-pushed the 16.0-mig-hr_timesheet_overtime branch from 95aa7db to bda1755 Compare February 2, 2024 13:30
@robinkeunen robinkeunen force-pushed the 16.0-mig-hr_timesheet_overtime branch from bda1755 to 1ddbf9a Compare February 2, 2024 13:32
remytms
remytms reviewed Feb 8, 2024
View reviewed changes
Copy link
Member

@remytms remytms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question about the README.md file, the rest seams correct.

README.md Show resolved Hide resolved
remytms
remytms approved these changes Feb 12, 2024
View reviewed changes
Copy link
Member

@remytms remytms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

robinkeunen and others added 2 commits February 15, 2024 15:43
@robinkeunen @carmenbianca
[ADD] hr_timesheet_overtime: test-requirements.txt
3afa2f7
@carmenbianca
[FIX] Update copier template
2be7e62 
This was previously using the OCA's instead of our own

Signed-off-by: Carmen Bianca BAKKER <[email protected]>
@carmenbianca carmenbianca force-pushed the 16.0-mig-hr_timesheet_overtime branch from 9ebc3ba to 2be7e62 Compare February 15, 2024 14:43
carmenbianca
carmenbianca approved these changes Apr 2, 2024
View reviewed changes
Copy link
Member

@carmenbianca carmenbianca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, one comment

hr_timesheet_overtime/views/resource_view.xml Outdated Show resolved Hide resolved
hr_timesheet_overtime/views/resource_view.xml Outdated Show resolved Hide resolved
@github-grap-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

1 similar comment
@github-grap-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@carmenbianca
Copy link
Member

@robinkeunen can you follow up? :)

@remytms
Copy link
Member

remytms commented Jun 6, 2024

\ocabot merge nobump

@remytms
Copy link
Member

remytms commented Jun 6, 2024

/ocabot merge nobump

@github-grap-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 16.0-ocabot-merge-pr-31-by-remytms-bump-nobump, awaiting test results.

@github-grap-bot github-grap-bot merged commit df7b7f0 into 16.0 Jun 6, 2024
2 checks passed
@github-grap-bot
Copy link
Contributor

Congratulations, your PR was merged at 13f79ee. Thanks a lot for contributing to coopiteasy. ❤️

@github-grap-bot github-grap-bot deleted the 16.0-mig-hr_timesheet_overtime branch June 6, 2024 16:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@remytms remytms remytms approved these changes

@carmenbianca carmenbianca carmenbianca approved these changes

@victor-champonnois victor-champonnois Awaiting requested review from victor-champonnois

@huguesdk huguesdk Awaiting requested review from huguesdk

Assignees
No one assigned
Labels
approved merged 🎉 needs review ready to merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@robinkeunen @github-grap-bot @carmenbianca @remytms @victor-champonnois @vvrossem @mclaeysb @huguesdk