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

[FW][FIX] mrp, sale_mrp: _run_pull creates many pickings #164221

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented May 2, 2024

The steps to reproduce:

  • Go to a warehouse. Under the technical information tab, change the field sam_loc_id from "WH/Post-Production" to "WH/Stock".
  • Create a sales order with 2 different products and confirm it.
  • 2 pickings will be created with different group_id MO/XXXX instead of a single picking.

After this commit, we only check the sam_loc_id if we are in 3 steps manufacturing.

OPW-3871886


I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #164056
Forward-Port-Of: #162947

@robodoo
Copy link
Contributor

robodoo commented May 2, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented May 2, 2024

@pno-odoo @clesgow cherrypicking of pull request #162947 failed.

stdout:

Auto-merging addons/mrp/models/stock_rule.py
Auto-merging addons/sale_mrp/tests/test_sale_mrp_procurement.py
CONFLICT (content): Merge conflict in addons/sale_mrp/tests/test_sale_mrp_procurement.py

stderr:

18:53:30.659656 git.c:463               trace: built-in: git cherry-pick 44791e617c4c0f663378897bff399560e754e0d8
error: could not apply 44791e617c4c... [FIX] mrp, sale_mrp: _run_pull creates many pickings
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label May 2, 2024
@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels May 2, 2024
The steps to reproduce:
- Go to a warehouse. Under the technical information tab, change the field sam_loc_id from "WH/Post-Production" to "WH/Stock".
- Create a sales order with 2 different products and confirm it.
- 2 pickings will be created with different group_id MO/XXXX instead of a single picking.

After this commit we only check the sam_loc_id if we are in 3 steps manufacturing.

OPW-3871886

X-original-commit: f9125dd
@pno-odoo pno-odoo force-pushed the saas-16.3-15.0-mrp-run_pull_generate_multiple_pickings-pno-QeBc-fw branch from e19eabd to 942db7f Compare May 3, 2024 06:35
@pno-odoo
Copy link
Contributor

pno-odoo commented May 3, 2024

robodoo r+

robodoo pushed a commit that referenced this pull request May 3, 2024
The steps to reproduce:
- Go to a warehouse. Under the technical information tab, change the field sam_loc_id from "WH/Post-Production" to "WH/Stock".
- Create a sales order with 2 different products and confirm it.
- 2 pickings will be created with different group_id MO/XXXX instead of a single picking.

After this commit we only check the sam_loc_id if we are in 3 steps manufacturing.

OPW-3871886

closes #164221

X-original-commit: f9125dd
Signed-off-by: Quentin Wolfs (quwo) <quwo@odoo.com>
Signed-off-by: Pedro Nogueira (pno) <pno@odoo.com>
@robodoo robodoo closed this May 3, 2024
@fw-bot fw-bot deleted the saas-16.3-15.0-mrp-run_pull_generate_multiple_pickings-pno-QeBc-fw branch May 17, 2024 09:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot OE the report is linked to a support ticket (opw-...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants