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][IMP] hr_employee_age: Add groups="hr.group_hr_user" to age field according to birthday field definition #1270

Merged
merged 1 commit into from
Jul 17, 2023
Merged

[16.0][IMP] hr_employee_age: Add groups="hr.group_hr_user" to age field according to birthday field definition #1270

merged 1 commit into from
Jul 17, 2023

Conversation

victoralmau
Copy link
Member

FWP from 15.0: #1268

Add groups="hr.group_hr_user" to age field according to birthday field definition (https://github.com/odoo/odoo/blob/16.0/addons/hr/models/hr_employee.py#L71)

Please @pedrobaeza and @CarlosRoca13 can you review it?

@Tecnativa TT43046

@pedrobaeza pedrobaeza added this to the 16.0 milestone Jul 17, 2023
@pedrobaeza
Copy link
Member

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 16.0-ocabot-merge-pr-1270-by-pedrobaeza-bump-patch, awaiting test results.

@OCA-git-bot
Copy link
Contributor

@pedrobaeza The merge process could not be finalized, because command git push origin 16.0-ocabot-merge-pr-1270-by-pedrobaeza-bump-patch:16.0 failed with output:

To https://github.com/OCA/hr
 ! [rejected]          16.0-ocabot-merge-pr-1270-by-pedrobaeza-bump-patch -> 16.0 (fetch first)
error: failed to push some refs to 'https://***@github.com/OCA/hr'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@OCA-git-bot OCA-git-bot merged commit 92963ff into OCA:16.0 Jul 17, 2023
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at f73052d. 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
Reviewers

@CarlosRoca13 CarlosRoca13 CarlosRoca13 approved these changes

@pedrobaeza pedrobaeza pedrobaeza approved these changes

Assignees
No one assigned
Labels
approved merged 🎉
Projects
None yet
Milestone
16.0
Development

Successfully merging this pull request may close these issues.
4 participants
@victoralmau @pedrobaeza @OCA-git-bot @CarlosRoca13