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

@jcs-odoo
Copy link
Contributor

jcs-odoo commented May 4, 2023

@samueljlieber and @StraubCreative

My workflow wasn't ideal here, as I introduced the link fix in the middle of this documentation forward-port. Therefore, I had to create manually all branches from 16.0 to master
odoo/odoo#120526
odoo/odoo#120532
odoo/odoo#120533
odoo/odoo#120535

The next time I'll have to update a link in the apps settings, I'll simply create a PR that is not linked to the documentation ones, after the documentation PRs have all been merged.

@jcs-odoo
Copy link
Contributor

jcs-odoo commented May 4, 2023

Linked PR were r+ed
@fw-bot r+ please, thank you very much Mr bot.

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

X-original-commit: bea00ec
Related: odoo/odoo#120535
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 #120535

Related: odoo/documentation#4336
Signed-off-by: Tiffany Chang <tic@odoo.com>
robodoo pushed a commit that referenced this pull request May 4, 2023
closes #4336

X-original-commit: bea00ec
Related: odoo/odoo#120535
Signed-off-by: Zachary Straub (zst) <zst@odoo.com>
Signed-off-by: Castillo Jonathan (jcs) <jcs@odoo.com>
@robodoo robodoo temporarily deployed to merge May 4, 2023 20:37 Inactive
@robodoo robodoo closed this May 4, 2023
@robodoo robodoo added the 16.3 label 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.

4 participants