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

chore: grant Employee role read permission for Payroll Period (backport #1746) #1747

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 7, 2024

Closes #1728


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

(cherry picked from commit ce86478)

# Conflicts:
#	hrms/payroll/doctype/payroll_period/payroll_period.json
@mergify mergify bot requested a review from ruchamahabal as a code owner May 7, 2024 06:04
@mergify mergify bot added the conflicts label May 7, 2024
Copy link
Contributor Author

mergify bot commented May 7, 2024

Cherry-pick of ce86478 has failed:

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

You are currently cherry-picking commit ce8647884.
  (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/payroll/doctype/payroll_period/payroll_period.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 ruchamahabal merged commit 4efdb1f into version-14-hotfix May 7, 2024
6 of 7 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-1746 branch May 7, 2024 06:33
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants