fix: asset depreciation ledger (backport #37991) #37992
Merged
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: include opening acc depr while calculating asset depr ledger report * chore: include opening acc depr properly in acc depr amt * chore: add cost_center in asset depr ledger report * fix: handle finance books properly in asset depr ledger report * chore: rename 'include default book entries' to 'include default FB entries' (cherry picked from commit 9a171db) # Conflicts: # erpnext/accounts/report/balance_sheet/balance_sheet.js # erpnext/accounts/report/cash_flow/cash_flow.js # erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js # erpnext/accounts/report/trial_balance/trial_balance.js # erpnext/translations/pl.csv # erpnext/translations/tr.csv
mergify
bot
requested review from
anandbaburajan,
deepeshgarg007 and
ruthra-kumar
as code owners
anandbaburajan
added
backport version-13-hotfix
and removed
needs-tests
|
@mergify backport version-14 |
✅ Backports have been created
|
mergify bot
added a commit
that referenced
this pull request
Nov 8, 2023
* fix: asset depreciation ledger (#37991) * fix: include opening acc depr while calculating asset depr ledger report * chore: include opening acc depr properly in acc depr amt * chore: add cost_center in asset depr ledger report * fix: handle finance books properly in asset depr ledger report * chore: rename 'include default book entries' to 'include default FB entries' (cherry picked from commit 9a171db) # Conflicts: # erpnext/accounts/report/balance_sheet/balance_sheet.js # erpnext/accounts/report/cash_flow/cash_flow.js # erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js # erpnext/accounts/report/trial_balance/trial_balance.js # erpnext/translations/pl.csv # erpnext/translations/tr.csv * chore: fix conflict in balance_sheet.js * chore: fix conflict in cash_flow.js * chore: fix conflict in consolidated_financial_statement.js * chore: fix conflict in trial_balance.js * chore: fix conflict in tr.csv * chore: fix conflict in pl.csv --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com> (cherry picked from commit 043dc1b)
mergify bot
added a commit
that referenced
this pull request
Nov 8, 2023
* fix: asset depreciation ledger (#37991) * fix: include opening acc depr while calculating asset depr ledger report * chore: include opening acc depr properly in acc depr amt * chore: add cost_center in asset depr ledger report * fix: handle finance books properly in asset depr ledger report * chore: rename 'include default book entries' to 'include default FB entries' (cherry picked from commit 9a171db) # Conflicts: # erpnext/accounts/report/balance_sheet/balance_sheet.js # erpnext/accounts/report/cash_flow/cash_flow.js # erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.js # erpnext/accounts/report/trial_balance/trial_balance.js # erpnext/translations/pl.csv # erpnext/translations/tr.csv * chore: fix conflict in balance_sheet.js * chore: fix conflict in cash_flow.js * chore: fix conflict in consolidated_financial_statement.js * chore: fix conflict in trial_balance.js * chore: fix conflict in tr.csv * chore: fix conflict in pl.csv --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com> (cherry picked from commit 043dc1b) # Conflicts: # erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.json # erpnext/accounts/report/financial_statements.py # erpnext/accounts/report/trial_balance/trial_balance.py
frappe-pr-bot
pushed a commit
that referenced
this pull request
Nov 14, 2023
# [14.48.0](v14.47.4...v14.48.0) (2023-11-14) ### Bug Fixes * asset depreciation ledger (backport [#37991](#37991)) ([#37992](#37992)) ([043dc1b](043dc1b)) * close `Credit Limit Crossed` dialog (backport [#38052](#38052)) ([#38058](#38058)) ([6979c3e](6979c3e)) * COA Importer app related issues ([#37238](#37238)) ([57ce73d](57ce73d)) * german translations of Accounts Settings ([b75aae9](b75aae9)) * indentation issue in the Production Plan Summary report (backport [#38019](#38019)) ([#38068](#38068)) ([c552884](c552884)) * make adjustment entry using stock reconciliation (backport [#37995](#37995)) ([#38008](#38008)) ([984703c](984703c)) * make item field read-only in batch (backport [#38010](#38010)) ([#38033](#38033)) ([424ebd1](424ebd1)) * minor change added to test_case ([6b34568](6b34568)) * minor issue ([0eab723](0eab723)) * new logic for handling revaluation journals ([9c0d80c](9c0d80c)) * pick serial nos from selected batch only ([#37988](#37988)) ([db29180](db29180)) * sales order not assigned to territory orders ([#37905](#37905)) ([#38024](#38024)) ([620f4f2](620f4f2)) * Set right party name in bank transaction ([21b430a](21b430a)) * **translations:** suggestions from review ([4d2169e](4d2169e)) * Use `process.extract` to get the corresponding party doc name of the result ([b0a184e](b0a184e)) ### Features * **accounts_receivable:** test_case added for multi-select customer group ([cf0d936](cf0d936)) * multi-select customer group in AR Report ([935286f](935286f))
|
🎉 This PR is included in version 14.48.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 #37991 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