diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping.rst b/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping.rst index 7b5f44016..81a5a7d22 100644 --- a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping.rst +++ b/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping.rst @@ -10,7 +10,6 @@ Advanced operations advanced_operations_shipping/scheduled_dates advanced_operations_shipping/invoicing advanced_operations_shipping/multipack - advanced_operations_shipping/labels advanced_operations_shipping/label_type advanced_operations_shipping/dropshipping advanced_operations_shipping/cancel diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing.rst b/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing.rst index 706474c6c..082c849cb 100644 --- a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing.rst +++ b/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing.rst @@ -2,8 +2,6 @@ Shipping cost invoicing ======================= -.. _inventory/shipping/invoice: - Invoicing customers for shipping after delivery ensures accurate charges based on real-time shipping factors like distance, weight, and method. @@ -122,4 +120,4 @@ Finally, invoice the customer the adjusted shipping cost by clicking :guilabel:` .. seealso:: - :doc:`../setup_configuration/third_party_shipper` - - :doc:`labels` + - :doc:`../setup_configuration/labels` diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration.rst b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration.rst index 13659bc8f..2630d512a 100644 --- a/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration.rst +++ b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration.rst @@ -9,6 +9,7 @@ Setup and configuration setup_configuration/delivery_method setup_configuration/third_party_shipper + setup_configuration/labels setup_configuration/sendcloud_shipping setup_configuration/ups_credentials setup_configuration/dhl_credentials diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/delivery_method.rst b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/delivery_method.rst index 2413b4acd..9a1a98d4d 100644 --- a/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/delivery_method.rst +++ b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/delivery_method.rst @@ -169,7 +169,7 @@ Policy` field to decide whether the added shipping charge on the sales order is from the shipping carrier. .. seealso:: - :ref:`Invoice cost of shipping ` + :doc:`Invoice cost of shipping <../advanced_operations_shipping/invoicing>` .. _inventory/shipping/sales-order: diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels.rst b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels.rst similarity index 97% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels.rst rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels.rst index 72990c94a..89cb8f00b 100644 --- a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels.rst +++ b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels.rst @@ -119,5 +119,5 @@ The tracking label is found in PDF format in the chatter. Sample label generated from Odoo's shipping connector with FedEx. .. seealso:: - - :doc:`invoicing` - - :doc:`multipack` + - :doc:`../advanced_operations_shipping/invoicing` + - :doc:`../advanced_operations_shipping/multipack` diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels/add-shipping-button.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels/add-shipping-button.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels/add-shipping-button.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels/add-shipping-button.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels/additional-info-tab.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels/additional-info-tab.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels/additional-info-tab.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels/additional-info-tab.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels/get-rate.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels/get-rate.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels/get-rate.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels/get-rate.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels/integration-level.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels/integration-level.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels/integration-level.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels/integration-level.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels/sample-label.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels/sample-label.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels/sample-label.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels/sample-label.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels/shipping-label.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels/shipping-label.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels/shipping-label.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels/shipping-label.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/third_party_shipper.rst b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/third_party_shipper.rst index c9d63f01b..6dc359c74 100644 --- a/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/third_party_shipper.rst +++ b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/third_party_shipper.rst @@ -9,7 +9,7 @@ Third-party shipping carriers Users can link third-party shipping carriers to Odoo databases, in order to verify carriers' delivery to specific addresses, :doc:`automatically calculate shipping costs `, and -:doc:`generate shipping labels <../advanced_operations_shipping/labels>`. +:doc:`generate shipping labels `. In Odoo, shipping carriers can be applied to a sales order (SO), invoice, or delivery order. For tips on resolving common issues when configuring shipping connectors, skip to the @@ -116,7 +116,7 @@ The :guilabel:`Shipping Method` page contains details about the provider, includ .. important:: Select :guilabel:`Get Rate and Create Shipment` to also :doc:`generate shipping labels - <../advanced_operations_shipping/labels>`. + `. - :guilabel:`Company`: if the shipping method should apply to a specific company, select it from the drop-down menu. Leave the field blank to apply the method to all companies. @@ -266,7 +266,7 @@ shipping carrier. When the delivery method is set to :ref:`production mode provided. .. seealso:: - :doc:`Generate shipping labels <../advanced_operations_shipping/labels>` + :doc:`Generate shipping labels ` .. image:: third_party_shipper/delivery-info.png :align: center diff --git a/content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst b/content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst index 1f3ac56ad..26ec5a13d 100644 --- a/content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst +++ b/content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst @@ -45,11 +45,13 @@ Another solution is to use one of the integrations with an existing shipping pro of using an integration is that delivery costs are automatically computed based on each order as well as generating shipping labels. + + .. seealso:: - - :doc:`/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/third_party_shipper` - - :doc:`/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/ups_credentials` - - :doc:`/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/dhl_credentials` - - :doc:`/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels` + - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/setup_configuration/third_party_shipper` + - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/setup_configuration/ups_credentials` + - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/setup_configuration/dhl_credentials` + - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels` Website availability ==================== diff --git a/content/applications/websites/ecommerce/ecommerce_management/order_handling.rst b/content/applications/websites/ecommerce/ecommerce_management/order_handling.rst index 5a92f2fbe..5c4cc4f9f 100644 --- a/content/applications/websites/ecommerce/ecommerce_management/order_handling.rst +++ b/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:`/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing` - - :doc:`/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/labels` - - :doc:`/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack` + - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing` + - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels` + - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack` Returns and refunds ------------------- diff --git a/redirects/16.0.txt b/redirects/16.0.txt index 7cb7beedd..113f7ab4c 100644 --- a/redirects/16.0.txt +++ b/redirects/16.0.txt @@ -110,6 +110,7 @@ applications/inventory_and_mrp/inventory/shipping/operation.rst applications/inv 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/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/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/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/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/*