Skip to content

fix: asset image field updation issue (backport #47615) #47616

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

Merged
merged 3 commits into from
May 20, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 19, 2025

fixes #45759


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

(cherry picked from commit ff2ccf9)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.json
#	erpnext/assets/doctype/asset/asset.py
@mergify mergify bot added the conflicts label May 19, 2025
Copy link
Contributor Author

mergify bot commented May 19, 2025

Cherry-pick of ff2ccf9 has failed:

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

You are currently cherry-picking commit ff2ccf9bce.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

@mergify mergify bot added the conflicts label May 19, 2025
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label May 19, 2025
@ruthra-kumar ruthra-kumar merged commit d88feec into version-14-hotfix May 20, 2025
10 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-14-hotfix/pr-47615 branch May 20, 2025 04:38
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.85.9 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants