Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Jul 13, 2023

This PR deletes the "Alternative Work Centers" doc in the "Manufacturing management" folder of the Manufacturing app documentation for version 16.0. The information in this doc has been rewritten and expanded upon in the "Manage work orders using work centers" doc, located in the same folder. Any references to the deleted doc in the documentation file tree have been removed. A redirect from the deleted doc to the new doc has been added as well.

Forward-Port-Of: #4838

@robodoo
Copy link
Collaborator

robodoo commented Jul 13, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jul 13, 2023

@hojo-odoo @StraubCreative cherrypicking of pull request #4838 failed.

stdout:

Auto-merging content/applications/inventory_and_mrp/manufacturing/management.rst
CONFLICT (content): Merge conflict in content/applications/inventory_and_mrp/manufacturing/management.rst
Auto-merging redirects/16.0.txt
CONFLICT (content): Merge conflict in redirects/16.0.txt

stderr:

05:03:03.577700 git.c:455               trace: built-in: git cherry-pick 45fa80b3496411f8d0a1888ef671be6b04e040cd
error: could not apply 45fa80b34... [DEL] MRP: Delete Alternative Work Centers 16.0
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

@samueljlieber samueljlieber force-pushed the saas-16.1-16.0-mrp-delete-alternative-work-centers-hojo-bEm--fw branch from 7aaaf35 to 6f97196 Compare July 13, 2023 13:34
@C3POdoo C3POdoo requested review from a team July 13, 2023 13:56
@StraubCreative
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Jul 13, 2023
closes #5096

X-original-commit: 222fd67
Signed-off-by: Zachary Straub (zst) <zst@odoo.com>
@robodoo robodoo temporarily deployed to merge July 13, 2023 19:01 Inactive
@robodoo robodoo closed this Jul 13, 2023
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