-
Notifications
You must be signed in to change notification settings - Fork 795
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: gratuity calculation for 'Sum of all previous slabs' option #2471
Open
AyshaHakeem
wants to merge
5
commits into
frappe:develop
Choose a base branch
from
AyshaHakeem:fix-gratuity-calculation
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
This needs tests |
@AyshaHakeem Hope this will resolve soon. |
…s with experience matching the upper limit of a slab
nabinhait
requested changes
Jan 2, 2025
slab_found = True | ||
|
||
elif self._is_experience_within_slab(slab, experience): | ||
gratuity_amount += ( | ||
years_left * total_component_amount * slab.fraction_of_applicable_earnings | ||
) | ||
slab_found = True | ||
years_left -= slab.to_year - slab.from_year |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The years_left
calculation does not seem correct. In the case of _is_experience_within_slab
, you should directly set years_left = 0
.
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.
Employees with experience matching the upper limit of a slab are now correctly applied the appropriate Gratuity Rule Slab for Gratuity calculation.
Example:
For an Employee with exactly 5 years of experience and the following Gratuity Rule Slabs:
0-5 years: Fraction = 0.7
5-0 years: Fraction = 1.0
The calculation incorrectly placed the employee in the second slab due to the condition in
_is_experience_within_slab
. This caused an amount higher than the correct gratuity amount to be calculated.Also, the
years_left
calculation was only updated within the if_is_experience_beyond_slab
block.