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: Purchase information is not required for creating a composite asset (backport #39163) #39189

Merged
merged 3 commits into from
Jan 10, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 8, 2024

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

On branch mergify/bp/version-14-hotfix/pr-39163
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

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

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

(cherry picked from commit fe43dab)
…eation

(cherry picked from commit c34f09c)

# Conflicts:
#	erpnext/assets/doctype/asset/asset.py
@mergify mergify bot requested a review from deepeshgarg007 as a code owner January 8, 2024 06:52
@mergify mergify bot added the conflicts label Jan 8, 2024
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jan 8, 2024
@nabinhait nabinhait merged commit cc07213 into version-14-hotfix Jan 10, 2024
10 checks passed
@nabinhait nabinhait deleted the mergify/bp/version-14-hotfix/pr-39163 branch January 10, 2024 06:45
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.59.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 26, 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