-
Notifications
You must be signed in to change notification settings - Fork 754
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: consider cases for partially consumed carry-forwarded and new leaves with carry-forwarded expiry #370
Merged
ruchamahabal
merged 6 commits into
frappe:develop
from
ruchamahabal:fix-balance-edge-cases
Mar 9, 2023
Merged
fix: consider cases for partially consumed carry-forwarded and new leaves with carry-forwarded expiry #370
ruchamahabal
merged 6 commits into
frappe:develop
from
ruchamahabal:fix-balance-edge-cases
Mar 9, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #370 +/- ##
===========================================
- Coverage 71.69% 71.67% -0.02%
===========================================
Files 181 181
Lines 9334 9342 +8
===========================================
+ Hits 6692 6696 +4
- Misses 2642 2646 +4
|
…hile calculating balance
- the above two cases weren't considering the split between cf leaves taken and new leaves taken and substracting all consumed leaves from cf leaves
ruchamahabal
force-pushed
the
fix-balance-edge-cases
branch
from
March 9, 2023 07:41
ab9aef9
to
84ee1dd
Compare
ruchamahabal
changed the title
fix: consider leaves taken while calculating expired carry-forwarded leaves
fix: consider cases for partially consumed carry-forwarded and new leaves with carry-forwarded expiry
Mar 9, 2023
… leaves allocation
ruchamahabal
added a commit
that referenced
this pull request
Mar 9, 2023
fix: consider cases for partially consumed carry-forwarded and new leaves with carry-forwarded expiry (backport #370)
ruchamahabal
added
the
backport version-13-hotfix
Needs manual backporting to frappe/erpnext
label
Apr 3, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Extending the edge cases from #335
Setup:
16 new leaves allocated + 5 carry forwarded leaves that will expire on 28-02-2023
Total 21 leaves allocated
Case 3: Leave Application across carry forwarded leave expiry
Before:
After:
Case 4: Leave Application after carry forwarded leave expiry
Leave Application created after carry forwarded leave expiry date (28-02-2023)
Before:
After: