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 #1806

Merged
merged 5 commits into from
May 24, 2024

Conversation

ruchamahabal
Copy link
Member

@ruchamahabal ruchamahabal commented May 23, 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

@ruchamahabal ruchamahabal changed the title fix: consider payment days = working days in the last salary slip while calculating Gratuity fix: consider payment days = total working days in the last salary slip while calculating Gratuity May 23, 2024
- to avoid passing around args repetitively
@ruchamahabal ruchamahabal force-pushed the fix-gratuity branch 2 times, most recently from 20dc9ab to 2f4c971 Compare May 23, 2024 15:48
- make gratuity settings a class property to avoid refetching

- get rid of unnecessary variables

- extract complex conditions into bool functions
@ruchamahabal ruchamahabal marked this pull request as ready for review May 24, 2024 10:07
@ruchamahabal ruchamahabal merged commit e41a1e5 into frappe:develop May 24, 2024
8 checks passed
ruchamahabal added a commit that referenced this pull request May 24, 2024
…1806

fix: consider payment days = total working days in the last salary slip while calculating Gratuity (backport #1806)
ruchamahabal added a commit that referenced this pull request May 24, 2024
…1806

fix: consider payment days = total working days in the last salary slip while calculating Gratuity (backport #1806)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant