Skip to content
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: consider payment days = total working days in the last salary slip while calculating Gratuity (backport #1806) #1809

Merged
merged 5 commits into from
May 24, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 24, 2024

Gratuity is calculated based on last drawn salary but if the employee worked for less number of days in the last payroll cycle, gratuity amount gets affected.

Always keep payment days = total working days irrespective of attendance making it non-deterministic


This is an automatic backport of pull request #1806 done by Mergify.

…ip while calculating Gratuity

(cherry picked from commit 52835d2)
- to avoid passing around args repetitively

(cherry picked from commit c07543e)
- make gratuity settings a class property to avoid refetching

- get rid of unnecessary variables

- extract complex conditions into bool functions

(cherry picked from commit 4b1437b)
- remove unnecessary test

(cherry picked from commit e474d86)
@mergify mergify bot requested a review from ruchamahabal as a code owner May 24, 2024 10:38
@ruchamahabal ruchamahabal merged commit 6101ac6 into version-14-hotfix May 24, 2024
7 of 8 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-1806 branch May 24, 2024 11:04
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.28.2 🎉

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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants