-
Notifications
You must be signed in to change notification settings - Fork 852
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
feat: Leave Encashment Enhancements #817
Merged
ruchamahabal
merged 11 commits into
frappe:develop
from
ruchamahabal:enhance-leave-encashment
Oct 23, 2023
Merged
feat: Leave Encashment Enhancements #817
ruchamahabal
merged 11 commits into
frappe:develop
from
ruchamahabal:enhance-leave-encashment
Oct 23, 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
f30cd8d
to
4c6abcf
Compare
Codecov Report
@@ Coverage Diff @@
## develop #817 +/- ##
===========================================
+ Coverage 73.83% 73.88% +0.04%
===========================================
Files 195 195
Lines 10397 10412 +15
===========================================
+ Hits 7677 7693 +16
+ Misses 2720 2719 -1
|
a9b521f
to
4b52caa
Compare
5e29d25
to
1b66524
Compare
Tests passed but coverage upload failed. Merging |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
no-docs
(temp)Closes #921
Leave Type
Leave Encashment
Instead of making Encashable Days directly editable - since its value is primarily derived from the leave balance & leave type settings:
Added Actual Encashable Days: Denotes the number of leaves eligible for encashment based on leave type settings
Added Encashment Days: By default set to actual encashable days but the user can choose to overwrite this to encash less number of leaves than the actual encashable days value. Added validations and msgprints for the same
Patch for setting the above fields = encashable days (old field)