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_subcontracting: changing UoM causes unreserve issues #154450

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Feb 16, 2024

Before this commit:
"Cannot unreserve more than you have in stock" Error
It was possible to purchase a subcontracted product, and on the receipt of the product, change the unit of measure o on the stock move lines of the components when the quantities were already reserved. This caused unreserve issue given that, all of a sudden, instead of having 200g, we would have 200kg reserved and the change would not be reflected on the quant.

After this commit:
The view was modified to not allow changes of UoM if there are reserved quantities, or if the state is done.

OPW-3742720

Forward-Port-Of: #154327

@robodoo
Copy link
Contributor

robodoo commented Feb 16, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Feb 16, 2024

@pno-odoo @Whenrow cherrypicking of pull request #154327 failed.

stdout:

Auto-merging addons/mrp_subcontracting/views/stock_move_views.xml
CONFLICT (content): Merge conflict in addons/mrp_subcontracting/views/stock_move_views.xml

stderr:

17:07:34.465038 git.c:463               trace: built-in: git cherry-pick 7fa4b60832878d444ccd6d1276cc12a656ec6cca
error: could not apply 7fa4b6083287... [FIX] mrp_subcontracting: changing UoM causes unreserve issues
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.

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

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Feb 16, 2024
@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label Feb 16, 2024
@pno-odoo pno-odoo force-pushed the saas-15.2-15.0-OPW-3742720-mrp_subcontracting-uom_unreserve-pno--yA5-fw branch from 90a1808 to bc96028 Compare February 19, 2024 07:02
Before this commit:
It was possible to purchase a subcontracted product and on the receipt of the product, change the unit of measure o on the stock move lines of the components when the quantities were already reserved.
This caused unreserve issue given that, all of a sudden, instead of having 200g, we would have 200kg reserved and the change would not be reflected on the quant.

After this commit:
The view was modified to not allow changes of UoM if there are reserved quantities, or if the state is done.

OPW-3742720

X-original-commit: 35da769
@pno-odoo pno-odoo force-pushed the saas-15.2-15.0-OPW-3742720-mrp_subcontracting-uom_unreserve-pno--yA5-fw branch from bc96028 to 5cb12ca Compare February 19, 2024 07:04
@pno-odoo
Copy link
Contributor

fw-bot r+

@fw-bot
Copy link
Contributor Author

fw-bot commented Feb 19, 2024

@pno-odoo I can only do this on unmodified forward-port PRs, ask robodoo.

@Whenrow
Copy link
Contributor

Whenrow commented Mar 4, 2024

robodoo r+

robodoo pushed a commit that referenced this pull request Mar 4, 2024
Before this commit:
It was possible to purchase a subcontracted product and on the receipt of the product, change the unit of measure o on the stock move lines of the components when the quantities were already reserved.
This caused unreserve issue given that, all of a sudden, instead of having 200g, we would have 200kg reserved and the change would not be reflected on the quant.

After this commit:
The view was modified to not allow changes of UoM if there are reserved quantities, or if the state is done.

OPW-3742720

closes #154450

X-original-commit: 35da769
Signed-off-by: William Henrotin (whe) <whe@odoo.com>
@robodoo robodoo closed this Mar 4, 2024
@fw-bot fw-bot deleted the saas-15.2-15.0-OPW-3742720-mrp_subcontracting-uom_unreserve-pno--yA5-fw branch March 18, 2024 12: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

5 participants