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: Earned Leave allocation based on joining date fixes (backport #29711) #29763

Merged
merged 7 commits into from
Feb 11, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 11, 2022

This is an automatic backport of pull request #29711 done by Mergify.
Cherry-pick of c7be9ef has failed:

On branch mergify/bp/version-13-hotfix/pr-29711
Your branch is ahead of 'origin/version-13-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit c7be9ef5d2.
  (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:   erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py

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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…g date too

(cherry picked from commit c7be9ef)

# Conflicts:
#	erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py
(cherry picked from commit cbaadcf)
@ruchamahabal ruchamahabal merged commit 672a633 into version-13-hotfix Feb 11, 2022
@ruchamahabal ruchamahabal deleted the mergify/bp/version-13-hotfix/pr-29711 branch February 11, 2022 16:13
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 9, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant