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

[16.0][IMP] hr_timesheet_begin_end: Change line overlap domain from looking for user to employee #657

Merged
merged 1 commit into from May 8, 2024

Conversation

dtec-landoo
Copy link

With this PR, the only thing I want to change is to replace the user with the employee in the domain. I don't see any logic in checking if the users are the same, since sometimes it can happen that the employee doesn't have a user. In other words, the employee will never be false, whereas the user might be.

Copy link

@oo-landoo oo-landoo left a comment

Choose a reason for hiding this comment

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

Approved

Copy link

@rp-landoo rp-landoo left a comment

Choose a reason for hiding this comment

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

Functional approval

@OCA-git-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). 🤖

@dtec-landoo
Copy link
Author

@guewen @luismontalba @ernestotejeda @astirpe @schhatbar-initos Hello, I want to merge the changes into the module. Can someone approve the changes?

@dtec-landoo
Copy link
Author

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

Sorry @dtec-landoo you are not allowed to merge.

To do so you must either have push permissions on the repository, or be a declared maintainer of all modified addons.

If you wish to adopt an addon and become it's maintainer, open a pull request to add your GitHub login to the maintainers key of its manifest.

@dtec-landoo
Copy link
Author

@pedrobaeza Ready to merge please.

@pedrobaeza pedrobaeza added this to the 16.0 milestone May 8, 2024
Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

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

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 16.0-ocabot-merge-pr-657-by-pedrobaeza-bump-patch, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit e5ccfc0 into OCA:16.0 May 8, 2024
1 check passed
@OCA-git-bot
Copy link
Contributor

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

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.

None yet

5 participants