[ADD] Appraisal: adding new section to HR and new overview doc

conf.py

@@ -291,16 +291,13 @@ latex_documents = [
      'Odoo Enterprise Subscription Agreement (ES)', '', 'howto'),
     ('legal/terms/i18n/partnership_tex_es',
      'odoo_partnership_agreement_es.tex', 'Odoo Partnership Agreement (ES)', '', 'howto'),
-
-    ('legal/terms/i18n/enterprise_tex_pt_BR', 'odoo_enterprise_agreement_pt_BR.tex',
-     'Odoo Enterprise Subscription Agreement (PT)', '', 'howto'),
 ]
 
 # List of languages that have legal translations (excluding EN). The keys must be in
 # `languages_names`. These translations will have a link to their versions of the legal
 # contracts, instead of the default EN one. The main legal documents are not part of the
 # translations since they have legal meaning.
-legal_translations = ['de', 'es', 'fr', 'nl', 'pt_BR']
+legal_translations = ['de', 'es', 'fr', 'nl']
 
 # The name of an image file (relative to this directory) to place at the top of the title page.
 latex_logo = 'static/img/odoo_logo.png'

content/administration/upgrade.rst

@@ -196,7 +196,7 @@ Help
 
 .. _upgrade/contact:
 
-Contact our upgrade service support
+Contact our Upgrade service support
 -----------------------------------
 
 Should you have any more questions about the upgrade, do not hesitate to send a message to `Odoo
@@ -219,46 +219,39 @@ upgrade again).
 
 .. _upgrade/sla:
 
-Service-level agreement (SLA)
-=============================
+Service Level Agreement
+=======================
 
-With Odoo Enterprise, upgrading a database to the most recent version of Odoo is **free**, including
-any support required to rectify potential discrepancies in the upgraded database.
+What is covered by the Enterprise Licence?
+------------------------------------------
 
-Information about the upgrade services included in the Enterprise Licence is available in the
-:ref:`Odoo Enterprise Subscription Agreement <upgrade>`. However, this section clarifies what
-upgrade services you can expect.
+Databases hosted on Odoo's Cloud platforms (Odoo Online and Odoo.sh) or On-Premise (Self-Hosting)
+enjoy the following services at all times.
 
-Upgrade services covered by the SLA
------------------------------------
+The upgrade of:
 
-Databases hosted on Odoo's cloud platforms (Odoo Online and Odoo.sh) or self-hosted (On-Premise) can
-benefit from upgrade services at all times for:
+* standard applications
+* Studio customization (as long as the :guilabel:`Studio` app is still active)
+* customizations *if* they are covered by a "Maintenance of Customizations" subscription
 
-- the upgrade of all **standard applications**;
-- the upgrade of all **customizations created with the Studio app**, as long as Studio is still
-  installed and the respective subscription is still active; and
-- the upgrade of all **developments and customizations covered by a maintenance of customizations
-  subscription**.
+The Upgrade Service is limited to your database's technical conversion and adaptation (standard
+modules and data) to make it compatible with the targeted version.
 
-Upgrade services are limited to the technical conversion and adaptation of a database (standard
-modules and data) to make it compatible with the version targeted by the upgrade.
+What upgrading does NOT cover
+-----------------------------
 
-Upgrade services not covered by the SLA
----------------------------------------
+* The cleaning of pre-existing data & configuration while upgrading
+* Any new developments and/or upgrades of your own :ref:`custom modules
+  <upgrade-faq/custom-modules>`
+* Lines of code added to standard modules that are not created with Odoo Studio.
+* `Training <https://www.odoo.com/learn>`_ on the latest version
 
-The following upgrade-related services are **not** included:
-
-- the **cleaning** of pre-existing data and configurations while upgrading;
-- the upgrade of **custom modules created in-house or by third parties**, including Odoo partners;
-- lines of **code added to standard modules**, i.e., customizations created outside the Studio app,
-  code entered manually, and :ref:`automated actions using Python code
-  <studio/automated-actions/actions>`; and
-- **training** on using the upgraded version's features and workflows.
+You can get more information about your Enterprise Licence on our :ref:`Odoo Enterprise Subscription
+Agreement <upgrade>` page.
 
 .. note:: |assistance-contact|
 
 .. seealso::
-   - :doc:`Upgrade FAQ <upgrade/faq>`
-   - :doc:`Odoo.sh documentation <odoo_sh>`
-   - :doc:`Supported Odoo versions <maintain/supported_versions>`
+   - :doc:`upgrade/faq`
+   - :doc:`odoo_sh`
+   - :doc:`maintain/supported_versions`

content/applications/finance/accounting/bank/bank_synchronization.rst

@@ -17,7 +17,7 @@ To connect to the banks, Odoo uses multiple web-services:
 
 - **Plaid**: United States of America and Canada
 - **Yodlee**: Worldwide
-- :doc:`Salt Edge <bank_synchronization/saltedge>`: Worldwide
+- :doc:`Salt Edge <bank_synchronization/saltedge>`: Europe
 - :doc:`Ponto <bank_synchronization/ponto>`: Europe
 - :doc:`Enable Banking <bank_synchronization/enablebanking>`: Scandinavian countries
 

content/applications/finance/accounting/receivables/customer_invoices/epc_qr_code.rst

@@ -1,61 +1,69 @@
-============
-EPC QR codes
-============
+============================
+Add EPC QR Codes to invoices
+============================
 
-European Payments Council quick response codes, or **EPC QR codes**, are two-dimensional barcodes
-that customers can scan with their **mobile banking applications** to initiate a **SEPA credit
-transfer (SCT)** and pay their invoices instantly.
+European Payments Council Quick Response Code,
+or **EPC QR Code**, are two-dimensional barcodes
+that customers can scan with their **mobile banking
+applications** to initiate a **SEPA Credit Transfer
+(SCT)**, and pay their invoices instantly.
 
-In addition to bringing ease of use and speed, it greatly reduces typing errors that would
-potentially make for payment issues.
+In addition to bringing ease of use and speed,
+it greatly reduces typing errors that would potentially
+make for payment issues.
 
 .. note::
