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: expired leave balance is -ve when leaves taken > carry forwarded expired leaves (backport #1288) #1292

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 10, 2024

This is an automatic backport of pull request #1288 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

@mergify mergify bot requested a review from ruchamahabal as a code owner January 10, 2024 11:36
@ruchamahabal ruchamahabal merged commit 48dfe64 into version-15-hotfix Jan 10, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1288 branch January 10, 2024 11:40
frappe-pr-bot pushed a commit that referenced this pull request Jan 10, 2024
# [15.9.0](v15.8.0...v15.9.0) (2024-01-10)

### Bug Fixes

* cannot update status for Group Goals ([fba6087](fba6087))
* comp leave request fails on leave period boundary dates ([82144c3](82144c3))
* error message tense ([bc6024c](bc6024c))
* **Expense Claim:** description not saved (backport [#1265](#1265)) ([#1267](#1267)) ([60c099b](60c099b))
* expired leave balance is -ve when leaves taken > carry forwarded expired leaves (backport [#1288](#1288)) ([#1292](#1292)) ([48dfe64](48dfe64))
* get current leave period for leave balance report (backport [#1277](#1277)) ([#1279](#1279)) ([beb3d82](beb3d82))
* incorrect night shift assignment timings in shift calendar ([a12df94](a12df94))
* naming ([2fd540d](2fd540d))
* salary slip cancellation with loan repayment (backport [#1270](#1270)) ([#1271](#1271)) ([98702b0](98702b0))
* **Salary Slip:** data evaluation (backport [#1283](#1283)) ([#1290](#1290)) ([c7b4dfc](c7b4dfc))
* show error after confirm dialog ([c75a3b9](c75a3b9))
* status past tense ([9221bc0](9221bc0))
* translation strings ([b8f8b86](b8f8b86))
* ui update on progress update ([f23f995](f23f995))

### Features

* add bulk action for updating status ([2885a51](2885a51))
* add bulk unarchive and reopen ([c9fdb37](c9fdb37))
* **Goal Tree:** add Mark as Completed ([6e445aa](6e445aa))
* make Bulk Assign Structure a primary button and add Branch filter (backport [#1197](#1197)) ([#1276](#1276)) ([1fedea1](1fedea1))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.9.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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants