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: HR Settings permissions (backport #1924) #1925

Merged
merged 2 commits into from
Jun 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 26, 2024

This PR gives roles HR User and HR Manager 'Read' and 'Read & Write' permissions respectively for the HR Settings DocType.

The lack of these permissions causes users with these roles to get a permission error while viewing and editing Employee Checkins.


This is an automatic backport of pull request #1924 done by Mergify.

(cherry picked from commit 6062f15)

# Conflicts:
#	hrms/hr/doctype/hr_settings/hr_settings.json
@mergify mergify bot requested a review from ruchamahabal as a code owner June 26, 2024 10:30
@mergify mergify bot added the conflicts label Jun 26, 2024
Copy link
Contributor Author

mergify bot commented Jun 26, 2024

Cherry-pick of 6062f15 has failed:

On branch mergify/bp/version-14-hotfix/pr-1924
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit 6062f15ad.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/doctype/hr_settings/hr_settings.json

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ruchamahabal
Copy link
Member

@krantheman can you fix the conflicts?

@krantheman krantheman merged commit 5e24717 into version-14-hotfix Jun 27, 2024
7 checks passed
@krantheman krantheman deleted the mergify/bp/version-14-hotfix/pr-1924 branch June 27, 2024 06:55
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 14.28.8 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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