-   This feature is only available for companies in several European countries such as Austria,
-   Belgium, Finland, Germany, and the Netherlands.
-
-.. seealso::
-   - :doc:`../../bank/setup/bank_accounts`
-   - `Odoo Academy: QR Code on Invoices for European Customers <https://www.odoo.com/r/VuU>`_
+   This feature is only available in several European
+   countries such as Austria, Belgium, Finland, Germany,
+   and The Netherlands.
 
 Configuration
 =============
 
-Go to :menuselection:`Accounting --> Configuration --> Settings` and activate the :guilabel:`QR
-Codes` feature in the :guilabel:`Customer Payments` section.
+Go to :menuselection:`Accounting --> Configuration --> Settings`
+and activate the **SEPA QR Code** feature.
 
-Configure your bank account's journal
+.. image:: epc_qr_code/epc_qr_code01.png
+   :align: center
+
+Configure your Bank Account’s journal
 -------------------------------------
 
-Make sure that your :guilabel:`Bank Account` is correctly configured in Odoo with your IBAN and BIC.
+Make sure that your *Bank Account* is correctly configured
+on Odoo with your IBAN and BIC.
 
-To do so, go to :menuselection:`Accounting --> Configuration --> Journals`, open your bank journal,
-then fill out the :guilabel:`Account Number` and :guilabel:`Bank` under the :guilabel:`Bank Account
-Number` column.
+To do so, go to :menuselection:`Accounting --> Configuration
+--> Journals`, open your *bank journal*, then fill out the
+*Bank Account* and *Bank* under the *Bank Account* tab.
 
-.. image:: epc_qr_code/bank-journal.png
-   :alt: Bank account number column in the bank journal
+.. image:: epc_qr_code/epc_qr_code02.png
+   :align: center
 
-Issue invoices with EPC QR codes
+Issue Invoices with EPC QR Codes
 ================================
 
-EPC QR codes are added automatically to your invoices. Customers whose bank supports making payments
-via EPC QR codes will be able to scan the code and pay the invoice.
+EPC QR Codes are added automatically to your invoices, as
+long as you issue them to customers that are located in a
+country where this feature is available.
 
-Go to :menuselection:`Accounting --> Customers --> Invoices`, and create a new invoice.
+Go to :menuselection:`Accounting --> Customers --> Invoices`,
+and create a new invoice.
 
-Before posting it, open the :guilabel:`Other Info` tab. Odoo automatically fills out the
-:guilabel:`Recipient Bank` field with your IBAN.
+Before posting it, open the *Other Info* tab. Odoo automatically
+fills out the *Bank Account* field with your IBAN.
 
-.. note::
-   In the :guilabel:`Other Info` tab, the account indicated in the :guilabel:`Recipient Bank` field
-   is used to receive your customer's payment. Odoo automatically populates this field with your
-   IBAN by default and uses it to generate the EPC QR code.
+Make sure that the account indicated is the one you want to use to
+receive your customer’s payment as Odoo uses this field to generate
+the EPC QR Code.
 
-When the invoice is printed or previewed, the QR code is included at the bottom.
-
-.. image:: epc_qr_code/invoice-qr-code.png
-   :alt: QR code on a customer invoice
+.. image:: epc_qr_code/epc_qr_code03.png
+   :align: center
 
 .. tip::
-   If you want to issue an invoice without an EPC QR code, remove the IBAN indicated in the
-   :guilabel:`Recipient Bank` field, under the :guilabel:`Other Info` tab of the invoice.
+   If you want to issue an invoice without an EPC QR Code,
+   remove the IBAN indicated in the *Bank Account* field,
+   under the *Other Info* tab of the invoice.
+
+.. seealso::
+   * :doc:`../../bank/setup/bank_accounts`
+   * `Odoo Academy: QR Code on Invoices for European Customers <https://www.odoo.com/r/VuU>`_

content/applications/finance/accounting/receivables/customer_payments/followup.rst

@@ -17,11 +17,11 @@ To configure a :guilabel:`Follow-Up Action`, go to :menuselection:`Accounting --
 Follow-up Levels`. Several follow-up actions are available by default, and you can customize them
 any way you want or create new ones to trigger the following actions:
 
-- Send an email;
-- :ref:`Send an SMS message <pricing/pricing_and_faq>`;
-- Print a letter;
-- :ref:`Send a letter <customer_invoices/snailmail>`;
-- Manual action (creates a task).
+- Send an Email
+- :ref:`Send an SMS Message <pricing/pricing_and_faq>`
+- Print a Letter
+- :ref:`Send a Letter <customer_invoices/snailmail>`
+- Manual Action (creates a task)
 
 It is also possible to automatically send a reminder by enabling the :guilabel:`Auto Execute`
 option, within a specific :guilabel:`Follow-Up Action`.
@@ -73,8 +73,3 @@ Send reminders in batches
 You can send reminder emails in batches from the :guilabel:`Follow-up Reports` page. To do so,
 select all the reports you would like to process, click on the :guilabel:`Action` gear icon, and
 select :guilabel:`Process follow-ups`.
-
-.. seealso::
-   - :doc:`../../../../general/in_app_purchase`
-   - :doc:`../../../../marketing/sms_marketing/pricing/pricing_and_faq`
-   - :doc:`../customer_invoices/snailmail`

content/applications/finance/fiscal_localizations/colombia_ES.rst

@@ -16,7 +16,6 @@ requiere los siguientes Módulos:
    - Impuestos
    - Retenciones
    - Tipos de Documentos de Identificación
-   - test and
 
 #. **l10n_co_edi**: Este módulo incluye todos los campos adicionales que son
    requeridos para la Integración entre Carvajal y la generación de la

content/applications/finance/payment_acquirers.rst

@@ -50,9 +50,10 @@ Bank Payments
 - | :doc:`Wire Transfer <payment_acquirers/wire_transfer>`
   | When selected, Odoo displays your payment information with a payment reference. You have to
     approve the payment manually once you have received it on your bank account.
-- | :doc:`SEPA Direct Debit <../finance/accounting/receivables/customer_payments/batch_sdd>`
+- | SEPA Direct Debit
   | Your customers can sign a SEPA Direct Debit mandate online and get their bank account charged
-    directly.
+    directly. :doc:`Click here <../finance/accounting/receivables/customer_payments/batch_sdd>` for more
+    information about this payment method.
 
 .. _payment_acquirers/online_providers:
 
@@ -106,7 +107,7 @@ Add a new Payment Acquirer
 --------------------------
 
 To add a new Payment acquirer and make it available to your customers, go to
-:menuselection:`Accounting / Website --> Configuration --> Payment Acquirers`, look for
+:menuselection:`Accounting / Website --> Configuration --> eCommerce: Payment Acquirers`, look for
 your payment acquirer, install the related module, and activate it. To do so, open the payment
 acquirer and change its state from *Disabled* to *Enabled*.
 
@@ -211,7 +212,7 @@ Multi-company environment
 
 If you have multiple companies on your database and wish to use the same payment acquirer for
 several or all of them, switch to the company on which the payment acquirer is configured, then go
-to :menuselection:`Accounting / Website --> Configuration --> Payment Acquirers` and
+to :menuselection:`Accounting / Website --> Configuration --> Payments: Payment Acquirers` and
 select the payment acquirer to use. Then, click :menuselection:`Action --> Duplicate`, and in the
 :guilabel:`Company` field, set the company for which you want to have that payment acquirer
 available. Configure the rest of the fields according to your needs, and :guilabel:`Save`.

content/applications/finance/payment_acquirers/wire_transfer.rst

@@ -1,47 +1,40 @@
-==============
-Wire transfers
-==============
+===================================
+How to get paid with wire transfers
+===================================
 
-The **Wire transfer** payment method allows you to provide payment instructions to your customers,
-such as the bank details and communication. They are displayed:
+**Wire Transfer** is the default payment method available.
+The aim is providing your customers with your bank details
+so they can pay on their own.
+This is very easy to start with but slow and inefficient process-wise.
+Opt for payment acquirers as soon as you can!
 
-- at the end of the checkout process, once the customer has selected :guilabel:`Wire transfer` as a
-  payment method and clicked the :guilabel:`Pay now` button:
+How to provide customers with payment instructions
+==================================================
 
-  .. image:: wire_transfer/payment_instructions_checkout.png
-     :alt: Payment instructions at checkout
-
-- on the customer portal:
-
-  .. image:: wire_transfer/payment_instructions_portal.png
-     :alt: Payment instructions on the customer portal
-
-.. note::
-   - While this method is very accessible and requires minimal setup, it is very inefficient
-     process-wise. We recommend setting up a :doc:`payment acquirer <../payment_acquirers>` instead.
-   - Online orders remain in the :guilabel:`Quotation sent` (i.e., unpaid order) stage until you
-     receive the payment and :guilabel:`Confirm` the order.
-
-.. tip::
-   **Wire transfer** can be used as a template for other payment methods that are processed
-   manually, such as checks, by renaming or duplicating it.
-
-Configuration
-=============
-
-**Wire Transfer** is installed and enabled by default.
-
-To configure it, go to :menuselection:`Accounting / Website --> Configuration -->
-Payment Acquirers`, and open the :guilabel:`Wire Transfer` card. Then, select the
-:guilabel:`Communication` to be used in the :guilabel:`Configuration` tab:
-
-  - :guilabel:`Based on Document Reference`: sales order or invoice number
-  - :guilabel:`Based on Customer ID`: customer identifier
-
-Define the payment instructions in the :guilabel:`Messages` tab:
+Put your payment instructions in the **Thanks Message** of your payment method.
 
 .. image:: wire_transfer/payment_instructions.png
-   :alt: Define payment instructions
+   :align: center
 
-.. seealso::
-   :doc:`../accounting/getting_started/cheat_sheet`
+They will appear to the customers when they place an order.
+
+.. image:: wire_transfer/payment_customer_instructions.png
+   :align: center
+
+How to manage an order once you get paid
+========================================
+
+Whenever a customer pays by wire transfer, the order stays in an
+intermediary stage **Quotation Sent** (i.e. unpaid order).
+When you get paid,
+you confirm the order manually to launch the delivery.
+
+How to create other manual payment methods
+==========================================
+
+If you manage a B2B business, you can create other manually-processed
+payment methods like paying by check.
+To do so, just rename *Wire Transfer* or duplicate it.
+
+.. image:: wire_transfer/payment_check.png
+   :align: center

content/applications/hr.rst

@@ -7,3 +7,4 @@ Human resources
 .. toctree::
 
    hr/attendances
+   hr/appraisal

content/applications/hr/appraisal.rst

@@ -0,0 +1,10 @@
+:nosearch:
+
+=========
+Appraisal
+=========
+
+.. toctree::
+   :titlesonly:
+
+   appraisal/overview

content/applications/hr/appraisal/overview.rst

@@ -0,0 +1,138 @@
+==============================
+Getting started with Appraisal
+==============================
+
+Employee goals can be set, appraisals performed, and reports run, all through the three main
+sections of the :guilabel:`Appraisal` application. Integration with the :guilabel:`Employees`
+application means all employees in the company automatically appear in the :guilabel:`Appraisals`
+application and are available for appraisals.
+
+Appraisal
+=========
+
+The main :guilabel:`Appraisal` view displays all the employees in a kanban view. A banner indicating
+the state of their appraisal, either :guilabel:`Ready`, :guilabel:`Done`, or :guilabel:`Canceled`,
+appears on each card, if applicable.
+
+.. image:: overview/appraisal-employees.png
+   :align: center
+   :alt: View all employees and their appraisal status
+
+If the kanban view is grouped by :guilabel:`Status`, the columns that appear are
+:guilabel:`To Confirm`, :guilabel:`Confirmed`, :guilabel:`Done`, and :guilabel:`Canceled`. Drag and
+move an employee card to a different stage to change the status of the appraisal. Employees can be
+filtered by selecting specific companies or departments on the left side navigation.
+
+.. image:: overview/kanban-stages.png
+   :align: center
+   :alt: View all employees and their appraisal status
+
+Goals
+=====
+
+Each employee's individual goals are organized in the :guilabel:`Goals` section. The default view
+displays all the goal cards individually. :guilabel:`Goals` can be grouped by name or deadline to
+better visualize them. Each card shows the name of the goal, the progress the employee has made, the
+deadline for the goal, the employee's photo, and a :guilabel:`Done` banner when the goal has been
+achieved. Every employee requires their own card for each individual goal, so it is common to see
+multiple cards for the same goal, assigned to different employees.
+
+.. image:: overview/appraisal-goals.png
+   :align: center
+   :alt: View all goals for each employee along with the stauts.
+
+Reporting
+=========
+
+The :guilabel:`Reporting` tab displays the :guilabel:`Appraisal Analysis` report for the company.
+Appraisals are grouped by department and can be displayed by the :guilabel:`Day`, :guilabel:`Week`,
+:guilabel:`Month`, or :guilabel:`Year`.
+
+.. image:: overview/appraisal-reporting.png
+   :align: center
+   :alt: View a color-coded chart of the appraisal status for each employee.
+
+The color of each employee's appraisal indicates the status:
+
+.. list-table::
+   :header-rows: 1
+   :stub-columns: 1
+
+   * - Color
+     - Status
+   * - Grey
+     - Not Started
+   * - Orange
+     - Sent
+   * - Yellow
+     - Done
+   * - Red
+     - Cancelled
+
+Configuration
+=============
+
+Settings
+--------
+
+Go to :menuselection:`Appraisal --> Configuration --> Settings`, and turn on automatic appraisals by
+checking the :guilabel:`Appraisal Plans` box. Click on the :guilabel:`Appraisal Plans` internal link
+to view the :guilabel:`Appraisal Plans` section.
+
+Checking the :guilabel:`360 Feedback` box will send out pre-configured surveys. This integrates with
+the :guilabel:`Surveys` application, so :guilabel:`Surveys` must be installed in order to use this
+option. Select a :guilabel:`Default Template`, and edit it with the :guilabel:`External Link`
+button. Edit the form in the pop-up, and then click :guilabel:`Save`.
+
+Email feedback templates can be modified in the :guilabel:`Feedback Templates` section. Use the
+text editor to edit the email. Default templates are for employees and managers.
+
+.. image:: overview/appraisal-feedback-template.png
+   :align: center
+   :alt: View and edit the Feedback Templates for employees and managers.
+
+Click the :guilabel:`Jobs Configuration` internal link to pull up a list view of all the
+:guilabel:`Job Positions` within the company. Add a new position by clicking :guilabel:`Create`,
+then enter the :guilabel:`Job Position` and add a description in the :guilabel:`Job Description`
+tab. Click on the :guilabel:`Recruitment` tab and enter all the other information for the position.
+The :guilabel:`Appraisals` tab will be filled in with the emails configured in the
+:guilabel:`Feedback Template` section of the :guilabel:`Settings` page. Click :guilabel:`Save` when
+done.
+
+Employees
+---------
+
+Click :menuselection:`Appraisal --> Configuration --> Employees` to view all the employees in the
+company. This is identical to the main view in the :guilabel:`Employees` application. Any changes
+made here will be reflected on any application that uses the employees list.
+
+Appraisal Plans
+---------------
+
+Click :menuselection:`Appraisal --> Configuration --> Appraisal Plans` to view the current appraisal
+schedule. This same list appears by clicking :menuselection:`Appraisal --> Configuration -->
+Settings` and clicking the :guilabel:`Appraisal Plans` internal link beneath
+:guilabel:`Appraisal Plans`. Here, view how often appraisals are automatically created. The default
+appraisals are set to be created 6 months after an employee is hired, and 6 months after the
+previous appraisal is completed.
+
+.. image:: overview/appraisal-plans.png
+   :align: center
+   :alt: View the automatic appraisal plan options.
+
+Click the :guilabel:`Create` button to make a new automatic appraisal. Enter how many months should
+pass before the new appraisal, and select whether or not the appraisal happens after the employee is
+hired or after the previous appraisal. Click the :guilabel:`Export All` button to export the list to
+a spreadsheet.
+
+Evaluation Scale
+----------------
+
+See the available options for an evaluation in this list. Click :guilabel:`Create` to add a new
+scale, enter the text to appear on the evaluation, and select the company the specific line applies
+to. To delete a line, check the box next to it and click :menuselection:`Actions --> Delete`. Click
+and drag the entries to change the order in which they appear on the appraisal.
+
+.. image:: overview/evaluation-scale.png
+   :align: center
+   :alt: View the evaluation scales that can be selected during an evaluation.

content/applications/inventory_and_mrp/inventory/management.rst

@@ -10,7 +10,8 @@ Warehouse Management
 
    management/products
    management/warehouses
-   management/shipments_deliveries
+   management/delivery
+   management/incoming
    management/misc
    management/planning
    management/lots_serial_numbers

content/applications/inventory_and_mrp/inventory/management/delivery.rst

@@ -0,0 +1,16 @@
+:nosearch:
+
+===============
+Delivery Orders
+===============
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   delivery/inventory_flow
+   delivery/one_step
+   delivery/two_steps
+   delivery/three_steps
+   delivery/dropshipping
+   delivery/label_type

content/applications/inventory_and_mrp/inventory/management/delivery/dropshipping.rst

@@ -11,14 +11,13 @@ inventory costs, including the price of operating warehouses.
 Configure products to be dropshipped
 ====================================
 
-To use dropshipping as a fulfillment strategy, navigate to the :menuselection:`Purchase` app and
-select :menuselection:`Configuration --> Settings`. Under the :guilabel:`Logistics` heading, click
-the :guilabel:`Dropshipping` checkbox, and :guilabel:`Save` to finish.
+To use dropshipping as a fulfillment strategy, navigate to the :guilabel:`Purchase` app and select
+:menuselection:`Configuration --> Settings`. Under the :guilabel:`Logistics` heading, click the
+:guilabel:`Dropshipping` checkbox, and :guilabel:`Save` to finish.
 
-Next, go to the :menuselection:`Sales` app, click :menuselection:`Products --> Products` and choose
-an existing product or select :guilabel:`Create` to configure a new one. On the :guilabel:`Product`
-page, make sure that the :guilabel:`Can be Sold` and :guilabel:`Can be Purchased` checkboxes are
-enabled.
+Next, go to the :guilabel:`Sales` app, click :menuselection:`Products --> Products` and choose an
+existing product or select :guilabel:`Create` to configure a new one. On the product page, make sure
+that the :guilabel:`Can be Sold` and :guilabel:`Can be Purchased` checkboxes are enabled.
 
 .. image:: dropshipping/sold-purchased-checkboxes.png
    :align: center
@@ -44,14 +43,13 @@ Fulfill orders using dropshipping
 
 When a customer completes an online purchase for a dropshipped product, a sales order will be
 automatically created with an associated request for quotation (:abbr:`RFQ (Request for Quotation)`)
-for the supplier. Sales orders can be viewed in the :menuselection:`Sales` app by selecting
+for the supplier. Sales orders can be viewed in the :guilabel:`Sales` app by selecting
 :menuselection:`Orders --> Orders`. Click the :guilabel:`Purchase` smart button at the top right of
 a sales order to view the associated :abbr:`RFQ (Request for Quotation)`.
 
 .. tip::
-   Dropship sales orders can also be created manually through the :menuselection:`Sales` app by
-   selecting :menuselection:`Orders --> Orders --> Create` and adding a product configured for
-   dropshipping.
+   Dropship sales orders can also be created manually through the :guilabel:`Sales` app by selecting
+   :menuselection:`Orders --> Orders --> Create` and adding a product configured for dropshipping.
 
 .. image:: dropshipping/dropship-sales-order.png
    :align: center
@@ -74,8 +72,8 @@ quantity.
    :align: center
    :alt: Validate the dropship receipt after delivery.
 
-To view all dropship orders, simply navigate to the :menuselection:`Inventory` :guilabel:`Overview`
-dashboard and click the teal :guilabel:`# TO PROCESS` button on the :guilabel:`Dropship` card.
+To view all dropship orders, simply navigate to the :guilabel:`Inventory` dashboard and click the
+teal :guilabel:`# TO PROCESS` button on the :guilabel:`Dropship` card.
 
 .. image:: dropshipping/view-all-dropship-orders.png
    :align: center

content/applications/inventory_and_mrp/inventory/management/delivery/inventory_flow.rst

@@ -0,0 +1,52 @@
+=================================================================
+How to choose the right inventory flow to handle delivery orders?
+=================================================================
+
+Depending on factors such as the type of items you sell, the size of
+your warehouse, the number of orders you register everyday... the way you
+handle deliveries to your customers can vary a lot.
+
+Odoo allows you to handle shipping from your warehouse in 3 different
+ways:
+
+-  **One step (shipping)**: Ship directly from stock
+
+-  **Two steps (pick + ship)**: Bring goods to output location before
+   shipping
+
+-  **Three steps (pick + pack + ship)**: Make packages into a dedicated
+   location, then bring them to the output location for shipping
+
+For companies having a rather small warehouse and that do not require
+high stock of items or don't sell perishable items, a one step shipping
+is the simplest solution, as it does not require a lot of configuration
+and allows to handle orders very quickly.
+
+Using inventory methods such as FIFO, LIFO and FEFO require to have at
+least two steps to handle a shipment. The picking method will be
+determined by the removal strategy, and the items removed will then be
+shipped to the customer. This method is also interesting if you hold
+larger stocks and especially when the items you stock are big in size.
+
+The three steps system becomes useful in more specific situations, the
+main one being for handling very large stocks. The items are transferred
+to a packing area, where they will be assembled by area of destination,
+and then set to outbound trucks for final delivery to the customers.
+
+Configuration
+=============
+
+One step flow
+-------------
+
+Please read documentation on :doc:`one_step`
+
+Two steps flow
+--------------
+
+Please read documentation on :doc:`two_steps`
+
+Three steps flow
+----------------
+
+Please read documentation on :doc:`three_steps`

content/applications/inventory_and_mrp/inventory/management/delivery/label_type.rst

@@ -0,0 +1,53 @@
+================================
+How can I change the label type?
+================================
+
+Overview
+========
+
+With Odoo, you can choose among different types of labels for your
+delivery orders. Follow the steps below and give an appropriate label
+type to your delivery.
+
+Configuration
+=============
+
+In the **Inventory** module, Go to **Configuration** and click on
+**Delivery methods**.
+
+Choose a delivery method and then click on **Edit**.
+
+.. image:: label_type/label_type01.png
+    :align: center
+
+In the **Pricing** tab, under **Fedex label stock type**, you can choose
+one of the label types available. The availability will vary depending
+on the carrier.
+
+.. image:: label_type/label_type02.png
+    :align: center
+
+Once this is done, you can see the result if you go to the Sales module
+and you create a new sale order.
+
+As you confirm the sale and validate the delivery with the carrier for
+which you have modified the label type, The label will appear in your
+history.
+
+.. image:: label_type/label_type03.png
+    :align: center
+
+.. image:: label_type/label_type04.png
+    :align: center
+
+.. image:: label_type/label_type05.png
+    :align: center
+
+The default label type is paper letter, and if you choose the label type
+bottom half for example, here is the difference :
+
+.. image:: label_type/label_type06.png
+    :align: center
+
+.. image:: label_type/label_type07.png
+    :align: center

content/applications/inventory_and_mrp/inventory/management/delivery/one_step.rst

@@ -0,0 +1,55 @@
+==============================================
+Process Delivery Orders in one Step (Shipping)
+==============================================
+
+There is no configuration needed to deliver in one step. The default
+outgoing shipments are configured to be directly delivered from the
+stock to the customers.
+
+However, if advanced routes have been activated and you set another
+shipping configuration on your warehouse, you can set it back to the
+one-step delivery configuration. Go to :menuselection:`Inventory --> Configuration --> Warehouses`
+and edit the warehouse in question.
+
+Then, choose *Deliver goods directly* as your *Outgoing Shipments*
+strategy.
+
+.. image:: one_step/one_step_01.png
+    :align: center
+
+Create a Sales Order
+====================
+
+In the *Sales* application, create a quotation with some storable
+products to deliver and confirm it.
+
+Notice that we now see 1 delivery associated with this *sales order*
+in the stat button above the sales order. If you click on the 1 Delivery
+stat button, you should now see your delivery order.
+
+.. image:: one_step/one_step_02.png
+    :align: center
+
+Process a Delivery
+==================
+
+You can also find the *delivery order* directly from the *Inventory*
+application. In the dashboard, you can click the *1 TO PROCESS* button
+under the Delivery Orders Kanban card.
+
+.. image:: one_step/one_step_03.png
+    :align: center
+
+Enter the picking that you want to process. You will be able to click on
+*Validate* to complete the move if you have products in stock.
+
+.. image:: one_step/one_step_04.png
+    :align: center
+
+Once you *Validate* the delivery order, the products leave your
+*WH/Stock location* and are moved to the *Customer location*. You
+can easily see that the delivery took place thanks to the status of the
+document which is now *Done*.
+
+.. image:: one_step/one_step_05.png
+    :align: center

content/applications/inventory_and_mrp/inventory/management/delivery/three_steps.rst

@@ -0,0 +1,104 @@
+===========================================================
+Process Delivery Orders in three Steps (Pick + Pack + Ship)
+===========================================================
+
+When an order goes to the shipping department for final delivery, Odoo
+is set up by default to utilize a one-step operation: once all goods are
+available, they are able to be shipped in a single delivery order.
+However, that process may not reflect reality and your company could
+require more steps before shipping.
+
+With the delivery in 3 steps (Pick + Pack + Ship), the items will be
+picked to be transferred to a packing area. Then, they will be moved to
+an output location before being effectively shipped to the customers.
+
+Activate Multi-Step Routes
+==========================
+
+The first step is to allow using *multi-step routes*. Indeed, routes
+provide a mechanism to chain different actions together. In this case,
+we will chain the picking step to the shipping step.
+
+To allow *multi-step routes*, go to :menuselection:`Inventory --> Configuration --> Settings` and
+activate the option. Note that activating *Multi-Step
+Routes* will also activate *Storage Locations*.
+
+.. image:: three_steps/three_steps_01.png
+    :align: center
+
+Configure Warehouse for Delivery in 3 Steps
+===========================================
+
+Once *Multi-Step Routes* has been activated, you can go to
+:menuselection:`Inventory --> Configuration --> Warehouse` and enter the warehouse which will use
+delivery in 3 steps. You can then select the option *Pack goods, send
+goods in output and then deliver (3 steps)* for *Outgoing Shipments*.
+
+.. image:: three_steps/three_steps_02.png
+    :align: center
+
+Activating this option will lead to the creation of two new locations,
+*Output* and *Packing Zone*. If you want to rename it go to :menuselection:`Inventory -->
+Configuration --> Locations`, *Select* the one you want to rename and update its name.
+
+Create a Sales Order
+====================
+
+In the *Sales* application, you can create a quotation with some
+storable products to deliver. Once you confirm the quotation, three
+pickings will be created and automatically linked to your sale order.
+
+.. image:: three_steps/three_steps_03.png
+    :align: center
+
+If you click the button, you should now see three different pickings:
+
+1. The first one with a reference PICK to designate the picking process,
+
+2. The second one with the reference PACK that is the packing process,
+
+3. The last one with a reference OUT to designate the shipping process.
+
+.. image:: three_steps/three_steps_04.png
+    :align: center
+
+Process the Picking, Packing, and Delivery
+==========================================
+
+The picking operation is the first one to be processed and has a
+*Ready* status while the other ones are *Waiting Another Operation*.
+The Packing operation will become *Ready* as soon as the picking one
+is marked as done.
+
+You can enter the picking operation from here, or access it through the
+inventory dashboard.
+
+.. image:: three_steps/three_steps_05.png
+    :align: center
+
+In case you have the product in stock, it has automatically been
+reserved and you can simply validate the picking document.
+
+.. image:: three_steps/three_steps_06.png
+    :align: center
+
+Once the picking has been validated, the packing order is ready to be
+processed. Thanks to the fact that the documents are chained, the
+products which have been previously picked are automatically reserved on
+the packing order which can be directly validated.
+
+.. image:: three_steps/three_steps_07.png
+    :align: center
+
+.. image:: three_steps/three_steps_08.png
+    :align: center
+
+Once the packing has been validated, the delivery order is ready to be
+processed. Here again, it is directly ready to be validated in order to
+transfer the products to the customer location.
+
+.. image:: three_steps/three_steps_09.png
+    :align: center
+
+.. image:: three_steps/three_steps_10.png
+    :align: center

content/applications/inventory_and_mrp/inventory/management/delivery/two_steps.rst

@@ -0,0 +1,92 @@
+==================================================
+Process Delivery Orders in two Steps (Pick + Ship)
+==================================================
+
+When an order goes to the shipping department for final delivery, Odoo
+is set up by default to utilize a one-step operation: once all goods are
+available, they are able to be shipped in a single delivery order.
+
+However, your company's business process may have one or more steps that
+happen before shipping. In the two steps process, the products which are
+part of the delivery order are picked in the warehouse and brought to an
+output location before being effectively shipped.
+
+Activate Multi-Step Routes
+==========================
+
+The first step is to allow using *multi-step routes*. Indeed, routes
+provide a mechanism to chain different actions together. In this case,
+we will chain the picking step to the shipping step.
+
+To allow *multi-step routes*, go to :menuselection:`Inventory --> Configuration --> Settings` and
+activate the option. Note that activating *Multi-Step Routes* will also
+activate *Storage Locations*.
+
+.. image:: two_steps/two_steps_01.png
+    :align: center
+
+Warehouse configuration
+=======================
+
+Once *Multi-Step Routes* has been activated, you can go to :menuselection:`Inventory -->
+Configuration --> Warehouse` and enter the warehouse which will use
+delivery in 2 steps. You can then select the option *Send goods in
+output and then deliver (2 steps)* for Outgoing Shipments.
+
+.. image:: two_steps/two_steps_02.png
+    :align: center
+
+Activating this option will lead to the creation of a new *Output*
+location. If you want to rename it go to :menuselection:`Inventory --> Configuration -->
+Locations`, Select Output and update its name.
+
+.. image:: two_steps/two_steps_03.png
+    :align: center
+
+Create a Sales Order
+====================
+
+In the *Sales* application, you can create a quotation with some
+storable products to deliver. Once you confirm the quotation, two
+pickings will be created and automatically linked to your sale order.
+
+.. image:: two_steps/two_steps_04.png
+    :align: center
+
+If you click on the *2 Delivery* button, you should now see two
+different pickings, one with a reference *PICK* to designate the
+picking process and another one with a reference *OUT* to designate
+the shipping process.
+
+.. image:: two_steps/two_steps_05.png
+    :align: center
+
+Process the Picking and the Delivery
+====================================
+
+The picking operation is the first one to be processed and has a
+*Ready* status while the delivery operation will only become *Ready*
+once the picking operation has been marked as done.
+
+You can enter the picking operation from here, or access it through the
+inventory dashboard.
+
+.. image:: two_steps/two_steps_06.png
+    :align: center
+
+In case you have the product in stock, it has automatically been
+reserved and you can simply validate the picking document.
+
+.. image:: two_steps/two_steps_07.png
+    :align: center
+
+Once the picking has been validated, the delivery order is ready to be
+processed. Thanks to the fact that the documents are chained, the
+products which have been previously picked are automatically reserved on
+the delivery order.
+
+.. image:: two_steps/two_steps_08.png
+    :align: center
+
+.. image:: two_steps/two_steps_09.png
+    :align: center

content/applications/inventory_and_mrp/inventory/management/incoming.rst

@@ -0,0 +1,14 @@
+:nosearch:
+
+==================
+Incoming Shipments
+==================
+
+.. toctree::
+   :titlesonly:
+   :glob:
+
+   incoming/handle_receipts
+   incoming/one_step
+   incoming/two_steps
+   incoming/three_steps

content/applications/inventory_and_mrp/inventory/management/incoming/handle_receipts.rst

@@ -0,0 +1,69 @@
+================================================
+How to choose the right flow to handle receipts?
+================================================
+
+Overview
+========
+
+Depending on factors such as the type of items you receive, the size of
+your warehouse, the number of receipt you register everyday... the way you
+handle receipts to your customers can vary a lot.
+
+Odoo allows you to handle receipts from your warehouse in 3 different
+ways:
+
+-  **One step**: Receive goods directly in stock.
+
+-  **Two steps**: Unload in input location then go to stock.
+
+-  **Three steps**: Unload in input location, go through a quality control
+   before being admitted in stock.
+
+Odoo uses **routes** to define exactly how you will handle the different
+receipt steps. The configuration is done at the level of the warehouse.
+In standard, the reception is a one step process, but changing the
+configuration can allow to have 2 or even 3 steps.
+
+The principles are the following:
+
+1. **One step**: You receive the goods directly in your stock.
+
+2. **Two steps**: You receive the goods in an input area then transfer them
+   from input area to your stock. As long as the goods are not
+   transferred in your stock, they will not be available for further
+   processing.
+
+3. **Three steps**: In many companies, it is necessary to assess the
+   received good. The goal is to check that the products
+   correspond to the quality requirements agreed with the
+   suppliers. Adding a quality control step in the goods receipt
+   process can become essential.
+
+   You receive the goods in an input area, then transfer them into
+   quality area for quality control. When your quality check
+   process finishes then you can move the goods from QC to stock.
+   Of course, you may change the quantity and only transfer to
+   Stock the quantity that is valid and decide that you will
+   return the quantity that is not good.
+
+Configuration
+=============
+
+One step flow
+-------------
+
+This is the default configuration in Odoo.
+
+Two steps flow
+--------------
+
+Please read documentation on :doc:`two_steps`
+
+Three steps flow
+----------------
+
+Please read documentation on :doc:`three_steps`
+
+.. seealso::
+   - :doc:`../delivery/inventory_flow`
+   - :doc:`/applications/inventory_and_mrp/purchase/advanced/analyze`

content/applications/inventory_and_mrp/inventory/management/incoming/one_step.rst

@@ -0,0 +1,62 @@
+=======================================
+Process a Receipt in one step (Receipt)
+=======================================
+
+There is no configuration needed to receive in one step. The default
+incoming shipments are configured to be directly received from the
+vendors to the stock.
+
+However, if advanced routes have been activated and you set another
+incoming configuration on your warehouse, you can set it back to the
+one-step receipt configuration. To do so, go to :menuselection:`Configuration -->
+Warehouses` and edit the warehouse in question.
+
+Set the *Incoming Shipments* option to *Receive goods directly (1
+step)*.
+
+.. image:: one_step/one_step_01.png
+   :align: center
+
+Create a Purchase Order
+=======================
+
+To create a *Request for Quotation*, go to the *Purchase*
+application and click on *Create*. Then, add some storable products to
+receive and confirm the *RfQ*.
+
+Notice that, now, we see 1 receipt associated with the purchase order
+you just created. If you click on the button, you will see your receipt
+order.
+
+.. image:: one_step/one_step_02.png
+   :align: center
+
+Process a Receipt
+=================
+
+You can also fin the receipt directly from the *Inventory* app. When
+on the dashboard, you can click the *1 TO PROCESS* button under the
+*Receipts* Kanban card. Then, you will see your receipt.
+
+.. image:: one_step/one_step_03.png
+   :align: center
+
+Now, enter the picking that you want to process. You will be able to
+click on *Validate* to complete the move directly as products coming
+from suppliers are considered as being always available.
+
+.. note::
+   If you have :guilabel:`Storage Locations` activated, you can click the hamburger menu next to
+   the :guilabel:`Done quantity` to specify the location(s) where you are storing the received
+   product(s).
+
+.. image:: one_step/one_step_04.png
+   :align: center
+
+Once you *Validate* the receipt, the products leave the *Supplier
+Location* to enter your *WH/Stock Location*. You can easily see that
+the receipt took place thanks to the status of the document, which is
+now *Done*.
+
+.. image:: one_step/one_step_05.png
+   :align: center

content/applications/inventory_and_mrp/inventory/management/incoming/three_steps.rst

@@ -0,0 +1,109 @@
+==========================================================
+Process a Receipt in three steps (Input + Quality + Stock)
+==========================================================
+
+Quality is essential for most companies. To make sure we maintain quality throughout the supply
+chain, it only makes sense that we assess the quality of the products received from suppliers.
+To do so, we will add a quality control step.
+
+Odoo uses routes to define how to handle the different receipt steps.
+Configuration of those routes is done at the warehouse level. By default, the reception is a
+one-step process, but it can also be configured to have two-steps or three-steps processes.
+
+The three-steps flow works as follows: you receive the goods in your receiving area, then transfer
+them into a quality area for quality control (QC). When the quality check is completed, the goods
+that match the QC requirements are moved to stock
+
+Activate Multi-Step Routes
+==========================
+
+The first step is to allow the use of *Multi-Step Routes*. Routes provide a mechanism to chain different
+actions together. In this case, we will chain the picking step to the shipping step.
+
+To enable *Multi-Step Routes*, go to :menuselection:`Inventory --> Configuration --> Settings` and
+activate the option.
+
+.. image:: three_steps/three_steps_01.png
+   :align: center
+   :alt: View of the features to enable in order to use multi-step routes for goods reception
+
+.. note::
+         By default, activating *Multi-Step Routes* also activates *Storage
+         Locations*.
+
+Configure warehouse for receipt in 3-steps
+==========================================
+
+Once *Multi-Step Routes* has been activated, go to :menuselection:`Inventory --> Configuration -->
+Warehouse` and enter the warehouse which should work with the 3-steps reception. Then, select
+*Receive goods in input, then quality and then stock (3 steps)* for *Incoming Shipments*.
+
+.. image:: three_steps/three_steps_02.png
+   :align: center
+   :alt: View of the incoming shipment strategy to choose to receive goods in three steps
+
+Activating this option leads to the creation of two new locations: *Input* and *Quality Control*.
+To rename them, go to :menuselection:`Inventory --> Configuration --> Locations` and select
+the one you want to rename.
+
+Create a Purchase Order
+=======================
+
+To start the 3-steps reception process, create a *Request for Quotation* from the *Purchase* app,
+add some storable products to it and confirm. Then, three pickings are created with your *Purchase
+Order* as the source document:
+
+1. The first one with a reference *IN* to designate the receipt
+   process;
+
+2. The second one with a reference *INT*, which is the move to the
+   quality control zone;
+
+3. The last one with a reference *INT* to designate the move to stock.
+
+.. image:: three_steps/three_steps_03.png
+   :align: center
+   :alt: View of the three moves created by the purchase of products in three steps strategy
+
+Process the receipt, quality control and entry in stock
+=======================================================
+
+As the receipt operation is the first one to be processed, it has a *Ready* status while the others
+are *Waiting Another Operation*.
+
+To access the receipt operation, click on the button from the *Purchase Order* or go back to the
+*Inventory* app dashboard and click on *Receipts*.
+
+.. image:: three_steps/three_steps_04.png
+   :align: center
+   :alt: View of the button to click to see the receipts that need to be processed
+
+In the receipt order, products are always considered available because they come from the supplier.
+Then, the receipt can be validated.
+
+.. image:: three_steps/three_steps_05.png
+   :align: center
+   :alt: View of the move (internal transfer) from the reception area to the warehouse input area
+
+Once the receipt has been validated, the transfer to quality becomes *Ready*. And, because the documents
+are chained to each other, products previously received are automatically reserved on the
+transfer. Then, the transfer can be directly validated.
+
+.. image:: three_steps/three_steps_06.png
+   :align: center
+   :alt: View of the button to click to see the internal transfers that need to be processed
+
+.. image:: three_steps/three_steps_07.png
+   :align: center
+   :alt: View of the move (internal transfer) from the input area to the quality control area
+
+Now, the transfer that enters the products to stock is *Ready*. Here, it is again ready to be
+validated in order to transfer the products to your stock location.
+
+.. image:: three_steps/three_steps_08.png
+   :align: center
+   :alt: View of the button to click to see the internal transfers that need to be processed
+
+.. image:: three_steps/three_steps_09.png
+   :align: center
+   :alt: View of the move (internal transfer) from the quality control area to the stock

content/applications/inventory_and_mrp/inventory/management/incoming/two_steps.rst

@@ -0,0 +1,97 @@
+==============================================
+Process a Receipt in two steps (Input + Stock)
+==============================================
+
+Configuration
+=============
+
+Odoo uses routes to define exactly how you will handle the different
+receipt steps. The configuration is done at the *Warehouse* level. By
+default, the reception is a one-step process, but changing the
+configuration can allow you to have 2 steps.
+
+The 2 steps flow is like this: you receive the goods in an input area,
+then transfer them to your stock. As long as the goods are not
+transferred in your stock, they will not be available for further
+processing.
+
+Activate Multi-Step Routes
+==========================
+
+The first step is to allow using *multi-step routes*. Indeed, routes
+provide a mechanism to chain different actions together. In this case,
+we will chain the unload step in the input area to the step entering the
+products in stock.
+
+To allow *multi-step routes*, go to :menuselection:`Configuration --> Settings` and
+activate the feature. By default, activating *multi-step routes* will
+also activate *Storage Locations*.
+
+.. image:: two_steps/two_steps_01.png
+   :align: center
+
+Configure warehouse for receipt in 2 steps
+==========================================
+
+Once *multi-step routes* is activated, you can go to :menuselection:`Configuration -->
+Warehouse` and enter the warehouse which will use receipt in 2 steps.
+Then, you can select the option *Receive goods in input and then stock
+(2 steps)* for *Incoming Shipments*.
+
+.. image:: two_steps/two_steps_02.png
+   :align: center
+
+Activating this option will lead to the creation of a new *Input*
+location. If you want to rename it, you can go to :menuselection:`Configuration -->
+Locations --> Select Input` and update its name.
+
+.. image:: two_steps/two_steps_03.png
+   :align: center
+
+Create a purchase order
+=======================
+
+In the *Purchase* application, you can create a *Request for
+Quotation* with some storable products to receive from a supplier. Once
+the *RfQ* is confirmed, the receipt picking will be created and
+automatically linked to your purchase order.
+
+.. image:: two_steps/two_steps_04.png
+   :align: center
+
+Now, by clicking on the *1 Receipt* button, you will see the first
+picking which will allow entering the product in the *input location*.
+Then, another picking, an internal transfer, has been created in order
+to move the products to *Stock*.
+
+Process the receipt and the internal transfer
+=============================================
+
+The receipt is the first one to be processed and has a *Ready* status
+while the internal transfer will only become *Ready* once the receipt
+has been marked as *Done*.
+
+You can enter the receipt operation from the purchase order, or access
+it through the inventory dashboard.
+
+.. image:: two_steps/two_steps_05.png
+   :align: center
+
+By default, a receipt is always considered as ready to be processed.
+Then, you will be able to directly click on *Validate* to mark it as
+done.
+
+.. image:: two_steps/two_steps_06.png
+   :align: center
+
+Once the receipt has been validated, the internal transfer is ready to
+be processed. As documents are chained, the products which have been
+received are automatically reserved on the internal transfer. Once the
+transfer is validated, those products enter the stock and you will be
+able to use them to fulfill customer deliveries or manufacture products.
+
+.. image:: two_steps/two_steps_07.png
+   :align: center
+
+.. image:: two_steps/two_steps_08.png
+   :align: center