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: rewrite attendance query in qb & add test for half-day attendance overwritten by leave application (backport #1205) #1206

Merged
merged 2 commits into from
Dec 23, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 23, 2023

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

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (28a840b) 74.34% compared to head (79642b1) 74.35%.

Additional details and impacted files
@@                Coverage Diff                 @@
##           version-14-hotfix    #1206   +/-   ##
==================================================
  Coverage              74.34%   74.35%           
==================================================
  Files                    193      193           
  Lines                  10155    10156    +1     
==================================================
+ Hits                    7550     7551    +1     
  Misses                  2605     2605           
Files Coverage Δ
hrms/hr/doctype/attendance/attendance.py 70.42% <100.00%> (+0.20%) ⬆️

@ruchamahabal ruchamahabal merged commit 77e0917 into version-14-hotfix Dec 23, 2023
8 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-1205 branch December 23, 2023 06:39
@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