-
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: exclude carry forwarded leaves while updating leaves after submission #381
Merged
ruchamahabal
merged 6 commits into
frappe:develop
from
ruchamahabal:fix-leave-balance-editing
Mar 14, 2023
Merged
fix: exclude carry forwarded leaves while updating leaves after submission #381
ruchamahabal
merged 6 commits into
frappe:develop
from
ruchamahabal:fix-leave-balance-editing
Mar 14, 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
ruchamahabal
force-pushed
the
fix-leave-balance-editing
branch
from
March 10, 2023 10:03
5ae1644
to
347e08c
Compare
ruchamahabal
changed the title
fix: leave allocation updated after submission is not considering carry forwarded leaves
fix: exclude carry forwarded leaves while updating leaves after submission
Mar 10, 2023
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #381 +/- ##
===========================================
- Coverage 71.68% 71.67% -0.01%
===========================================
Files 181 181
Lines 9344 9341 -3
===========================================
- Hits 6698 6695 -3
Misses 2646 2646
|
Unrelated test case failure from Salary Slip. Will fix in a separate PR. |
ruchamahabal
added a commit
that referenced
this pull request
Mar 14, 2023
fix: exclude carry forwarded leaves while updating leaves after submission (backport #381)
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.
Problem
15 leaves allocated with 5 carry forwarded leaves
Changed 15 leaves allocated to 10
New leaves allocated should be 10 not 5,
The intermediate leave ledger entry created on updating new leaves allocated is also considering carry forwarded leaves while finding out the difference to update existing allocation:
Fix
Ledger entry should only consider new leaves allocated and exclude carry forwarded leaves while computing difference
Leave balance is rectified: