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

feat(Gratuity): allow setting work experience manually (backport #1541) #1542

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 14, 2024

Added an option to manually set work experience in gratuity
image

Will refactor the code in a separate PR

no-docs (temp)

Useful if historical attendance data is not present in the system or need to conditionally count a year in years of experience


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

@mergify mergify bot requested a review from ruchamahabal as a code owner March 14, 2024 21:47
@ruchamahabal ruchamahabal merged commit 04f86ab into version-14-hotfix Mar 15, 2024
8 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-1541 branch March 15, 2024 01:58
frappe-pr-bot pushed a commit that referenced this pull request Mar 15, 2024
# [14.24.0](v14.23.0...v14.24.0) (2024-03-15)

### Bug Fixes

* convert datetime to date ([859dd8b](859dd8b))
* get blocked days in the correct order ([bead61f](bead61f))
* half day ([8ad3a63](8ad3a63))
* **Leave Application:** calendar view ([3f16093](3f16093))
* remove employee_name and leave_type before checking in events ([ad05477](ad05477))
* remove unused whitelisting from get_applicable_block_dates ([1e7064c](1e7064c))
* set employee before company ([764a1ff](764a1ff))
* show blocked dates as "allDay" ([867d838](867d838))
* use get_single_value instead of get_value ([c2d8743](c2d8743))

### Features

* **Gratuity:** allow setting work experience manually ([#1541](#1541)) ([#1542](#1542)) ([04f86ab](04f86ab))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.24.0 🎉

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

Successfully merging this pull request may close these issues.

2 participants