Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Nov 10, 2023

This PR adds a new doc detailing how to manufacture products using three steps.

NOTE: There is a ref tag in this doc that does not currently work because the doc it is referencing is not yet live. The doc being referenced should be live by the time this doc is published, at which point, the ref tag will work.

Forward-Port-Of: #5163

@robodoo
Copy link
Collaborator

robodoo commented Nov 10, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Nov 10, 2023

@hojo-odoo cherrypicking of pull request #5163 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

stderr:

19:34:04.803640 git.c:463               trace: built-in: git cherry-pick 7880b94e16da88ce477b4b45ad0bf0f46bd828bd
error: could not apply 7880b94e1... [ADD] MRP: Three-step 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

@StraubCreative solution:

  1. merge all 2-step fwps on [FW][ADD] MRP: Two-step manufacturing #6402 first
  2. then cherry pick 1-step [FW][ADD] MRP: One-step manufacturing #6403 + fwp all
  3. do 3-step last

closes #5163

Signed-off-by: John Holton (hojo) <hojo@odoo.com>
@StraubCreative StraubCreative force-pushed the saas-16.1-16.0-mrp-add-three-step-hojo-TDfU-fw branch from a028de0 to fa79310 Compare November 16, 2023 20:52
@C3POdoo C3POdoo requested a review from a team November 16, 2023 20:53
@StraubCreative
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Nov 16, 2023
closes #5163

closes #6407

Signed-off-by: John Holton (hojo) <hojo@odoo.com>
Signed-off-by: Zachary Straub (zst) <zst@odoo.com>
@robodoo robodoo closed this Nov 16, 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.

3 participants