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: depreciation schedule for existing assets [v14] (backport #35255) #35347

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 17, 2023

This is an automatic backport of pull request #35255 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: depreciation schedule for existing assets

* chore: correct logic for existing assets and fix test

(cherry picked from commit 0a080ef)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
Copy link
Contributor

@anandbaburajan anandbaburajan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@anandbaburajan anandbaburajan merged commit 7506132 into version-13-hotfix May 17, 2023
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-35255 branch May 17, 2023 17:23
frappe-pr-bot pushed a commit that referenced this pull request May 24, 2023
## [13.50.6](v13.50.5...v13.50.6) (2023-05-24)

### Bug Fixes

* allow over-payment against SO ([#35079](#35079)) ([eb243c2](eb243c2))
* bypass flag in Customer Group wasn't effective ([f0c9d89](f0c9d89))
* change field-type to remove currency field from total row in export ([f65be40](f65be40))
* consider 0 if rate/qty are null (backport [#35338](#35338)) ([#35341](#35341)) ([387f8b9](387f8b9))
* depreciation schedule for existing assets [v14] (backport [#35255](#35255)) ([#35347](#35347)) ([7506132](7506132))
* error while saving job card ([d6427cf](d6427cf))
* get_query filters ([2aa7729](2aa7729))
* Incorrect Earned Leaves Proration ([#35156](#35156)) ([dc04b24](dc04b24))
* linter ([0a42e6f](0a42e6f))
* non manufacturing items/fixed asset items in BOM ([66ba74f](66ba74f))
* Pick List TypeError ([137898d](137898d))
* tds incorrectly calculated for invoice that are below threshold ([6c170ab](6c170ab))
* **test:** cumulative threshold checks ([06deecb](06deecb))
* use flt instead of mandatory field ([f63b866](f63b866))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.50.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 Mar 4, 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