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 qty validation in SCR (backport #42124) #42224

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 8, 2024

Steps to replicate the issue

  1. User has transferred materials to the supplier
  2. User has created SCO and did transferred partial materials to supplier because stock is exists at supplier's warehouse
  3. Now user is trying to create the SCR but system throwing an error

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

(cherry picked from commit 99f2735)

# Conflicts:
#	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
Copy link
Contributor Author

mergify bot commented Jul 8, 2024

Cherry-pick of 99f2735 has failed:

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

You are currently cherry-picking commit 99f2735ad3.
  (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/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.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 merged commit e2f8e02 into version-14-hotfix Jul 8, 2024
10 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-14-hotfix/pr-42124 branch July 8, 2024 11:36
frappe-pr-bot pushed a commit that referenced this pull request Jul 10, 2024
## [14.70.10](v14.70.9...v14.70.10) (2024-07-10)

### Bug Fixes

* add missing german translations ([d5c1c62](d5c1c62))
* empty item-wise sales/purchase register reports on initial load ([13895fa](13895fa))
* fetch expence account from asset category ([4d6a71a](4d6a71a))
* group by in item-wise purchase register ([62ad466](62ad466))
* **Holiday List:** sort holidays on save to avoid disorienting the user (backport [#42236](#42236)) ([#42251](#42251)) ([fcf6500](fcf6500))
* manual pick allow to pick more than available stock (backport [#42155](#42155)) ([#42158](#42158)) ([454e147](454e147))
* multiple free items on same Item Group ([701dd9e](701dd9e))
* removed max discount validation for sales return ([4195c50](4195c50))
* stock qty validation in SCR (backport [#42124](#42124)) ([#42224](#42224)) ([e2f8e02](e2f8e02))
* tax on stock_rbnb on repost of Purchase Receipt ([106c154](106c154))
* **tds:** use doctype reference when mapping keys across multiple doctypes ([51cbbee](51cbbee))
* updated logic for calculating tax_withholding_net_total in payment entry ([49e5066](49e5066))
* use standard method to get `_doc_before_save` ([9fde733](9fde733))
@frappe-pr-bot
Copy link
Collaborator

🎉 This issue has been resolved in version 14.70.10 🎉

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 25, 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