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: do not consider rejected warehouses in pick list (backport #39539) #39804

Merged
merged 5 commits into from
Feb 8, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 8, 2024

This is an automatic backport of pull request #39539 done by Mergify.
Cherry-pick of f6725e4 has failed:

On branch mergify/bp/develop/pr-39539
Your branch is up to date with 'origin/develop'.

You are currently cherry-picking commit f6725e4342.
  (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/stock/doctype/warehouse/warehouse.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/selling/doctype/sales_order/test_sales_order.py
	both modified:   erpnext/stock/doctype/pick_list/pick_list.json
	both modified:   erpnext/stock/doctype/pick_list/pick_list.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


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> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* 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
@rohitwaghchaure rohitwaghchaure force-pushed the mergify/bp/develop/pr-39539 branch from 5c403f4 to ffb6da9 Compare February 8, 2024 07:36
@rohitwaghchaure rohitwaghchaure merged commit 2c8e4c1 into develop Feb 8, 2024
13 checks passed
@rohitwaghchaure rohitwaghchaure deleted the mergify/bp/develop/pr-39539 branch February 8, 2024 08:24
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))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant