fix: Incorrect Earned Leaves Proration #35156
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
Consider current month for earned leaves if today date is after joining date
|
This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing. |
ruchamahabal
approved these changes
May 21, 2023
|
Already fixed in https://github.com/frappe/hrms |
frappe-pr-bot
pushed a commit
that referenced
this pull request
May 24, 2023
## [13.50.6](v13.50.5...v13.50.6) (2023-05-24) ### Bug Fixes * allow over-payment against SO ([#35079](#35079)) ([eb243c2](eb243c2)) * bypass flag in Customer Group wasn't effective ([f0c9d89](f0c9d89)) * change field-type to remove currency field from total row in export ([f65be40](f65be40)) * consider 0 if rate/qty are null (backport [#35338](#35338)) ([#35341](#35341)) ([387f8b9](387f8b9)) * depreciation schedule for existing assets [v14] (backport [#35255](#35255)) ([#35347](#35347)) ([7506132](7506132)) * error while saving job card ([d6427cf](d6427cf)) * get_query filters ([2aa7729](2aa7729)) * Incorrect Earned Leaves Proration ([#35156](#35156)) ([dc04b24](dc04b24)) * linter ([0a42e6f](0a42e6f)) * non manufacturing items/fixed asset items in BOM ([66ba74f](66ba74f)) * Pick List TypeError ([137898d](137898d)) * tds incorrectly calculated for invoice that are below threshold ([6c170ab](6c170ab)) * **test:** cumulative threshold checks ([06deecb](06deecb)) * use flt instead of mandatory field ([f63b866](f63b866))
|
🎉 This PR is included in version 13.50.6 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
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.
If today date is after or equal to employee's joining date, current month should be considered in earned leaves proration.
Test Cases