[REF] inventory: restructure shipping section

closes odoo/documentation#10699

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

content/applications/finance/expenses.rst

@@ -41,7 +41,7 @@ drop-down menu (most products will be set to :guilabel:`Units`).
    units, miles, nights, etc.). Go to :menuselection:`Sales app --> Configuration --> Settings` and
    ensure `Units of Measure` is enabled in the `Product Catalog` section. Click on the
    :guilabel:`Units of Measure` internal link to :doc:`view, create, and edit the units of measure
-   <../inventory_and_mrp/inventory/product_management/product_replenishment/uom>`.
+   <../inventory_and_mrp/inventory/product_management/configure/uom>`.
 
 .. image:: expenses/new-expense-product.png
    :align: center

content/applications/finance/fiscal_localizations/egypt.rst

@@ -175,7 +175,7 @@ Make sure your products are correctly configured so your e-invoices are valid:
 
 - :guilabel:`Product Type`: storable products, consumables, or services.
 - :guilabel:`Unit of Measure`: if you also use Odoo Inventory and have enabled :doc:`Units of
-  Measure <../../inventory_and_mrp/inventory/product_management/product_replenishment/uom>`.
+  Measure <../../inventory_and_mrp/inventory/product_management/configure/uom>`.
 - :guilabel:`Barcode`: **GS1** or **EGS** barcode
 - :guilabel:`ETA Item code` (under the :menuselection:`Accounting` tab): if the barcode doesn't
   match your ETA item code.

content/applications/general/companies.rst

@@ -237,7 +237,7 @@ options:
 
 .. note::
    Products **must** be configured as :guilabel:`Can be sold` and shared between the companies. See
-   :doc:`../inventory_and_mrp/inventory/product_management/product_tracking/type`.
+   :doc:`../inventory_and_mrp/inventory/product_management/configure/type`.
 
 .. example::
    :guilabel:`Synchronize invoice/bills`: an invoice posted on `JS Store Belgium`, for `JS Store

content/applications/inventory_and_mrp/inventory/product_management.rst

@@ -7,5 +7,5 @@ Product management
 .. toctree::
    :titlesonly:
 
-   product_management/product_replenishment
+   product_management/configure
    product_management/product_tracking

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

@@ -0,0 +1,14 @@
+:nosearch:
+
+=================
+Configure product
+=================
+
+.. toctree::
+   :titlesonly:
+
+   configure/type
+   configure/uom
+   configure/package
+   configure/packaging
+

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

@@ -23,9 +23,9 @@ to *Reusable Box* **only** when configuring packages for :ref:`cluster pickings
 <inventory/warehouses_storage/cluster-pack>`.
 
 *Package type* is an optional feature used for :doc:`calculating shipping cost
-<../../shipping_receiving/setup_configuration/delivery_method>`, based on real shipping weight.
-Create package types to include the weight of the package itself (e.g. boxes, pallets, other
-shipping containers) in shipping cost calculations.
+<../../shipping_receiving/setup_configuration>`, based on real shipping weight. Create package types
+to include the weight of the package itself (e.g. boxes, pallets, other shipping containers) in
+shipping cost calculations.
 
 .. note::
    While packages are commonly used in the :doc:`three-step delivery route
@@ -120,7 +120,7 @@ calculate package weights for shipping costs.
 
 .. seealso::
    - :doc:`Shipping carriers <../../shipping_receiving/setup_configuration/third_party_shipper>`
-   - :doc:`../../shipping_receiving/setup_configuration/delivery_method`
+   - :doc:`../../shipping_receiving/setup_configuration`
 
 On the :guilabel:`Package Types` list, clicking :guilabel:`New` opens a blank package type form. The
 fields of the form are as follows:
@@ -185,8 +185,7 @@ following fields:
    :alt: Display package form to create a cluster pack.
 
 .. seealso::
-   :doc:`Using cluster packages
-   <../../warehouses_storage/advanced_operations_warehouse/cluster_picking>`
+   :doc:`Using cluster packages <../../shipping_receiving/picking_methods/cluster>`
 
 View packages
 =============

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

@@ -7,9 +7,9 @@ Product type
 Define *product types* in Odoo to track products in varying levels of detail.
 
 Classify products as *storable* to track stock counts, allowing users to trigger :doc:`reordering
-rules <../product_replenishment/reordering_rules>` for generating purchase orders. *Consumable*
-products are assumed to always be in stock, and *service* products are performed and served by the
-business.
+rules <../../warehouses_storage/replenishment/reordering_rules>` for generating purchase orders.
+*Consumable* products are assumed to always be in stock, and *service* products are performed and
+served by the business.
 
 .. seealso::
    `Odoo Tutorials: Product Type <https://www.youtube.com/watch?v=l6j0ZkP5mLM>`_
@@ -87,7 +87,7 @@ to detailed sections.
      - :ref:`Yes* <inventory/product_management/transfer-store>`
      - :ref:`Yes* <inventory/product_management/transfer-con>`
      - :ref:`No* <inventory/product_management/transfer-serv>`
-   * - :doc:`Lot/serial number tracking <differences>`
+   * - :doc:`Lot/serial number tracking <../product_tracking>`
      - Yes
      - No
      - No

content/applications/inventory_and_mrp/inventory/product_management/product_replenishment.rst

@@ -1,13 +0,0 @@
-:nosearch:
-
-=====================
-Product replenishment
-=====================
-
-.. toctree::
-   :titlesonly:
-
-   product_replenishment/strategies
-   product_replenishment/mto
-   product_replenishment/reordering_rules
-   product_replenishment/uom

content/applications/inventory_and_mrp/inventory/product_management/product_tracking.rst

@@ -1,18 +1,111 @@
-:nosearch:
+:show-content:
+:hide-page-toc:
 
 ================
 Product tracking
 ================
 
+*Lots* and *serial numbers* are the two ways to identify and track products in Odoo. While there are
+similarities between the two traceability methods, there are also notable differences that affect
+receipts, deliveries, and inventory reports.
+
+A *lot* usually indicates a specific batch of an item that was received, is currently stored, or was
+shipped from a warehouse. However, it can also pertain to a batch of products manufactured in-house,
+as well.
+
+A *serial number* is a unique identifier assigned incrementally (or sequentially) to an item or
+product, used to distinguish it from other items or products.
+
+.. seealso::
+   - :doc:`product_tracking/lots`
+   - :doc:`product_tracking/serial_numbers`
+
+Enable lots & serial numbers
+============================
+
+To track products using lots and serial numbers, the *Lots & Serial Numbers* feature must be
+enabled.
+
+To do that, go to the :menuselection:`Inventory app --> Configuration --> Settings`, scroll down to
+the :guilabel:`Traceability` section, and click the box next to :guilabel:`Lots & Serial Numbers`.
+Then, click the :guilabel:`Save` button to save changes.
+
+.. image:: product_tracking/product_tracking/differences-enabled-setting.png
+   :align: center
+   :alt: Enabled lots and serial numbers feature in inventory settings.
+
+When to use lots
+================
+
+Lots are useful for products that are manufactured or received in large quantities, such as clothes
+or food. Lots and can be used to trace a product back to a group, which is especially useful when
+managing product recalls or expiration dates.
+
+.. example::
+   .. image:: product_tracking/product_tracking/differences-lot.png
+      :align: center
+      :alt: Created lot with quantity of products in it.
+
+Manufacturers assign lot numbers to groups of products that have common properties; this can lead to
+multiple goods sharing the same lot number. This helps identify a number of products in a single
+group, and allows for end-to-end traceability of these products through each step in their life
+cycles.
+
+When to use serial numbers
+==========================
+
+The goal of assigning serial numbers to individual products is to make sure every item's history is
+identifiable when it travels through the supply chain. This can be especially useful for
+manufacturers that provide after-sales services related to products they sell and deliver.
+
+.. example::
+   .. image:: product_tracking/product_tracking/differences-serial-numbers.png
+      :align: center
+      :alt: List of serial numbers for product.
+
+Serial numbers can contain many different types of characters: numbers, letters, typographical
+symbols, or a mixture of all three types.
+
+Traceability
+============
+
+Manufacturers and companies can refer to traceability reports to see the entire life cycle of a
+product. These reports include vital information, like where it came from (and when), where it was
+stored, and to whom it was sent.
+
+To see the full traceability of a product, or group products by lots and/or serial numbers, go to
+:menuselection:`Inventory app --> Products --> Lots/Serial Numbers`. Doing so reveals the
+:guilabel:`Lots/Serial Numbers` dashboard.
+
+From here, products with lots or serial numbers assigned to them are listed by default. They can
+also be expanded to show what lots or serial numbers have been specifically assigned to them.
+
+To group by lots or serial numbers, first remove any default filters from the search bar in the
+upper-right corner. Then, click :guilabel:`Group By`, and select :guilabel:`Add Custom Group`, which
+reveals a mini drop-down menu. From this mini drop-down menu, select :guilabel:`Lot/Serial Number`,
+and click :guilabel:`Apply`.
+
+Doing so reveals all existing lots and serial numbers, and each can be expanded to show all product
+quantities with that assigned number. For unique serial numbers that are *not* reused, there should
+*only* be one product per serial number.
+
+.. image:: product_tracking/product_tracking/differences-tracking.png
+   :align: center
+   :alt: Reporting page with drop-down lists of lots and serial numbers.
+
+.. tip::
+   For additional information regarding an individual lot number or serial number, click the line
+   item for the lot or serial number to reveal that specific number's :guilabel:`Lot` or
+   :guilabel:`Serial Number` form. From this form, click the :guilabel:`Location` and
+   :guilabel:`Traceability` smart buttons to see all stock on-hand using that serial number. Any
+   operations made using that lot or serial number can be found here, as well.
+
 .. toctree::
    :titlesonly:
 
-   product_tracking/type
-   product_tracking/differences
-   product_tracking/create_sn
    product_tracking/serial_numbers
+   product_tracking/create_sn
    product_tracking/lots
    product_tracking/reassign
    product_tracking/expiration_dates
-   product_tracking/package
-   product_tracking/packaging
+

content/applications/inventory_and_mrp/inventory/product_management/product_tracking/differences.rst

@@ -1,98 +0,0 @@
-==========================================
-Difference between lots and serial numbers
-==========================================
-
-*Lots* and *serial numbers* are the two ways to identify and track products in Odoo. While there are
-similarities between the two traceability methods, there are also notable differences that affect
-receipts, deliveries, and inventory reports.
-
-A *lot* usually indicates a specific batch of an item that was received, is currently stored, or was
-shipped from a warehouse. However, it can also pertain to a batch of products manufactured in-house,
-as well.
-
-A *serial number* is a unique identifier assigned incrementally (or sequentially) to an item or
-product, used to distinguish it from other items or products.
-
-.. seealso::
-   - :doc:`lots`
-   - :doc:`serial_numbers`
-
-Enable lots & serial numbers
-============================
-
-To track products using lots and serial numbers, the *Lots & Serial Numbers* feature must be
-enabled.
-
-To do that, go to the :menuselection:`Inventory app --> Configuration --> Settings`, scroll down to
-the :guilabel:`Traceability` section, and click the box next to :guilabel:`Lots & Serial Numbers`.
-Then, click the :guilabel:`Save` button to save changes.
-
-.. image:: differences/differences-enabled-setting.png
-   :align: center
-   :alt: Enabled lots and serial numbers feature in inventory settings.
-
-When to use lots
-================
-
-Lots are useful for products that are manufactured or received in large quantities, such as clothes
-or food. Lots and can be used to trace a product back to a group, which is especially useful when
-managing product recalls or expiration dates.
-
-.. example::
-   .. image:: differences/differences-lot.png
-      :align: center
-      :alt: Created lot with quantity of products in it.
-
-Manufacturers assign lot numbers to groups of products that have common properties; this can lead to
-multiple goods sharing the same lot number. This helps identify a number of products in a single
-group, and allows for end-to-end traceability of these products through each step in their life
-cycles.
-
-When to use serial numbers
-==========================
-
-The goal of assigning serial numbers to individual products is to make sure every item's history is
-identifiable when it travels through the supply chain. This can be especially useful for
-manufacturers that provide after-sales services related to products they sell and deliver.
-
-.. example::
-   .. image:: differences/differences-serial-numbers.png
-      :align: center
-      :alt: List of serial numbers for product.
-
-Serial numbers can contain many different types of characters: numbers, letters, typographical
-symbols, or a mixture of all three types.
-
-Traceability
-============
-
-Manufacturers and companies can refer to traceability reports to see the entire life cycle of a
-product. These reports include vital information, like where it came from (and when), where it was
-stored, and to whom it was sent.
-
-To see the full traceability of a product, or group products by lots and/or serial numbers, go to
-:menuselection:`Inventory app --> Products --> Lots/Serial Numbers`. Doing so reveals the
-:guilabel:`Lots/Serial Numbers` dashboard.
-
-From here, products with lots or serial numbers assigned to them are listed by default. They can
-also be expanded to show what lots or serial numbers have been specifically assigned to them.
-
-To group by lots or serial numbers, first remove any default filters from the search bar in the
-upper-right corner. Then, click :guilabel:`Group By`, and select :guilabel:`Add Custom Group`, which
-reveals a mini drop-down menu. From this mini drop-down menu, select :guilabel:`Lot/Serial Number`,
-and click :guilabel:`Apply`.
-
-Doing so reveals all existing lots and serial numbers, and each can be expanded to show all product
-quantities with that assigned number. For unique serial numbers that are *not* reused, there should
-*only* be one product per serial number.
-
-.. image:: differences/differences-tracking.png
-   :align: center
-   :alt: Reporting page with drop-down lists of lots and serial numbers.
-
-.. tip::
-   For additional information regarding an individual lot number or serial number, click the line
-   item for the lot or serial number to reveal that specific number's :guilabel:`Lot` or
-   :guilabel:`Serial Number` form. From this form, click the :guilabel:`Location` and
-   :guilabel:`Traceability` smart buttons to see all stock on-hand using that serial number. Any
-   operations made using that lot or serial number can be found here, as well.

content/applications/inventory_and_mrp/inventory/product_management/product_tracking/expiration_dates.rst

@@ -223,7 +223,7 @@ alerts will be created.
    Removal strategies can also be set on :guilabel:`Product Categories`.
 
 .. seealso::
-   :doc:`../../warehouses_storage/removal_strategies`
+   :doc:`../../shipping_receiving/removal_strategies`
 
 View expiration dates for lots & serial numbers
 ===============================================

content/applications/inventory_and_mrp/inventory/product_management/product_tracking/lots.rst

@@ -186,7 +186,7 @@ should be taken from multiple lots, change the :guilabel:`Quantity` directly.
    on-hand quantity is enough to fulfill the order.
 
 .. seealso::
-   :doc:`../../warehouses_storage/removal_strategies`
+   :doc:`../../shipping_receiving/removal_strategies`
 
 Repeat the above steps to select enough lots to fulfill the :guilabel:`Demand`, and click
 :guilabel:`Save` to close the pop-up window. Lastly, click the :guilabel:`Validate` button on the
@@ -377,4 +377,4 @@ smart button.
    :alt: Show the Traceability Report for a lot, that displays the stock moves.
 
 .. seealso::
-   :doc:`differences`
+   :doc:`../product_tracking`

content/applications/inventory_and_mrp/inventory/product_management/product_tracking/serial_numbers.rst

@@ -290,4 +290,4 @@ just one product per serial number.
    number.
 
 .. seealso::
-   :doc:`/applications/inventory_and_mrp/inventory/product_management/product_tracking/differences`
+   :doc:`../product_tracking`

content/applications/inventory_and_mrp/inventory/shipping_receiving.rst

@@ -7,7 +7,9 @@ Shipping and receiving
 .. toctree::
    :titlesonly:
 
-   shipping_receiving/setup_configuration
    shipping_receiving/daily_operations
+   shipping_receiving/setup_configuration
    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

@@ -7,10 +7,8 @@ Advanced operations
 .. toctree::
    :titlesonly:
 
-   advanced_operations_shipping/scheduled_dates
    advanced_operations_shipping/invoicing
    advanced_operations_shipping/multipack
    advanced_operations_shipping/label_type
    advanced_operations_shipping/print_on_validation
-   advanced_operations_shipping/dropshipping
    advanced_operations_shipping/cancel

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

@@ -291,9 +291,9 @@ and tick the :guilabel:`Package Contents` checkbox.
 
 .. important::
    If the option is not available, enable the :doc:`Packages
-   <../../product_management/product_tracking/package>` feature, by going to
-   :menuselection:`Inventory app --> Configuration --> Settings`, ticking the :guilabel:`Packages`
-   checkbox, and clicking :guilabel:`Save`.
+   <../../product_management/configure/package>` feature, by going to :menuselection:`Inventory app
+   --> Configuration --> Settings`, ticking the :guilabel:`Packages` checkbox, and clicking
+   :guilabel:`Save`.
 
 After enabling the feature in the :guilabel:`Hardware` tab, validating the operation prints a PDF of
 the package contents.
@@ -316,7 +316,7 @@ clicking the *Put in Pack* button.
 
 .. important::
    The :guilabel:`Put in Pack` button is available **only** when the :doc:`Packages
-   <../../product_management/product_tracking/package>` feature is enabled in
+   <../../product_management/configure/package>` feature is enabled in
    :menuselection:`Inventory app --> Configuration --> Settings`.
 
    After it is enabled, the :guilabel:`Put in Pack` button is available on all inventory operations

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

@@ -1,14 +1,103 @@
-:nosearch:
+:show-content:
+:hide-page-toc:
 
