From 0f87ae1ae41f2350f1dd071c93e9a513d81014c5 Mon Sep 17 00:00:00 2001 From: Felicious Date: Thu, 15 Aug 2024 21:33:04 +0000 Subject: [PATCH] [REF] inventory: advanced shipping methods closes odoo/documentation#10821 X-original-commit: 152e8447a17d6555fcf1faad57f049568c181594 Signed-off-by: Felicia Kuan (feku) Co-authored-by: Sam Lieber (sali) <36018073+samueljlieber@users.noreply.github.com> --- .../product_management/configure/package.rst | 2 +- .../inventory/shipping_receiving.rst | 1 - .../advanced_operations_shipping.rst | 14 -------------- .../shipping_receiving/setup_configuration.rst | 8 +++++++- .../cancel.rst | 0 .../cancel/cancel01.png | Bin .../cancel/cancel02.png | Bin .../cancel/cancel03.png | Bin .../invoicing.rst | 0 .../invoicing/add-a-shipping-method.png | Bin .../invoicing/add-shipping.png | Bin .../invoicing/create-invoice.png | Bin .../invoicing/delivery-product.png | Bin .../invoicing/enable-delivery.png | Bin .../invoicing/invoice-cost.png | Bin .../invoicing/invoice-line.png | Bin .../label_type.rst | 0 .../label_type/full-page-fedex.png | Bin .../label_type/half-page-fedex.png | Bin .../label_type/label-type-dropdown.png | Bin .../label_type/shipping-italy-so.png | Bin .../label_type/shipping-options.png | Bin .../label_type/shipping-pdfs.png | Bin .../label_type/shipping-rate.png | Bin .../setup_configuration/labels.rst | 4 ++-- .../multipack.rst | 0 .../multipack/back-orders-button.png | Bin .../multipack/backorder-chatter.png | Bin .../multipack/backorder-pop-up.png | Bin .../multipack/detailed-operations.png | Bin .../multipack/packages-setting.png | Bin .../multipack/packages-smart-button.png | Bin .../multipack/product-menu-icon.png | Bin .../multipack/put-in-pack.png | Bin .../print_on_validation.rst | 0 .../print_on_validation/delivery-slip.png | Bin .../print_on_validation/export-doc.png | Bin .../print_on_validation/fedex-carrier-label.png | Bin .../print_on_validation/four-seven.png | Bin .../print_on_validation/four-twelve-lots.png | Bin .../print_on_validation/four-twelve.png | Bin .../print_on_validation/label-type.png | Bin .../print_on_validation/package-barcode.png | Bin .../print_on_validation/package-content.png | Bin .../print_on_validation/print-on-validation.png | Bin .../print_on_validation/printer-report.png | Bin .../print_on_validation/return-slip.png | Bin .../print_on_validation/select-printer.png | Bin .../print_on_validation/two-seven.png | Bin .../setup_configuration/third_party_shipper.rst | 6 ++---- .../checkout_payment_shipping/shipping.rst | 6 +++--- .../ecommerce_management/order_handling.rst | 4 ++-- redirects/16.0.txt | 4 ++++ redirects/17.0.txt | 1 + 54 files changed, 22 insertions(+), 28 deletions(-) delete mode 100644 content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping.rst rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/cancel.rst (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/cancel/cancel01.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/cancel/cancel02.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/cancel/cancel03.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/invoicing.rst (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/invoicing/add-a-shipping-method.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/invoicing/add-shipping.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/invoicing/create-invoice.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/invoicing/delivery-product.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/invoicing/enable-delivery.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/invoicing/invoice-cost.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/invoicing/invoice-line.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/label_type.rst (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/label_type/full-page-fedex.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/label_type/half-page-fedex.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/label_type/label-type-dropdown.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/label_type/shipping-italy-so.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/label_type/shipping-options.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/label_type/shipping-pdfs.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/label_type/shipping-rate.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/multipack.rst (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/multipack/back-orders-button.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/multipack/backorder-chatter.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/multipack/backorder-pop-up.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/multipack/detailed-operations.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/multipack/packages-setting.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/multipack/packages-smart-button.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/multipack/product-menu-icon.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/multipack/put-in-pack.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/print_on_validation.rst (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/print_on_validation/delivery-slip.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/print_on_validation/export-doc.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/print_on_validation/fedex-carrier-label.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/print_on_validation/four-seven.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/print_on_validation/four-twelve-lots.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/print_on_validation/four-twelve.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/print_on_validation/label-type.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/print_on_validation/package-barcode.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/print_on_validation/package-content.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/print_on_validation/print-on-validation.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/print_on_validation/printer-report.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/print_on_validation/return-slip.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/print_on_validation/select-printer.png (100%) rename content/applications/inventory_and_mrp/inventory/shipping_receiving/{advanced_operations_shipping => setup_configuration}/print_on_validation/two-seven.png (100%) diff --git a/content/applications/inventory_and_mrp/inventory/product_management/configure/package.rst b/content/applications/inventory_and_mrp/inventory/product_management/configure/package.rst index d44250dd1..212c14d62 100644 --- a/content/applications/inventory_and_mrp/inventory/product_management/configure/package.rst +++ b/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: diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving.rst b/content/applications/inventory_and_mrp/inventory/shipping_receiving.rst index 3301cdbae..2fd6242d7 100644 --- a/content/applications/inventory_and_mrp/inventory/shipping_receiving.rst +++ b/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 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 deleted file mode 100644 index ab3ad1181..000000000 --- a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping.rst +++ /dev/null @@ -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 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 42a62533c..c4a54616d 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 @@ -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 ` + :doc:`Invoice cost of shipping ` .. _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 + diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/cancel.rst b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/cancel.rst similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/cancel.rst rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/cancel.rst diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/cancel/cancel01.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/cancel/cancel01.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/cancel/cancel01.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/cancel/cancel01.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/cancel/cancel02.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/cancel/cancel02.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/cancel/cancel02.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/cancel/cancel02.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/cancel/cancel03.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/cancel/cancel03.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/cancel/cancel03.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/cancel/cancel03.png 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/setup_configuration/invoicing.rst similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing.rst rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing.rst diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing/add-a-shipping-method.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing/add-a-shipping-method.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing/add-a-shipping-method.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing/add-a-shipping-method.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing/add-shipping.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing/add-shipping.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing/add-shipping.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing/add-shipping.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing/create-invoice.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing/create-invoice.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing/create-invoice.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing/create-invoice.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing/delivery-product.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing/delivery-product.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing/delivery-product.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing/delivery-product.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing/enable-delivery.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing/enable-delivery.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing/enable-delivery.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing/enable-delivery.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing/invoice-cost.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing/invoice-cost.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing/invoice-cost.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing/invoice-cost.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing/invoice-line.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing/invoice-line.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/invoicing/invoice-line.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing/invoice-line.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type.rst b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type.rst similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type.rst rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type.rst diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type/full-page-fedex.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type/full-page-fedex.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type/full-page-fedex.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type/full-page-fedex.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type/half-page-fedex.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type/half-page-fedex.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type/half-page-fedex.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type/half-page-fedex.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type/label-type-dropdown.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type/label-type-dropdown.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type/label-type-dropdown.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type/label-type-dropdown.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type/shipping-italy-so.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type/shipping-italy-so.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type/shipping-italy-so.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type/shipping-italy-so.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type/shipping-options.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type/shipping-options.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type/shipping-options.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type/shipping-options.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type/shipping-pdfs.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type/shipping-pdfs.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type/shipping-pdfs.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type/shipping-pdfs.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type/shipping-rate.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type/shipping-rate.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/label_type/shipping-rate.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/label_type/shipping-rate.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels.rst b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels.rst index 28b035680..abc4d001d 100644 --- a/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/labels.rst +++ b/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:`../advanced_operations_shipping/multipack` + - :doc:`invoicing` + - :doc:`multipack` diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack.rst b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack.rst similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack.rst rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack.rst diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/back-orders-button.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/back-orders-button.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/back-orders-button.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/back-orders-button.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/backorder-chatter.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/backorder-chatter.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/backorder-chatter.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/backorder-chatter.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/backorder-pop-up.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/backorder-pop-up.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/backorder-pop-up.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/backorder-pop-up.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/detailed-operations.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/detailed-operations.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/detailed-operations.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/detailed-operations.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/packages-setting.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/packages-setting.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/packages-setting.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/packages-setting.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/packages-smart-button.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/packages-smart-button.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/packages-smart-button.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/packages-smart-button.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/product-menu-icon.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/product-menu-icon.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/product-menu-icon.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/product-menu-icon.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/put-in-pack.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/put-in-pack.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack/put-in-pack.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack/put-in-pack.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation.rst b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation.rst similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation.rst rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation.rst diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/delivery-slip.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/delivery-slip.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/delivery-slip.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/delivery-slip.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/export-doc.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/export-doc.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/export-doc.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/export-doc.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/fedex-carrier-label.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/fedex-carrier-label.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/fedex-carrier-label.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/fedex-carrier-label.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/four-seven.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/four-seven.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/four-seven.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/four-seven.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/four-twelve-lots.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/four-twelve-lots.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/four-twelve-lots.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/four-twelve-lots.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/four-twelve.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/four-twelve.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/four-twelve.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/four-twelve.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/label-type.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/label-type.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/label-type.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/label-type.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/package-barcode.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/package-barcode.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/package-barcode.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/package-barcode.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/package-content.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/package-content.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/package-content.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/package-content.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/print-on-validation.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/print-on-validation.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/print-on-validation.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/print-on-validation.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/printer-report.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/printer-report.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/printer-report.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/printer-report.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/return-slip.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/return-slip.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/return-slip.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/return-slip.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/select-printer.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/select-printer.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/select-printer.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/select-printer.png diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/two-seven.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/two-seven.png similarity index 100% rename from content/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/print_on_validation/two-seven.png rename to content/applications/inventory_and_mrp/inventory/shipping_receiving/setup_configuration/print_on_validation/two-seven.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 dda72735d..e3692660f 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 @@ -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 - <../advanced_operations_shipping/invoicing>`. + refer to :doc:`Invoice real shipping costs ` document. - :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 - <../advanced_operations_shipping/invoicing>` + :doc:`Charge customers for shipping after product delivery ` .. _inventory/shipping_receiving/third-party-do: diff --git a/content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst b/content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst index e0a279925..4ad329bca 100644 --- a/content/applications/websites/ecommerce/checkout_payment_shipping/shipping.rst +++ b/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:`/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/multipack` - - :doc:`/applications/inventory_and_mrp/inventory/shipping_receiving/advanced_operations_shipping/cancel` + - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/setup_configuration/invoicing` + - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/setup_configuration/multipack` + - :doc:`../../../inventory_and_mrp/inventory/shipping_receiving/setup_configuration/cancel` .. _ecommerce-shipping-providers: diff --git a/content/applications/websites/ecommerce/ecommerce_management/order_handling.rst b/content/applications/websites/ecommerce/ecommerce_management/order_handling.rst index 5c4cc4f9f..b3427ae33 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:`../../../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 ------------------- diff --git a/redirects/16.0.txt b/redirects/16.0.txt index 783e1c41d..24c6d3812 100644 --- a/redirects/16.0.txt +++ b/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 diff --git a/redirects/17.0.txt b/redirects/17.0.txt index 0fef7f87e..14e72ae30 100644 --- a/redirects/17.0.txt +++ b/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/*