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: #4331
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

This PR targets saas-16.1 and is part of the forward-port chain. Further PRs will be created up to master.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

robodoo pushed a commit that referenced this pull request May 4, 2023
closes #4334

X-original-commit: bea00ec
Related: odoo/odoo#120532
Signed-off-by: Zachary Straub (zst) <zst@odoo.com>
Signed-off-by: Castillo Jonathan (jcs) <jcs@odoo.com>
robodoo pushed a commit to odoo/odoo that referenced this pull request May 4, 2023
This commit updates the documentation link in the settings tooltip, as
introduced by the documentation PR
odoo/documentation#3762
A redirection rule is added in that doc PR to act as a fallback.

closes #120532

Related: odoo/documentation#4334
Signed-off-by: Tiffany Chang <tic@odoo.com>
@robodoo robodoo temporarily deployed to merge May 4, 2023 14:45 Inactive
@robodoo robodoo closed this May 4, 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