hr icon indicating copy to clipboard operation
hr copied to clipboard

[16.0][ADD] resource_multi_week_calendar

Open carmenbianca opened this issue 1 year ago • 3 comments

Allow a calendar to alternate between multiple weeks.

An implementation of this functionality exists in Odoo's resource module since version 13. In Odoo's implementation, you can only alternate between two weeks.

This implementation is more generic.

~~At time of writing, it is heavily WIP.~~

Internal task: T12626

carmenbianca avatar Aug 02 '24 08:08 carmenbianca

tagging @huguesdk , this is ready for review :)

carmenbianca avatar Sep 02 '24 09:09 carmenbianca

There hasn't been any activity on this pull request in the past 4 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days. If you want this PR to never become stale, please ask a PSC member to apply the "no stale" label.

github-actions[bot] avatar Jan 12 '25 12:01 github-actions[bot]

@OCA/human-resources-maintainers could someone please review (and merge) this (and #1389)? many thanks!

huguesdk avatar Jan 13 '25 08:01 huguesdk

There hasn't been any activity on this pull request in the past 4 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days. If you want this PR to never become stale, please ask a PSC member to apply the "no stale" label.

github-actions[bot] avatar May 25 '25 12:05 github-actions[bot]

@OCA/human-resources-maintainers could someone please review or merge this?

huguesdk avatar May 26 '25 08:05 huguesdk

/ocabot merge nobump

gurneyalex avatar May 27 '25 13:05 gurneyalex

@gurneyalex The merge process could not start, because command `git merge --no-ff -m 'Merge PR #1384 into 16.0

Signed-off-by gurneyalex' tmp-pr-1384` failed with output:

CONFLICT (modify/delete): test-requirements.txt deleted in HEAD and modified in tmp-pr-1384.  Version tmp-pr-1384 of test-requirements.txt left in tree.
Automatic merge failed; fix conflicts and then commit the result.

OCA-git-bot avatar May 27 '25 13:05 OCA-git-bot

@gurneyalex thanks for approving and trying to merge. i’ve just fixed the merge conflict, it should be all good now.

huguesdk avatar May 27 '25 15:05 huguesdk

/ocabot merge nobump

gurneyalex avatar May 30 '25 06:05 gurneyalex

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

OCA-git-bot avatar May 30 '25 06:05 OCA-git-bot

Congratulations, your PR was merged at 42a327e2153a3e8e14f7dad82e2cefe7583c0065. Thanks a lot for contributing to OCA. ❤️

OCA-git-bot avatar May 30 '25 06:05 OCA-git-bot