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

[12.0][ADD] resource_multi_week_work_time_from_contracts #324

Merged
merged 11 commits into from
Oct 9, 2024

Conversation

carmenbianca
Copy link
Member

@carmenbianca carmenbianca commented Sep 3, 2024

Description

A glue module between #323 and OCA/hr#1389

Built on top of #323, depends on OCA/hr#1389

Odoo task (if applicable)

T12626 and T12627

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.

@carmenbianca carmenbianca marked this pull request as draft September 3, 2024 11:42
@carmenbianca carmenbianca force-pushed the 12.0-glue-multi_week_work_time_from_contracts branch 4 times, most recently from fafde77 to 8d3f8ff Compare September 3, 2024 15:26
@carmenbianca
Copy link
Member Author

carmenbianca commented Sep 4, 2024

Capture d’écran du 2024-09-04 14-45-06

add a domain here to not be able to select children

edit: done

Copy link
Member

@huguesdk huguesdk left a comment

Choose a reason for hiding this comment

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

add a domain here to not be able to select children

edit: done

where is this done?

@carmenbianca
Copy link
Member Author

add a domain here to not be able to select children
edit: done

where is this done?

0202a82

carmenbianca and others added 10 commits October 9, 2024 15:20
…r refactoring

I changed some names in a refactor upstream. This commit reflects those
changes.

Signed-off-by: Carmen Bianca BAKKER <[email protected]>
…t datetime

I wrongly assumed that get_first_last_attendance used datetime objects.
This is not true. It uses date objects. This rectifies that.

Signed-off-by: Carmen Bianca BAKKER <[email protected]>
…one value

Upstream returns None, not False.

Signed-off-by: Carmen Bianca BAKKER <[email protected]>
@huguesdk huguesdk force-pushed the 12.0-glue-multi_week_work_time_from_contracts branch 2 times, most recently from 03259ce to f50e18a Compare October 9, 2024 13:30
@huguesdk huguesdk force-pushed the 12.0-glue-multi_week_work_time_from_contracts branch from c9c8a6b to e8a3700 Compare October 9, 2024 14:04
@huguesdk huguesdk marked this pull request as ready for review October 9, 2024 14:21
@huguesdk
Copy link
Member

huguesdk commented Oct 9, 2024

/ocabot merge nobump

@github-grap-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 12.0-ocabot-merge-pr-324-by-huguesdk-bump-nobump, awaiting test results.

@github-grap-bot github-grap-bot merged commit d54e73f into 12.0 Oct 9, 2024
2 checks passed
@github-grap-bot github-grap-bot deleted the 12.0-glue-multi_week_work_time_from_contracts branch October 9, 2024 14:36
@github-grap-bot
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants