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: validate SO and SI references in Delivery Notes (backport #40485) #40489

Merged
merged 3 commits into from
Mar 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 16, 2024

Validation to prevent incomplete references of Sales Orders and Sales Invoices in Delivery Note. Either both, against_sales_order and so_detail should be set or both should be unset. Same applies for against_sales_invoice and si_detail.

Ex:
Screenshot 2024-03-16 at 10 21 40 AM


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

(cherry picked from commit 4d090bd)

# Conflicts:
#	erpnext/stock/doctype/delivery_note/delivery_note.py
(cherry picked from commit 4f396d3)

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

mergify bot commented Mar 16, 2024

Cherry-pick of 4d090bd has failed:

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

You are currently cherry-picking commit 4d090bd3b8.
  (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/delivery_note/delivery_note.py

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 4f396d3 has failed:

On branch mergify/bp/version-14-hotfix/pr-40485
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 4f396d3049.
  (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/delivery_note/test_delivery_note.py

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

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 a0e839e into version-14-hotfix Mar 16, 2024
9 of 10 checks passed
@ruthra-kumar ruthra-kumar deleted the mergify/bp/version-14-hotfix/pr-40485 branch March 16, 2024 09:58
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.65.4 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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