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: show only items with inspection enabled on create QI dialog (backport #45710) #45718

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 4, 2025

Reference support ticket 30355

Dialog box when creating Quality Inspection will now show only those items which have Quality Inspection enabled in their masters

no-docs


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

(cherry picked from commit c92ec31)

# Conflicts:
#	erpnext/controllers/stock_controller.py
(cherry picked from commit ffd10d1)
@mergify mergify bot requested a review from deepeshgarg007 as a code owner February 4, 2025 19:05
@mergify mergify bot added the conflicts label Feb 4, 2025
@mergify mergify bot requested a review from rohitwaghchaure as a code owner February 4, 2025 19:05
Copy link
Contributor Author

mergify bot commented Feb 4, 2025

Cherry-pick of c92ec31 has failed:

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/controllers/stock_controller.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

@github-actions github-actions bot added needs-tests This PR needs automated unit-tests. stock labels Feb 4, 2025
@rohitwaghchaure rohitwaghchaure merged commit efa7602 into version-15-hotfix Feb 5, 2025
11 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/version-15-hotfix/pr-45710 branch February 5, 2025 07:35
@u3716280
Copy link

It has error with "You are not permitted in this resource" before this. No this error

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts needs-tests This PR needs automated unit-tests. stock
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants