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: Re-open allows SO's to be over credit limit (backport #42126) #42131

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 1, 2024

  1. Make Sales Order within Credit Limit
  2. Set status to 'Close'
  3. Make another Sales Order within Credit Limit. Both the Sales Order should be over the limit
  4. Reopen sales order [1]

Credit LImit validation should prevent Re-opening.


This is an automatic backport of pull request #42126 done by Mergify.

(cherry picked from commit 60694e0)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
Copy link
Contributor Author

mergify bot commented Jul 1, 2024

Cherry-pick of 60694e0 has failed:

On branch mergify/bp/version-14-hotfix/pr-42126
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 60694e09c4.
  (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/selling/doctype/sales_order/test_sales_order.py

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

@ruthra-kumar ruthra-kumar merged commit d5366c5 into version-14-hotfix Jul 1, 2024
10 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-14-hotfix/pr-42126 branch July 1, 2024 11:55
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 14.70.8 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 20, 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.

2 participants