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: test creation of leave ledger entries depending on leave type while encashing leaves (backport #2633) #2654

Open
wants to merge 4 commits into
base: version-15-hotfix
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 16, 2025

Added tests for #2614
(Yes, I shoulda added them along with the PR)


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

…y forward type.

(cherry picked from commit acd618f)

# Conflicts:
#	hrms/hr/doctype/leave_encashment/leave_encashment.py
(cherry picked from commit de06a25)

# Conflicts:
#	hrms/hr/doctype/leave_encashment/leave_encashment.py
…while creating leave encashment

(cherry picked from commit 2a1632e)
@mergify mergify bot added the conflicts label Jan 16, 2025
@mergify mergify bot requested a review from ruchamahabal as a code owner January 16, 2025 11:45
Copy link
Contributor Author

mergify bot commented Jan 16, 2025

Cherry-pick of acd618f has failed:

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

You are currently cherry-picking commit acd618f8.
  (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/leave_encashment/leave_encashment.py

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

Cherry-pick of de06a25 has failed:

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

You are currently cherry-picking commit de06a25a.
  (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/leave_encashment/leave_encashment.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

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.

1 participant