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: value of depreciable assets not updating after manual depr entry [v14] (backport #35010) #35029

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 25, 2023

This is an automatic backport of pull request #35010 done by Mergify.
Cherry-pick of 3c75e55 has failed:

On branch mergify/bp/version-13-hotfix/pr-35010
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit 3c75e55cb9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/accounts/doctype/account/test_account.py
	modified:   erpnext/accounts/doctype/journal_entry/journal_entry.py
	modified:   erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
	modified:   erpnext/assets/doctype/asset/depreciation.py
	modified:   erpnext/assets/doctype/asset/test_asset.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/doctype/journal_entry/journal_entry.js

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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

… [v14] (#35010)

* fix: update value of asset with calc_depr on after manual depr entry

* fix: value of asset with calc_depr on after manual depr entry not reflecting in asset_depr_and_bal report

* chore: add validation for depr journal entry

* test: manual_depr_for_depreciable_asset and manual_depr_w_incorrect_jv_voucher_type

* chore: unlink depreciable asset from manual depr entry

(cherry picked from commit 3c75e55)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/journal_entry.js
@anandbaburajan anandbaburajan merged commit 9087ac0 into version-13-hotfix Apr 25, 2023
5 of 6 checks passed
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-35010 branch April 25, 2023 08:04
frappe-pr-bot pushed a commit that referenced this pull request Apr 25, 2023
## [13.49.14](v13.49.13...v13.49.14) (2023-04-25)

### Bug Fixes

* `PermissionError` in Work Order ([5680045](5680045))
* Advance payment against payment terms ([#34872](#34872)) ([d215a85](d215a85))
* internal Purchase Receipt GL Entries ([b73422e](b73422e))
* Payment entry with TDS in bank reco statement ([#34961](#34961)) ([5f28b1d](5f28b1d))
* Payment Request flow fixes from Order to Payment Entry ([#33350](#33350)) ([d5a80b5](d5a80b5))
* SLA permissions ([#34981](#34981)) ([c1187be](c1187be))
* **test:** `test_backdated_stock_reco_cancellation_future_negative_stock` ([d010b04](d010b04))
* Unable to allocate advance against invoice ([#35007](#35007)) ([61a3121](61a3121))
* use filter_by_finance_book instead of only_depreciable_assets in fixed asset register (backport [#35031](#35031)) ([#35036](#35036)) ([be2095a](be2095a))
* validation for internal transfer entry ([91b5a33](91b5a33))
* value of depreciable assets not updating after manual depr entry [v14] (backport [#35010](#35010)) ([#35029](#35029)) ([9087ac0](9087ac0))
* wrong qty of remaining work orders to be created when using "Create" > "Work Order" ([#34726](#34726)) ([189b020](189b020))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.49.14 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants