[IMP] core: add SQL wrapper

This completes https://github.com/odoo/odoo/pull/134677.

Makefile

@@ -26,7 +26,7 @@ SOURCE_DIR     = content
 
 HTML_BUILD_DIR = $(BUILD_DIR)/html
 ifdef VERSIONS
-  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/master
+  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/17.0
 endif
 ifneq ($(CURRENT_LANG),en)
   HTML_BUILD_DIR := $(HTML_BUILD_DIR)/$(CURRENT_LANG)

conf.py

@@ -22,7 +22,7 @@ copyright = 'Odoo S.A.'
 # `version` is the version info for the project being documented, acts as replacement for |version|,
 # also used in various other places throughout the built documents.
 # `release` is the full version, including alpha/beta/rc tags. Acts as replacement for |release|.
-version = release = 'master'
+version = release = '17.0'
 
 # `current_branch` is the technical name of the current branch.
 # E.g., saas-15.4 -> saas-15.4; 12.0 -> 12.0, master -> master (*).

content/administration/install/packages.rst

@@ -54,10 +54,10 @@ Odoo needs a `PostgreSQL <https://www.postgresql.org/>`_ server to run properly.
          $ sudo systemctl start postgresql
 
 .. warning::
-   `wkhtmltopdf` is not installed through **pip** and must be installed manually in `version 0.12.6
-   <https://github.com/wkhtmltopdf/packaging/releases/tag/0.12.6.1-3>`_ for it to support headers
-   and footers. Check out the `wkhtmltopdf wiki <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_
-   for more details on the various versions.
+   `wkhtmltopdf` is not installed through **pip** and must be installed manually in `version 0.12.5
+   <https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.5>`_ for it to support headers and
+   footers. Check out the `wkhtmltopdf wiki <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_ for
+   more details on the various versions.
 
 Repository
 ----------

content/administration/install/source.rst

@@ -229,7 +229,7 @@ PostgreSQL user.
 
       .. code-block:: console
 
-         $ sudo -u postgres createuser -d -R -S $USER
+         $ sudo -u postgres createuser -s $USER
          $ createdb $USER
 
       .. note::
@@ -254,7 +254,7 @@ PostgreSQL user.
 
       .. code-block:: console
 
-         $ sudo -u postgres createuser -d -R -S $USER
+         $ sudo -u postgres createuser -s $USER
          $ createdb $USER
 
       .. note::
@@ -413,10 +413,10 @@ Dependencies
                $ sudo npm install -g rtlcss
 
 .. warning::
-   `wkhtmltopdf` is not installed through **pip** and must be installed manually in `version 0.12.6
-   <https://github.com/wkhtmltopdf/packaging/releases/tag/0.12.6.1-3>`_ for it to support headers
-   and footers. Check out the `wkhtmltopdf wiki <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_
-   for more details on the various versions.
+   `wkhtmltopdf` is not installed through **pip** and must be installed manually in `version 0.12.5
+   <https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.5>`_ for it to support headers and
+   footers. Check out the `wkhtmltopdf wiki <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_ for
+   more details on the various versions.
 
 .. _install/source/running_odoo:
 

content/applications/finance/accounting/get_started/cheat_sheet.rst

@@ -129,8 +129,6 @@ Example
 
       .. placeholder
 
-.. _cheat_sheet/journals:
-
 Journal entries
 ===============
 

content/applications/finance/accounting/payments/follow_up.rst

@@ -79,7 +79,7 @@ To know whether a customer usually pays late or not, you can set a trust level b
 :guilabel:`Good Debtor`, :guilabel:`Normal Debtor`, or :guilabel:`Bad Debtor` on their follow-up
 report. To do so, click on the bullet next to the customer's name and select a trust level.
 
-.. image:: follow_up/debtor-level.png
+.. image:: follow_up/debtors-trust-level.png
     :alt: Set debtor's trust level
 
 Send reminders in batches

content/applications/finance/documents.rst

@@ -2,15 +2,16 @@
 Documents
 =========
 
-**Odoo Documents** allows you to store, view, and manage files within Odoo.
+**Odoo Documents** allows you to store, view and manage files within Odoo.
 
-You can upload any file (max 64MB per file on Odoo Online) and organize them in various workspaces.
+You can upload any type of file (max 64MB per file on Odoo Online), and organize them in various
+workspaces.
 
 .. seealso::
    - `Odoo Documents: product page <https://www.odoo.com/app/documents>`_
-   - `Odoo Tutorials: Documents basics [video]
-     <https://www.odoo.com/slides/slide/documents-basics-674>`_
-   - `Odoo Tutorials: Using Documents with your Accounting App [video] <https://www.odoo.com/slides/slide/using-documents-with-your-accounting-app-675?fullscreen=1#>`_
+   - `Odoo Tutorials: Documents basics <https://www.odoo.com/slides/slide/documents-basics-674>`_
+   - `Odoo Tutorials: Using Documents with your Accounting App
+     <https://www.odoo.com/slides/slide/using-documents-with-your-accounting-app-675?fullscreen=1#>`_
 
 Configuration
 =============
@@ -19,10 +20,11 @@ By going to :menuselection:`Documents --> Configuration --> Settings`, you can e
 centralization of files attached to a specific area of your activity. For example, by ticking
 :guilabel:`Human Resources`, your HR documents are automatically available in the HR workspace,
 while documents related to Payroll are automatically available in the Payroll sub-workspace . You
-can change the default workspace using the dropdown menu and edit its properties by clicking the
+can change the default workspace by using the dropdown menu and edit its properties by clicking the
 internal link button (:guilabel:`➔`).
 
 .. image:: documents/files-centralization.png
+   :align: center
    :alt: Enable the centralization of files attached to a specific area of your activity.
 
 .. note::
@@ -31,7 +33,8 @@ internal link button (:guilabel:`➔`).
      synchronization.
 
      .. image:: documents/accounting-files-centralization.png
-        :alt: Enable the centralization of files attached to your accounting.
+      :align: center
+      :alt: Enable the centralization of files attached to your accounting.
 
    - If you select a new workspace, existing documents aren't moved. Only newly created documents
      will be found under the new workspace.
@@ -39,55 +42,34 @@ internal link button (:guilabel:`➔`).
 Workspaces
 ==========
 
-Workspaces are hierarchical folders having their own set of tags and :ref:`actions
-<documents/workflow-actions>`. Default workspaces exist, but you can create your own by going to
-:menuselection:`Documents --> Configuration --> Workspaces` and clicking :guilabel:`New`. On the new
-page, fill in the following information:
+Workspaces are hierarchical folders having their own set of tags and actions. Default workspaces
+exist, but you can create your own by going to :menuselection:`Documents --> Configuration -->
+Workspaces` and clicking on :guilabel:`Create`.
 
-- :guilabel:`Name`
-- :guilabel:`Parent Workspace`: if you want to create a sub-workspace, select its :guilabel:`Parent
-  Workspace`
+.. note::
+   :guilabel:`Workspaces` and :guilabel:`Sub-workspaces` can be created, edited, or deleted by
+   clicking on the gear icon :guilabel:`⚙` on the left menu.
+
+.. image:: documents/sub-workspaces-creation.png
+   :align: center
+   :alt: Create sub-workspaces from the left menu
 
 Tags
-----
+====
 
 Tags are used within workspaces to add a level of differentiation between documents. They are
-organized per category, and filters can be used to sort them.
-
-Tags can be created from the :guilabel:`Tags` tab. Click :guilabel:`Add a line`, create the
-:guilabel:`Tag Category`, and :guilabel:`Name` your tags.
+organized per category and filters can be used to sort them.
 
 .. note::
-   - The tags of a parent workspace apply to the child workspaces automatically;
-   - Tags can be created and modified by going to :menuselection:`Configuration --> Tags`;
-   - Tags can also be created or edited by clicking the gear icon :guilabel:`⚙` on the left menu.
-
-Access rights
--------------
-
-To manage your workspace access rights, go to :menuselection:`Documents --> Configuration -->
-Workspaces`, open the workspace you want to edit, and go to the :guilabel:`Access Rights` tab.
-You can add :guilabel:`Write Groups` that can view, create, and edit the workspace's documents.
-You can also add :guilabel:`Read Groups` that can only view the workspace's documents.
-
-Description
------------
-
-You can add descriptive information to your workspace by going to :menuselection:`Documents -->
-Configuration --> Workspaces`, opening the workspace you want to describe and going to the
-:guilabel:`Description` tab.
-
-.. note::
-   Workspaces can also be created and edited by clicking the gear icon :guilabel:`⚙` on the left
-   menu.
-
-   .. image:: documents/sub-workspaces-creation.png
-      :alt: Create sub-workspaces from the left menu
+   - The tags of a parent workspace apply to the child workspaces automatically.
+   - Tags can be created and modified by going to :menuselection:`Configuration --> Tags`.
+   - Tags can also be created, edited, or deleted, by clicking on the gear icon :guilabel:`⚙`, on
+     the left menu.
 
 Documents management
 ====================
 
-When selecting or opening a document, the right panel displays different options. On the top,
+When clicking on a specific document, the right panel displays different options. On the top,
 additional options might be available: :guilabel:`Download`, :guilabel:`Share`, :guilabel:`Replace`,
 :guilabel:`Lock` or :guilabel:`Split`. It is also possible to :guilabel:`Open chatter` or
 :guilabel:`Archive` the document.
@@ -98,7 +80,7 @@ additional options might be available: :guilabel:`Download`, :guilabel:`Share`,
 
 Then, you can modify the name of your file by clicking on :guilabel:`Document`. A
 :guilabel:`Contact` or an :guilabel:`Owner` can be assigned. The related :guilabel:`Workspace` can
-be modified and it is possible to access the related :guilabel:`Journal Entry` or add
+be modified and it is possible to access the related :guilabel:`Journal Entry` or to add
 :guilabel:`Tags`.
 
 .. note::
@@ -106,111 +88,30 @@ be modified and it is possible to access the related :guilabel:`Journal Entry` o
      view the document and not modify it. I.e.: an existing supplier in your database is the contact
      for their bill.
    - The person who creates a document is, by default :guilabel:`Owner` of it and has complete
-     rights to it. It is possible to replace the owner of a document. I.e., an employee
+     rights to the document. It is possible to replace the owner of a document. I.e.: an employee
      must be owner of a document to be able to see it in "My Profile".
 
-Different :ref:`Actions <documents/workflow-actions>` are available at the bottom of the right
-panel, depending on the workspace where your document is stored.
-
-Split PDF documents
--------------------
-
-Select the PDF you want to split, and click the scissors icon. A new view displays all the pages of
-the document.
-
-By default, each page of the document will be split when clicking :guilabel:`Split`. To remove a
-split between two pages, click on the scissors icon.
-
-.. image:: documents/split-pdf.png
-   :alt: split your documents
-
-.. tip::
-   To merge documents from your dashboard, select them and click the scissors icon. Click on the
-   scissors between the two documents and click :guilabel:`Split` to merge the documents.
-
-Additional features
--------------------
-
-Select a workspace and click the arrow next to the :guilabel:`Upload` button to access additional
-features:
-
-Request
-~~~~~~~
-
-You can create "missing documents" and organize them as documents, to remind users to download them.
-
-Select the workspace where the file should be stored, click :guilabel:`Upload`, then
-:guilabel:`Request`. Add the :guilabel:`Document Name`, select the person you need it from in the
-:guilabel:`Request To` field, fill in the :guilabel:`Due Date In`, confirm the
-:guilabel:`Workspace`, the document should belong to, and add :guilabel:`Tags` and a
-:guilabel:`Note`, if needed. Then, click :guilabel:`Request`. A placeholder for the missing document
-is created in the workspace.
-
-When your document is available, click the placeholder to upload it.
-
-You can see all missing documents by going to the **Activity** view and to the :guilabel:`Requested
-Document` column.
-
-.. tip::
-   From the :guilabel:`Activity` view, you can send a **reminder email** to users from whom you are
-   expecting a document. Go to the :guilabel:`Requested Document` column, click on ⋮ and
-   :guilabel:`Document Request: Reminder`.
-
-   Click on a date to see the details of a specific request. You can update it by clicking on the
-   pen icon, :guilabel:`Preview` the content of the reminder email, or :guilabel:`Send Now` to send
-   a reminder email.
-
-   .. image:: documents/reminder-email.png
-      :alt: send a reminder email from the Activity view
-
-Add a link
-~~~~~~~~~~
-
-To add a link to your documents dashboard, click on :guilabel:`Add a Link`, enter the
-:guilabel:`URL`, and :guilabel:`Name` it.
-
-Share
-~~~~~
-
-You can create a share link to a document or all documents of a workspace. It allows anyone to
-download the file(s) or upload files to a workspace.
-
-To do so, select the workspace or the document and click the arrow next to the :guilabel:`Upload`
-button then :guilabel:`Share`. On the pop-up, the share :guilabel:`URL` is displayed.
-:guilabel:`Copy` it to share it with anyone. :guilabel:`Name` the share link and set a validity date
-for the URL by filling in the :guilabel:`Valid Until` field. Tick the :guilabel:`Include Sub
-Folders` box if you also want to share a workspace's sub-folders. To let users upload their own
-documents, select :guilabel:`Download and Upload`.
-
-.. note::
-   It is possible to only share one or more documents (without their workspace) by selecting them
-   and clicking :guilabel:`Share`.
-
-New spreadsheet
-~~~~~~~~~~~~~~~
-
-To create a new :doc:`spreadsheet <spreadsheet>`, click :guilabel:`New Spreadsheet`. You can select
-a :guilabel:`Blank spreadsheet` or an :doc:`existing template <spreadsheet/templates>`.
-
-.. _documents/workflow-actions:
+Finally, different :guilabel:`Actions` are available at the bottom of the right panel, depending on
+the workspace where your document is stored.
 
 Workflow actions
 ================
 
-Workflow actions help manage documents and overall business operations. These are automated actions
-that can be created and customized for each workspace. With a single click you can, for example,
-create, move, sign, and add tags to a document, and process bills.
-
-These workflow actions appear on the right panel when a document meets the set criteria.
+Workflow actions help you streamline the management of your documents and your overall business
+operations. These are automated actions that can be created and customized for each workspace. For
+example, create documents, process bills, sign, organize files, add tags to a file or move it to
+another workspace with a single click etc. These workflow actions appear on the right panel when it
+meets the criteria you set.
 
 Create workflow actions
 -----------------------
 
-To create workflow actions, go to :menuselection:`Documents --> Configuration --> Actions` and click
-:guilabel:`New`.
+To create workflow actions, go to :menuselection:`Documents --> Configuration --> Actions` and then
+click on :guilabel:`Create`.
 
 .. note::
-   An action applies to all **sub-workspaces** under the :guilabel:`Related Workspace` you selected.
+   An action applies to all :guilabel:`Child Workspaces` under the :guilabel:`Parent Workspace` you
+   selected.
 
 Set the conditions
 ------------------
@@ -221,7 +122,7 @@ You can :guilabel:`Create` a new :guilabel:`Action` or edit an existing one. You
 
 There are three basic types of conditions you can set:
 
-#. :guilabel:`Tags`: you can use the :guilabel:`Contains` and :guilabel:`Does not contain`
+#. :guilabel:`Tags`: you can both use the :guilabel:`Contains` and :guilabel:`Does not contain`
    conditions, meaning the files *must have* or *mustn't have* the tags set here.
 
 #. :guilabel:`Contact`: the files must be associated with the contact set here.
@@ -229,34 +130,43 @@ There are three basic types of conditions you can set:
 #. :guilabel:`Owner`: the files must be associated with the owner set here.
 
 .. image:: documents/basic-condition-example.png
+   :align: center
    :alt: Example of a workflow action's basic condition in Odoo Documents
 
 .. tip::
-   If you don't set any conditions, the action button appears for all files inside the selected
-   workspace.
+   If you don't set any conditions, the action button appears for all files located inside the
+   selected workspace.
 
 Advanced condition type: domain
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. important::
-   It is recommended to have some knowledge of Odoo development to configure *Domain* filters
-   properly.
+   It is recommended to have some knowledge of Odoo development to properly configure *Domain*
+   filters.
 
-The :ref:`developer mode <developer-mode>` needs to be activated to access the :guilabel:`Domain`
-condition from the :guilabel:`Actions` tab. Once done, select the :guilabel:`Domain` condition type
-and click :guilabel:`Add condition`.
+To access the *Domain* condition, the :ref:`developer mode <developer-mode>` needs to be activated.
+Once that's done, select the :guilabel:`Domain` condition type, and click on :guilabel:`Add Filter`.
+
+.. image:: documents/activate-domain-condition.png
+   :align: center
+   :alt: Activating the domain condition type in Odoo Documents
 
 To create a rule, you typically select a :guilabel:`field`, an :guilabel:`operator`, and a
 :guilabel:`value`. For example, if you want to add a workflow action to all the PDF files inside a
 workspace, set the :guilabel:`field` to *Mime Type*, the :guilabel:`operator` to *contains*, and the
-pdf :guilabel:`value`.
+:guilabel:`value` to *pdf*.
 
 .. image:: documents/domain-condition-example.png
+   :align: center
    :alt: Example of a workflow action's domain condition in Odoo Documents
 
-Click :guilabel:`Add New Rule` (plus icon) and :guilabel:`Add branch` to add conditions and
-sub-conditions. You can then specify if your rule should match :guilabel:`all` or :guilabel:`any`
-conditions. You can also edit the rule directly using the :guilabel:`Code editor`.
+Click on :guilabel:`Add node` (plus-circle icon) and :guilabel:`Add branch` (ellipsis icon) to add
+conditions and sub-conditions. You can then specify if your rule should match :guilabel:`ALL` or
+:guilabel:`ANY` conditions. You can also edit the rule directly using the :guilabel:`Code editor`.
+
+.. image:: documents/use-domain-condition.png
+   :align: center
+   :alt: Add a node or a branch to a workflow action's condition in Odoo Documents
 
 Configure the actions
 ---------------------
@@ -268,24 +178,19 @@ Select the :guilabel:`Actions` tab to set up your action. You can simultaneously
 - **Move to Workspace**: move the file to any workspace.
 - **Create**: create one of the following items attached to the file in your database:
 
-   - **Link to record**: link the document to a record (i.e. link to a vehicle in Fleet);
-   - **Product template**: create a product you can edit directly;
-   - **Task**: create a Project task you can edit directly;
-   - **Signature PDF template**: create a new Sign template to send out;
-   - **PDF to sign**: create a PDF to sign;
-   - **Applicant**: create a new HR application you can edit directly;
+   - **Product template**: create a product you can edit directly.
+   - **Task**: create a Project task you can edit directly.
+   - **Signature request**: create a new Sign template to send out.
+   - **Sign directly**: create a Sign template to sign directly.
    - **Vendor bill**: create a vendor bill using OCR and AI to scrape information from the file
-     content;
+     content.
    - **Customer invoice**: create a customer invoice using OCR and AI to scrape information from
-     the file;
+     the file.
    - **Vendor credit note**: create a vendor credit note using OCR and AI to scrape information
-     from the file;
+     from the file.
    - **Credit note**: create a customer credit note using OCR and AI to scrape information from
-     the file;
-   - **Miscellaneous Operations**: create a record in :guilabel:`Miscellaneous Operations`
-     in Accounting;
-   - **Bank Statement**: create a Bank Statement in Finance;
-   - **Expense**: create an expense automatically based on a file's content.
+     the file.
+   - **Applicant**: create a new HR application you can edit directly.
 
 - **Set Tags**: add, remove, and replace any number of tags.
 - **Activities - Mark all as Done**: mark all activities linked to the file as done.
@@ -293,14 +198,15 @@ Select the :guilabel:`Actions` tab to set up your action. You can simultaneously
   the action. You can choose to set the activity on the document owner.
 
 .. image:: documents/workflow-action-example.png
+   :align: center
    :alt: Example of a workflow action Odoo Documents
 
 Digitize documents with AI and optical character recognition (OCR)
 ==================================================================
 
-Documents available in the Finance workspace can be digitized. Select the document to digitize,
-click :guilabel:`Create Bill`, :guilabel:`Create Customer Invoice`, or
-:guilabel:`Create credit note`, and then click :guilabel:`Send for Digitization`.
+Documents available in the Finance workspace can be digitized. Select the document you want to
+digitize, click on :guilabel:`Create Bill`, :guilabel:`Create Customer Invoice` or
+:guilabel:`Create credit note`, and then click on :guilabel:`Send for Digitization`.
 
 .. seealso::
    :doc:`AI-powered document digitization <../finance/accounting/vendor_bills/invoice_digitization>`

content/applications/finance/fiscal_localizations/colombia.rst

@@ -4,16 +4,15 @@ Colombia
 
 .. |DIAN| replace:: :abbr:`DIAN (Dirección de Impuestos y Aduanas Nacionales)`
 
-Odoo's Colombian localization package provides accounting, fiscal, and legal features for databases
-in Colombia – such as chart of accounts, taxes, and electronic invoicing.
+Odoo's Colombian localization package provides accounting, fiscal and legal features in Colombia
+such as chart of accounts, taxes and electronic invoicing.
 
-In addition, a series of videos on the subject is also available. These videos cover how to start
-from scratch, set up configurations, complete common workflows, and provide in-depth looks at some
-specific use cases as well.
+In addition, we have a series of videos covering how to start from scratch, configuration, main
+workflows, and specific use cases.
 
 .. seealso::
-   `Smart Tutorial - Colombian Localization
-   <https://www.odoo.com/slides/smart-tutorial-localizacion-de-colombia-132>`_.
+   `Odoo Colombian localization videos
+   <https://www.youtube.com/playlist?list=PL1-aSABtP6ABxZshems3snMjx7bj_7ZsZ>`_.
 
 .. _colombia/configuration:
 
@@ -37,78 +36,74 @@ localization:
      - `l10n_co`
      - Default :ref:`fiscal localization package <fiscal_localizations/packages>`. This module adds
        the base accounting features for the Colombian localization: chart of accounts, taxes,
-       withholdings, and identification document type.
+       withholdings, identification document type.
    * - :guilabel:`Colombian - Accounting Reports`
      - `l10n_co_reports`
      - Includes accounting reports for sending certifications to suppliers for withholdings applied.
    * - :guilabel:`Electronic invoicing for Colombia with Carvajal`
      - `l10n_co_edi`
-     - This module includes the features required for integration with Carvajal, and
-       generates the electronic invoices and support documents related to the vendor bills, based on
+     - This module includes the features that are required for the integration with Carvajal and
+       generates the electronic invoices and support document related to the vendor bills based on
        |DIAN| regulations.
    * - :guilabel:`Colombian - Point of Sale`
      - `l10n_co_pos`
-     - Includes Point of Sale receipts for Colombian localization.
+     - Includes Point of Sale Receipt for Colombian Localization.
 
 .. note::
-   When `Colombia` is selected for a company's :guilabel:`Fiscal Localization`, Odoo automatically
-   installs certain modules.
+   When a database is created from scratch selecting :guilabel:`Colombia` as the country, Odoo
+   automatically installs the base modules *Colombia - Accounting* and *Colombia - Accounting
+   Reports*.
 
 Company configuration
 ---------------------
 
-To configure your company information, go to the :menuselection:`Contacts` app, and search for your
-company.
-
-Alternatively, activate :ref:`developer mode <developer-mode>` and navigate to
+To configure your company information, go to the :menuselection:`Contacts` app and search for your
+company. Alternatively, activate :ref:`developer mode <developer-mode>` and navigate to
 :menuselection:`General Setting --> Company --> Update Info --> Contact`. Then, edit the contact
-form and configure the following information:
+form to configure the following information:
 
 - :guilabel:`Company Name`.
-- :guilabel:`Address`: Including :guilabel:`City`, :guilabel:`Department` and :guilabel:`ZIP` code.
-- :guilabel:`Identification Number`: Select the :guilabel:`Identification Type` (`NIT`, `Cédula de
-  Ciudadanía`, `Registro Civil`, etc.). When the :guilabel:`Identification Type` is `NIT`, the
-  :guilabel:`Identification Number` **must** have the *verification digit* at the end of the ID
-  prefixed by a hyphen (`-`).
+- :guilabel:`Address`: Including :guilabel:`City`, :guilabel:`Department` and :guilabel:`Zip Code`.
+- :guilabel:`Tax ID`: When it is a `NIT`, it must have the *verification digit* at the end of the ID
+  followed by a hyphen (`-`).
 
 Next, configure the :guilabel:`Fiscal Information` in the :guilabel:`Sales & Purchase` tab:
 
 - :guilabel:`Obligaciones y Responsabilidades`: Select the fiscal responsibility for the company
-  (`O-13` Gran Contribuyente, `O-15` Autorretenedor, `O-23` Agente de retención IVA, `O-47` Regimen
-  de tributación simple, `R-99-PN` No Aplica).
+  (:guilabel:`O-13` Gran Contribuyente, :guilabel:`O-15` Autorretenedor, :guilabel:`O-23` Agente de
+  retención IVA, :guilabel:`O-47` Regimen de tributación simple, :guilabel:`R-99-PN` No Aplica).
 - :guilabel:`Gran Contribuyente`: If the company is *Gran Contribuyente* this option should be
   selected.
-- :guilabel:`Fiscal Regimen`: Select the Tribute Name for the company (`IVA`, `INC`, `IVA e INC`,
-  or `No Aplica`)
+- :guilabel:`Fiscal Regimen`: Select the Tribute Name for the company (:guilabel:`IVA`,
+  :guilabel:`INC`, :guilabel:`IVA e INC`, :guilabel:`No Aplica`)
 - :guilabel:`Commercial Name`: If the company uses a specific commercial name, and it needs to be
   displayed in the invoice.
 
 Carjaval credentials configuration
 ----------------------------------
 
-Once the modules are installed, the user credentials **must** be configured, in order to connect
-with Carvajal Web Service. To do so, navigate to :menuselection:`Accounting --> Configuration -->
-Settings` and scroll to the :guilabel:`Colombian Electronic Invoicing` section. Then, fill in the
-required configuration information provided by Carvajal:
+Once the modules installed, the user credentials must be configured in order to connect with
+Carvajal Web Service. Navigate to :menuselection:`Accounting --> Configuration --> Settings` and
+scroll to the :guilabel:`Colombian Electronic Invoicing` section. Then, fill in the required
+configuration information provided by Carvajal:
 
-- :guilabel:`Username` and :guilabel:`Password`: Username and password (provided by Carvajal) to the
-  company.
+- :guilabel:`Username` and :guilabel:`Password`: Correspond to the username and password provided
+  by Carvajal to the company.
 - :guilabel:`Company Registry`: Company's NIT number *without* the verification code.
-- :guilabel:`Account ID`: Company's NIT number followed by `_01`.
-- :guilabel:`Colombia Template Code`: Select one of the two available templates (`CGEN03` or
-  `CGNE04`) to be used in the PDF format of the electronic invoice.
-
-Enable the :guilabel:`Test mode` checkbox to connect with the Carvajal testing environment.
-
-Once Odoo and Carvajal are fully configured and ready for production, deactivate the :guilabel:`Test
-mode` checkbox to use the production database.
+- :guilabel:`Account ID`: Company ID followed by `_01`.
+- :guilabel:`Colombia Template Code`: Select one of the two available templates (:guilabel:`CGEN03`
+  or :guilabel:`CGNE04`) to be used in the PDF format of the electronic invoice.
 
 .. image:: colombia/carvajal-configuration.png
-   :align: center
    :alt: Configure credentials for Carvajal web service in Odoo.
 
+.. note::
+   Check the :guilabel:`Test mode` checkbox to connect with the Carvajal testing environment. Once
+   Odoo and Carvajal are fully configured and ready for production, uncheck the :guilabel:`Test
+   mode` checkbox to use the production database.
+
 .. important::
-   :guilabel:`Test mode` must **only** be used on duplicated databases, **not** the production
+   :guilabel:`Test mode` must be used **only** on replicated databases, **not** the production
    environment.
 
 Report data configuration
@@ -117,17 +112,8 @@ Report data configuration
 Report data can be defined for the fiscal section and bank information of the PDF as part of the
 configurable information sent in the XML.
 
-Navigate to :menuselection:`Accounting --> Configuration --> Settings`, and scroll to the
-:guilabel:`Colombian Electronic Invoicing` section, in order to find the :guilabel:`Report
-Configuration` fields. Here the header information for each report type can be configured.
-
-- :guilabel:`Gran Contribuyente`
-- :guilabel:`Tipo de Régimen`
-- :guilabel:`Retenedores de IVA`
-- :guilabel:`Autorretenedores`
-- :guilabel:`Resolución Aplicable`
-- :guilabel:`Actividad Económica`
-- :guilabel:`Bank Information`
+Navigate to :menuselection:`Accounting --> Configuration --> Settings` and scroll to the
+:guilabel:`Colombian Electronic Invoicing` section.
 
 .. _colombia/master-data:
 
@@ -137,85 +123,67 @@ Master data configuration
 Partner
 ~~~~~~~
 
-Partner contacts can be created in the *Contacts* app. To do so, navigate to
-:menuselection:`Contacts`, and click the :guilabel:`Create` button.
-
-Then, name the contact, and using the radio buttons, select the contact type, either
-:guilabel:`Individual` or :guilabel:`Company`.
-
-Complete the full :guilabel:`Address`, including the :guilabel:`City`, :guilabel:`State`, and
-:guilabel:`ZIP` code. Then, complete the identification and fiscal information.
-
 Identification information
 **************************
 
-Identification types, defined by the |DIAN|, are available on the partner form, as part of the
-Colombian localization. Colombian partners **must** have their :guilabel:`Identification Number`
-(VAT) and :guilabel:`Document Type` set.
+Document types defined by the |DIAN| are available on the partner form as part of the Colombian
+localization. Colombian partners must have their :guilabel:`Identification Number` (VAT) and
+:guilabel:`Document Type` set.
 
 .. tip::
    When the :guilabel:`Document Type` is `NIT`, the :guilabel:`Identification Number` needs to be
-   configured in Odoo, including the *verification digit at the end of the ID, prefixed by a hyphen
-   (`-`)*.
+   configured in Odoo, including the *verification digit*; Odoo splits this number when the data to
+   is sent to the third party.
 
 Fiscal information
 ******************
 
-The partner's responsibility codes (section 53 in the :abbr:`RUT (Registro único tributario)`
-document) are included as part of the electronic invoicing module, as it is required by the |DIAN|.
+The partner's responsibility codes (section 53 in the RUT document) are included as part of the
+electronic invoicing module, as it is required by the |DIAN|.
 
 The required fields can be found under :menuselection:`Partner --> Sales & Purchase Tab --> Fiscal
-Information section`:
+Information`:
 
 - :guilabel:`Obligaciones y Responsabilidades`: Select the fiscal responsibility for the company
-  (`O-13` Gran Contribuyente, `O-15` Autorretenedor, `O-23` Agente de retención IVA, `O-47` Regimen
-  de tributación simple, or `R-99-PN` No Aplica).
+  (:guilabel:`O-13` Gran Contribuyente, :guilabel:`O-15` Autorretenedor, :guilabel:`O-23` Agente de
+  retención IVA, :guilabel:`O-47` Regimen de tributación simple, :guilabel:`R-99-PN` No Aplica).
 - :guilabel:`Gran Contribuyente`: If the company is *Gran Contribuyente* this option should be
   selected.
-- :guilabel:`Fiscal Regimen`: Select the tribute name for the company (`IVA`, `INC`, `IVA e INC`, or
-  `No Aplica`)
+- :guilabel:`Fiscal Regimen`: Select the Tribute Name for the company (:guilabel:`IVA`,
+  :guilabel:`INC`, :guilabel:`IVA e INC`, :guilabel:`No Aplica`)
 - :guilabel:`Commercial Name`: If the company uses a specific commercial name, and it needs to be
   displayed in the invoice.
 
 Products
 ~~~~~~~~
 
-To manage products, navigate to :menuselection:`Accounting --> Customers --> Products`, then click
-on a product.
-
-When adding general information on the product form, it is required that either the
-:guilabel:`UNSPSC Category` (:guilabel:`Accounting` tab), or :guilabel:`Internal Reference`
-(:guilabel:`General Information` tab) field is configured. Be sure to :guilabel:`Save` the product
-once configured.
+In addition to adding general information (in the :guilabel:`General Information` tab) on the
+product form, either the :guilabel:`UNSPSC Category`, :guilabel:`Barcode`, or :guilabel:`Internal
+Reference` field must also be configured.
 
 Taxes
 ~~~~~
 
-To create or modify taxes, go to :menuselection:`Accounting --> Configuration --> Taxes`, and select
-the related tax.
-
 If sales transactions include products with taxes, the :guilabel:`Value Type` field in the
-:guilabel:`Advanced Options` tab needs to be configured per tax. Retention tax types
-(:guilabel:`ICA`, :guilabel:`IVA`, :guilabel:`Fuente`) are also included. This configuration is used
-to display taxes correctly in the invoice PDF.
+:guilabel:`Advanced Options` tab needs to be configured per tax. To do so, go to
+:menuselection:`Accounting --> Configuration --> Taxes`, and select the related tax.
+
+Retention tax types (:guilabel:`ICA`, :guilabel:`IVA`, :guilabel:`Fuente`) are also included. This
+configuration is used to display taxes in the invoice PDF correctly.
 
 .. image:: colombia/retention-tax-types.png
-   :align: center
    :alt: The ICA, IVA and Fuente fields in the Advanced Options tab in Odoo.
 
-.. _co-journals:
-
 Sales journals
 ~~~~~~~~~~~~~~
 
-Once the |DIAN| has assigned the official sequence and prefix for the electronic invoice resolution,
-the sales journals related to the invoice documents **must** be updated in Odoo. To do so, navigate
-to :menuselection:`Accounting --> Configuration --> Journals`, and select an existing sales journal,
-or create a new one with the :guilabel:`Create` button.
+.. _co-journals:
 
-On the sales journal form, input the :guilabel:`Journal Name`, :guilabel:`Type`, and set a unique
-:guilabel:`Short Code` in the :guilabel:`Journals Entries` tab. Then, configure the following data
-in the :guilabel:`Advanced Settings` tab:
+Once the |DIAN| has assigned the official sequence and prefix for the electronic invoice resolution,
+the sales journals related to the invoice documents must be updated in Odoo. To do so, navigate to
+:menuselection:`Accounting --> Configuration --> Journals`.
+
+Configure the following data in the :guilabel:`Advanced Settings` tab:
 
 - :guilabel:`Electronic invoicing`: Enable :guilabel:`UBL 2.1 (Colombia)`.
 - :guilabel:`Invoicing Resolution`: Resolution number issued by |DIAN| to the company.
@@ -225,31 +193,32 @@ in the :guilabel:`Advanced Settings` tab:
 - :guilabel:`Range of Numbering (maximum)`: Last authorized invoice number.
 
 .. note::
-   The sequence and resolution of the journal **must** match the one configured in Carvajal and the
+   The sequence and resolution of the journal must match the one configured in Carvajal and the
    |DIAN|.
 
 Invoice sequence
 ****************
 
-The invoice sequence and prefix **must** be correctly configured when the first document is created.
+The invoice sequence and prefix must be correctly configured when the first document is created.
 
 .. note::
-   Odoo automatically assigns a prefix and sequence to the following invoices.
+   Odoo automatically assigns a prefix and sequence to the following documents.
 
 Purchase journals
 *****************
 
-Once the |DIAN| has assigned the official sequence and prefix for the *support document* related to
+Once the |DIAN| has assigned the official sequence and prefix for the support document related to
 vendor bills, the purchase journals related to their supporting documents need to be updated in
 Odoo. The process is similar to the configuration of the :ref:`sales journals <co-journals>`.
 
 Chart of accounts
 *****************
 
-The :doc:`chart of accounts </applications/finance/accounting/get_started/chart_of_accounts>` is
-installed by default as part of the localization module, the accounts are mapped automatically in
-taxes, default account payable, and default account receivable. The chart of accounts for Colombia
-is based on the PUC (Plan Unico de Cuentas).
+The :doc:`chart of accounts
+</applications/finance/accounting/get_started/chart_of_accounts>` is installed by default as part of
+the localization module, the accounts are mapped automatically in taxes, default account payable,
+and default account receivable. The chart of accounts for Colombia is based on the PUC (Plan Unico
+de Cuentas).
 
 .. _colombia/workflows:
 
@@ -259,38 +228,18 @@ Main workflows
 Electronic invoices
 -------------------
 
-The following is a breakdown of the main workflow for electronic invoices with the Colombian
-localization:
-
-#. Sender creates an invoice.
-#. Electronic invoice provider generates the legal XML file.
-#. Electronic invoice provider creates the CUFE (Invoice Electronic Code) with the electronic
-   signature.
-#. Electronic invoice provider sends a notification to |DIAN|.
-#. |DIAN| validates the invoice.
-#. |DIAN| accepts or rejects the invoice.
-#. Electronic invoice provider generates the PDF invoice with a QR code.
-#. Electronic invoice provider sends invoice to the acquirer.
-#. Acquirer sends a receipt of acknowledgement, and accepts or rejects the invoice.
-#. Sender downloads a :file:`.zip` file with the PDF and XML.
-
-.. image:: colombia/workflow-electronic-invoice.png
-   :align: center
-   :alt: Electronic invoice workflow for Colombian localization.
-
 .. _colombia/invoice-creation:
 
 Invoice creation
 ~~~~~~~~~~~~~~~~
 
 .. note::
-   The functional workflow taking place before an invoice validation does **not** alter the main
-   changes introduced with the electronic invoice.
+   The functional workflow taking place before an invoice validation does not alter the main changes
+   introduced with the electronic invoice.
 
 Electronic invoices are generated and sent to both the |DIAN| and customer through Carvajal's web
-service integration. These documents can be created from your sales order or manually generated. To
-create a new invoice, go to :menuselection:`Accounting --> Customers --> Invoices`, and select
-:guilabel:`Create`. On the invoice form configure the following fields:
+service integration. These documents can be created from your sales order or manually. Go to
+:menuselection:`Accounting --> Customers --> Invoices` and configure:
 
 - :guilabel:`Customer`: Customer's information.
 - :guilabel:`Journal`: Journal used for electronic invoices.
@@ -310,10 +259,9 @@ invoice is then processed asynchronously by the E-invoicing service UBL 2.1 (Col
 also displayed in the chatter.
 
 .. image:: colombia/invoice-sent.png
-   :align: center
    :alt: Carvajal XML invoice file in Odoo chatter.
 
-The :guilabel:`Electronic Invoice Name` field is now displayed in the :guilabel:`EDI Documents` tab,
+The :guilabel:`Electronic Invoice Name` field is now displayed in the :guilabel:`EDI Documents` tab
 with the name of the XML file. Additionally, the :guilabel:`Electronic Invoice Status` field is
 displayed with the initial value :guilabel:`To Send`. To process the invoice manually, click on the
 :guilabel:`Process Now` button.
@@ -323,7 +271,7 @@ displayed with the initial value :guilabel:`To Send`. To process the invoice man
 Reception of legal XML and PDF
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The electronic invoice vendor (Carvajal) receives the XML file, and proceeds to validate its
+The electronic invoice vendor (Carvajal) receives the XML file and proceeds to validate its
 structure and information.
 
 After validating the electronic invoice, proceed to generate a legal XML which includes a digital
@@ -331,11 +279,10 @@ signature and a unique code (CUFE), a PDF invoice that includes a QR code and th
 generated. If everything is correct the :guilabel:`Electronic Invoicing` field value changes to
 :guilabel:`Sent`.
 
-A :file:`.zip` containing the legal electronic invoice (in XML format) and the invoice in (PDF
-format) is downloaded and displayed in the invoice chatter:
+A ZIP containing the legal electronic invoice in XML format and the invoice in PDF format is
+downloaded and displayed in the invoice chatter:
 
 .. image:: colombia/invoice-zip.png
-   :align: center
    :alt: ZIP file displayed in the invoice chatter in Odoo.
 
 The electronic invoice status changes to :guilabel:`Accepted`.
@@ -345,7 +292,7 @@ Credit notes
 
 The process for credit notes is the same as for invoices. To create a credit note with reference to
 an invoice, go to :menuselection:`Accounting --> Customers --> Invoices`. On the invoice, click
-:guilabel:`Add Credit Note`, and complete the following information:
+:guilabel:`Add Credit Note` and complete the following information:
 
 - :guilabel:`Credit Method`: Select the type of credit method.
 
@@ -369,7 +316,7 @@ Debit notes
 
 The process for debit notes is similar to credit notes. To create a debit note with reference to an
 invoice, go to :menuselection:`Accounting --> Customers --> Invoices`. On the invoice, click the
-:guilabel:`Add Debit Note` button, and enter the following information:
+:guilabel:`Add Debit Note` button and complete the following information:
 
 - :guilabel:`Reason`: Type the reason for the debit note.
 - :guilabel:`Debit note date`: Select the specific options.
@@ -384,7 +331,7 @@ Support document for vendor bills
 ---------------------------------
 
 With master data, credentials, and the purchase journal configured for support documents related to
-vendor bills, you can start using *support documents*.
+vendor bills, you can start using support documents.
 
 Support documents for vendor bills can be created from your purchase order or manually. Go to
 :menuselection:`Accounting --> Vendors --> Bills` and fill in the following data:
@@ -425,7 +372,6 @@ Commerce (ICA) tax. The report can be found under :menuselection:`Accounting -->
 Colombian Statements --> Certificado de Retención en ICA`.
 
 .. image:: colombia/ica-report.png
-   :align: center
    :alt: Certificado de Retención en ICA report in Odoo Accounting.
 
 Certificado de Retención en IVA
@@ -436,7 +382,6 @@ can be found under :menuselection:`Accounting --> Reporting --> Colombian Statem
 de Retención en IVA`.
 
 .. image:: colombia/iva-report.png
-   :align: center
    :alt: Certificado de Retención en IVA report in Odoo Accounting.
 
 Certificado de Retención en la Fuente
@@ -447,5 +392,4 @@ be found under :menuselection:`Accounting --> Reporting --> Colombian Statements
 Retención en Fuente`.
 
 .. image:: colombia/fuente-report.png
-   :align: center
    :alt: Certificado de Retención en Fuente report in Odoo Accounting.

content/applications/finance/sign.rst

@@ -2,18 +2,18 @@
 Sign
 ====
 
-**Odoo Sign** allows you to send, sign, and approve documents online, using electronic signatures.
+**Odoo Sign** allows you to send, sign and approve documents online, using electronic signatures.
 
 An **electronic signature** shows a person's agreement to the content of a document. Just like a
 handwritten signature, the electronic one represents a legal bounding by the terms of the signed
 document.
 
-With Sign, you can upload any PDF file and add fields to it. These fields can be automatically
-filled in with the user's details present in your database.
+With Sign, you can upload any PDF file and add fields to it. These fields are automatically filled
+in with the user's details present in your database.
 
 .. seealso::
    - `Odoo Sign: product page <https://www.odoo.com/app/sign>`_
-   - `Odoo Tutorials: Sign [video] <https://www.odoo.com/slides/sign-61>`_
+   - `Odoo Tutorials: Sign <https://www.odoo.com/slides/sign-61>`_
 
 Validity of electronic signatures
 =================================
@@ -82,60 +82,16 @@ Overall, to be recognized as valid, electronic signatures have to meet five crit
    is up-to-date. We advise contacting a local attorney for legal advice regarding electronic
    signature compliance and validity.
 
-Send a document to sign
-=======================
-
-One-time signature
-------------------
-
-You can click :guilabel:`Upload a PDF to sign` from your dashboard for a one-time signature. Select
-your document, open it, and drag and drop the required :ref:`fields <sign/fields>` in your document.
-You can modify the :ref:`role <sign/role>` assigned to a field by clicking on it and selecting the
-one you want.
-
-When ready, click :guilabel:`Send`, and fill in the required fields. Once sent, your document
-remains available. Go to :menuselection:`Documents --> All Documents` to see your document
-and the status of the signatures.
-
-.. image:: sign/signature-status.png
-   :alt: Signature status
-
-Templates
----------
-
-You can create document templates when you have to send the same document several times. From your
-dashboard, click :guilabel:`Upload a PDF template`. Select the document and add the required
-:ref:`fields <sign/fields>`. You can modify the :ref:`role <sign/role>` of a field by clicking on it
-and selecting the one you want.
-
-Click :guilabel:`Template Properties` to add :guilabel:`Tags` to your template, define a
-:guilabel:`Signed Document Workspace`, add :guilabel:`Signed Document Tags`, set a
-:guilabel:`Redirect Link` that will be available in the signature confirmation message received
-after the signature, or define :guilabel:`Authorized Users` if you want to restrict the use of your
-template to specific authorized users or groups.
-
-Your templates are visible by default on your dashboard. You can click :guilabel:`Send` to quickly
-send a document template to a signer or :guilabel:`Sign Now` if you are ready to sign your document
-immediately.
-
-.. tip::
-   You can **create a template from a document that was previously sent**. To do so, go to
-   :menuselection:`Documents --> All Documents`. On the document you want to retrieve, click on
-   ⋮, then :guilabel:`Template`. Click on ⋮ again, then :guilabel:`Restore`. Your document now
-   appears on your dashboard next to your other templates.
-
-.. _sign/role:
-
 Roles
 =====
 
-Each field in a Sign document is related to a role corresponding to a specific person. When a
-document is being signed, the person assigned to the role must fill in their assigned fields and
+Each field in a Sign document is related to a role that corresponds to a specific person. When a
+document is being signed, the person assigned to the role needs to fill in their assigned fields and
 sign it.
 
 Roles are available by going to :menuselection:`Sign --> Configuration --> Roles`.
 
-It is possible to update existing roles or to create new roles by clicking on :guilabel:`New`.
+It is possible to update existing roles or to create new roles by clicking on :guilabel:`Create`.
 Choose a :guilabel:`Role Name`, add an :guilabel:`Extra Authentication Step` to confirm the
 identity of the signing person, and if the document can be reassigned to another contact, select
 :guilabel:`Change Authorized` for the role. A :guilabel:`Color` can also be chosen for the role.
@@ -145,133 +101,79 @@ template.
 Secured identification
 ----------------------
 
-As the owner of a document, you may request an :guilabel:`Extra Authentication Step` through
-:ref:`SMS verification <sign/sms>` or via :ref:`Itsme® <sign/itsme>` (available in Belgium and the
-Netherlands). Both authentication options require :ref:`credits <iap/buying_credits>`. If you do not
-have any credits left, the authentication steps will be skipped.
+As the owner of a document, you may request an :guilabel:`Extra Authentication Step` through an SMS
+verification or via Itsme® (available in Belgium and the Netherlands). Both authentication options
+require :ref:`credits <iap/buying_credits>`. If you do not have any credits left, the authentication
+steps will be skipped.
 
 .. seealso::
    - :doc:`In-App Purchase (IAP) <../general/in_app_purchase>`
    - :doc:`SMS pricing and FAQ <../marketing/sms_marketing/pricing/pricing_and_faq>`
 
-.. _sign/sms:
-
 SMS verification
 ~~~~~~~~~~~~~~~~
 
 Go to :menuselection:`Sign --> Configuration --> Roles`. Click in the :guilabel:`Extra
 Authentication Step` column for the role, and select :guilabel:`Unique Code Via SMS`.
 
-.. note::
-   Before being able to send SMS Text Messages, you need to register your phone number. To do so, go
-   to :menuselection:`Sign --> Configuration --> Settings` and click :guilabel:`Buy credits` under
-   :guilabel:`Authenticate by SMS`.
-
-Go to the document to sign, add the field for which the SMS verification is required, for example,
-the :guilabel:`Signature` field, and click :guilabel:`Send`. On the new page, select the
-:guilabel:`customer` and click :guilabel:`Send`.
-
-The person signing the document fills in the :guilabel:`Signature` field, then :guilabel:`Sign`, and
-clicks :guilabel:`Validate & Send Completed Document`. A :guilabel:`Final Validation` page pops up
-where to add their phone number. One-time codes are sent by SMS.
-
 .. image:: sign/sms-verification.png
+   :align: center
    :alt: Add a hash to your document
 
+Go to the document to sign, add the field for which the SMS verification is required, for example
+the :guilabel:`Signature` field, and click :guilabel:`Send`. A page pops up, select the customer,
+and click :guilabel:`Send`.
+
+The person signing the document fills in the :guilabel:`Signature` field and clicks
+:guilabel:`Validate & Send Completed Document`. A :guilabel:`Final Validation` page pops up where to
+add their phone number. One-time codes are sent by SMS.
+
+.. image:: sign/final-validation.png
+   :align: center
+   :alt: fill in your phone number for final validation
+
 .. note::
    - This feature is enabled by default.
    - As soon as the :guilabel:`Extra Authentication Step` applies to a role, this validation step is
      requested for any field assigned to this role.
 
-.. _sign/itsme:
-
 Itsme®
 ~~~~~~
 
-Itsme® authentication can be used to allow signatories to provide their identity using itsme®. This
-feature is only available in **Belgium** and the **Netherlands**.
+Go to :menuselection:`Sign --> Configuration --> Settings` and enable :guilabel:`Identify with
+itsme®`.
 
-The feature can be enabled in :guilabel:`Sign Settings` and applies automatically to the
-:guilabel:`Customer (identified with itsme®)` role. To enable it for other roles, go to
-:menuselection:`Sign --> Configuration --> Roles`. Click in the :guilabel:`Extra Authentication
-Step` column for the role, and select :guilabel:`Via itsme®`.
+Then, go to :menuselection:`Sign --> Configuration --> Roles`. Click in the :guilabel:`Extra
+Authentication Step` column for the role, and select :guilabel:`Via itsme®`.
 
-Go to the document that needs to be signed and add the :guilabel:`Signature` field. Switch to any
-role configured to use the feature, and click :guilabel:`Validate` and :guilabel:`Send`.
+Go to the document that needs to be signed and add the :guilabel:`Signature` field. Switch the role
+to :guilabel:`customer (identified with itsme®)`, and click :guilabel:`Validate`, and
+:guilabel:`Send`.
 
 .. image:: sign/itsme-identification.png
+   :align: center
    :alt: select customer identified with itsme®
 
-Upon signing the document, the signer completes the :guilabel:`Signature` field and proceeds by
-clicking on :guilabel:`Validate & Send Completed Document`, triggering a
-:guilabel:`Final verification` page where authentication via itsme® is required.
+The person signing the document fills in the :guilabel:`Signature` field and clicks
+:guilabel:`Validate & Send Completed Document`. A :guilabel:`Final Validation` page pops up, and the
+person must authenticate with itsme®.
 
-Signatory hash
-==============
-
-Each time someone signs a document, a **hash** - a unique digital signature of the operation - is
-generated to ensure traceability, integrity, and inalterability. This process guarantees that any
-changes made after a signature is affixed can be easily detected, maintaining the document's
-authenticity and security throughout its lifecycle.
-
-A visual security frame displaying the beginning of the hash is added to the signatures. Internal
-users can hide or show it by turning the :guilabel:`Frame` option on or off when signing the
-document.
-
-.. image:: sign/sign-hash.png
-   :alt: Adding the visual security frame to a signature.
+.. note::
+   This feature is only available in Belgium and the Netherlands.
 
 .. _sign/field-types:
 
-Tags
-====
-
-Tags can be used to categorize and organize documents, allowing users to search for and filter
-documents based on specific criteria quickly.
-
-You can manage tags by going to :menuselection:`Configuration --> Tags`. To create a tag, click
-:guilabel:`New`. On the new line, add the :guilabel:`Tag Name` and select a :guilabel:`Color Index`
-for your tag.
-
-To apply a tag to a document, use the dropdown list available in your document.
-
-Sign order
-==========
-
-When a document needs to be signed by different parties, the signing order lets you control the
-order in which your recipients receive it for signature.
-
-By going to :menuselection:`Configuration --> Settings`, you can :guilabel:`Enable Signing Order`.
-Each recipient receives the signature request notification only once the previous recipient has
-completed their action.
-
-Add at least two :guilabel:`Signature` fields with different roles to your document. Click
-:guilabel:`Send`, go to the :guilabel:`Options` tab, and tick the :guilabel:`Specify signing order`
-box.
-
-Add the signer's :guilabel:`Name or email` information. You can decide on the :guilabel:`Sign Order`
-by typing :guilabel:`1` or :guilabel:`2` in the :guilabel:`Sign Order` column.
-
-.. seealso::
-   `Odoo Quick Tips: Sign order [video] <https://www.youtube.com/watch?v=2KUq7RPt1cU/>`_
-
-.. _sign/fields:
-
-Field types
+Field Types
 ===========
 
-Fields are used in a document to indicate what information must be completed by the signers. You can
-add fields to your document simply by dragging and dropping them for the left column into your
-document.
-
-Various field types can be used to sign documents (placeholder, autocompletion, etc.). By
-configuring your own field types, also known as signature item types, the signing process can be
-even faster for your customers, partners, and employees.
+Various field types can be used to sign documents (placeholder, autocompletion, ...). By configuring
+your own field types, also known as signature item types, the signing process can be even faster for
+your customers, partners, and employees.
 
 To create and edit field types, go to :menuselection:`Sign --> Configuration --> Settings -->
 Edit field types`.
 
-You can select an existing field by clicking on it, or you can :guilabel:`Create` a new one. First,
+You can select an existing field by clicking on it or you can :guilabel:`Create` a new one. First,
 edit the :guilabel:`Field Name`. Then, select a :guilabel:`Field Type`:
 
 - :guilabel:`Signature`: users are asked to enter their signature either by drawing it, generating
@@ -297,10 +199,10 @@ the person signing the document. To do so, enter the contact model field's techn
    document.
 
 The size of the fields can also be changed by editing the :guilabel:`Default Width` and
-:guilabel:`Default Height`. Both sizes are defined as a percentage of the full page expressed as a
-decimal, with 1 equalling the full page's width or height. By default, the width of new fields you
-create is set to 15% (0.150) of a full page's width, while their height is set to 1.5% (0.015) of a
-full page's height.
+:guilabel:`Default Height`. Both sizes are defined as a percentage of the full-page expressed as a
+decimal, with 1 equalling the full-page's width or height. By default, the width of new fields you
+create is set to 15% (0.150) of a full-page's width, while their height is set to 1.5% (0.015) of a
+full-page's height.
 
 Next, write a :guilabel:`Tip`. Tips are displayed inside arrows on the left-hand side of the user's
 screen during the signing process to help them understand what the step entails (e.g., "Sign here"
@@ -308,4 +210,23 @@ or “Fill in your birthdate”). You can also use a :guilabel:`Placeholder` tex
 the field before it is completed.
 
 .. image:: sign/tip-placeholder.png
+   :align: center
    :alt: Tip and placeholder example in Odoo Sign
+
+Signatory hash
+==============
+
+A :guilabel:`hash` can be added to a document that is shared (attached to an email or printed, for
+example) to indicate that the signature is electronic and that there is some traceability behind
+it. The :guilabel:`hash` corresponds to a unique ID number related to the signed document.
+
+If you are an :doc:`internal user <../general/users/manage_users>`,
+you can choose to tick or untick the frame option when signing the document. Tick the box to have
+the frame and hash visible.
+
+.. image:: sign/sign-hash.png
+   :align: center
+   :alt: Add a hash to your document
+
+.. note::
+   The :guilabel:`hash` is only applicable to the signature field.

content/applications/inventory_and_mrp/barcode/setup/hardware.rst

@@ -4,84 +4,64 @@ Set up your barcode scanner
 
 .. _barcode/setup/hardware:
 
-Follow this guide to choose and set up a barcode scanner compatible with Odoo's *Inventory* and
-*Barcode* apps.
+Getting started with barcode scanning in Odoo is fairly easy. Yet, a
+good user experience relies on an appropriate hardware setup. This guide
+will help you through the task of choosing and configuring the barcode
+scanner.
 
-.. figure:: hardware/barcode-scanner.png
-   :align: center
-   :alt: An image of an example barcode scanner.
+Find the barcode scanner that suits your needs
+==============================================
 
-   An image of an example barcode scanner.
+The 3 recommended type of barcode scanners to work with the Odoo
+**Inventory** and **Barcode Scanning** apps are the **USB scanner**, **the bluetooth
+scanner** and the **mobile computer scanner**.
 
-Scanner types
-=============
+.. image:: hardware/hardware02.png
+    :align: center
 
-Before setting up a barcode scanner, it is important to determine which scanner type best meets the
-needs of the business. There are three main types, each with their own benefits and use cases:
+-   If you scan products at a computer location, the **USB scanner** is the
+    way to go. Simply plug it in the computer to start scanning. Just
+    make sure when you buy it that the scanner is compatible with
+    your keyboard layout or can be configured to be so.
 
-- **USB scanners** are connected to a computer, and are suitable for businesses that scan products
-  at a fixed location, like at the checkout in a grocery store. Ensure the chosen USB scanner is
-  compatible with the keyboard layout of the computer.
+-   The **bluetooth scanner** can be paired with a smartphone or a tablet and
+    is a good choice if you want to be mobile but don't need a big
+    investment. An approach is to log in Odoo on you smartphone, pair
+    the bluetooth scanner with the smartphone and work in the
+    warehouse with the possibility to check your smartphone
+    from time to time and use the software 'manually'.
 
-- **Bluetooth scanners** pair with a smartphone or tablet, making them an ideal cost-effective and
-  portable barcode scanner option. In this scenario, Odoo is installed on the smartphone, allowing
-  warehouse operators to handle operations, and check stock directly through their mobile devices.
+-   For heavy use, the **mobile computer scanner** is the handiest solution.
+    It consists of a small computer with a built-in barcode scanner.
+    This one can turn out to be a very productive solution, however
+    you need to make sure that is is capable of running Odoo smoothly.
+    The most recent models using Android + Google Chrome or Windows +
+    Internet Explorer Mobile should do the job. However, due to the
+    variety of models and configurations on the market, it is
+    essential to test it first.
 
-- **Mobile computer scanners** are mobile devices with a built-in barcode scanner. First, ensure the
-  device can run the Odoo mobile app properly. Recent models that use Android OS with the Google
-  Chrome browser, or Windows OS with Microsoft Edge, should work. However, testing is crucial due to
-  the variety of available models and configurations.
-
-.. seealso::
-   `Compatible hardware with Odoo Inventory <https://www.odoo.com/app/inventory-hardware>`_
-
-Configuration
-=============
-
-When setting up the barcode scanner, make sure the following configurations are correct so the
-scanner can properly interpret barcodes with Odoo.
+Configure your barcode scanner
+==============================
 
 Keyboard layout
 ---------------
 
-When using a USB barcode scanner, match its keyboard layout with the operating system's layout for
-proper interpretation of characters. Generally, the scanning mode should be set to accept a USB
-keyboard (HID), with the language set based on the keyboard that is in use.
+.. image:: hardware/hardware01.png
+    :align: center
 
-To configure the keyboard layout for a **Zebra** scanner, scan the keyboard wedge barcode for the
-desired language in the scanner's user manual.
-
-.. figure:: hardware/keyboard-barcode.png
-   :alt: Example of a user manual for keyboard layout.
-
-   Examples of keyboard language settings in the Zebra scanner user manual.
+An USB barcode scanner needs to be configured to use the same keyboard
+layout as your operating system. Otherwise, your scanner won't translate
+characters correctly (replacing a 'A' with a 'Q' for example). Most
+scanners are configured by scanning the appropriate barcode in the user
+manual.
 
 Automatic carriage return
 -------------------------
 
-Odoo has a default 50-millisecond delay between scans to prevent accidental double scanning. To
-synchronize with the barcode scanner, set it to include a *carriage return* (:dfn:`character like
-the "Enter" key on a keyboard`) after each scan. Odoo interprets the carriage return as the end of
-the barcode input; so Odoo accepts the scan, and waits for the next one.
-
-Typically, on the scanner, a carriage return is included by default. Ensure it is set by scanning a
-specific barcode in the user manual, like `CR suffix ON` or `Apply Enter for suffix`.
-
-Zebra scanner
--------------
-
-When using Zebra scanners, ensure the following keystroke configurations are set to prevent errors.
-
-Begin on the Zebra scanner's home screen, and select the :guilabel:`DataWedge` app (the icon for the
-app is a light blue barcode). On the :guilabel:`DataWedge Profiles` page, select the profile option
-to access the Zebra scanner's settings.
-
-Scroll down to the :guilabel:`Keyboard Output` option, and ensure the :guilabel:`Enable/disable
-keystroke output` option is :guilabel:`Enabled`.
-
-.. image:: hardware/enable-keystroke.png
-   :align: center
-   :alt: Show keystroke option in the Zebra scanner's DataWedge app.
-
-Now, go back to the :guilabel:`Profile` options page, and select :guilabel:`Key event options`.
-Here, ensure the :guilabel:`Send Characters as Events` option is checked.
+By default, Odoo has a 50 milliseconds delay between each successive
+scan (it helps avoid accidental double scanning). If you want to
+suppress this delay, you can configure your scanner to insert a carriage
+return at the end of each barcode. This is usually the default
+configuration and can be explicitly configured by scanning a specific
+barcode in the user manual ('CR suffix ON', 'Apply Enter for suffix',
+etc.).

content/applications/inventory_and_mrp/maintenance/equipment_management/add_new_equipment.rst

@@ -2,15 +2,13 @@
 Add new equipment
 =================
 
-.. _maintenance/equipment_management/add_new_equipment:
-
-In Odoo, *equipment* refers to any item that is used in everyday operations, including the
+In Odoo, **equipment** refers to any item that is used in everyday operations, including the
 manufacturing of products. This can mean a piece of machinery on a production line, a tool that is
 used in different locations, or a computer in an office space. Equipment registered in Odoo can be
 owned by the company that uses the Odoo database, or by a third party, such as a vendor in the case
 of equipment rentals.
 
-Using Odoo *Maintenance*, it is possible to track individual pieces of equipment, along with
+Using Odoo **Maintenance**, it is possible to track individual pieces of equipment, along with
 information about their maintenance requirements. To add a new piece of equipment, navigate to the
 :guilabel:`Maintenance` module, select :menuselection:`Equipments --> Machines & Tools --> Create`,
 and configure the equipment as follows:

content/applications/inventory_and_mrp/quality/quality_check_types.rst

@@ -10,4 +10,3 @@ Quality check types
    quality_check_types/instructions_check
    quality_check_types/pass_fail_check
    quality_check_types/measure_check
-   quality_check_types/picture_check

content/applications/inventory_and_mrp/quality/quality_check_types/picture_check.rst

@@ -1,165 +0,0 @@
-============================
-Take a Picture quality check
-============================
-
-.. |QCP| replace:: :abbr:`QCP (Quality Control Point)`
-.. |QCPs| replace:: :abbr:`QCP (Quality Control Points)`
-
-In Odoo *Quality*, a *Take a Picture* check is one of the quality check types that can be selected
-when creating a new quality check or quality control point (QCP). *Take a Picture* checks require a
-picture to be attached to the check, which can then be reviewed by a quality team.
-
-Create a Take a Picture quality check
-=====================================
-
-There are two distinct ways that *Take a Picture* quality checks can be created. A single check can
-be manually created. Alternatively, a |QCP| can be configured that automatically creates checks at a
-predetermined interval.
-
-This documentation only details the configuration options that are unique to *Take a Picture*
-quality checks and |QCPs|. For a full overview of all the configuration options available when
-creating a single check or a |QCP|, see the documentation on :ref:`quality checks
-<quality/quality_management/quality-checks>` and :ref:`quality control points
-<quality/quality_management/quality-checks>`.
-
-Quality check
--------------
-
-To create a single *Take a Picture* quality check, navigate to :menuselection:`Quality --> Quality
-Control --> Quality Checks`, and click :guilabel:`New`. Fill out the new quality check form as
-follows:
-
-- In the :guilabel:`Type` drop-down field, select the :guilabel:`Take a Picture` quality check type.
-- In the :guilabel:`Team` drop-down field, select the quality team responsible for managing the
-  check.
-- In the :guilabel:`Instructions` text field of the :guilabel:`Notes` tab, enter instructions for
-  how the picture should be taken.
-
-.. image:: picture_check/picture-check-form.png
-   :align: center
-   :alt: A quality check form configured for a Take a Picture quality check.
-
-Quality Control Point (QCP)
----------------------------
-
-To create a |QCP| that will generate *Take a Picture* quality checks automatically, navigate to
-:menuselection:`Quality --> Quality Control --> Control Points`, and click :guilabel:`New`. Fill out
-the new |QCP| form as follows:
-
-- In the :guilabel:`Type` drop-down field, select the :guilabel:`Take a Picture` quality check type.
-- If the *Maintenance* app is installed, a :guilabel:`Device` field appears after selecting the
-  *Take a Picture* check type. Use this field to specify a device that should be used to take
-  quality check pictures. For information about managing devices in the *Maintenance* app, see the
-  documentation on :ref:`adding new equipment <maintenance/equipment_management/add_new_equipment>`.
-- In the :guilabel:`Team` drop-down field, select the quality team responsible for managing the
-  checks created by the |QCP|.
-- In the :guilabel:`Instructions` text field, enter instructions for how the picture should be
-  taken.
-
-.. image:: picture_check/picture-qcp-form.png
-   :align: center
-   :alt: A Quality Control Point (QCP) form configured to create a Take a Picture quality check.
-
-Process a Take a Picture quality check
-======================================
-
-Once created, there are multiple ways that *Take a Picture* quality checks can be processed. If a
-quality check is assigned to a specific inventory, manufacturing, or work order, the check can be
-processed on the order itself. Alternatively, a check can be processed from the check's page.
-
-From the check's page
----------------------
-
-To process a *Take a Picture* quality check from the check's page, begin by navigating to
-:menuselection:`Quality --> Quality Control --> Quality Checks`, and then select a quality check.
-Follow the :guilabel:`Instructions` for how to take the picture.
-
-After taking the picture, make sure it is stored on the device being used to process the quality
-check (computer, tablet, etc.). Then, click the :guilabel:`✏️ (pencil)` button in the
-:guilabel:`Picture` section to open the device's file manager. In the file manager, navigate to the
-picture, select it, and click :guilabel:`Open` to attach it.
-
-.. image:: picture_check/picture-edit-button.png
-   :align: center
-   :alt: The edit button (pencil) on a Take a Picture quality check.
-
-On an order
------------
-
-To process a *Take a Picture* quality check on an order, select a manufacturing order or inventory
-order (receipt, delivery, return, etc.), for which a check is required. Manufacturing orders can be
-selected by navigating to :menuselection:`Manufacturing --> Operations --> Manufacturing Orders`,
-and clicking on an order. Inventory orders can be selected by navigating to
-:menuselection:`Inventory`, clicking the :guilabel:`# To Process` button on an operation card, and
-selecting an order.
-
-On the selected manufacturing or inventory order, a purple :guilabel:`Quality Checks` button appears
-at the top of the page. Click the button to open the :guilabel:`Quality Check` pop-up window, which
-shows all of the quality checks required for that order.
-
-Follow the instructions detailing how to take the picture, which are shown on the :guilabel:`Quality
-Check` pop-up window. After taking the picture, make sure it is stored on the device being used to
-process the quality check (computer, tablet, etc.).
-
-Then, click the :guilabel:`Take a Picture` button in the :guilabel:`Picture` section to open the
-device's file manager. In the file manager, navigate to the picture, select it, and click
-:guilabel:`Open` to attach it. Finally, click :guilabel:`Validate` on the :guilabel:`Quality Check`
-pop-up window to complete the quality check.
-
-.. image:: picture_check/picture-check-pop-up.png
-   :align: center
-   :alt: A Take a Picture quality check pop-up window on a manufacturing or inventory order.
-
-If a quality alert must be created, click the :guilabel:`Quality Alert` button that appears at the
-top of the manufacturing or inventory order after the check is validated. Clicking
-:guilabel:`Quality Alert` opens a quality alert form on a new page. For a complete guide on how to
-fill out quality alert forms, view the documentation on :ref:`quality alerts
-<quality/quality_management/quality-alerts>`.
-
-On a work order
----------------
-
-When configuring a |QCP| that is triggered during manufacturing, a specific work order can also be
-specified in the :guilabel:`Work Order Operation` field on the |QCP| form. If a work order is
-specified, a *Take a Picture* quality check is created for that specific work order, rather than the
-manufacturing order as a whole.
-
-*Take a Picture* quality checks created for work orders must be completed from the tablet view. To
-do so, begin by navigating to :menuselection:`Manufacturing --> Operations --> Manufacturing
-Orders`. Select a manufacturing order that includes a work order for which a quality check is
-required. Open the tablet view for that work order by selecting the :guilabel:`Work Orders` tab, and
-then clicking the :guilabel:`📱 (tablet)` button on the order's line.
-
-With tablet view open, complete the steps listed on the left side of the screen until the *Take a
-Picture* quality check step is reached. Upon reaching the check, follow the instructions for how to
-take the picture, which appear at the top of the screen.
-
-After taking the picture, make sure it is stored on the device being used to process the work order
-(computer, tablet, etc.). Then, click the :guilabel:`Take a Picture` button to open the device's
-file manager. In the file manager, navigate to the picture, select it, and click :guilabel:`Open` to
-attach it. Finally, click :guilabel:`Validate` to complete the quality check.
-
-.. image:: picture_check/work-order-picture-check.png
-   :align: center
-   :alt: A Take a Picture check for a manufacturing work order.
-
-If a quality alert must be created, do so by clicking the :guilabel:`☰ (three horizontal lines)`
-button in the tablet view, and selecting :guilabel:`Quality Alert` from the :guilabel:`Menu` pop-up
-window. A :guilabel:`Quality Alerts` pop-up window appears, from which a quality alert can be
-created. For a complete guide on how to fill out quality alert forms, view the documentation on
-:ref:`quality alerts <quality/quality_management/quality-alerts>`.
-
-Review a picture attached to a check
-====================================
-
-After a picture has been attached to a check, it can then be reviewed by quality team members or
-other users. To do so, navigate to :menuselection:`Quality --> Quality Control --> Quality Checks`,
-and select a quality check to review.
-
-The attached picture appears in the :guilabel:`Picture` section of the quality check form. After
-reviewing the picture, click the :guilabel:`Pass` button if the check passes, or the
-:guilabel:`Fail` button if the check fails.
-
-.. image:: picture_check/review-picture-check.png
-   :align: center
-   :alt: A Take a Picture check with a picture attached.

content/applications/productivity/discuss/overview/plan_activities.rst

@@ -1,249 +1,64 @@
-==========
-Activities
-==========
+====================================
+Get Organized by Planning Activities
+====================================
 
-*Activities* are follow-up tasks tied to a record in an Odoo database. Activities can be scheduled
-on any page of the database that contains a chatter thread, kanban view, list view, or activities
-view of an application.
+When you plan activities you minimize the risk of uncertainties, as you provide clear directions
+for the course of your next action. In addition to that, you do not leave space for wasteful
+activities and reduce the chance of having overlapping actions between team members.
 
-Schedule activities
-===================
+Where do I see my schedule activities?
+======================================
 
-One way that activities are created is by clicking the :guilabel:`Schedule Activity` button, located
-at the top of the *chatter* on any record. On the pop-up window that appears, select an
-:guilabel:`Activity Type` from the drop-down menu.
+Access and manage your activities wherever you are in Odoo by the *Activities* menu.
+
+.. image:: plan_activities/activities_menu.png
+   :align: center
+   :height: 300
+   :alt: View of crm leads page emphasizing the activities menu for Odoo Discuss
+
+Plan activities
+===============
+
+Activities can be planned and managed from the chatter by clicking on *Schedule activity*,
+or through Kanban views.
+
+.. image:: plan_activities/schedule_activity.png
+   :align: center
+   :height: 300
+   :alt: View of crm leads and the option to schedule an activity for Odoo Discuss
+
+Set your activity types
+-----------------------
+
+A number of activities types are available by default in Odoo (call, email, meeting, etc.). However,
+you can set new ones going to :menuselection:`Settings --> Activity types`.
+
+.. image:: plan_activities/settings_activities_types.png
+   :align: center
+   :height: 300
+   :alt: View of the settings page emphasizing the menu activity types for Odoo Discuss
 
 .. tip::
-   Individual applications have a list of *Activity Types* dedicated to that application. For
-   example, to view and edit the activities available for the *CRM* application, go to
-   :menuselection:`CRM app --> Configuration --> Activity Types`.
+   If you need to create an activity type with an available calendar, make sure to create
+   it with an *Action to Perform* set as *Meeting*.
 
-Enter a title for the activity in the :guilabel:`Summary` field, located in the :guilabel:`Schedule
-Activity` pop-up window.
+Recommend next activities
+-------------------------
 
-To assign the activity to a different user, select a name from the :guilabel:`Assigned to` drop-down
-menu. Otherwise, the user creating the activity is automatically assigned.
+Odoo helps you to plan a flow of activities by allowing you to set *Recommended Next Activities*.
 
-Lastly, feel free to add any additional information in the optional :guilabel:`Log a note...` field.
-
-.. note::
-   The :guilabel:`Due Date` field on the :guilabel:`Schedule Activity` pop-up window auto-populates
-   based on the configuration settings for the selected :guilabel:`Activity Type`. However, this
-   date can be changed by selecting a day on the calendar in the :guilabel:`Due Date` field.
-
-Lastly, click one of the following buttons:
-
-- :guilabel:`Schedule`: adds the activity to the chatter under :guilabel:`Planned activities`.
-- :guilabel:`Mark as Done`: adds the details of the activity to the chatter under :guilabel:`Today`.
-  The activity is not scheduled, it is automatically marked as completed.
-- :guilabel:`Done \& Schedule Next`: adds the task under :guilabel:`Today` marked as done, and
-  opens a new activity window.
-- :guilabel:`Discard`: discards any changes made on the pop-up window.
-
-.. image:: plan_activities/schedule-pop-up.png
+.. image:: plan_activities/recommended_activities.png
    :align: center
-   :alt: View of CRM leads and the option to schedule an activity.
+   :alt: View of an activity type form emphasizing the field recommended next activities for Odoo
+         Discuss
 
-.. note::
-   Depending on the activity type, the :guilabel:`Schedule` button may be replaced by a
-   :guilabel:`Save` button, or an :guilabel:`Open Calendar` button.
+Once the respective activity is completed, select *Done & Schedule Next* and next steps are
+suggested to you.
 
-Scheduled activities are added to the chatter for the record under :guilabel:`Planned activities`.
-
-.. image:: plan_activities/chatter-activities.png
+.. image:: plan_activities/schedule_recommended_activity.png
    :align: center
-   :alt: View of CRM leads and the option to schedule an activity.
-
-Activities can also be scheduled from the kanban, list, or activities view of an application.
-
-.. tabs::
-
-   .. tab:: Kanban view
-
-      Select a record on which to schedule an activity. Click on the :guilabel:`🕘 (clock)` icon,
-      then :guilabel:`Schedule An Activity`, and proceed to fill out the pop-up form.
-
-      .. image:: plan_activities/schedule-kanban-activity.png
-         :align: center
-         :alt: Kanban view of the CRM pipeline and the option to schedule an activity.
-
-   .. tab:: List view
-
-      Select a record on which to schedule an activity. Click on the :guilabel:`🕘 (clock)` icon,
-      then :guilabel:`Schedule An Activity`. If the record already has an activity scheduled, the
-      clock icon may be replaced by a :guilabel:`📞 (phone)` or an :guilabel:`✉️ (envelope)` icon.
-
-      .. image:: plan_activities/schedule-list-activity.png
-         :align: center
-         :alt: List view of the CRM pipeline and the option to schedule an activity.
-
-   .. tab:: Activity view
-
-      To open the activity view for an application, select the :guilabel:`🕘 (clock)` icon from the
-      menu bar anywhere in the database. Select any application from the drop-down menu, and click
-      the :guilabel:`🕘 (clock)` icon for the desired app.
-
-      .. image:: plan_activities/schedule-activity-view-menu.png
-         :align: center
-         :alt: Activity menu drop down with focus on where to open activity view for CRM.
-
-      Select a record on which to schedule an activity. Move across the row to find the desired
-      activity type, then click the :guilabel:`＋ (plus sign)`.
-
-      .. image:: plan_activities/schedule-activity-view.png
-         :align: center
-         :alt: Activity view of the CRM pipeline and the option to schedule an activity.
-
-.. note::
-   Activity colors, and their relation to an activity's due date, is consistent throughout Odoo,
-   regardless of the activity type, or the view.
-
-   - Activities that appear in **green** indicate a due date sometime in the future.
-   - **Yellow** indicates that the activity's due date is today.
-   - **Red** indicates that the activity is overdue and the due date has passed.
-
-   For example, if an activity is created for a phone call, and the due date passes, the activity
-   appears with a red phone in list view, and a red clock on the kanban view.
-
-View scheduled activities
-=========================
-
-To view scheduled activities, open either the :menuselection:`Sales app` or :menuselection:`CRM app`
-and click the :guilabel:`🕘 (clock)` icon, located to the far-right side of the other view options.
-
-Doing so opens the activities menu, showcasing all the scheduled activities for the user, by
-default. To show all activities for every user, remove the :guilabel:`My Pipeline` filter from the
-:guilabel:`Search...` bar.
-
-To view a consolidated list of activities separated by the application where they were created, and
-by deadline, click the :guilabel:`🕘 (clock)` icon on the header menu to see the activities for that
-specific application in a drop-down menu.
-
-The possibility to :guilabel:`Add new note` and :guilabel:`Request a Document` appear at the bottom
-of this drop-down menu, when the :guilabel:`🕘 (clock)` icon on the header menu is clicked.
-
-.. image:: plan_activities/activities-menu.png
-   :align: center
-   :alt: View of CRM leads page emphasizing the activities menu.
-
-Configure activity types
-========================
-
-To configure the types of activities in the database, go to :menuselection:`Settings app --> Discuss
---> Activities --> Activity Types`.
-
-.. image:: plan_activities/settings-activities-types.png
-   :align: center
-   :alt: View of the settings page emphasizing the menu activity types.
-
-Doing so reveals the :guilabel:`Activity Types` page, where the existing activity types are found.
-
-To edit an existing activity type, select it from the list, then click :guilabel:`Edit`. To create a
-new activity type, click :guilabel:`Create`.
-
-At the top of a blank activity type form, start by choosing a :guilabel:`Name` for the new activity
-type.
-
-.. image:: plan_activities/new-activity-type.png
-   :align: center
-   :alt: New activity type form.
-
-Activity settings
------------------
-
-Action
-~~~~~~
-
-The *Action* field specifies the intent of the activity. Some actions trigger specific behaviors
-after an activity is scheduled.
-
-- If :guilabel:`Upload Document` is selected, a link to upload a document is added directly to the
-  planned activity in the chatter.
-- If either :guilabel:`Phonecall` or :guilabel:`Meeting` are selected, users have the option to open
-  their calendar to schedule a time for this activity.
-- If :guilabel:`Request Signature` is selected, a link is added to the planned activity in the
-  chatter that opens a signature request pop-up window.
-
-.. note::
-   The actions available to select on an activity type vary, depending on the applications currently
-   installed in the database.
-
-Default user
-~~~~~~~~~~~~
-
-To automatically assign this activity to a specific user when this activity type is scheduled,
-choose a name from the :guilabel:`Default User` drop-down menu. If this field is left blank, the
-activity is assigned to the user who creates the activity.
-
-Default summary
-~~~~~~~~~~~~~~~
-
-To include notes whenever this activity type is created, enter them into the :guilabel:`Default
-Summary` field.
-
-.. note::
-   The information in the :guilabel:`Default User` and :guilabel:`Default Summary` fields are
-   included when an activity is created. However, they can be altered before the activity is
-   scheduled or saved.
-
-Next activity
--------------
-
-To automatically suggest, or trigger, a new activity after an activity has been marked complete, the
-:guilabel:`Chaining Type` must be set.
-
-Suggest next activity
-~~~~~~~~~~~~~~~~~~~~~
-
-In the :guilabel:`Chaining Type` field, select :guilabel:`Suggest Next Activity`. Upon doing so, the
-field underneath changes to: :guilabel:`Suggest`. Click the :guilabel:`Suggest` field drop-down menu
-to select any activities to recommend as follow-up tasks to this activity type.
-
-In the :guilabel:`Schedule` field, choose a default deadline for these activities. To do so,
-configure a desired number of :guilabel:`Days`, :guilabel:`Weeks`, or :guilabel:`Months`. Then,
-decide if it should occur :guilabel:`after completion date` or :guilabel:`after previous activity
-deadline`.
-
-This :guilabel:`Schedule` field information can be altered before the activity is scheduled.
-
-When all configurations are complete, click :guilabel:`Save`.
-
-.. image:: plan_activities/schedule-recommended-activity.png
-   :align: center
-   :alt: Schedule activity popup with emphasis on recommended activities.
-
-.. note::
-   If an activity has the :guilabel:`Chaining Type` set to :guilabel:`Suggest Next Activity`, and
-   has activities listed in the :guilabel:`Suggest` field, users are presented with recommendations
-   for activities as next steps.
-
-Trigger next activity
-~~~~~~~~~~~~~~~~~~~~~
-
-Setting the :guilabel:`Chaining Type` to :guilabel:`Trigger Next Activity` immediately launches the
-next activity once the previous one is completed.
-
-If :guilabel:`Trigger Next Activity` is selected in the :guilabel:`Chaining Type` field, the field
-beneath changes to: :guilabel:`Trigger`. From the :guilabel:`Trigger` field drop-down menu, select
-the activity that should be launched once this activity is completed.
-
-In the :guilabel:`Schedule` field, choose a default deadline for these activities. To do so,
-configure a desired number of :guilabel:`Days`, :guilabel:`Weeks`, or :guilabel:`Months`. Then,
-decide if it should occur :guilabel:`after completion date` or :guilabel:`after previous activity
-deadline`.
-
-This :guilabel:`Schedule` field information can be altered before the activity is scheduled.
-
-When all configurations are complete, click :guilabel:`Save`.
-
-.. image:: plan_activities/triggered-activities.png
-   :align: center
-   :alt: Schedule new activity popup with emphasis on Done and launch next button.
-
-.. note::
-   When an activity has the :guilabel:`Chaining Type` set to :guilabel:`Trigger Next Activity`,
-   marking the activity as `Done` immediately launches the next activity listed in the
-   :guilabel:`Trigger` field.
+   :alt: View of an activity being schedule emphasizing the recommended activities field being
+         shown for Odoo Discuss
 
 .. seealso::
    - :doc:`get_started`

content/applications/sales/crm/pipeline/lost_opportunities.rst

@@ -2,120 +2,77 @@
 Manage lost opportunities
 =========================
 
-Not all opportunities result in successful sales. In order to keep the pipeline up to date, lost
-opportunities need to be identified. Specifying the reason why an opportunity was lost provides
-additional insight that can prove useful for future opportunities.
+While working with your opportunities, you might lose some of them. You
+will want to keep track of the reasons you lost them and also which ways
+Odoo can help you recover them in the future.
 
 Mark a lead as lost
 ===================
 
-To mark a lead as lost, open the :menuselection:`CRM` application, and select a lead from the
-pipeline, by clicking on its corresponding kanban card. Doing so reveals that lead's detail form.
+While in your pipeline, select any opportunity you want and you will see
+a *Mark Lost* button.
 
-Then, click :guilabel:`Lost`, located at the top of the lead's detail form.
+You can then select an existing *Lost Reason* or create a new one
+right there.
 
-.. image:: lost_opportunities/lost-opps-lost-button.png
+.. image:: lost_opportunities/lost_opportunities01.png
    :align: center
-   :alt: Buttons from the top of an opportunity record with the lost button emphasized.
 
-This opens the :guilabel:`Lost Reason` popup. From the drop-down, choose an existing lost reason. If
-no applicable reason is available, create a new one by entering it into the :guilabel:`Lost Reason`
-field, and clicking :guilabel:`Create`.
+Manage & create lost reasons
+----------------------------
 
-Additional notes and comments can be added below the lost reason designated in the :guilabel:`Lost
-Reason` field.
+You will find your *Lost Reasons* under :menuselection:`Configuration --> Lost Reasons`.
 
-When all the desired information has been entered in the :guilabel:`Lost Reason` pop-up window,
-click :guilabel:`Submit`.
-
-.. image:: lost_opportunities/lost-opps-lost-reason.png
-   :align: center
-   :alt: Lost reasons popup with sample reasons.
-
-Upon clicking :guilabel:`Submit`, the pop-up window disappears, and Odoo returns to the lead detail
-form, where a new red :guilabel:`Lost` banner is now present in the upper-right corner of the lead.
-
-Create/edit lost reasons
-========================
-
-To create a new lost reason, or edit an existing one, navigate to :menuselection:`CRM app -->
-Configuration --> Lost Reasons`.
-
-To edit an existing reason, click on the reason that should be modified. When clicked, that reason
-becomes highlighted. Once highlighted, change the description of the selected lost reason by editing
-the :guilabel:`Description` field. When done, click :guilabel:`Save` in the upper-left corner.
-
-To create a new lost reason, click :guilabel:`Create` in the upper-left corner of the
-:guilabel:`Lost Reasons` page. Doing so reveals a new blank line in the :guilabel:`Description`
-field. Then, proceed to type in the new lost reason in that new line. Once ready, click
-:guilabel:`Save`.
+You can select & rename any of them as well as create a new one from
+there.
 
 Retrieve lost opportunities
 ===========================
 
-To retrieve lost opportunities in Odoo *CRM*, open the :menuselection:`CRM app` to the main
-:guilabel:`Pipeline` dashboard. Then, click the :guilabel:`Filters` drop-down menu, located beneath
-the search bar.
+To retrieve lost opportunities and do actions on them (send an email,
+make a feedback call, etc.), select the *Lost* filter in the search
+bar.
 
-.. image:: lost_opportunities/lost-opps-lost-filter.png
+.. image:: lost_opportunities/lost_opportunities02.png
    :align: center
-   :alt: Search bar with lost filter emphasized.
 
-From the :guilabel:`Filters` drop-down menu, select the :guilabel:`Lost` option. Upon selecting
-:guilabel:`Lost`, only the leads that have been marked as `Lost` appear on the :guilabel:`Pipeline`
-page.
+You will then see all your lost opportunities.
 
-To filter leads by a specific lost reason, select :menuselection:`Filters --> Add Custom Filter`.
-Doing so reveals another drop-down menu with three fields.
+If you want to refine them further, you can add a filter on the *Lost
+Reason*.
 
-In the top field drop-down menu, select :guilabel:`Lost Reason`. In the second field drop-down menu,
-select :guilabel:`Contains`. Then, in the third field of the :guilabel:`Add Custom Field` sub menu,
-type in the specific keyword(s). Lastly, click :guilabel:`Apply`. Upon clicking :guilabel:`Apply`,
-Odoo reveals all the lost leads with a reason that contains that specified keyword(s).
+For Example, *Too Expensive*.
 
-.. image:: lost_opportunities/lost-opps-lost-custom-filter.png
+.. image:: lost_opportunities/lost_opportunities03.png
    :align: center
-   :alt: Search bar with custom filter added for lost reason.
 
 Restore lost opportunities
 ==========================
 
-To restore a lost opportunity, navigate to the main :guilabel:`Pipeline` dashboard on the *CRM* app,
-open the :guilabel:`Filters` drop-down menu, and select the :guilabel:`Lost` option. Doing so
-reveals all the lost opportunities on the :guilabel:`Pipeline` page.
+From the Kanban view with the filter(s) in place, you can select any
+opportunity you wish and work on it as usual. You can also restore it by
+clicking on *Archived*.
 
-Then, click on the kanban card of the desired lost opportunity to restore, which opens that lead's
-detail form.
-
-From the lost lead's detail form, click :guilabel:`Restore` in the upper-left corner. Doing so
-removes the red :guilabel:`Lost` banner from the lead form, signifying the lead has been restored.
-
-.. image:: lost_opportunities/lost-opps-restore.png
+.. image:: lost_opportunities/lost_opportunities04.png
    :align: center
-   :alt: Lost opportunity with emphasis on the Restore button.
 
-Restore multiple opportunities at once
---------------------------------------
+You can also restore items in batch from the Kanban view when they
+belong to the same stage. Select *Restore Records* in the column
+options. You can also archive the same way.
 
-To restore multiple opportunities at once, navigate to the main :guilabel:`Pipeline` dashboard in
-the *CRM* app, open the :guilabel:`Filters` drop-down menu, and select the :guilabel:`Lost` option.
-
-Next, select the list view option, which is represented by the three-line :guilabel:`☰ (list)` icon
-in the upper-right corner. Doing so places all the leads from the :guilabel:`Pipeline` page in a
-list form. With the list form chosen, select the checkbox to the left of each desired
-opportunity/lead to be restored.
-
-Once the desired opportunities/leads have been selected, click the :guilabel:`⚙️ Action (gear)`
-drop-down menu at the top of the :guilabel:`Pipeline` page. From the :guilabel:`⚙️ Action (gear)`
-drop-down menu, select :guilabel:`Unarchive`.
-
-Doing so removes those selected lost opportunities from the :guilabel:`Pipeline` page because they
-no longer fit into the `Lost` filter criteria. To reveal these newly-restored leads, delete the
-`Lost` filter from the search bar.
-
-.. image:: lost_opportunities/lost-opps-unarchive.png
+.. image:: lost_opportunities/lost_opportunities05.png
+   :align: center
+
+To select specific opportunities, you should switch to the list view.
+
+.. image:: lost_opportunities/lost_opportunities06.png
+   :align: center
+
+Then you can select as many or all opportunities and select the actions
+you want to take.
+
+.. image:: lost_opportunities/lost_opportunities07.png
    :align: center
-   :alt: Action button from list view with the Unarchive option emphasized.
 
 .. seealso::
-   :doc:`../performance/win_loss`
+   * :doc:`../performance/win_loss`

content/applications/sales/point_of_sale.rst

@@ -51,19 +51,14 @@ Once an order is completed, proceed to checkout by clicking :guilabel:`Payment`.
 Set customers
 =============
 
-Registering your customer is necessary to :doc:`collect their loyalty points and grant them rewards
+You can create and set customers from an :ref:`open POS session <pos/session-start>`. Registering
+your customer is necessary to :doc:`collect their loyalty points and grant them rewards
 <point_of_sale/pricing/loyalty>`, automatically apply the :doc:`attributed pricelist
 <point_of_sale/pricing/pricelists>`, or :ref:`generate and print an invoice
 <receipts-invoices/invoices>`.
 
-You can create customers from an :ref:`open POS session <pos/session-start>` by clicking
-:menuselection:`Customer --> Create`, and filling in the contact information. You can also create
-customers from the backend by going to :menuselection:`Point of Sale --> Orders --> Customers` and
-clicking :guilabel:`New`. Then, fill in the information and save.
-
-To set a customer during an order, access the list of customers by clicking :guilabel:`Customer` on
-the POS interface. You can also set a customer at the payment screen by clicking
-:guilabel:`Customer`.
+To access the list of customers, click :guilabel:`Customer` on the POS interface. Then, select a
+customer or create a new one by clicking :guilabel:`Create`, completing the form, and saving.
 
 .. _pos/customer-notes:
 

content/applications/sales/point_of_sale/receipts_invoices.rst

@@ -39,38 +39,41 @@ select the corresponding order and click :guilabel:`Print Receipt`.
 Invoices
 ========
 
-Point of Sale allows you to issue and print invoices for :ref:`registered customers <pos/customers>`
-upon payment and retrieve all past invoiced orders.
+In Point of Sale, you can issue and print invoices upon payment at the cash register or retrieve all
+the past invoiced orders.
+
+Set a customer
+--------------
+
+First, you need to open a session and set your customer. Open the **POS interface** by going to
+:menuselection:`Point of Sale --> New session --> Open session`. Then, click :guilabel:`Customer` to
+access the list of **customers**.
+
+.. image:: receipts_invoices/select-customer-ui.png
+   :alt: customer selection and creation button
+
+From there, you can either set an existing customer by clicking their name or create a new one by
+clicking :guilabel:`Create`. Doing so opens a customer creation form to fill in with their
+information. Click :guilabel:`Save` to validate and set this new customer.
 
 .. note::
-   An invoice created in a POS creates an entry into the corresponding :ref:`accounting journal
-   <cheat_sheet/journals>`, previously :ref:`set up <receipts_invoices/invoice_configuration>`.
-
-.. _receipts_invoices/invoice_configuration:
-
-Configuration
--------------
-
-To define what journals will be used for a specific POS, go to the :ref:`POS' settings
-<configuration/settings>` and scroll down to the accounting section. Then, you can determine the
-accounting journals used by default for orders and invoices in the :guilabel:`Default Journals`
-section.
-
-.. image:: receipts_invoices/invoice-config.png
-   :alt: accounting section in the POS settings
+   - You can also **edit** a customer's information by clicking :guilabel:`Details`.
+   - If you did not set your customer during the order, you can do so at the payment screen by
+     clicking :guilabel:`Customer`.
 
 Invoice a customer
 ------------------
 
-Upon processing a payment, click :guilabel:`Invoice` underneath the customer's name to issue an
-invoice for that order.
+Once an order is done, click :guilabel:`Payment` to move to the **payment screen**. Click
+:guilabel:`Invoice` underneath the customer's name to enable issuing and printing invoices upon
+payment.
+
+.. image:: receipts_invoices/invoice-button.png
+   :alt: button to generate an invoice in POS
 
 Select the payment method and click :guilabel:`Validate`. The **invoice** is automatically issued
 and ready to be downloaded and/or printed.
 
-.. note::
-   To be able to issue an invoice, a :ref:`customer <pos/customers>` must be selected.
-
 Retrieve invoices
 -----------------
 

content/applications/sales/sales/send_quotations/orders_and_variants.rst

@@ -1,116 +1,79 @@
-===============================================
-Product variants on quotations and sales orders
-===============================================
+===================================================
+Use product variants on quotations and sales orders
+===================================================
 
-Before getting into detail about how to use product variants on quotations and sales orders, it's
-recommended to learn about :doc:`../products_prices/products/variants` in Odoo.
+Product variants can be added to quotations and sales orders using the Product Configurator,
+Variant Grid Entry, or both.
 
-Once familiarized with the basics surrounding product variants, the following covers how product
-variants can be added to quotations and sales orders using the *product configurator* or *order grid
-entry*.
+Configuration
+=============
+
+To enable product variants on quotations and sales orders, go to :menuselection:`Sales -->
+Configuration --> Settings --> Product Catalog` and activate one or both of the
+:guilabel:`Product Configurator` and :guilabel:`Variant Grid Entry` settings. Finally, click
+:guilabel:`Save` to apply the settings.
+
+.. image:: orders_and_variants/activating-entry-type-settings.png
+   :align: center
+   :alt: Activating entry type settings.
+
+After saving the settings, configure the product form. Head over to :menuselection:`Sales -->
+Products --> Products` and select any product (or click :guilabel:`Create` to create a new one).
+On the product form, click :guilabel:`Edit`, and then click on the :guilabel:`Variants` tab. Under
+:guilabel:`Sales Variant Selection`, choose either :guilabel:`Product Configurator` or
+:guilabel:`Order Grid Entry`. This selection determines which method is used to add the product to
+quotations or sales orders. Finally, click :guilabel:`Save` to apply the setting.
+
+.. image:: orders_and_variants/sales-variant-selection.png
+   :align: center
+   :alt: Sales variant selection.
 
 .. note::
-   It should be noted that the setting is titled, *Variant Grid Entry* on the *Sales* app settings
-   page, and titled, *Order Grid Entry* on product forms. So, be sure to keep that in mind.
+   The product must have at least two variants (one attribute with two values) created in order for
+   the :guilabel:`Sales Variant Selection` option to appear. Click :guilabel:`Add a line` under
+   :guilabel:`Attribute` to add attributes and values to this product and create product variants.
 
-Settings
-========
+Use the Product Configurator
+============================
 
-When working with product variants, Odoo uses the product configurator, by default. To add the
-variant grid entry option, that feature **must** be enabled in the Odoo *Sales* application. The
-variant grid entry option provides a pop-up window on the quotation/sales order to simplify the
-variant selection process.
+The :guilabel:`Product Configurator` appears on a quotation or sales order when products are added
+that have both variants configured and the :guilabel:`Product Configurator` option selected.
 
-To enable that setting, go to :menuselection:`Sales app --> Configuration --> Settings`, and scroll
-to the :guilabel:`Product Catalog` section. Then, check the box next to the :guilabel:`Variant Grid
-Entry` option, and click :guilabel:`Save`.
+The :guilabel:`Product Configurator` lets salespeople choose exactly which product variant to add
+to the quotation or sales order using a format similar to online shopping. Color options display
+any HTML color codes set up in the :guilabel:`Color` attribute. Features with an additional cost
+will display the additional cost next to their name. Once the desired product variant attributes
+are selected, click :guilabel:`Add` to add the product variant to the quotation or sales order.
 
-.. image:: orders_and_variants/order-grid-entry-setting.png
+.. image:: orders_and_variants/configurator-price-extras.png
    :align: center
-   :alt: The variant grid entry setting in the Odoo Sales application.
+   :alt: Product Configurator and Price Extras.
 
-.. note::
-   Of course, the :guilabel:`Variants` feature **must** also be activated, in order to use product
-   variants on quotations and sales orders.
+By default, the product variant attributes are displayed on the quotation or sales order in the
+:guilabel:`Description` column, but the :guilabel:`Product Variant` column can be added through the
+additional options menu (3 vertical dots icon).
 
-Product configuration
-=====================
+Use Variant Grid Entries
+========================
 
-Once the :guilabel:`Variant Grid Entry` setting is enabled, both options (*Product Configurator* and
-*Order Grid Entry*) become available on every product form.
+:guilabel:`Variant Grid Entries` appear on a quotation or sales order when products are added that
+have both variants configured and the :guilabel:`Order Grid Entry` option selected. Grid entry can
+streamline the process of creating large, varied quotations by letting salespeople enter exact
+quantities of each product variant all at once.
 
-To configure a product form to use either a product configurator or variant grid entry, start by
-navigating to :menuselection:`Sales app --> Products --> Products` to view all the products in the
-database.
+:guilabel:`Variant Grid Entry` displays a grid of every variant available for the selected product.
+Choose the exact quantities of each product variant for a quotation or sales order by typing in the
+number or using the arrows. :guilabel:`Not Available` is displayed when a particular variant has
+been deactivated in the database. Once all the product variants and their quantities have been set,
+click :guilabel:`Confirm` to add them to the quotation or sales order.
 
-Then, select the desired product to configure, or click :guilabel:`New`, to create a new product
-from scratch. Once on the product form, click into the :guilabel:`Attributes \& Variants` tab, where
-product variants can be viewed, modified, and added.
-
-At the bottom of the :guilabel:`Attributes \& Variants` tab, there is a :guilabel:`Sales Variant
-Selection` section with two options: :guilabel:`Product Configurator` and :guilabel:`Order Grid
-Entry`.
-
-.. note::
-   It should be noted that these options **only** appear if at least two values of an attribute have
-   been added to the record.
-
-.. image:: orders_and_variants/attributes-variants-tab-selection-options.png
+.. image:: orders_and_variants/grid-entry-popup-amounts.png
    :align: center
-   :alt: Sales variant selection options on the attributes and variants tab on product form.
+   :alt: Variant Grid Entry pop-up.
 
-These options determine which method is used when adding product variants to quotations or sales
-orders.
+Each product variant appears as an individual line item on the quotation or sales order, because
+each of these items has its own stock.
 
-The :guilabel:`Product Configurator` provides a pop-up window that neatly displays all the available
-product variants for that particular product when it's added to a quotation. However, only one
-variant can be selected/added at a time.
-
-The :guilabel:`Order Grid Entry` provides the same information as the :guilabel:`Product
-Configurator` in a table layout, allowing the user to select larger numbers of unique product
-variants, and add them to a quotation/sales order, in a single view.
-
-Product configurator
-====================
-
-The product configurator feature appears as a :guilabel:`Configure` pop-up window, as soon as a
-product with (at least two) variants is added to a quotation or sales order, but **only** if the
-:guilabel:`Product Configurator` option is selected on its product form.
-
-.. image:: orders_and_variants/product-configurator-window.png
+.. image:: orders_and_variants/grid-variants-line-items.png
    :align: center
-   :alt: The product configurator pop-up window that appears on a quotation or sales order.
-
-.. note::
-   This :guilabel:`Configure` pop-up window also appears if the :guilabel:`Order Grid Entry` setting
-   is **not** activated, as it is the default option Odoo uses when dealing with product variants on
-   quotations and/or sales orders.
-
-The :guilabel:`Product Configurator` option lets salespeople choose exactly which product variant to
-add to the quotation or sales order using a format similar to online shopping.
-
-Order grid entry
-================
-
-The order grid entry feature appears as a :guilabel:`Choose Product Variants` pop-up window, as soon
-as a product with (at least two) variants is added to a quotation or sales order, but **only** if
-the :guilabel:`Order Grid Entry` option is selected on its product form.
-
-.. image:: orders_and_variants/choose-product-variants-popup.png
-   :align: center
-   :alt: The choose product variants pop-up window that appears on a quotation in Odoo.
-
-The :guilabel:`Choose Product Variants` pop-up window features all the variant options for that
-particular product. From this pop-up window, the salesperson can designate how many of each variant
-they'd like to add to the quotation/sales order at once.
-
-When all the desired quantities and variants have been selected, the salesperson simply clicks
-:guilabel:`Confirm`, and those orders are instantly added to the quotation/sales order in the
-:guilabel:`Order Lines` tab.
-
-.. image:: orders_and_variants/order-grid-entry-order-lines-tab.png
-   :align: center
-   :alt: Populated order lines tab after order grid entry has been chosen to select products.
-
-.. seealso::
-   :doc:`../products_prices/products/variants`
+   :alt: Line items for grid variants.

content/applications/sales/sales/send_quotations/quote_template.rst

@@ -3,10 +3,9 @@ Quotation templates
 ===================
 
 In Odoo *Sales*, salespeople have the ability to create reusable quotation templates for common
-products or services that the business offers.
-
-By using these templates, quotations can be tailored and sent to customers at a much faster pace,
-without having to create new quotations from scratch every time a sales negotiation occurs.
+product or service offerings that the business offers. By using these templates, quotations can be
+tailored and sent to customers at a much faster pace, without having to create new quotations from
+scratch every time a sales negotiation occurs.
 
 .. _sales/send_quotations/templates:
 
@@ -14,10 +13,10 @@ Configuration
 =============
 
 Begin by activating the setting in :menuselection:`Sales app --> Configuration --> Settings`, and
-scroll to the :guilabel:`Quotations \& Orders` heading.
+scroll to the :guilabel:`Quotations & Orders` heading.
 
-In that section, check the box beside the :guilabel:`Quotation Templates` option. Doing so reveals a
-new :guilabel:`Default Template` field, in which a default quotation template can be chosen from a
+In that section, check the box beside the :guilabel:`Quotation Templates` option. Doing so reveals
+a new :guilabel:`Default Template` field, in which a default quotation template can be chosen from a
 drop-down menu.
 
 .. image:: quote_template/quotations-templates-setting.png
@@ -25,13 +24,18 @@ drop-down menu.
    :alt: How to enable quotation templates on Odoo Sales.
 
 Also, upon activating the :guilabel:`Quotation Template` feature, an internal :guilabel:`➡️
-Quotation Templates` link appears beneath the :guilabel:`Default Template` field.
+Quotation Templates` link appears beneath the :guilabel:`Default Template` field. Clicking that link
+reveals the :guilabel:`Quotation Templates` page, from which templates can be created, viewed, and
+edited.
+
+.. tip::
+   Consider activating the :guilabel:`PDF Quote Builder` option in the :guilabel:`Settings`, as
+   well, which is located in the right column beside the :guilabel:`Quotation Templates` option.
+   This feature enables the creation of beautiful quotations using various PDF.
 
-Clicking that link reveals the :guilabel:`Quotation Templates` page, from which templates can be
-created, viewed, and edited.
 
 Before leaving the :guilabel:`Settings` page, don't forget to click the :guilabel:`Save` button to
-save all changes made during the session.
+activate the feature(s) and save all changes made during the session.
 
 Create quotation templates
 ==========================
@@ -40,234 +44,62 @@ Click the :guilabel:`Quotation Templates` link on the :guilabel:`Settings` page,
 :menuselection:`Sales app --> Configuration --> Quotation Templates`. Both options reveal the
 :guilabel:`Quotation Templates` page, where quotation templates can be created, viewed, and edited.
 
-.. image:: quote_template/quotation-templates-page.png
-   :align: center
-   :alt: Quotation templates page in the Odoo Sales application.
-
-To create a new quotation template, click the :guilabel:`New` button, located in the upper-left
+To create a new quotation template, click the :guilabel:`Create` button, located in the upper-left
 corner. Doing so reveals a blank quotation template form that can be customized in a number of ways.
 
-.. image:: quote_template/blank-quotation-form.png
+.. image:: quote_template/blank-quotation-template.png
    :align: center
    :alt: Create a new quotation template on Odoo Sales.
 
-Start by entering a name for the template in the :guilabel:`Quotation Template` field.
+Start by entering a name for the template in the :guilabel:`Quotation Template` field. Then, in the
+:guilabel:`Quotation expires after` field, designate how many days the quotation template will
+remain valid for, or leave the field on the default `0` to keep the template valid indefinitely.
 
-Then, in the :guilabel:`Quotation expires after` field, designate how many days the quotation
-template will remain valid for, or leave the field on the default `0` to keep the template valid
-indefinitely.
+In the :guilabel:`Company` field, designate to which company this quotation template applies, if
+working in a multi-company environment.
 
-If the :guilabel:`Online Signature` and/or :guilabel:`Online Payment` features are activated in the
-:guilabel:`Settings` (:menuselection:`Sales app --> Configuration --> Settings`), those options are
-available in the :guilabel:`Online confirmation` field.
-
-In the :guilabel:`Online confirmation` field, check the box beside :guilabel:`Signature` to request
-an online signature from the customer to confirm an order. Check the box beside :guilabel:`Payment`
-to request an online payment from the customer to confirm an order.
-
-Both options can be enabled simultaneously, in which case the customer must provide **both** a
-signature **and** a payment to confirm an order.
-
-Next, in the :guilabel:`Confirmation Mail` field, click the blank field to reveal a drop-down menu.
-From the drop-down menu, select a pre-configured email template to be sent to customers upon
-confirmation of an order.
-
-.. tip::
-   To create a new email template directly from the :guilabel:`Confirmation Mail` field, start
-   typing the name of the new email template in the field, and select either: :guilabel:`Create` or
-   :guilabel:`Create and edit...` from the drop-down menu that appears.
-
-   Selecting :guilabel:`Create` creates the email template, which can be edited later. Selecting
-   :guilabel:`Create and edit...` creates the email template, and a :guilabel:`Create Confirmation
-   Mail` pop-up window appears, in which the email template can be customized and configured right
-   away.
-
-   .. image:: quote_template/create-confirmation-mail-popup.png
-      :align: center
-      :alt: Create confirmation mail pop-up window from the quotation template form in Odoo Sales.
-
-   When all modifications are complete, click :guilabel:`Save \& Close` to save the email template
-   and return to the quotation form.
-
-If working in a multi-company environment, use the :guilabel:`Company` field to designate to which
-company this quotation template applies.
-
-In the :guilabel:`Recurrence` field, choose from a variety of pre-configured amounts of time (e.g.
-:guilabel:`Monthly`, :guilabel:`Quarterly`) to designate how often this quotation template should
-occur.
-
-.. note::
-   The :guilabel:`Recurrence` field **only** applies to subscription plans. For more information,
-   check out the documentation on :doc:`../../subscriptions/plans`.
-
-Lines tab
----------
+Beneath those fields are three tabs: :guilabel:`Lines`, :guilabel:`Optional Products`,
+:guilabel:`Confirmation`.
 
 In the :guilabel:`Lines` tab, products can be added to the quotation template by clicking
-:guilabel:`Add a product`, organized by clicking :guilabel:`Add a section` (and dragging/dropping
-section headers), and further explained with discretionary information (such as warranty details,
-terms, etc.) by clicking :guilabel:`Add a note`.
+:guilabel:`Add a product`, organized by clicking `Add a section` (and dragging/dropping section
+headers accordingly), and further explained with discretionary information (such as warranty
+details, terms, etc.) by clicking :guilabel:`Add a note`.
 
-.. image:: quote_template/lines-tab-quotation-template.png
+In the :guilabel:`Optional Products` tab, :guilabel:`Add a line` for each compatible cross-selling
+product related to the original items in the :guilabel:`Lines` tab, if applicable. The products
+added here ideally compliment the original offering as added value for the prospective buyer.
+
+Lastly, in the :guilabel:`Confirmation` tab, enable options, as needed, to require an
+:guilabel:`Online Signature` and/or an :guilabel:`Online Payment`, which each allow buyers to
+confirm orders automatically using the web portal view after the required action is taken.
+
+There's also an option to add a :guilabel:`Confirmation Mail` to the quotation template, as well -
+meaning whenever this template is used, and an order is confirmed, an email is sent to the customer
+informing them that their order has been confirmed.
+
+.. image:: quote_template/quotations-templates-confirmation-tab.png
    :align: center
-   :alt: Populated lines tab on a quotation template form in Odoo Sales.
+   :alt: Allow customers to sign electronically or to pay online on Odoo Sales.
 
-To add a product to a quotation template, click :guilabel:`Add a product` in the :guilabel:`Lines`
-tab of a quotation template form. Doing so reveals a blank field in the :guilabel:`Product` column.
-
-When clicked, a drop-down menu with existing products in the database appear. Select the desired
-product from the drop-down menu to add it to the quotation template.
-
-.. tip::
-   If the desired product isn't readily visible, type the name of the desired product in the
-   :guilabel:`Product` field, and the option appears in the drop-down menu. Products can also be
-   found by clicking :guilabel:`Search More...` from the drop-down menu.
-
-.. note::
-   When a product is added to a quotation template, the default :guilabel:`Quantity` is `1`, but
-   that can be edited at any time.
-
-Then, drag-and-drop the product to the desired position, via the :guilabel:`six squares` icon,
-located to the left of each line item.
-
-To add a *section*, which serves as a header to organize the lines of a sales order, click
-:guilabel:`Add a section` in the :guilabel:`Lines` tab. When clicked, a blank field appears, in
-which the desired name of the section can be typed. When the name has been entered, click away to
-secure the section name.
-
-Then, drag-and-drop the section name to the desired position, via the :guilabel:`six squares` icon,
-located to the left of each line item.
-
-To add a note, which would appear as a piece of text for the customer on the quotation, click
-:guilabel:`Add a note` in the :guilabel:`Lines` tab. When clicked, a blank field appears, in which
-the desired note can be typed. When the note has been entered, click away to secure the note.
-
-Then, drag-and-drop the note to the desired position, via the :guilabel:`six squares` icon.
-
-To delete any line item from the :guilabel:`Lines` tab (product, section, and/or note), click the
-:guilabel:`🗑️ (trash can)` icon on the far-right side of the line.
-
-Optional Products tab
----------------------
-
-The use of *optional products* is a marketing strategy that involves the cross-selling of products
-along with a core product. The aim is to offer useful and related products to customers, which may
-result in an increased sale.
-
-For instance, if a customer wants to buy a car, they have the choice to order massaging seats, as
-well, or ignore the offer and simply buy the car. Presenting the choice to purchase optional
-products enhances the customer experience.
-
-Optional products appear as a section on the bottom of sales orders and eCommerce pages. Customers
-can immediately add them to their online sales orders themselves, if desired.
-
-.. image:: quote_template/optional-products-on-sales-order.png
-   :align: center
-   :alt: Optional products appearing on a typical sales order with Odoo Sales.
-
-In the :guilabel:`Optional Products` tab, :guilabel:`Add a line` for each cross-selling product
-related to the original items in the :guilabel:`Lines` tab, if applicable. The products added here
-ideally complement the original offering as added value for the prospective buyer.
-
-.. image:: quote_template/optional-products-tab-quotation-template.png
-   :align: center
-   :alt: Populated optional products tab on a quotation template in Odoo Sales.
-
-Clicking :guilabel:`Add a line` reveals a blank field in the :guilabel:`Product` column.
-
-When clicked, a drop-down menu with products from the database appear. Select the desired product
-from the drop-down menu to add it as an optional product to the quotation template.
-
-To delete any line item from the :guilabel:`Optional Products` tab, click the :guilabel:`🗑️ (trash
-can)` icon.
-
-.. note::
-   Optional products are **not** required to create a quotation template.
-
-Terms \& Conditions tab
------------------------
-
-The :guilabel:`Terms \& Conditions` tab provides the opportunity to add terms and conditions to the
-quotation template. To add terms and conditions, simply type (or copy/paste) the desired terms and
-conditions in this tab.
-
-.. image:: quote_template/terms-and-conditions-tab.png
-   :align: center
-   :alt: Terms and conditions tab in a quotation template form in Odoo Sales.
-
-.. seealso::
-   :doc:`../../../finance/accounting/customer_invoices/terms_conditions`
-
-.. note::
-   Terms and conditions are **not** required to create a quotation template.
-
-Design quotation templates
-==========================
-
-In the upper-left corner of the quotation template form, there's a :guilabel:`Design Template`
-button.
-
-.. image:: quote_template/design-template-button.png
-   :align: center
-   :alt: Design template button in the upper-left corner of quotation template form.
-
-When clicked, Odoo reveals a preview of the quotation template, through the Odoo *Website*
-application, as it will appear on the front-end of the website to the customer.
-
-.. note::
-   This feature is **only** available if the *Website* application is installed.
-
-Odoo uses numerous blue placeholder blocks to signify where certain elements appear, and what they
-contain (e.g. :guilabel:`Template Header`, :guilabel:`Product`).
-
-To edit the content, appearance, and overall design of the quotation template via the *Website*
-application, click the :guilabel:`Edit` button in the upper-right corner.
-
-.. image:: quote_template/design-template-edit-button.png
-   :align: center
-   :alt: Design template edit button in the upper-right corner of quotation template design.
-
-When :guilabel:`Edit` is clicked, Odoo reveals a sidebar filled with a variety of design elements
-and feature-rich building blocks. These building blocks can be dragged-and-dropped anywhere on the
-quotation template design.
-
-.. image:: quote_template/design-quotation-building-blocks.png
-   :align: center
-   :alt: Design quotation template building blocks sidebar in Odoo Website.
-
-After a block has been dropped in the desired position, it can be customized and configured to fit
-any unique need, look, or style.
-
-.. tip::
-   Quotation template design uses the same methodology and functionality with design building blocks
-   as a typical web page design with Odoo *Website*. Be sure to check out the
-   :doc:`../../../websites/website` documentation to learn more.
-
-When all blocks and customizations are complete, click the :guilabel:`Save` button to put those
-configurations into place.
-
-There is also a blue banner at the top of the quotation template design with a link to quickly
-return :guilabel:`Back to edit mode`. When clicked, Odoo returns to the quotation template form in
-the back-end of the *Sales* application.
 
 Use quotation templates
 =======================
 
-When creating a quotation (:menuselection:`Sales app --> New`), choose a pre-configured template in
-the :guilabel:`Quotation Template` field.
+When creating a quotation (:menuselection:`Sales app --> Create`), choose a preconfigured template
+in the :guilabel:`Quotation Template` field drop-down menu.
 
-.. image:: quote_template/quotation-templates-field.png
+.. image:: quote_template/quotations-templates-field.png
    :align: center
-   :alt: Quotation templates field on a standard quotation form in Odoo Sales.
+   :alt: Select a specific template on Odoo Sales.
 
-To view what the customer will see, click the :guilabel:`Preview` button at the top of the page to
-see how the quotation template appears on the front-end of the website through Odoo's customer
-portal.
+To view what the customer will see, click the :guilabel:`Customer Preview` smart button to see how
+the quotation template will look on the front-end of the website.
 
-.. image:: quote_template/quotations-templates-preview.png
-   :align: center
-   :alt: Customer preview of a quotation template in Odoo Sales.
+.. tip::
+   Go to :menuselection:`Sales --> Configuration --> Settings` to select a :guilabel:`Default
+   Template`.
 
 .. seealso::
-   - :doc:`get_signature_to_validate`
-   - :doc:`get_paid_to_validate`
+   - :doc:`/applications/sales/sales/send_quotations/get_signature_to_validate`
+   - :doc:`/applications/sales/sales/send_quotations/get_paid_to_validate`