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: recalculate WDV rate after asset repair [v13] (backport #34567) #34569

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 23, 2023

This is an automatic backport of pull request #34567 done by Mergify.
Cherry-pick of c8bde39 has failed:

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

You are currently cherry-picking commit c8bde399e5.
  (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/assets/doctype/asset_repair/asset_repair.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/assets/doctype/asset/asset.py

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

fix: recalculate wdv rate after asset repair
(cherry picked from commit c8bde39)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
@mergify mergify bot added the conflicts label Mar 23, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Mar 23, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-34567 branch March 23, 2023 14:17
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
conflicts needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant