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(Expense Claim): status update on document cancellation (backport #1392) #1405

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 7, 2024

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

* fix(Expense Claim): status update on document cancellation

* chore: improve readability and flow

(cherry picked from commit 6403978)
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (7948d3c) 72.57% compared to head (3bc51c9) 72.58%.

Additional details and impacted files
@@                Coverage Diff                 @@
##           version-15-hotfix    #1405   +/-   ##
==================================================
  Coverage              72.57%   72.58%           
==================================================
  Files                    201      201           
  Lines                  11027    11029    +2     
==================================================
+ Hits                    8003     8005    +2     
  Misses                  3024     3024           
Files Coverage Δ
hrms/hr/doctype/expense_claim/expense_claim.py 85.43% <100.00%> (+0.11%) ⬆️

@ruchamahabal ruchamahabal merged commit 9c0cd3d into version-15-hotfix Feb 7, 2024
8 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1392 branch February 7, 2024 08:30
frappe-pr-bot pushed a commit that referenced this pull request Feb 13, 2024
## [15.11.1](v15.11.0...v15.11.1) (2024-02-13)

### Bug Fixes

* don't consider holidays as Absent when 'Consider Unmarked Attendance' = Absent ([deace66](deace66))
* exclude holidays while getting marked attendance days ([04df09e](04df09e))
* **Expense Claim:** status update on document cancellation (backport [#1392](#1392)) ([#1405](#1405)) ([9c0cd3d](9c0cd3d))
* handle attendance condition for missing holidays ([0452649](0452649))
* **Monthly Attendance Sheet:** parsing error (backport [#1415](#1415)) ([#1423](#1423)) ([2118961](2118961))
* update leave dashboard string to translatable format (backport [#1418](#1418)) ([#1420](#1420)) ([aa49f74](aa49f74))
@frappe-pr-bot
Copy link
Collaborator

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

Successfully merging this pull request may close these issues.

4 participants