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: update payable leave encashment doc handling in full and final statement (backport #2843) #2844

Merged
merged 4 commits into from
Mar 9, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 9, 2025

  • Add Status and Pay Via Payment Entry filters to Leave Encashment payables in Full and Final Statement
  • Update payment status of Leave Encashment doc based on FnF payment status
  • Add test

fnf gif


This is an automatic backport of pull request #2843 done by [Mergify](https://mergify.com).

(cherry picked from commit 3589e04)

# Conflicts:
#	hrms/hr/doctype/leave_encashment/test_leave_encashment.py
@mergify mergify bot requested a review from ruchamahabal as a code owner March 9, 2025 06:49
@mergify mergify bot added the conflicts label Mar 9, 2025
Copy link
Contributor Author

mergify bot commented Mar 9, 2025

Cherry-pick of 3589e04 has failed:

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

You are currently cherry-picking commit 3589e049.
  (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/test_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

@AyshaHakeem AyshaHakeem removed the request for review from ruchamahabal March 9, 2025 11:34
@AyshaHakeem AyshaHakeem merged commit 59dbd48 into version-15-hotfix Mar 9, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant