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 previous Leave Applications while enforcing Maximum Consecutive Leaves Allowed (backport #1097) #1182

Merged
merged 11 commits into from
Dec 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 14, 2023

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

krantheman and others added 11 commits December 14, 2023 11:08
…secutive Leaves Allowed

(cherry picked from commit 4ae0270)
(cherry picked from commit 085b56e)
Co-authored-by: Rucha Mahabal <[email protected]>
(cherry picked from commit 10eedd4)
Co-authored-by: Rucha Mahabal <[email protected]>
(cherry picked from commit c48976c)
(cherry picked from commit eca5d7f)
(cherry picked from commit 32919e6)
- simplify getting dates recursively

- avoid extra db call to fetch applications between dates

- remove unnecessary list comprehension for generator function

(cherry picked from commit 3f63beb)
@mergify mergify bot requested a review from ruchamahabal as a code owner December 14, 2023 11:08
@ruchamahabal ruchamahabal merged commit 06f784c into version-14-hotfix Dec 14, 2023
8 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-1097 branch December 14, 2023 11:29
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.20.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.

3 participants