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: set correct work experience during gratuity calculation (copy #2460) #2509

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2024

Fix work experience calculation for gratuity rules using the Take Exact Completed Years method. Previously, the experience was rounded to a whole number instead of using the exact decimal value (eg. 1.4 years was incorrectly treated as 1 year).

Gratuity Rule:
Screenshot 2024-11-29 at 12 59 56 PM

Before:
Screenshot 2024-11-29 at 1 12 41 PM

After:
Screenshot 2024-11-29 at 1 15 47 PM


This is an automatic copy of pull request #2460 done by [Mergify](https://mergify.com).

AyshaHakeem and others added 3 commits December 16, 2024 13:13
(cherry picked from commit ce75e4e)

# Conflicts:
#	hrms/payroll/doctype/gratuity/gratuity.json
(cherry picked from commit da17577)
Copy link
Contributor Author

mergify bot commented Dec 16, 2024

Cherry-pick of ce75e4e has failed:

On branch mergify/copy/version-14-hotfix/pr-2460
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ce75e4e9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/payroll/doctype/gratuity/gratuity.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/doctype/gratuity/gratuity.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ruchamahabal ruchamahabal merged commit fd70a60 into version-14-hotfix Dec 17, 2024
7 checks passed
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.35.4 🎉

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.

3 participants