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(Employee Grievance): fix perms for Reports To field (backport #2103) #2105

Merged
merged 2 commits into from
Aug 21, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 21, 2024

Employee Grievance cannot be created by employees if their Reports To has been set in Employee master.

Ignoring User Permission for this field in Employee Grievance fixes the issue.


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

(cherry picked from commit 7ca003c)

# Conflicts:
#	hrms/hr/doctype/employee_grievance/employee_grievance.json
Copy link
Contributor Author

mergify bot commented Aug 21, 2024

Cherry-pick of 7ca003c has failed:

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

You are currently cherry-picking commit 7ca003c02.
  (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/employee_grievance/employee_grievance.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

@krantheman krantheman merged commit c9f3bc9 into version-15-hotfix Aug 21, 2024
7 checks passed
@krantheman krantheman deleted the mergify/bp/version-15-hotfix/pr-2103 branch August 21, 2024 11:10
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 15.27.1 🎉

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.

2 participants