fix(Timesheet): reset billing hours equal to hours if they exceed actual hours (backport #38134) #38154
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://github.com/avatars/in/10562?s=60&v=4){kind=small}
|
Unrelated linter failure |
frappe-pr-bot
pushed a commit
that referenced
this pull request
Nov 21, 2023
## [13.54.12](v13.54.11...v13.54.12) (2023-11-21) ### Bug Fixes * `get_previous_allocation` return value ([6cb8a40](6cb8a40)) * backward compatible query without pluck ([958db77](958db77)) * pass check permission in render_address ([65ae8d9](65ae8d9)) * **Timesheet:** reset billing hours equal to hours if they exceed actual hours (backport [#38134](#38134)) ([#38154](#38154)) ([1e43605](1e43605)) * **Timesheet:** warn user if billing hours > actual hours instead of resetting (backport [#38239](#38239)) ([#38242](#38242)) ([a9429e1](a9429e1)) * use `get_all` instead of `get_list` ([4b8ed0f](4b8ed0f)) ### Performance Improvements * index most queried fields in Leave Ledger Entry ([eea7bbc](eea7bbc)) * limit rows to 1 for cf leave expiry query ([635c3d5](635c3d5))
|
🎉 This PR is included in version 13.54.12 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #38134 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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com