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: comp leave request fails on leave period boundary dates (backport #1255) #1259

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 4, 2024

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

- system tries to find the leave period/allocation for updating balance based on the work from & to dates in comp leave but actual comp leave is applicable 1 day after the work end date

- find the period & allocation 1 day after work end date to update balance + fix relevant error messages

(cherry picked from commit 51ec04f)
@ruchamahabal
Copy link
Member

Unrelated test failures. HRA exemption failing test fixed in #1254

@ruchamahabal ruchamahabal merged commit 8b7be90 into version-14-hotfix Jan 5, 2024
7 of 8 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-1255 branch January 5, 2024 07:05
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.21.1 🎉

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.

2 participants