-
Notifications
You must be signed in to change notification settings - Fork 688
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: calculate lwp based on LA for leave types including holidays on salary slip #1574
Merged
ruchamahabal
merged 1 commit into
frappe:version-15-hotfix
from
Axentorllc:fix-calc-lwp
Mar 26, 2024
Merged
fix: calculate lwp based on LA for leave types including holidays on salary slip #1574
ruchamahabal
merged 1 commit into
frappe:version-15-hotfix
from
Axentorllc:fix-calc-lwp
Mar 26, 2024
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
…tion on salary slip
KerollesFathy
changed the title
fix: leave type include holidays when calc lwp based on leave applica…
fix: leave type include holidays when calc lwp based on LA on salary slip
Mar 24, 2024
1 task
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## version-15-hotfix #1574 +/- ##
==================================================
Coverage 72.86% 72.86%
==================================================
Files 202 202
Lines 11172 11172
==================================================
Hits 8140 8140
Misses 3032 3032
|
KerollesFathy
changed the title
fix: leave type include holidays when calc lwp based on LA on salary slip
fix: calculate lwp based on LA for leave types including holidays on salary slip
Mar 24, 2024
ruchamahabal
approved these changes
Mar 26, 2024
ruchamahabal
pushed a commit
that referenced
this pull request
Mar 26, 2024
…salary slip (backport #1574) (#1578) (cherry picked from commit 03995bf) Co-authored-by: Kerolles Fathy <[email protected]>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Mar 27, 2024
# [15.15.0](v15.14.2...v15.15.0) (2024-03-27) ### Bug Fixes * add filter for employee in vehicle log (backport [#1571](#1571)) ([#1582](#1582)) ([3d6f333](3d6f333)) * blue color tap highlighting (backport [#1589](#1589)) ([#1593](#1593)) ([affdd4e](affdd4e)) * bold in group by and options mapping (backport [#1564](#1564)) ([#1580](#1580)) ([5f917ce](5f917ce)) * calculate lwp based on LA for leave types including holidays on salary slip ([#1574](#1574)) ([03995bf](03995bf)) * incorrect IFSC codes in bank remittance report (backport [#1538](#1538)) ([#1584](#1584)) ([920e8f4](920e8f4)) ### Features * **PWA:** allow adding attachments in Leave & Advances (backport [#1591](#1591)) ([#1592](#1592)) ([05d5844](05d5844))
🎉 This PR is included in version 15.15.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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.
Fixes #1573