[REF] inventory: advanced shipping methods

closes odoo/documentation#10821

X-original-commit: 152e8447a1
Signed-off-by: Felicia Kuan (feku) <feku@odoo.com>
Co-authored-by: Sam Lieber (sali) <36018073+samueljlieber@users.noreply.github.com>

content/applications/inventory_and_mrp/inventory/product_management/configure/package.rst

@@ -87,7 +87,7 @@ the above steps to place the :guilabel:`Product` in different packages. Once fin
 
 .. seealso::
    :doc:`Ship one order in multiple packages
-   <../../shipping_receiving/advanced_operations_shipping/multipack>`
+   <../../shipping_receiving/setup_configuration/multipack>`
 
 .. _inventory/warehouses_storage/put-in-pack:
 

content/applications/inventory_and_mrp/inventory/shipping_receiving.rst

@@ -12,4 +12,3 @@ Shipping and receiving
    shipping_receiving/reservation_methods
    shipping_receiving/picking_methods
    shipping_receiving/removal_strategies
-   shipping_receiving/advanced_operations_shipping

content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping.rst

@@ -1,14 +0,0 @@
-:nosearch:
-
-===================
-Advanced operations
-===================
-
-.. toctree::
-   :titlesonly:
-
-   advanced_operations_shipping/invoicing
-   advanced_operations_shipping/multipack
-   advanced_operations_shipping/label_type
-   advanced_operations_shipping/print_on_validation
-   advanced_operations_shipping/cancel

content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration.rst

@@ -172,7 +172,7 @@ Policy` field to decide whether the added shipping charge on the sales order is
 from the shipping carrier.
 
 .. seealso::
-   :doc:`Invoice cost of shipping <advanced_operations_shipping/invoicing>`
+   :doc:`Invoice cost of shipping <setup_configuration/invoicing>`
 
 .. _inventory/shipping/sales-order:
 
@@ -228,3 +228,9 @@ delivery order. To add or change the delivery method on the delivery itself, go
    setup_configuration/starshipit_shipping
    setup_configuration/ups_credentials
    setup_configuration/zebra
+   setup_configuration/cancel
+   setup_configuration/invoicing
+   setup_configuration/label_type
+   setup_configuration/multipack
+   setup_configuration/print_on_validation
+

content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels.rst

@@ -160,5 +160,5 @@ The tracking label is found in PDF format in the chatter.
    Sample label generated from Odoo's shipping connector with FedEx.
 
 .. seealso::
-   - :doc:`../advanced_operations_shipping/invoicing`
+   - :doc:`invoicing`
-   - :doc:`../advanced_operations_shipping/multipack`
+   - :doc:`multipack`

content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/third_party_shipper.rst

@@ -131,8 +131,7 @@ The :guilabel:`Shipping Method` page contains details about the provider, includ
   |SO| or invoice.
 - :guilabel:`Invoicing Policy`: select and calculate an :guilabel:`Estimated cost` of shipping
   directly from the shipping carrier. If the :guilabel:`Real cost` of shipping is wanted instead,
-  refer to this :doc:`doc about invoicing real shipping costs
+  refer to :doc:`Invoice real shipping costs <invoicing>` document.
-  <../advanced_operations_shipping/invoicing>`.
 - :guilabel:`Margin on Rate`: specify an additional percentage amount added to the base shipping
   rate to cover extra costs, such as handling fees, packaging materials, exchange rates, etc.
 - :guilabel:`Free if order amount is above`: enables free shipping for orders surpassing a specified
@@ -253,8 +252,7 @@ cost through the shipping connector. Then, click the :guilabel:`Add` button to a
 charge to the |SO| or invoice.
 
 .. seealso::
-   :doc:`Charge customers for shipping after product delivery
+   :doc:`Charge customers for shipping after product delivery <invoicing>`
-   <../advanced_operations_shipping/invoicing>`
 
 .. _inventory/shipping_receiving/third-party-do:
 

content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst

@@ -30,9 +30,9 @@ sites` can be made **website-specific**, but are by default available for *all*
 
 .. seealso::
    - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/setup_configuration`
-   - :doc:`/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing`
+   - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing`
-   - :doc:`/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack`
+   - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack`
-   - :doc:`/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/cancel`
+   - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/setup_configuration/cancel`
 
 .. _ecommerce-shipping-providers:
 

content/applications/websites/ecommerce/ecommerce_management/order_handling.rst

@@ -80,9 +80,9 @@ enable the feature in the settings of the
    manually to reserve products in stock.
 
 .. seealso::
-   - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing`
+   - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing`
    - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels`
-   - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack`
+   - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack`
 
 Returns and refunds
 -------------------

redirects/16.0.txt

@@ -132,13 +132,17 @@ applications/inventory_and_mrp/inventory/management/planning/scheduled_dates.rst
 applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/scheduled_dates.rst applications/inventory_and_mrp/inventory/warehouses_storage/replenishment/lead_times.rst                         # /inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/scheduled_dates inventory_and_mrp/inventory/warehouses_storage/replenishment/lead_times
 applications/inventory_and_mrp/inventory/shipping/operation.rst applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping.rst                                                                  # /inventory_and_mrp/inventory/shipping/operation -> /inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping
 applications/inventory_and_mrp/inventory/shipping/operation/invoicing.rst applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing.rst                                              # /inventory_and_mrp/inventory/shipping/operation/* -> /inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/*
+applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing.rst applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing.rst                          # /inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/* -> /inventory_and_mrp/inventory/shipping_receiving/setup_configuration/*
 applications/inventory_and_mrp/inventory/shipping/operation/multipack.rst applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack.rst                                              # /inventory_and_mrp/inventory/shipping/operation/* -> /inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/*
+applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack.rst applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack.rst                          # /inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/* -> /inventory_and_mrp/inventory/shipping_receiving/setup_configuration/*
 applications/inventory_and_mrp/inventory/shipping/operation/labels.rst applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels.rst                                                    # /inventory_and_mrp/inventory/shipping/operation/* -> /inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/*
 applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels.rst applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels.rst                                # /inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels -> /inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels
 applications/inventory_and_mrp/inventory/shipping/operation/label_type.rst applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type.rst                                            # /inventory_and_mrp/inventory/shipping/operation/* -> /inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/*
+applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type.rst applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type.rst                        # /inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/* -> /inventory_and_mrp/inventory/shipping_receiving/setup_configuration/*
 applications/inventory_and_mrp/inventory/shipping/operation/dropshipping.rst applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/dropshipping.rst                                        # /inventory_and_mrp/inventory/shipping/operation/* -> /inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/*
 applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/dropshipping.rst applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/dropshipping.rst                       # /inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/dropshipping -> /inventory_and_mrp/inventory/shipping_receiving/daily_operations/dropshipping
 applications/inventory_and_mrp/inventory/shipping/operation/cancel.rst applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/cancel.rst                                                    # /inventory_and_mrp/inventory/shipping/operation/* -> /inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/*
+applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/cancel.rst applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/cancel.rst                                # /inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/* -> /inventory_and_mrp/inventory/shipping_receiving/setup_configuration/*
 
 # applications/sales
 

redirects/17.0.txt

@@ -45,6 +45,7 @@ applications/inventory_and_mrp/inventory/warehouses_storage/advanced_operations_
 applications/inventory_and_mrp/inventory/warehouses_storage/removal_strategies/lifo.rst applications/inventory_and_mrp/inventory/shipping_receiving/removal_strategies/lifo.rst                            # warehouses_storage/removal_strategies/* --> shipping_receiving/removal_strategies/*
 applications/inventory_and_mrp/inventory/warehouses_storage/inventory_management/resupply_warehouses.rst applications/inventory_and_mrp/inventory/warehouses_storage/replenishment/resupply_warehouses.rst                              # inventory_management/resupply_warehouses --> replenishment/resupply_warehouses
 applications/inventory_and_mrp/inventory/warehouses_storage/inventory_management/warehouse_replenishment_transfer.rst applications/inventory_and_mrp/inventory/warehouses_storage/replenishment/warehouse_replenishment_transfer.rst    # inventory_management/warehouse_replenishment_transfer --> replenishment/warehouse_replenishment_transfer
+applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation.rst applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation.rst                # shipping_receiving/advanced_operations_shipping/* -> shipping_receiving/setup_configuration/*
 applications/inventory_and_mrp/manufacturing/management/bill_configuration.rst applications/inventory_and_mrp/manufacturing/basic_setup/bill_configuration.rst                              # management/* --> basic_setup/*
 applications/inventory_and_mrp/manufacturing/management/configure_manufacturing_product.rst applications/inventory_and_mrp/manufacturing/basic_setup/configure_manufacturing_product.rst    # management/* --> basic_setup/*
 applications/inventory_and_mrp/manufacturing/management/kit_shipping.rst applications/inventory_and_mrp/manufacturing/advanced_configuration/kit_shipping.rst                               # management/* --> advanced_configuration/*