fix(Timesheet): reset billing hours equal to hours if they exceed actual hours (backport #38134) #38152
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}
frappe-pr-bot
pushed a commit
that referenced
this pull request
Nov 22, 2023
# [14.49.0](v14.48.1...v14.49.0) (2023-11-22) ### Bug Fixes * add revaluation journal filter in Payable report ([d0698b3](d0698b3)) * attributes were mandatory for manufacturers ([430980a](430980a)) * duplicate field in `Closing Stock Balance` ([#38105](#38105)) ([1f16c47](1f16c47)) * incorrect incoming rate for serial and batch items in standalone debit note ([#38121](#38121)) ([9a34518](9a34518)) * pass check permission in render_address ([1ccd5e4](1ccd5e4)) * payment entry rounding error ([49735bc](49735bc)) * remove ESS role when not mapped to employee (backport [#37867](#37867)) ([#38132](#38132)) ([bc01007](bc01007)) * round `unreconciled_amount` before asserting ([392ee2e](392ee2e)) * set asset's valuation_rate according to asset quantity (backport [#38254](#38254)) ([#38255](#38255)) ([00def82](00def82)) * set default asset quantity as 1 [v14] ([#38224](#38224)) ([3daf6f8](3daf6f8)) * show party values when naming by is not naming series ([dd76695](dd76695)) * Supplier Quotation fields ([#37963](#37963)) ([883eaee](883eaee)) * test case for rounded total with cash disc ([9b5185a](9b5185a)) * **Timesheet:** reset billing hours equal to hours if they exceed actual hours (backport [#38134](#38134)) ([#38152](#38152)) ([c7c751e](c7c751e)) * **Timesheet:** warn user if billing hours > actual hours instead of resetting (backport [#38239](#38239)) ([#38240](#38240)) ([e08f114](e08f114)) * update modified timestamp ([2849e0d](2849e0d)) * valuation rate in report Item Prices ([#38161](#38161)) ([a70696e](a70696e)) * wrong round off and rounded total ([296433a](296433a)) ### Features * add `Supplier Delivery Note` field in SCR (backport [#38127](#38127)) ([#38155](#38155)) ([8d4a19c](8d4a19c)) * Add accounting dimensions to Supplier Quotation ([51e33e1](51e33e1)) * virtual parent doctype ([8dbf2ce](8dbf2ce))
|
🎉 This PR is included in version 14.49.0 🎉 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