-================
-Daily operations
-================
+==========================
+Inbound and outbound flows
+==========================
+
+There are several ways to handle how a warehouse receives products (receipts) and ships products
+(deliveries). Depending on several factors, such as the type of products stocked and sold, warehouse
+size, and the amount of daily confirmed receipts and delivery orders, the way products are handled
+when coming in and out of the warehouse can vary a lot. Different settings can be configured for
+receipts and deliveries; they do not have to be configured to have the same number of steps.
+
+.. seealso::
+   - `Using Routes (eLearning Tutorial) <https://www.odoo.com/slides/slide/using-routes-1018>`_
+   - `Push & Pull Rules (eLearning Tutorial)
+     <https://www.odoo.com/slides/slide/push-pull-rules-1024>`_
+
+Choosing the right inventory flow to handle receipts and deliveries
+===================================================================
+
+By default, Odoo handles shipping and receiving in three different ways: in one, two, or three
+steps. The simplest configuration is one step, which is the default. Each additional step required
+for a warehouse for either the receiving or shipping process will add an additional layer of
+operations to perform before a product is either received or shipped. These configurations depend
+entirely on the requirements for the products stored, such as performing quality checks on received
+products, or using special packaging on shipped products.
+
+One-step flow
+-------------
+
+The receiving and shipping rules for a one-step configuration are as follows:
+
+- **Receipt**: Receive products directly into stock. No intermediate steps between receipt and stock
+  occur, such as a transfer to a quality control location.
+- **Shipping**: Ship products directly from stock. No intermediate steps between stock and shipping
+  occur, such as a transfer to a packing location.
+- Can only be used if not using :abbr:`FIFO (First In, First Out)`, :abbr:`LIFO (Last In, First
+  Out)`, or :abbr:`FEFO (First Expired, First Out)` removal strategies.
+- Receipts and/or deliveries are handled quickly.
+- Recommended for small warehouses with low stock levels, and for non-perishable items.
+- Items are received or shipped directly into/from stock.
+
+.. seealso::
+   :doc:`daily_operations/receipts_delivery_one_step`
+
+Two-step flow
+-------------
+
+The receiving and shipping rules for a two-step configuration are as follows:
+
+- **Input + stock**: Bring products to an input location *before* moving into stock. Products can be
+  organized by different internal storage locations, such as various shelves, freezers, and locked
+  areas, before being stocked in the warehouse.
+- **Pick + ship**: Bring products to an output location before shipping. Packages can be organized
+  by different carriers or shipping docks before being shipped.
+- Minimum requirement to use lot numbers or serial numbers to track products with a
+  :abbr:`FIFO (First In, First Out)`, :abbr:`LIFO (Last In, First Out)` or
+  :abbr:`FEFO (First Expired, First Out)` removal strategy.
+- Recommended for larger warehouses with high stock levels, or when stocking large items (such as
+  mattresses, large furniture, heavy machinery, etc.).
+- Products received will not be available for manufacturing, shipping, etc., until they are
+  transferred into stock.
+
+.. seealso::
+   :doc:`daily_operations/receipts_delivery_two_steps`
+
+Three-step flow
+---------------
+
+The receiving and shipping rules for a three-step configuration are as follows:
+
+- **Input + quality + stock**: Receive products at the input location, transfer them to a quality
+  control area, and move the ones that pass inspection into stock.
+- **Pick + pack + ship**: Pick products according to their removal strategy, pack them in a
+  dedicated packing area, and bring them to an output location for shipping.
+- Can be used when tracking products by lot or serial numbers when using a :abbr:`FIFO (First In,
+  First Out)`, :abbr:`LIFO (Last In, First Out)`, or :abbr:`FEFO (First Expired, First Out)` removal
+  strategy.
+- Recommended for very large warehouses with very high stock levels.
+- Required for any warehouse needing to perform quality control inspections before receiving items
+  into stock.
+- Products received will not be available for manufacturing, shipping, etc., until they are
+  transferred into stock.
+
+.. seealso::
+   - :doc:`daily_operations/receipts_three_steps`
+   - :doc:`daily_operations/delivery_three_steps`
 
 .. toctree::
    :titlesonly:
 
-   daily_operations/shipments_deliveries
+   daily_operations/use_routes
    daily_operations/receipts_delivery_one_step
    daily_operations/receipts_delivery_two_steps
    daily_operations/receipts_three_steps
    daily_operations/delivery_three_steps
+   daily_operations/putaway
+   daily_operations/storage_category
+   daily_operations/cross_dock
+   daily_operations/stock_warehouses
+   daily_operations/owned_stock
+   daily_operations/dropshipping

content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/delivery_three_steps.rst

@@ -1,8 +1,6 @@
-=================================
-Process deliveries in three steps
-=================================
-
-.. _inventory/delivery_three_steps:
+===================
+Three-step delivery
+===================
 
 Some companies process large amounts of deliveries every day, many of which include multiple
 products or require special packaging. To make this efficient, a packing step is needed before
@@ -17,11 +15,10 @@ business.
 Configuration
 =============
 
-Odoo is configured by default to :ref:`receive and deliver goods in one step
-<inventory/receipts_delivery_one_step>`, so the settings need to be changed in order to utilize
-three step deliveries. First, make sure the *Multi-Step Routes* option is enabled in
-:menuselection:`Inventory --> Configuration --> Settings --> Warehouse`. Note that activating
-:guilabel:`Multi-Step Routes` will also activate *Storage Locations*.
+To change delivery settings from :doc:`one step <receipts_delivery_one_step>` to three steps, make
+sure the *Multi-Step Routes* option is enabled in :menuselection:`Inventory app --> Configuration
+--> Settings --> Warehouse`. Note that activating :guilabel:`Multi-Step Routes` will also activate
+*Storage Locations*.
 
 .. image:: delivery_three_steps/delivery-three-steps-multi-step-routes.png
    :align: center

content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_one_step.rst

@@ -1,8 +1,6 @@
-===========================================
-Process receipts and deliveries in one step
-===========================================
-
-.. _inventory/receipts_delivery_one_step:
+=============================
+One-step receipt and delivery
+=============================
 
 .. |PO| replace:: :abbr:`PO (Purchase Order)`
 .. |SO| replace:: :abbr:`SO (Sales Order)`
@@ -146,4 +144,4 @@ product line, the quantity in the :guilabel:`Delivered` column now matches the o
 :guilabel:`Quantity`.
 
 .. seealso::
-   :doc:`shipments_deliveries`
+   :doc:`../daily_operations`

content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps.rst

@@ -1,8 +1,6 @@
-============================================
-Process receipts and deliveries in two steps
-============================================
-
-.. _inventory/receipts_delivery_two_steps:
+=============================
+Two-step receipt and delivery
+=============================
 
 .. |PO| replace:: :abbr:`PO (Purchase Order)`
 .. |SO| replace:: :abbr:`SO (Sales Order)`
@@ -226,4 +224,4 @@ Once ready, click :guilabel:`Validate`. Once validated, the delivery order moves
 :guilabel:`Done` stage.
 
 .. seealso::
-   :doc:`shipments_deliveries`
+   :doc:`../daily_operations`

content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_three_steps.rst

@@ -1,8 +1,6 @@
-===============================
-Process receipts in three steps
-===============================
-
-.. _inventory/receipts_three_steps:
+==================
+Three-step receipt
+==================
 
 Some companies require a quality control process before receiving goods from suppliers. To
 accomplish this, Odoo has a three-step process for receiving goods.
@@ -15,11 +13,11 @@ quality area and into stock.
 Configuration
 =============
 
-Odoo is configured by default to :ref:`receive and deliver goods in one step
-<inventory/receipts_delivery_one_step>`, so the settings need to be changed in order to utilize
-three-step receipts. First, make sure the *Multi-Step Routes* option is enabled in
-:menuselection:`Inventory --> Configuration --> Settings --> Warehouse`. Note that activating
-:guilabel:`Multi-Step Routes` will also activate *Storage Locations*.
+Odoo is configured by default to :doc:`receive and deliver goods in one step
+<receipts_delivery_one_step>`, so the settings need to be changed in order to utilize three-step
+receipts. First, make sure the *Multi-Step Routes* option is enabled in :menuselection:`Inventory
+--> Configuration --> Settings --> Warehouse`. Note that activating :guilabel:`Multi-Step Routes`
+will also activate *Storage Locations*.
 
 .. image:: receipts_three_steps/receipts-three-steps-multi-step-routes.png
    :align: center

content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/shipments_deliveries.rst

