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: force to do reposting for cancelled document (backport #35328) #35456

Merged
merged 2 commits into from
May 29, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 29, 2023

This is an automatic backport of pull request #35328 done by Mergify.
Cherry-pick of 6e661e7 has failed:

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

You are currently cherry-picking commit 6e661e7c0e.
  (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/stock/doctype/repost_item_valuation/test_repost_item_valuation.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/controllers/stock_controller.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 6e661e7)

# Conflicts:
#	erpnext/controllers/stock_controller.py
@s-aga-r s-aga-r force-pushed the mergify/bp/version-13-hotfix/pr-35328 branch from 60d0c78 to 44cb628 Compare May 29, 2023 09:52
@s-aga-r s-aga-r removed the conflicts label May 29, 2023
@s-aga-r s-aga-r merged commit 3e95d56 into version-13-hotfix May 29, 2023
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-35328 branch May 29, 2023 10:27
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.51.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 Mar 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants