[IMP] inventory: update two step doc copy

closes odoo/documentation#9259

X-original-commit: 5f5deac264
Signed-off-by: Samuel Lieber (sali) <sali@odoo.com>
Signed-off-by: Brandon Seltenrich (brse) <brse@odoo.com>

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

@@ -4,185 +4,226 @@ Process receipts and deliveries in two steps
 
 .. _inventory/receipts_delivery_two_steps:
 
-Depending on a company's business processes, multiple steps may be needed before receiving or
-shipping products. In the two-step receipt process, products are received in an input area, then
-transferred to stock. Two-step receipts work best when various storage locations are being used,
-such as locked or secured areas, freezers and refrigerators, or various shelves.
+.. |PO| replace:: :abbr:`PO (Purchase Order)`
+.. |SO| replace:: :abbr:`SO (Sales Order)`
+.. |DO| replace:: :abbr:`DO (Delivery Order)`
+.. |RfQ| replace:: :abbr:`RfQ (Request for Quotation)`
+
+Depending on a company's needs, receiving and shipping products in and out of the warehouse might
+require multi-step operations. In Odoo *Inventory*, this can be done using *Multi-Step Routes*.
+
+In the two-step receipt process, products are received in an input area, then transferred to stock.
+This kind of process for incoming shipments might be beneficial for warehouses with specific storage
+locations, such as freezers and refrigerators, secured locked areas, or special aisles and shelves.
 
 Products can be sorted according to where they are going to be stored, and employees can stock all
-the products going to a specific location. The products are not available for further processing
+the products going to a specific location. The products are *not* available for further processing,
 until they are transferred into stock.
 
-In the two-step delivery process, products that are part of a delivery order are picked from the
-warehouse according to their removal strategy, and brought to an output location before being
-shipped.
+In the two-step delivery process, products are first picked from their respective location in the
+warehouse, then transferred to an output location before being shipped to the customer.
 
-One situation where this would be useful is when using either a :abbr:`FIFO (First In, First Out)`,
-:abbr:`LIFO (Last In, First Out)`, or :abbr:`FEFO (First Expired, First Out)` removal strategy,
-where the products that are being picked need to be selected based on their receipt date or
-expiration date.
+This might be beneficial for companies using a First In, First Out (FIFO), Last In, First Out
+(LIFO), or First Expired, First Out (FEFO) removal strategy.
 
-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
-two-step receipts and deliveries. Incoming and outgoing shipments do not need to be set to have the
-same steps. For example, products can be received in two steps, but shipped in one step. In the
-following example, two steps will be used for both receipts and deliveries.
+.. tip::
+   Incoming and outgoing shipments do **not** need to be configured with the same amount of steps.
 
-Configure multi-step routes
-===========================
+   For example, a warehouse's settings can be configured so products can be received in two steps
+   (input + stock), and delivered in three steps (pick + pack + ship).
 
-First, make sure the :guilabel:`Multi-Step Routes` option is enabled in :menuselection:`Inventory
---> Configuration --> Settings`, under the :guilabel:`Warehouse` heading. After enabling the
-setting, :guilabel:`Save` the changes.
+Configuration
+=============
 
-.. note::
-   Activating the :guilabel:`Multi-Step Routes` setting will also activate the :guilabel:`Storage
-   Locations` feature.
+In Odoo *Inventory*, both incoming and outgoing shipments are configured to process in one step, by
+default. To change these settings, the *Multi-Step Routes* feature must be enabled.
+
+To enable *Multi-Step Routes*, 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 activates the :guilabel:`Storage Locations`
+feature.
 
 .. image:: receipts_delivery_two_steps/receipts-delivery-two-steps-settings.png
    :align: center
-   :alt: Activate multi-step routes and storage locations in inventory settings.
+   :alt: Enabled Multi-Step Routes feature in Inventory app settings.
 
-Next, the warehouse needs to be configured for two-step receipts and deliveries. Go to
-:menuselection:`Inventory --> Configuration --> Warehouses`, and click on the warehouse to change
-the warehouse settings.
+Next, configure a warehouse for two-step receipts and deliveries. Navigate to
+:menuselection:`Inventory app --> Configuration --> Warehouses`, and select a warehouse to edit.
 
-Then, select :guilabel:`Receive goods in input and then stock (2 steps)` for :guilabel:`Incoming
-Shipments`, and :guilabel:`Send goods in output and then deliver (2 steps)` for :guilabel:`Outgoing
-Shipments`.
+Under the :guilabel:`Warehouse Configuration` tab, set :guilabel:`Incoming Shipments` to
+:guilabel:`Receive goods in input and then stock (2 steps)`, and set :guilabel:`Outgoing Shipments`
+to :guilabel:`Send goods in output and then deliver (2 steps)`.
 
 .. image:: receipts_delivery_two_steps/receipts-delivery-two-steps-shipments.png
    :align: center
-   :alt: Set incoming and outgoing shipment options to receive and deliver in two steps.
+   :alt: Incoming and outgoing shipments set to two-step on warehouse form.
 
-.. tip::
-   Activating two-step receipts and deliveries will create new *input* and *output* locations, which
-   by default, are labeled :guilabel:`WH/Input` and :guilabel:`WH/Output`, respectively, on the
-   :guilabel:`Locations` dashboard. To rename these locations, go to :menuselection:`Configuration
-   --> Locations`, and select the :guilabel:`Location` to change. On the location form, update the
-   :guilabel:`Location Name`, and make any other changes (if necessary).
+.. note::
+   Selecting two-step receipts and deliveries automatically creates new *Input* and *Output*
+   warehouse locations in the database, named `WH/Input` and `WH/Output`, respectively.
 
-Process a receipt in two steps (input + stock)
-==============================================
+   To rename or edit these locations, navigate to :menuselection:`Inventory app --> Configuration
+   --> Locations`, and select the desired location.
 
-Create a purchase order
------------------------
+   On the location's form, change the :guilabel:`Location Name`, and make any other necessary
+   changes.
 
-On the main :menuselection:`Purchase` application dashboard, start by making a new quote by clicking
-:guilabel:`New`. Then, select (or create) a :guilabel:`Vendor` from the drop-down field, add a
-storable :guilabel:`Product` to the order lines, and click :guilabel:`Confirm Order` to finalize the
-quote as a new purchase order.
+Process receipt in two steps (input + stock)
+============================================
 
-.. important::
-   For businesses with multiple warehouses that have different step configurations, the
-   :guilabel:`Deliver To` field on the :abbr:`PO (Purchase Order)` form may need to be specified as
-   the correct *input location* connected to the two-step warehouse, which can be done by selecting
-   the warehouse from the drop-down selection that includes the `Receipts` label at the end of the
-   name.
+When products are received in two steps, they first move from the vendor location to an input
+location. Then, they move from the input location to warehouse stock in the database, upon
+validation of a purchase order (PO), and a subsequent internal transfer.
 
-After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` smart button appears at the
-top of the :abbr:`PO (Purchase Order)` form. Click it to reveal the new receipt (WH/IN) operation.
+Create purchase order
+---------------------
+
+To create a |PO|, navigate to the :menuselection:`Purchase app`, and click :guilabel:`New`. This
+opens a blank :guilabel:`Request for Quotation` (RfQ) form.
+
+Add a vendor in the :guilabel:`Vendor` field. Then, fill out the various fields on the |RfQ|, as
+necessary.
+
+.. image:: receipts_delivery_two_steps/receipts-delivery-two-steps-new-rfq.png
+   :align: center
+   :alt: Filled out new Request for Quotation from vendor.
+
+Under the :guilabel:`Products` tab, click :guilabel:`Add a product`, and select a product to add to
+the |RfQ|.
+
+Once ready, click :guilabel:`Confirm Order`. This moves the |RfQ| to the :guilabel:`Purchase Order`
+stage.
+
+Once the |PO| is confirmed, a :guilabel:`Receipt` smart button appears at the top of the form.
+Clicking the smart button opens the warehouse receipt (WH/IN) form.
 
 .. image:: receipts_delivery_two_steps/receipts-delivery-two-steps-smart-button.png
    :align: center
-   :alt: After confirming a purchase order, a Receipt smart button will appear.
+   :alt: Delivery smart button for validated purchase order.
 
-Process the receipt
--------------------
+.. tip::
+   For businesses with multiple warehouses that have different step configurations, the
+   :guilabel:`Deliver To` field on the |PO| form **must** be specified as the correct *input
+   location* connected to the two-step warehouse.
 
-Once the purchase order is confirmed, a receipt is generated and ready to process.
+   This can be done by selecting the warehouse from the drop-down menu that includes the `Receipts`
+   label at the end of the name.
 
-Navigate to the :menuselection:`Inventory app`, and locate the :guilabel:`Receipts` task card on the
-:guilabel:`Inventory Overview` dashboard. This reveals a list of all receipts to process.
+Process receipt
+---------------
 
-Click on the :guilabel:`Receipt` associated with the purchase order, then click :guilabel:`Validate`
-to complete the receipt and move the product to :guilabel:`WH/Input`.
+From the warehouse receipt form, the products ordered can be received into the warehouse. To receive
+the products, click :guilabel:`Validate`. Once validated, the receipt moves to the :guilabel:`Done`
+stage, and the products move to the :guilabel:`WH/Input` location.
 
 .. image:: receipts_delivery_two_steps/receipts-delivery-two-steps-receipt-form.png
    :align: center
-   :alt: Receipt form for product move to WH/Input.
+   :alt: Receipt form for products ordered from vendor.
 
-Process the internal transfer
------------------------------
+Click back to the |PO| (via the breadcrumbs, at the top of the form) to view the |PO| form. On the
+product line, the quantity in the :guilabel:`Received` column now matches the ordered
+:guilabel:`Quantity`.
+
+Process internal transfer
+-------------------------
 
 Once the receipt is validated, an internal transfer is created and ready to process.
 
-Click back to the :guilabel:`Inventory Overview` in the breadcrumbs, and locate the
+To view the internal transfer, navigate to the :menuselection:`Inventory app`, and locate the
 :guilabel:`Internal Transfers` task card.
 
-Click the :guilabel:`# To Process` button to reveal a list of all internal transfers to process, and
-select the transfer associated with the previously validated receipt.
+Click the :guilabel:`# To Process` button on the task card to reveal a list of all internal
+transfers to process, and select the transfer associated with the previously validated receipt.
 
-Click :guilabel:`Validate` to complete the transfer and move the product from :guilabel:`WH/Input`
-to :guilabel:`WH/Stock`.
+Once ready, click :guilabel:`Validate` to complete the transfer, and move the product from
+:guilabel:`WH/Input` to :guilabel:`WH/Stock`.
 
-Once the transfer is validated, the product enters inventory and is available for customer
+Once the transfer is validated, the products enter inventory, and are available for customer
 deliveries or manufacturing orders.
 
 .. image:: receipts_delivery_two_steps/receipts-delivery-two-steps-internal-transfer.png
    :align: center
-   :alt: Validate the internal transfer to move the item to stock.
+   :alt: Internal transfer form for products ordered from vendor.
 
-Process a delivery order in two steps (pick + ship)
-===================================================
+Process delivery order in two steps (pick + ship)
+=================================================
 
-Create a sales order
---------------------
+When products are delivered in two steps, they move from warehouse stock to an output location.
+Then, they move from the output location to a customer location in the database, upon validation of
+a picking order, and a subsequent delivery order (DO).
 
-In the :menuselection:`Sales` application, create a new quote by clicking :guilabel:`New`. Select
-(or create) a :guilabel:`Customer`, add a storable :guilabel:`Product` to the order lines, and then
-click :guilabel:`Confirm`.
+Create sales order
+------------------
 
-After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart button will appear in
-the top, above the :abbr:`SO (Sales Order)` form. Click the :guilabel:`Delivery` smart button to
-reveal the associated receipt.
+To create a |SO|, navigate to the :menuselection:`Sales app`, and click :guilabel:`New`. This
+opens a blank sales quotation form.
+
+Add a customer in the :guilabel:`Customer` field. Then, fill out the various fields on the sales
+quotation form, as necessary.
+
+.. image:: receipts_delivery_two_steps/receipts-delivery-two-steps-new-sales-order.png
+   :align: center
+   :alt: Filled out new sales order form.
+
+Under the :guilabel:`Order Lines` tab, click :guilabel:`Add a product`, and select a product to add
+to the sales order quotation.
+
+Once ready, click :guilabel:`Confirm`. This moves the quotation to the :guilabel:`Sales Order`
+stage.
+
+Once the |SO| is confirmed, a :guilabel:`Delivery` smart button appears at the top of the form.
+Clicking the smart button opens the warehouse delivery (WH/OUT) form.
 
 .. image:: receipts_delivery_two_steps/receipts-delivery-two-steps-delivery-button.png
    :align: center
-   :alt: Delivery smart button on sales order form.
+   :alt: Delivery smart button on validated sales order form.
 
-.. tip::
-   Sales order receipts can also be found in the :menuselection:`Inventory` application. In the
-   :guilabel:`Overview` dashboard, click the :guilabel:`# To Process` smart button in the
-   :guilabel:`Pick` Kanban card.
-
-Process the picking
--------------------
+Process picking
+---------------
 
 Once the sales order is confirmed, a picking order is generated and ready to process.
 
-Navigate to the :menuselection:`Inventory app`, and locate the :guilabel:`Pick` task card on the
-:guilabel:`Inventory Overview` dashboard. This reveals a list of all pickings to process.
+To complete the picking, navigate to the :guilabel:`Inventory app`, and locate the :guilabel:`Pick`
+task card on the :guilabel:`Inventory Overview` dashboard. Alternatively, the picking order can also
+be accessed via the :guilabel:`Delivery` smart button at the top of the sales order form.
+
+From the :guilabel:`Inventory Overview` page, click the :guilabel:`# To Process` button on the
+:guilabel:`Pick` task card. This reveals a list of all pickings to process.
 
 Click on the picking (WH/PICK) operation associated with the sales order to reveal the picking
 order.
 
-Click :guilabel:`Check Availability` on the picking order form. If the product is in stock, Odoo
-automatically reserves the product. Quantities can also be manually set by changing the value in the
-:guilabel:`Quantity` column to match the value in the :guilabel:`Demand` column.
-
-Once ready, click :guilabel:`Validate` to complete the picking and move the product from
-:guilabel:`WH/Stock` to :guilabel:`WH/Output.`
-
 .. image:: receipts_delivery_two_steps/receipts-delivery-two-steps-picking-form.png
    :align: center
-   :alt: Picking operation form moving product to WH/Output.
+   :alt: Picking order form for products included in sales order.
 
-Process the delivery
---------------------
+Manually set the quantity by changing the value in the :guilabel:`Quantity` column, to match the
+value in the :guilabel:`Demand` column.
 
-Once the picking has been processed, the delivery order is generated, and can be processed.
+Once ready, click :guilabel:`Validate` to complete the picking, and move the product from
+:guilabel:`WH/Stock` to :guilabel:`WH/Output.`
 
-Navigate back to the original sales order by going to :menuselection:`Sales app`, and selecting the
-associated sales order.
+Process delivery
+----------------
 
-The :guilabel:`Delivery` smart button now indicates there are two transfers. Click the
-:guilabel:`Delivery` smart button to reveal each transfer tied to this sales order: the completed
-picking, and the new delivery (WH/OUT) operation. Click the delivery operation to open the delivery
-order.
+Once the picking is validated, a delivery order is created, and ready to process. Clicking the
+:guilabel:`Delivery` smart button on the sales order form reveals the newly created delivery order.
 
-Once ready, click :guilabel:`Validate` to complete the delivery.
+Alternatively, to view the delivery order, navigate back to the :guilabel:`Inventory Overview` page,
+via the breadcrumbs, and locate the :guilabel:`Delivery Orders` task card.
+
+Click the :guilabel:`# To Process` button on the task card to reveal a list of all delivery orders
+to process, and select the order associated with the previously validated picking.
 
 .. image:: receipts_delivery_two_steps/receipts-delivery-two-steps-delivery-order.png
    :align: center
-   :alt: Delivery operation form moving product to customer location.
+   :alt: Delivery order form for products ordered by customer.
+
+To deliver the products, change the value in the :guilabel:`Quantity` field to match the ordered
+quantity in the :guilabel:`Demand` field.
+
+Once ready, click :guilabel:`Validate`. Once validated, the delivery order moves to the
+:guilabel:`Done` stage.
+
+.. seealso::
+   :doc:`shipments_deliveries`