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: rearrange stock settings fields (backport #46202) #46217

Open
wants to merge 2 commits into
base: version-15-hotfix
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 1, 2025


This is an automatic backport of pull request #46202 done by [Mergify](https://mergify.com).

(cherry picked from commit 93f461c)

# Conflicts:
#	erpnext/stock/doctype/stock_settings/stock_settings.json
@mergify mergify bot requested a review from rohitwaghchaure as a code owner March 1, 2025 06:57
@mergify mergify bot added the conflicts label Mar 1, 2025
Copy link
Contributor Author

mergify bot commented Mar 1, 2025

Cherry-pick of 93f461c has failed:

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

You are currently cherry-picking commit 93f461c6f3.
  (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/stock/doctype/stock_settings/stock_settings.json

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant