Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented May 4, 2023

Tasks: #3205819, #3208499, #3208472, #3210922, #3189292, #3189335

Targets: 14.0, 15.0, & 16.0

This PR restructures the Delivery Orders and Incoming Shipments folders by consolidating both folders into a single Incoming Shipments & Delivery Orders folder and merges the following docs:

  • delivery/inventory_flow.rst ➡️ shipments_deliveries/inventory_flow.rst
  • delivery/one_step.rst & incoming/one_step.rst ➡️ shipments_deliveries/receipts_delivery_one_step.rst
  • delivery/two_steps.rst & incoming/two_step.rst ➡️ shipments_deliveries/receipts_delivery_two_steps.rst
  • delivery/three_steps.rst ➡️ shipments_deliveries/delivery_three_steps.rst
  • incoming/three_steps.rst ➡️ shipments_deliveries/receipts_three_steps.rst

As well as moved two files from Delivery Orders to a more appropriate location for the file content Shipping Operations:

  • delivery/label_type.rst ➡️ shipping/operation/label_type.rst
  • delivery/dropshipping.rst ➡️ shipping/operation/dropshipping.rst

Here are images showing the old structure and the new structure created by this PR.

Redirects were added for all file moves and name changes.

Forward-Port-Of: #3762

@robodoo
Copy link
Collaborator

robodoo commented May 4, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented May 4, 2023

@samueljlieber @StraubCreative cherrypicking of pull request #3762 failed.

stdout:

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

stderr:

02:24:47.950397 git.c:455               trace: built-in: git cherry-pick c91b7b377016c7bcdedb586dddf6e5aae3d8d4ed
error: could not apply c91b7b377... [IMP] inventory: delivery orders and incoming shipments restructure
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.

@StraubCreative
Copy link
Contributor

@samueljlieber can you take a look please?
After we should be able to continue the FWP which will generate the full chain.

Reminder not to fw-bot r+ the master branch we need to tag JCS on 16.0 branches 😉

@jcs-odoo jcs-odoo force-pushed the 15.0-14.0-inventory-delivery-orders-and-shipments-restructure-larm-aglt-fw branch from f24a207 to d863e66 Compare May 4, 2023 07:07
@C3POdoo C3POdoo requested review from a team May 4, 2023 07:09
@jcs-odoo
Copy link
Contributor

jcs-odoo commented May 4, 2023

I took the liberty to fix this one as it was a really small conflict :)

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

5 participants