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

refactor: ignore unreconcile doc for PO and SO on cancel/delete (backport #41900) #41937

Merged
merged 2 commits into from
Jun 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 18, 2024

Cannot cancel Sales Order if Payment is unreconciled.

Internal Support Ticket: https://support.frappe.io/app/hd-ticket/17140

Error Message:
image


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

(cherry picked from commit b618d68)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.js
#	erpnext/selling/doctype/sales_order/sales_order.js
@mergify mergify bot added the conflicts label Jun 18, 2024
@mergify mergify bot requested a review from rohitwaghchaure as a code owner June 18, 2024 04:57
Copy link
Contributor Author

mergify bot commented Jun 18, 2024

Cherry-pick of b618d68 has failed:

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

You are currently cherry-picking commit b618d685c6.
  (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/buying/doctype/purchase_order/purchase_order.py
	modified:   erpnext/selling/doctype/sales_order/sales_order.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/buying/doctype/purchase_order/purchase_order.js
	both modified:   erpnext/selling/doctype/sales_order/sales_order.js

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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jun 18, 2024
@ruthra-kumar ruthra-kumar merged commit 57a81c4 into version-14-hotfix Jun 18, 2024
10 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-14-hotfix/pr-41900 branch June 18, 2024 06:27
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.70.7 🎉

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 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants