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 depreciate assets with no schedule on scrapping (backport #38276) #38293

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 23, 2023

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

fix: don't depreciate non-depreciable assets on scrapping
(cherry picked from commit 816b1b6)
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Nov 23, 2023
@anandbaburajan anandbaburajan merged commit 18613c5 into version-15-hotfix Nov 23, 2023
12 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-38276 branch November 23, 2023 08:35
frappe-pr-bot pushed a commit that referenced this pull request Nov 28, 2023
# [15.4.0](v15.3.0...v15.4.0) (2023-11-28)

### Bug Fixes

* allow on submit for child table fields ([ac7615a](ac7615a))
* annual income and expenses in digest ([ca2ad17](ca2ad17))
* check reposting settings before allowing editable si ([25bf475](25bf475))
* condition in other bundle utils ([e4d9ef1](e4d9ef1))
* create contact if existing customer doesn't have contact ([b1b065d](b1b065d))
* display all item rate stop messages (backport [#38289](#38289)) ([#38307](#38307)) ([99c1fbf](99c1fbf))
* do not set repost flag without validating voucher ([6a3c3b4](6a3c3b4))
* don't depreciate assets with no schedule on scrapping (backport [#38276](#38276)) ([#38293](#38293)) ([18613c5](18613c5))
* filter bundle items based on disabled check ([fb517e8](fb517e8))
* fiscal year using future date ([b9a1fac](b9a1fac))
* has_product_bundle util to only check for enabled bundles ([5c12872](5c12872))
* job card overlap validation (backport [#38345](#38345)) ([#38348](#38348)) ([d6fe7eb](d6fe7eb))
* make parameters of `create_subscription_process` optional (and other minor fixes) ([#38360](#38360)) ([721b429](721b429))
* Negative Qty and Rates in SO/PO (backport [#38252](#38252)) ([#38357](#38357)) ([14174df](14174df))
* no fstring in translation (backport [#38381](#38381)) ([#38387](#38387)) ([c101855](c101855))
* patch - Duplicate entry quality inspection parameter (backport [#38262](#38262)) ([#38264](#38264)) ([4c9890a](4c9890a))
* Payment Reco Issue and chart of account importer ([4699887](4699887))
* serial no status (backport [#38391](#38391)) ([#38397](#38397)) ([b65c225](b65c225))
* Server Error while creating Product Bundle (backport [#38377](#38377)) ([#38380](#38380)) ([922aef6](922aef6))
* skip disabled bundles for non-report utils ([3d46b32](3d46b32))
* skip fixed assets in parent ([314a91a](314a91a))
* Supplier `Primary Contact` (backport [#38268](#38268)) ([#38286](#38286)) ([37d1f1a](37d1f1a))
* **ux:** Sales Order Stock Reservation Dialog (backport [#38261](#38261)) ([#38344](#38344)) ([3cbe599](3cbe599))
* validation for existing bundles ([c0de9c0](c0de9c0))

### Features

* add Bank Transaction to connections in Journal and Payment Entry (backport [#38297](#38297)) ([#38301](#38301)) ([72647b8](72647b8))
* add disabled field in product bundle ([fcd53be](fcd53be))
* new Report "Lost Quotations" ([#38309](#38309)) ([ea2c348](ea2c348))

### Performance Improvements

* optimize total_purchase_cost update ([deed9f5](deed9f5))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.4.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants