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: don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (backport #35714) #35716

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 15, 2023

This is an automatic backport of pull request #35714 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 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

…e assets (#35714)

fix: on asset scrap, don't add gl entry for acc. depr. if no acc. depr.
(cherry picked from commit bb39a2c)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py
@anandbaburajan anandbaburajan merged commit 0e11317 into version-13-hotfix Jun 15, 2023
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-35714 branch June 15, 2023 12:11
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))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.51.6 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 24, 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.

2 participants