Skip to content

fix(stock): allow to create quality inspection after purchase/delivery (backport #55415)#55518

Merged
rohitwaghchaure merged 4 commits into
version-15-hotfixfrom
mergify/bp/version-15-hotfix/pr-55415
Jun 2, 2026
Merged

fix(stock): allow to create quality inspection after purchase/delivery (backport #55415)#55518
rohitwaghchaure merged 4 commits into
version-15-hotfixfrom
mergify/bp/version-15-hotfix/pr-55415

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jun 1, 2026

Issue:
The system does not allow users to create a Quality Inspection after enabling "Allow to Make Quality Inspection after Purchase / Delivery" when "Inspection Required before Purchase" is disabled in the Item master.

When the source document is already in the submitted state and post-submission Quality Inspection is allowed, the system should not validate the "Inspection Required before Purchase" setting. Users should be able to create the Quality Inspection regardless of the Item master configuration.

Ref: #68706

Backport Needed for v15 & v16


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

(cherry picked from commit c6a88ab)

# Conflicts:
#	erpnext/controllers/stock_controller.py
#	erpnext/public/js/controllers/transaction.js
…nspection

(cherry picked from commit e003fe4)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jun 1, 2026

Cherry-pick of c6a88ab has failed:

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

You are currently cherry-picking commit c6a88ab1d2.
  (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/controllers/stock_controller.py
	both modified:   erpnext/public/js/controllers/transaction.js

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

Cherry-pick of e003fe4 has failed:

On branch mergify/bp/version-15-hotfix/pr-55415
Your branch is ahead of 'origin/version-15-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e003fe4de0.
  (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/public/js/controllers/transaction.js

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

@github-actions github-actions Bot added needs-tests This PR needs automated unit-tests. stock labels Jun 1, 2026
@rohitwaghchaure rohitwaghchaure merged commit ad55c7c into version-15-hotfix Jun 2, 2026
19 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-15-hotfix/pr-55415 branch June 2, 2026 06:22
@frappe-pr-bot
Copy link
Copy Markdown
Collaborator

🎉 This PR is included in version 15.110.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-tests This PR needs automated unit-tests. released stock

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants