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: unable to change company for manual Serial No entry (backport #34858) #34869

Merged
merged 3 commits into from
Apr 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 15, 2023

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

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

You are currently cherry-picking commit fb3271c624.
  (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/serial_no/serial_no.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/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 fb3271c)

# Conflicts:
#	erpnext/stock/doctype/serial_no/serial_no.json
@mergify mergify bot added the conflicts label Apr 15, 2023
@s-aga-r s-aga-r marked this pull request as draft April 15, 2023 07:15
@s-aga-r s-aga-r removed the conflicts label Apr 16, 2023
@s-aga-r s-aga-r marked this pull request as ready for review April 16, 2023 14:40
@s-aga-r s-aga-r marked this pull request as draft April 17, 2023 03:15
@s-aga-r s-aga-r marked this pull request as ready for review April 18, 2023 15:58
@s-aga-r
Copy link
Contributor

s-aga-r commented Apr 18, 2023

Unrelated failing test

@s-aga-r s-aga-r merged commit a2d2beb into version-13-hotfix Apr 18, 2023
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-34858 branch April 18, 2023 15:59
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant