Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Dec 22, 2023

This PR is an [IMP] targeting the product_variants doc in Odoo's MRP documentation.

Performed complete rewrite to the document for 14.0 to be fwd-ported (targeted revisions for 15.0 and 16.0 to follow).

  • Completely rewrote the .rst file and added example flow instructions
  • Added additional screenshots
  • Rewrote and added to doc to make more robust and comprehensive than before

Forward-Port-Of: #5236

@robodoo
Copy link
Collaborator

robodoo commented Dec 22, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Dec 22, 2023

@brse-odoo @StraubCreative cherrypicking of pull request #5236 failed.

stdout:

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

stderr:

02:56:29.194339 git.c:463               trace: built-in: git cherry-pick 940d9e02c857d272abe64c1ce3ba46c512daad82
error: could not apply 940d9e02c... [IMP] mrp: update variants doc
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

@samueljlieber @brse-odoo the entire fwp doc has merge conflicts— please work together and advise to what's best for 15.0+, thanks!

@samueljlieber samueljlieber force-pushed the 15.0-14.0-mrp-update-bom-variants-brse-YmOj-fw branch from 82f2f3b to 7a747c9 Compare December 26, 2023 15:55
@C3POdoo C3POdoo requested a review from a team December 26, 2023 15:56
@samueljlieber samueljlieber removed the request for review from a team December 26, 2023 15:57
@samueljlieber
Copy link
Contributor

Resolved conflict in 7a747c9 due to past small changes in the 15.0 version of product_variants.rst. I cherry-picked the improvements in #5236. These changes should be fine to FWP through to master.

@brse-odoo
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.

6 participants