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: create single leave ledger encashment entry for carry forwarding leave type (backport #2614) #2626

Merged
merged 2 commits into from
Jan 13, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 13, 2025

Issue

Double ledger entry is created for encashment if leave type is carry forwarding, which doesn't expire normally through expire leave job, leading to extra leaves which could be incorrectly carry forwarded with new allocation


Before

Screenshot 2025-01-10 at 2 34 11 PM Screenshot 2025-01-10 at 2 35 09 PM

After

Screenshot 2025-01-10 at 2 36 36 PM Screenshot 2025-01-10 at 2 37 08 PM

Fix

Added a condition to check if leave type is carry forwarding before creating second leave ledger entry


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

… leave type (#2614)

(cherry picked from commit d8e4234)

# Conflicts:
#	hrms/hr/doctype/leave_encashment/leave_encashment.py
@mergify mergify bot requested a review from ruchamahabal as a code owner January 13, 2025 05:31
@mergify mergify bot added the conflicts label Jan 13, 2025
Copy link
Contributor Author

mergify bot commented Jan 13, 2025

Cherry-pick of d8e4234 has failed:

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

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

@ruchamahabal ruchamahabal merged commit 5655bca into version-14-hotfix Jan 13, 2025
7 checks passed
frappe-pr-bot pushed a commit that referenced this pull request Jan 14, 2025
## [14.36.2](v14.36.1...v14.36.2) (2025-01-14)

### Bug Fixes

* add leaves to the correct allocation for compensatory leave request ([7cbc9d3](7cbc9d3))
* create single leave ledger encashment entry for carry forwarding leave type (backport [#2614](#2614)) ([#2626](#2626)) ([5655bca](5655bca))
* rectify and add more info to Leave Ledger validation message ([17e1546](17e1546))
* **SalarySlip:** use the correct variable for the function in _get_days_outside_period ([#2620](#2620)) ([81a6f28](81a6f28))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.36.2 🎉

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.

3 participants