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: Exclude carry forwarded leaves from expired leaves (backport #2399) #2411

Merged
merged 2 commits into from
Nov 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 11, 2024

Issue

Mismatch of closing balance in employee leave balance and employee leave balance summary reports

Before

Screenshot 2024-11-08 at 12 00 52 AM Screenshot 2024-11-08 at 12 01 05 AM

After

Screenshot 2024-11-08 at 12 08 49 AM Screenshot 2024-11-08 at 12 09 06 AM

Fix

Excluded carry forwarded leaves from expired leaves
Added a test case for closing balance


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

@mergify mergify bot requested a review from ruchamahabal as a code owner November 11, 2024 07:30
@ruchamahabal ruchamahabal merged commit 9f7d711 into version-15-hotfix Nov 11, 2024
8 checks passed
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.35.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@krantheman krantheman deleted the mergify/bp/version-15-hotfix/pr-2399 branch November 13, 2024 11:13
@mastewalm
Copy link

Leave

this is what I am getting when I use carry forwarded leaves for 365 days and allocated leave for 3 years.

@asmitahase
Copy link
Collaborator

Leave

this is what I am getting when I use carry forwarded leaves for 365 days and allocated leave for 3 years.

Hi, could you please share more details about the annual leave type? Additionally if you are a customer, you can raise a support ticket so we can get into more details to fix this.

@mastewalm
Copy link

Leave Type: Annual Leave

image

Leave Periods

image

Leave policy: 2022/23 - 32; 2023/24 - 33; 2024/25 - 34

image

So based on this I allocated it to an individual. and the first two years balance, which is dated from July 1, 2022 to June 30, 2023, and July 1, 2023 to June 30, 2024, is ok but when it comes to the last year, which is July 1, 2024 to June 30, 2025, the balance becomes like the one I sent you previously. here is the image:

July 1, 2022 to June 30, 2023

image

July 1, 2023 to June 30, 2024

image

July 1, 2024 to June 30, 2025

image

Note:
This is just a consideration that no leave has been taken.

@mastewalm
Copy link

I think you also need to exclude expired carry forwarded leaves from leave application.

image

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.

4 participants