diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps.rst b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps.rst index fab6b1655..9f9e7bb32 100644 --- a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps.rst +++ b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps.rst @@ -39,7 +39,7 @@ setting, :guilabel:`Save` the changes. Activating the :guilabel:`Multi-Step Routes` setting will also activate the :guilabel:`Storage Locations` feature. -.. image:: receipts_delivery_two_steps/multi-step-routes.png +.. image:: receipts_delivery_two_steps/receipts-delivery-two-steps-settings.png :align: center :alt: Activate multi-step routes and storage locations in inventory settings. @@ -51,7 +51,7 @@ Then, select :guilabel:`Receive goods in input and then stock (2 steps)` for :gu Shipments`, and :guilabel:`Send goods in output and then deliver (2 steps)` for :guilabel:`Outgoing Shipments`. -.. image:: receipts_delivery_two_steps/two-step-warehouse-config.png +.. 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. @@ -80,57 +80,46 @@ quote as a new purchase order. the warehouse from the drop-down selection that includes the `Receipts` label at the end of the name. -After confirming the :abbr:`PO (Purchase Order)`, a :guilabel:`Receipt` smart button will appear in -the top of the :abbr:`PO (Purchase Order)` form — click it to reveal the associated receipt. +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. -.. image:: receipts_delivery_two_steps/two-step-po-receipt.png +.. 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. -.. tip:: - Purchase 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:`Receipts` kanban card. - - .. image:: receipts_delivery_two_steps/two-step-receipts-kanban.png - :align: center - :alt: One receipt ready to process in the Inventory Overview kanban view. - Process the receipt ------------------- -The receipt and internal transfer will be created once the purchase order is confirmed. The status -of the receipt will be :guilabel:`Ready`, since the receipt must be processed first. The status of -the internal transfer will be :guilabel:`Waiting Another Operation`, since the transfer cannot -happen until the receipt is completed. The status of the internal transfer will only change to -:guilabel:`Ready` once the receipt has been marked as :guilabel:`Done`. +Once the purchase order is confirmed, a receipt is generated and ready to process. + +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. Click on the :guilabel:`Receipt` associated with the purchase order, then click :guilabel:`Validate` -to complete the receipt and move the product to the :guilabel:`Input Location`. +to complete the receipt and move the product to :guilabel:`WH/Input`. -.. image:: receipts_delivery_two_steps/validate-two-step-receipt.png +.. image:: receipts_delivery_two_steps/receipts-delivery-two-steps-receipt-form.png :align: center - :alt: Validate the receipt by clicking Validate, then the product will be transferred to the - WH/Input location. + :alt: Receipt form for product move to WH/Input. Process the internal transfer ----------------------------- -Once the product is in the :guilabel:`Input Location`, the internal transfer is ready to move the -product into stock. Navigate to the :menuselection:`Inventory` app, and on the :guilabel:`Inventory -Overview` dashboard, click the :guilabel:`# To Process` smart button in the :guilabel:`Internal -Transfers` kanban card. +Once the receipt is validated, an internal transfer is created and ready to process. -.. image:: receipts_delivery_two_steps/transfer-two-step-kanban.png - :align: center - :alt: One Internal Transfer ready to process in the Inventory Overview kanban view. +Click back to the :guilabel:`Inventory Overview` in the breadcrumbs, and locate the +:guilabel:`Internal Transfers` task card. -Click on the :guilabel:`Transfer` associated with the purchase order, then click -:guilabel:`Validate` to complete the receipt and move the product to stock. Once the transfer is -validated, the product enters the stock and is available for customer deliveries or manufacturing -orders. +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. -.. image:: receipts_delivery_two_steps/two-step-validate-transfer.png +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 +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. @@ -148,72 +137,52 @@ After confirming the :abbr:`SO (Sales Order)`, a :guilabel:`Delivery` smart butt the top, above the :abbr:`SO (Sales Order)` form. Click the :guilabel:`Delivery` smart button to reveal the associated receipt. -.. image:: receipts_delivery_two_steps/two-step-sales-quote.png +.. image:: receipts_delivery_two_steps/receipts-delivery-two-steps-delivery-button.png :align: center - :alt: After confirming the sales order, the Delivery smart button appears showing two items - associated with it. + :alt: Delivery smart button on 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. - - .. image:: receipts_delivery_two_steps/two-step-pick-kanban.png - :align: center - :alt: The pick order can be seen in the Inventory kanban view. + :guilabel:`Pick` Kanban card. Process the picking ------------------- -The picking and delivery order will be created once the sales order is confirmed. When the -:guilabel:`Delivery` smart button appears, click it to reveal the :guilabel:`Transfers` dashboard, -which lists both the picking and the delivery orders. +Once the sales order is confirmed, a picking order is generated and ready to process. -The status of the picking will be :guilabel:`Ready`, since the product must be picked from stock -before it can be shipped. The status of the delivery order will be :guilabel:`Waiting Another -Operation`, since the delivery cannot happen until the picking is completed. The status of the -delivery order will only change to :guilabel:`Ready` once the picking has been marked as -:guilabel:`Done`. +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. -.. image:: receipts_delivery_two_steps/two-step-status.png - :align: center - :alt: Ready status for the pick operation while the delivery operation is Waiting Another - Operation. - -Click on the picking delivery order to begin processing it. If the product is in stock, Odoo will -automatically reserve the product. Click :guilabel:`Validate` to mark the picking as -:guilabel:`Done`, then the delivery order will be ready for processing. Since the documents are -linked, the products which have been previously picked are automatically reserved on the delivery +Click on the picking (WH/PICK) operation associated with the sales order to reveal the picking order. -.. image:: receipts_delivery_two_steps/validate-two-step-pick.png +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: Validate the picking by clicking Validate. + :alt: Picking operation form moving product to WH/Output. Process the delivery -------------------- -The delivery order will be ready to be processed once the picking is completed, and can be found in -the :menuselection:`Inventory` application, on the :guilabel:`Inventory Overview` dashboard. Click -the :guilabel:`# To Process` smart button in the :guilabel:`Delivery Orders` kanban card to begin. +Once the picking has been processed, the delivery order is generated, and can be processed. -.. tip:: - The delivery order associated with the :abbr:`SO (Sales Order)` can also be quickly accessed by - clicking on the :guilabel:`Delivery` smart button again, and choosing the delivery order on the - :guilabel:`Transfers` page (which should now be marked as :guilabel:`Ready`). +Navigate back to the original sales order by going to :menuselection:`Sales app`, and selecting the +associated sales order. -.. image:: receipts_delivery_two_steps/deliver-two-step-kanban.png +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 ready, click :guilabel:`Validate` to complete the delivery. + +.. image:: receipts_delivery_two_steps/receipts-delivery-two-steps-delivery-order.png :align: center - :alt: The delivery order can be seen in the Inventory Kanban view. - -Click on the delivery order associated with the :abbr:`SO (Sales Order)`, then click on -:guilabel:`Validate` to complete the move. - -.. image:: receipts_delivery_two_steps/validate-two-step-delivery.png - :align: center - :alt: Click Validate on the delivery order to transfer the product from the output location to - the customer location. - -Once the delivery order is validated, the product leaves the :guilabel:`WH/Output` location on the -:guilabel:`Transfers` dashboard and moves to the :guilabel:`Partners/Customers` location. Then, the -status of the document will change to :guilabel:`Done`. + :alt: Delivery operation form moving product to customer location. diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/deliver-two-step-kanban.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/deliver-two-step-kanban.png deleted file mode 100644 index 35163ba8e..000000000 Binary files a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/deliver-two-step-kanban.png and /dev/null differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/multi-step-routes.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/multi-step-routes.png deleted file mode 100644 index c8f016b1e..000000000 Binary files a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/multi-step-routes.png and /dev/null differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-delivery-button.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-delivery-button.png new file mode 100644 index 000000000..d65204f74 Binary files /dev/null and b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-delivery-button.png differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-delivery-order.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-delivery-order.png new file mode 100644 index 000000000..21dc6ca40 Binary files /dev/null and b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-delivery-order.png differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-internal-transfer.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-internal-transfer.png new file mode 100644 index 000000000..f7879a7c2 Binary files /dev/null and b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-internal-transfer.png differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-picking-form.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-picking-form.png new file mode 100644 index 000000000..4a4077719 Binary files /dev/null and b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-picking-form.png differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-receipt-form.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-receipt-form.png new file mode 100644 index 000000000..b43fc4e30 Binary files /dev/null and b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-receipt-form.png differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-settings.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-settings.png new file mode 100644 index 000000000..60ecea7ca Binary files /dev/null and b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-settings.png differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-shipments.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-shipments.png new file mode 100644 index 000000000..805289a4c Binary files /dev/null and b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-shipments.png differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-smart-button.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-smart-button.png new file mode 100644 index 000000000..e0bf7c2ed Binary files /dev/null and b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/receipts-delivery-two-steps-smart-button.png differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/transfer-two-step-kanban.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/transfer-two-step-kanban.png deleted file mode 100644 index 5b66c913f..000000000 Binary files a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/transfer-two-step-kanban.png and /dev/null differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-pick-kanban.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-pick-kanban.png deleted file mode 100644 index f794c6f3a..000000000 Binary files a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-pick-kanban.png and /dev/null differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-po-receipt.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-po-receipt.png deleted file mode 100644 index 2c2dbee74..000000000 Binary files a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-po-receipt.png and /dev/null differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-receipts-kanban.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-receipts-kanban.png deleted file mode 100644 index 3f4eae498..000000000 Binary files a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-receipts-kanban.png and /dev/null differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-sales-quote.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-sales-quote.png deleted file mode 100644 index 288df3f4b..000000000 Binary files a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-sales-quote.png and /dev/null differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-status.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-status.png deleted file mode 100644 index fe66d58dc..000000000 Binary files a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-status.png and /dev/null differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-validate-transfer.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-validate-transfer.png deleted file mode 100644 index 5f89cfdaf..000000000 Binary files a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-validate-transfer.png and /dev/null differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-warehouse-config.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-warehouse-config.png deleted file mode 100644 index a61a5957b..000000000 Binary files a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/two-step-warehouse-config.png and /dev/null differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/validate-two-step-delivery.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/validate-two-step-delivery.png deleted file mode 100644 index d38e3eed3..000000000 Binary files a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/validate-two-step-delivery.png and /dev/null differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/validate-two-step-pick.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/validate-two-step-pick.png deleted file mode 100644 index 5406f252f..000000000 Binary files a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/validate-two-step-pick.png and /dev/null differ diff --git a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/validate-two-step-receipt.png b/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/validate-two-step-receipt.png deleted file mode 100644 index 4b3b74843..000000000 Binary files a/content/applications/inventory_and_mrp/inventory/shipping_receiving/daily_operations/receipts_delivery_two_steps/validate-two-step-receipt.png and /dev/null differ