-
Notifications
You must be signed in to change notification settings - Fork 7.9k
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: honour 'include holidays' setting while marking attendance for leave application #29425
Merged
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
6df9689
to
d780813
Compare
46d2f85
to
53c4928
Compare
Codecov Report
@@ Coverage Diff @@
## develop #29425 +/- ##
===========================================
+ Coverage 57.99% 58.04% +0.05%
===========================================
Files 1091 1091
Lines 67868 67880 +12
===========================================
+ Hits 39357 39402 +45
+ Misses 28511 28478 -33
|
d5a08b6
to
31ff0d3
Compare
31ff0d3
to
49c4a49
Compare
@Mergifyio backport version-13-hotfix |
✅ Backports have been created
|
KrithiRamani
pushed a commit
to KrithiRamani/erpnext
that referenced
this pull request
Mar 14, 2022
…eave application (backport frappe#29425) (frappe#29432) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Steps to replicate:
Create a Leave Type with Include holidays within leaves as leaves disabled
Create a Leave Application that has holidays in between.
Since the above setting is disabled, the holidays in between should not be considered as leaves but holidays.
Even though the Total Leave Days are calculated correctly (after excluding holidays), attendance is marked for 6 days (holidays included) with the status "On Leave"
Fix:
Honour Include holidays within leaves as leaves while marking attendance too, and not just while calculating Total Leave Days.
P.S: These had no side effects like affecting leave balance because total leave days are/were calculated fine. Just attendance marking was corrected.