Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 5, 2025

no-docs


This is an automatic backport of pull request #50343 done by Mergify.

(cherry picked from commit 1928a39)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/assets/doctype/asset_repair/asset_repair.json
#	erpnext/assets/doctype/asset_repair/asset_repair.py
@mergify mergify bot requested a review from khushi8112 as a code owner November 5, 2025 18:50
@mergify mergify bot added the conflicts label Nov 5, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 5, 2025

Cherry-pick of 1928a39 has failed:

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

You are currently cherry-picking commit 1928a394c9.
  (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/asset.py

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

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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Nov 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflicts needs-tests This PR needs automated unit-tests.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants