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: stock reservation not working for sales invoice with update stock (backport #45763) #45764

Open
wants to merge 4 commits into
base: version-15-hotfix
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 6, 2025

  • Enable Stock Reservation for sales order
  • Create the sales order
  • System will auto reserve the stock
  • Create the sales invoice against above sales order with update stock
  • While submitting sales invoice, system will throw error that the stock has not reserved for the respective item

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

Copy link
Contributor Author

mergify bot commented Feb 6, 2025

Cherry-pick of 0c9d0ea has failed:

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

You are currently cherry-picking commit 0c9d0ea1f4.
  (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/accounts/doctype/sales_invoice/sales_invoice.py
	modified:   erpnext/controllers/selling_controller.py
	modified:   erpnext/stock/doctype/delivery_note/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

@rohitwaghchaure rohitwaghchaure force-pushed the mergify/bp/version-15-hotfix/pr-45763 branch 2 times, most recently from f666841 to 0852137 Compare February 10, 2025 05:13
(cherry picked from commit 0c9d0ea)

# Conflicts:
#	erpnext/selling/doctype/sales_order/test_sales_order.py
@rohitwaghchaure rohitwaghchaure force-pushed the mergify/bp/version-15-hotfix/pr-45763 branch 2 times, most recently from 04efec3 to e8ff585 Compare February 12, 2025 11:02
@rohitwaghchaure rohitwaghchaure force-pushed the mergify/bp/version-15-hotfix/pr-45763 branch from e8ff585 to 2d22301 Compare February 12, 2025 11:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant