fix: date and finance book fixes in fixed asset register (backport #35751) #35800
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://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
* fix: handle finance books properly and show all assets by default in fixed asset register * chore: rename value to depr amount * chore: get asset value for correct fb properly * chore: rename include_default_book_entries to include_default_book_assets (cherry picked from commit 0d12588) # Conflicts: # erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
mergify
bot
requested review from
anandbaburajan and
deepeshgarg007
as code owners
frappe-pr-bot
pushed a commit
that referenced
this pull request
Jun 21, 2023
## [13.51.6](v13.51.5...v13.51.6) (2023-06-21) ### Bug Fixes * account group totals calculation to consider include_in_gross ([f22969d](f22969d)) * add total col for gross and net profit ([e899c30](e899c30)) * add validation for QI in PR (backport [#35677](#35677)) ([#35758](#35758)) ([0a8b714](0a8b714)) * Allocated amount validation for other party types ([#35741](#35741)) ([3d0add8](3d0add8)) * date and finance book fixes in fixed asset register (backport [#35751](#35751)) ([#35800](#35800)) ([aa8446d](aa8446d)) * don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (backport [#35714](#35714)) ([#35716](#35716)) ([0e11317](0e11317)) * fix get outstanding invoices btn and add get outstanding orders btn (backport [#35776](#35776)) ([#35788](#35788)) ([04990d5](04990d5)) * Incorrect field while calculating Tax withholding net total ([571c977](571c977)) * Incorrect field while calculating Tax withholding net total ([b95d459](b95d459)) * loan interest accrual date ([#35695](#35695)) ([46d0b7d](46d0b7d)) ### Performance Improvements * index `purpose` in `Stock Entry` (backport [#35782](#35782)) ([#35784](#35784)) ([7239e83](7239e83))
|
🎉 This PR is included in version 13.51.6 🎉 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 #35751 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