Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Aug 3, 2023

This PR adds a new doc detailing how to scrap components and finished products during the manufacturing process.

Forward-Port-Of: #4954

@robodoo
Copy link
Collaborator

robodoo commented Aug 3, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Aug 3, 2023

@hojo-odoo cherrypicking of pull request #4954 failed.

stdout:

CONFLICT (modify/delete): content/applications/inventory_and_mrp/inventory/management/warehouses/difference_warehouse_location.rst deleted in HEAD and modified in 3108ea1ca ([ADD] MRP: Add Scrap during manufacturing).  Version 3108ea1ca ([ADD] MRP: Add Scrap during manufacturing) of content/applications/inventory_and_mrp/inventory/management/warehouses/difference_warehouse_location.rst left in tree.
Auto-merging content/applications/inventory_and_mrp/manufacturing/management.rst

stderr:

01:03:19.442199 git.c:455               trace: built-in: git cherry-pick 3108ea1cad3c2007665e0a6e2246f3398e2d3236
error: could not apply 3108ea1ca... [ADD] MRP: Add Scrap during manufacturing
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

@StraubCreative
Copy link
Contributor

small snag here @samueljlieber can you take a look please? 🙏

@samueljlieber samueljlieber force-pushed the 15.0-14.0-mrp-add-scrap-manufacturing-hojo-crY0-fw branch from 3964716 to 78be229 Compare August 8, 2023 13:37
@samueljlieber
Copy link
Contributor

Resolved merge conflict in 78be229 due to custom anchor / ref to doc inventory/management/difference-warehouse-location.rst that only exists on 14.0. Removed the ref to non-existent doc in 15.0 version of this doc.

@C3POdoo C3POdoo requested a review from a team August 8, 2023 14:08
@StraubCreative
Copy link
Contributor

@robodoo r+

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants