-
Notifications
You must be signed in to change notification settings - Fork 7.5k
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: do not consider rejected warehouses in pick list (backport #39539) #39804
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* fix: do not picked rejected materials * test: test case for pick list without rejected materials (cherry picked from commit f6725e4) # Conflicts: # erpnext/selling/doctype/sales_order/test_sales_order.py # erpnext/stock/doctype/pick_list/pick_list.json # erpnext/stock/doctype/pick_list/pick_list.py
mergify
bot
requested review from
rohitwaghchaure,
s-aga-r,
deepeshgarg007 and
ruthra-kumar
as code owners
February 8, 2024 05:36
rohitwaghchaure
force-pushed
the
mergify/bp/develop/pr-39539
branch
from
February 8, 2024 07:36
5c403f4
to
ffb6da9
Compare
mergify bot
added a commit
that referenced
this pull request
Feb 8, 2024
… (#39804) * fix: do not consider rejected warehouses in pick list (#39539) * fix: do not picked rejected materials * test: test case for pick list without rejected materials (cherry picked from commit f6725e4) # Conflicts: # erpnext/selling/doctype/sales_order/test_sales_order.py # erpnext/stock/doctype/pick_list/pick_list.json # erpnext/stock/doctype/pick_list/pick_list.py * chore: fix conflicts * chore: fix conflicts * chore: fix conflicts * chore: fixed test case --------- Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> (cherry picked from commit 2c8e4c1) # Conflicts: # erpnext/selling/doctype/sales_order/test_sales_order.py
rohitwaghchaure
added a commit
that referenced
this pull request
Feb 8, 2024
… (backport #39804) (#39811) * fix: do not consider rejected warehouses in pick list (backport #39539) (#39804) * fix: do not consider rejected warehouses in pick list (#39539) * fix: do not picked rejected materials * test: test case for pick list without rejected materials (cherry picked from commit f6725e4) # Conflicts: # erpnext/selling/doctype/sales_order/test_sales_order.py # erpnext/stock/doctype/pick_list/pick_list.json # erpnext/stock/doctype/pick_list/pick_list.py * chore: fix conflicts * chore: fix conflicts * chore: fix conflicts * chore: fixed test case --------- Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com> (cherry picked from commit 2c8e4c1) # Conflicts: # erpnext/selling/doctype/sales_order/test_sales_order.py * chore: fix conflicts --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
frappe-pr-bot
pushed a commit
that referenced
this pull request
Feb 14, 2024
# [15.14.0](v15.13.0...v15.14.0) (2024-02-14) ### Bug Fixes * production plan issue with sales order (backport [#39901](#39901)) ([#39904](#39904)) ([88a7248](88a7248)) * add permissions to SRE (backport [#39780](#39780)) ([#39786](#39786)) ([ba05648](ba05648)) * Brazilian COA for demo data creation ([#39839](#39839)) ([4daee6d](4daee6d)) * calculate `stock_value_diff` ([5a66c85](5a66c85)) * create SBB for `transfer_qty` in SE (backport [#39835](#39835)) ([#39863](#39863)) ([92e6017](92e6017)) * do not consider rejected warehouses in pick list (backport [#39539](#39539)) (backport [#39804](#39804)) ([#39811](#39811)) ([30dacce](30dacce)) * incorrect planned qty in PP (backport [#39785](#39785)) ([#39793](#39793)) ([60e04ab](60e04ab)) * landed cost voucher not submitting because of incorrect reference (backport [#39898](#39898)) ([#39900](#39900)) ([a548f12](a548f12)) * remove duplicates from tax category map ([3c6114a](3c6114a)) * set rate for PO created against BO (backport [#39765](#39765)) ([#39767](#39767)) ([2213886](2213886)) * stock entry for use serial batch fields (backport [#39843](#39843)) ([#39844](#39844)) ([43fce29](43fce29)) * use correct field name in accounts controller (backport [#39884](#39884)) ([#39897](#39897)) ([f08b424](f08b424)) * **ux:** set rate as price list rate on uom change in MR (backport [#39816](#39816)) ([#39818](#39818)) ([63b4d20](63b4d20)) * validate duplicate SBB (backport [#39862](#39862)) ([#39866](#39866)) ([a2f1a96](a2f1a96)) * warehouse issue in pick list (backport [#39826](#39826)) ([#39827](#39827)) ([b625b05](b625b05)) ### Features * get RM costs from consumption entry in manufacture SE (backport [#39822](#39822)) ([#39847](#39847)) ([2d5f186](2d5f186)) ### Performance Improvements * cached get_last_purchase_details to fix performance issue (backport [#39854](#39854)) ([#39856](#39856)) ([c643e70](c643e70)) * production plan submission (backport [#39846](#39846)) ([#39860](#39860)) ([10f17df](10f17df))
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #39539 done by Mergify.
Cherry-pick of f6725e4 has failed:
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
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refresh
will re-evaluate the rules@Mergifyio rebase
will rebase this PR on its base branch@Mergifyio update
will merge the base branch into this PR@Mergifyio backport <destination>
will backport this PR on<destination>
branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com