@@ -1,97 +0,0 @@
-======================================
-Incoming shipments and delivery orders
-======================================
-
-In Odoo, there are many different ways to process receipts and deliveries for products moving in and
-out of a warehouse.
-
-A company's preferred method of receiving, or shipping, products depends on several factors, such as
-the type of products stocked and sold, the size of the warehouse, the amount of receipts and
-delivery orders processed daily, and so on.
-
-Enabling the *Multi-Step Routes* feature in Odoo's *Inventory* app settings allows users to change
-the manner in which receipts and deliveries are processed in the database.
-
-.. seealso::
-   - `Using Routes (eLearning Tutorial) <https://www.odoo.com/slides/slide/using-routes-1018>`_
-   - `Push & Pull Rules (eLearning Tutorial)
-     <https://www.odoo.com/slides/slide/push-pull-rules-5789>`_
-
-The default incoming and outgoing routes in Odoo are set to receive and deliver goods in one step.
-However, once the *Multi-Step Routes* feature is enabled, the incoming and outgoing routes can be
-changed to either two steps or three steps.
-
-.. note::
-   To activate the *Multi-Step Routes* feature, navigate to :menuselection:`Inventory app -->
-   Configuration --> Settings`. Under the :guilabel:`Warehouse` section, tick the checkbox next to
-   :guilabel:`Multi-Step Routes`, and click :guilabel:`Save`.
-
-   Doing so *also* enables the :guilabel:`Storage Locations` feature, if not already enabled.
-
-Adding additional steps to receipts and deliveries moving in and out of the warehouse adds
-additional operations that must be completed *before* a product is finally received or shipped.
-
-These configurations vary, depending on the needs of the business. They also depend on any
-requirements for the products stored, including the performance of quality control checks on
-received products, or the use of special packaging on shipped products.
-
-One-step flow
-=============
-
-The receiving and shipping rules for a one-step configuration are as follows:
-
-- **Receipt**: receive products directly from vendors into stock. *No* intermediate steps between
-  receipt and input to stock occur.
-- **Shipping**: ship products directly from warehouse stock to customer. *No* intermediate steps
-  occur before shipping.
-- Can *only* be used if **not** using First In, First Out (FIFO), Last In, First Out (LIFO), or
-  First Expired, First Out (FEFO) removal strategies.
-- Items are received or shipped directly into/from stock.
-- Suited for warehouses that require receipts and/or deliveries to be handled quickly.
-- Recommended for small warehouses with low stock levels, and for non-perishable items.
-
-.. seealso::
-   :doc:`receipts_delivery_one_step`
-
-Two-step flow
-=============
-
-The receiving and shipping rules for a two-step configuration are as follows:
-
-- **Input + stock**: bring products to an input location *before* moving into stock. Products can be
-  organized by different internal storage locations, such as various shelves, freezers, and locked
-  areas, before being stocked in the warehouse.
-- **Pick + ship**: bring products to an output location before shipping. Packages can be organized
-  by different carriers, or moved to shipping docks before being shipped.
-- Minimum requirement to use lot numbers, or serial numbers, to track products with a :abbr:`FIFO
-  (First In, First Out)`, :abbr:`LIFO (Last In, First Out)`, or :abbr:`FEFO (First Expired, First
-  Out)` removal strategy.
-- Products received will not be available for manufacturing, shipping, etc., until they are
-  transferred into warehouse stock.
-- Recommended for larger warehouses with high stock levels, or when stocking large items (e.g.,
-  mattresses, large furniture, heavy machinery, etc.).
-
-.. seealso::
-   :doc:`receipts_delivery_two_steps`
-
-Three-step flow
-===============
-
-The receiving and shipping rules for a three-step configuration are as follows:
-
-- **Input + quality + stock**: receive products at the input location, transfer them to a quality
-  control area, and move the ones that pass inspection into stock.
-- **Pick + pack + ship**: pick products according to their removal strategy, pack them in a
-  dedicated packing area, and bring them to an output location for shipping.
-- Can be used when tracking products by lot or serial numbers when using :abbr:`FIFO (First In,
-  First Out)`, :abbr:`LIFO (Last In, First Out)`, or :abbr:`FEFO (First Expired, First Out)` removal
-  strategy.
-- Products received will not be available for manufacturing, shipping, etc., until they are
-  transferred into stock.
-- Required for any warehouse needing to perform quality control inspections before receiving items
-  into stock.
-- Recommended for very large warehouses with very high stock levels.
-
-.. seealso::
-   - :doc:`receipts_three_steps`
-   - :doc:`delivery_three_steps`

content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/stock_warehouses.rst

@@ -73,9 +73,9 @@ steps below to finish configuring the virtual parent warehouse.
    :alt: New warehouse form.
 
 .. seealso::
-   - :doc:`Warehouse configurations <../inventory_management/warehouses>`
+   - :doc:`Warehouse configurations <../../warehouses_storage/inventory_management/warehouses>`
    - :ref:`Incoming and outgoing shipments <inventory/receipts_delivery_one_step/wh>`
-   - :doc:`Resupply from another warehouse <../inventory_management/resupply_warehouses>`
+   - :doc:`../../warehouses_storage/replenishment/resupply_warehouses`
 
 .. _inventory/routes/child-wh: