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: disallow mulitple SO with same Purchase Order No if not enabled in Settings (backport #36590) #36671

Merged
merged 3 commits into from
Aug 16, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 16, 2023

This is an automatic backport of pull request #36590 done by Mergify.
Cherry-pick of 64614cd has failed:

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

You are currently cherry-picking commit 64614cd915.
  (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/selling/doctype/sales_order/test_sales_order.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/delivery_note/test_delivery_note.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 64614cd)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/test_delivery_note.py
@ruthra-kumar ruthra-kumar merged commit 066cf0e into version-13-hotfix Aug 16, 2023
6 checks passed
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-36590 branch August 16, 2023 10:52
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.52.12 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants