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

[FIX] [16.0] hr_contract_update_overtime: Reorganize Leaves across Contracts + Message #172

Merged

Conversation

Shide
Copy link

@Shide Shide commented Jul 17, 2024

  • Note when Updating Overtime
  • Reorganize leaves across Calendars when Update Overtime from Contract History

MT-6583 @moduon @rafaelbn @loida-vm @fcvalgar please reivew if you want 😄

@OCA-git-bot
Copy link
Contributor

Hi @rafaelbn,
some modules you are maintaining are being modified, check this out!

@Shide Shide marked this pull request as draft July 17, 2024 11:49
@rafaelbn
Copy link
Member

Ping me when I can test it @Shide ! ❤️ Thank you! 😄

Copy link
Member

@rafaelbn rafaelbn left a comment

Choose a reason for hiding this comment

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

Functional tested in runboat! 👍🏼

Just missing fix tests @yajo

@@ -38,6 +38,9 @@ You can Update Overtime in different ways:
- Header button on Contract History form view
- Header button on Contract form view

Choose a reason for hiding this comment

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

  • Header button on Contract form view is visible if the user is responsible HR for the employee

Copy link

@fcvalgar fcvalgar left a comment

Choose a reason for hiding this comment

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

…attendance

If you run this module's tests while it's being installed for the 1st time, `hr_holidays_attendance` will enter its test scope and add extra constrains to which leaves are considered for employees. If we don't follow those constrains, the tests fail.

Thus here I'm using that module lazily, while not being strictly required as a dependency. If installed, I fulfill the data required for it to work, and then tests are more resilient.

@moduon MT-6583
Copy link
Member

@yajo yajo left a comment

Choose a reason for hiding this comment

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

I fixed the tests here and it should be ready to merge, but I cannot take it out from draft. Could you do it please @Shide?

@Shide Shide marked this pull request as ready for review July 23, 2024 13:08
@Shide
Copy link
Author

Shide commented Jul 23, 2024

I fixed the tests here and it should be ready to merge, but I cannot take it out from draft. Could you do it please @Shide?

Done

@Shide
Copy link
Author

Shide commented Jul 29, 2024

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 16.0-ocabot-merge-pr-172-by-Shide-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit e8e0182 into OCA:16.0 Jul 29, 2024
5 of 7 checks passed
@OCA-git-bot
Copy link
Contributor

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

@Shide Shide deleted the 16.0-improvements-hr_contract_update_overtime branch July 29, 2024 07:21
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.

5 participants