[FIX] deploy: nginx forwarded-host with tcp port

Install nginx using the nginx configuration found in the documentation
and changes the `listen` port to 8080. Start Odoo in `--proxy-mode`.

    listen 8080;
    server_name mycompany.odoo.com;
    proxy_set_header X-Forwarded-Host $host;
    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
    proxy_set_header X-Forwarded-Proto $scheme;
    proxy_set_header X-Real-IP $remote_addr;
    location / {
            proxy_pass http://127.0.0.1:8069;
    }

Inside your browser, access "http://mycompany.odoo.com:8080" you are
wrongly redirected to "http://mycompany.odoo.com:80".

Odoo uses the `X-Forwarded-Host` http header value to generate new URls,
in this configuration `$host` only contains the domain (=hostname using
the urllib terminology) instead of the domain+port (=netloc). The
variable that contains both the domain and the port is actually
`$http_host`.

Closes: odoo/odoo#64643

content/administration/maintain/odoo_online.rst

@@ -129,5 +129,6 @@ users, click :guilabel:`Add more users`.
 To remove users, select them and click :guilabel:`Remove`.
 
 .. seealso::
-   - :doc:`/applications/general/users/manage_users`
-   - :doc:`/applications/general/users/odoo_account`
+   - :doc:`../../applications/general/users/manage_users`
+   - :doc:`../../applications/general/users/delete_account`
+

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

@@ -3,37 +3,48 @@ Chart of accounts
 =================
 
 The **chart of accounts (COA)** is the list of all the accounts used to record financial
-transactions in the general ledger of an organization. The chart of accounts can be found under
-:menuselection:`Accounting-->Configuration-->Chart of Accounts`.
+transactions in the general ledger of an organization.
 
-When browsing your chart of accounts, you can sort the accounts by :guilabel:`Code`,
-:guilabel:`Account Name`, or :guilabel:`Type`, but other options are available in the drop-down menu
-:guilabel:`(⋮)`.
+The accounts are usually listed in the order of appearance in the financial reports. Most of the
+time, they are listed as follows :
 
-.. image:: chart_of_accounts/chart-of-accounts-sort.png
+- Balance Sheet accounts:
+
+  - Assets
+  - Liabilities
+  - Equity
+
+- Profit & Loss:
+
+  - Income
+  - Expense
+
+When browsing your chart of accounts, you can filter the accounts by number, in the left column, and
+also group them by :guilabel:`Account Type`.
+
+.. image:: chart_of_accounts/chart-of-accounts.png
+   :align: center
    :alt: Group the accounts by type in Odoo Accounting
 
 Configuration of an account
 ===========================
 
-The country you select during the creation of your database (or additional company in your database)
-determines which :doc:`fiscal localization package <../../fiscal_localizations>` is installed by
-default. This package includes a standard chart of accounts already configured according to the
-country's regulations. You can use it directly or set it according to your company's needs.
-
-To create a new account, go to :menuselection:`Accounting-->Configuration-->Chart of Accounts`,
-click :guilabel:`Create`, and fill in (at the minimum) the required fields
-(:guilabel:`Code, Account Name, Type`).
+The country you select at the creation of your database (or additional company on your database)
+determines which **fiscal localization package** is installed by default. This package includes a
+standard chart of accounts already configured according to the country's regulations. You can use
+it directly or set it according to your company's needs.
 
 .. warning::
    It is not possible to modify the **fiscal localization** of a company once a journal entry has
    been posted.
 
+To create a new account, go to :menuselection:`Accounting --> Configuration --> Chart of Accounts`,
+click on :guilabel:`Create`, and fill out the form.
+
 Code and name
 -------------
 
-Each account is identified by its :guilabel:`Code` and :guilabel:`Name`, which also indicate the
-account's purpose.
+Each account is identified by its **code** and **name**, which also indicates the account's purpose.
 
 .. _chart-of-account/type:
 
@@ -48,7 +59,7 @@ Correctly configuring the **account type** is critical as it serves multiple pur
 - Generate opening entries
 
 To configure an account type, open the :guilabel:`Type` field's drop-down selector and select the
-corresponding type from the following list:
+right type among the following list:
 
 +---------------+--------------+-------------------------+
 | Report        | Category     | Account Types           |
@@ -93,31 +104,29 @@ corresponding type from the following list:
 Assets, deferred expenses, and deferred revenues automation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Some **account types** can **automate** the creation of :ref:`assets <assets-automation>` entries,
-:ref:`deferred expenses <deferred-expenses-automation>` entries, and
-:ref:`deferred revenues <deferred-revenues-automation>` entries. To **automate** entries, click
-:guilabel:`Setup` on an account line and go to the :guilabel:`Automation` tab.
+Some **account types** display a new field **to automate** the creation of :ref:`assets
+<assets-automation>` entries, :ref:`deferred expenses <deferred-expenses-automation>` entries,
+and :ref:`deferred revenues <deferred-revenues-automation>` entries.
 
-You have three choices for the :guilabel:`Automation` tab:
+You have three choices for the :guilabel:`Automation` field:
 
 #. :guilabel:`No`: this is the default value. Nothing happens.
 #. :guilabel:`Create in draft`: whenever a transaction is posted on the account, a draft entry is
-   created but not validated. You must first fill out the corresponding form.
-#. :guilabel:`Create and validate`: you must also select a :guilabel:`Deferred Expense Model`.
-   Whenever a transaction is posted on the account, an entry is created and immediately validated.
+   created, but not validated. You must first fill out the corresponding form.
+#. :guilabel:`Create and validate`: you must also select a **model**. Whenever a transaction is
+   posted on the account, an entry is created and immediately validated.
 
 Default taxes
 -------------
 
-In the :guilabel:`Setup` menu of an account, select a **default tax** to be applied when this
-account is chosen for a product sale or purchase.
+Select a **default tax** that will be applied when this account is chosen for a product sale or
+purchase.
 
 Tags
 ----
 
-Some accounting reports require **tags** to be set on the relevant accounts. To add a tag, under
-:guilabel:`Setup`, click the :guilabel:`Tags` field and select an existing tag or :guilabel:`Create`
-a new one.
+Some accounting reports require **tags** to be set on the relevant accounts. By default, you can
+choose among the tags that are used by the *Cash Flow Statement*.
 
 Account groups
 --------------
@@ -125,29 +134,31 @@ Account groups
 **Account groups** are useful to list multiple accounts as *sub-accounts* of a bigger account and
 thus consolidate reports such as the **Trial Balance**. By default, groups are handled automatically
 based on the code of the group. For example, a new account `131200` is going to be part of the group
-`131000`. You can attribute a specific group to an account in the :guilabel:`Group` field under
-:guilabel:`Setup`.
+`131000`.
 
 Create account groups manually
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+------------------------------
 
 .. note::
    Regular users should not need to create account groups manually. The following section is only
    intended for rare and advanced use cases.
 
-To create a new account group, activate :ref:`developer mode <developer-mode>` and head to
-:menuselection:`Accounting app-->Configuration-->Account Groups`. Here, create a new group and enter
-the :guilabel:`name, code prefix, and company` to which that group account should be available. Note
-that you must enter the same code prefix in both :guilabel:`From` and :guilabel:`to` fields.
+To create a new account group, :ref:`developer mode <developer-mode>` and head to
+:menuselection:`Accounting app --> Configuration --> Account Groups`. Here, create a new group and
+enter the :guilabel:`name, code prefix, and company` to which that group account should be
+available. Note that you must enter the same code prefix in both :guilabel:`From` and :guilabel:`to`
+fields.
 
 .. image:: chart_of_accounts/account-groups.png
+   :align: center
    :alt: Account groups creation.
 
-To display your **Trial Balance** report with your account groups, go to
-:menuselection:`Accounting-->Reporting-->Trial Balance`, then open the :guilabel:`Options` menu and
-select :guilabel:`Hierarchy and Subtotals`.
+To display your **Trial Balance** report with your account groups, go to :menuselection:`Accounting
+app-->Reporting-->Trial Balance`, then open the :guilabel:`Options` menu and select
+:guilabel:`Hierarchy and Subtotals`.
 
-.. image:: chart_of_accounts/chart-of-accounts-groups.png
+.. image:: chart_of_accounts/trial-balance.png
+   :align: center
    :alt: Account Groups in the Trial Balance in Odoo Accounting
 
 Allow reconciliation
@@ -160,18 +171,15 @@ For example, an invoice paid with a credit card can be marked as :guilabel:`paid
 its payment. Therefore, the account used to record credit card payments needs to be configured as
 **allowing reconciliation**.
 
-To do so, check the :guilabel:`Allow Reconciliation` box in the account's settings, and
-:guilabel:`Save`; or enable the button from the chart of accounts view.
-
-.. image:: chart_of_accounts/chart-of-accounts-reconciliation.png
-   :alt: Allow reconciliation for accounts in Odoo Accounting
+To do so, check the :guilabel:`Allow Reconciliation` box in the account's settings, and save.
 
 Deprecated
 ----------
 
 It is not possible to delete an account once a transaction has been recorded on it. You can make
-them unusable by using the **Deprecated** feature: check the :guilabel:`Deprecated` box in the
-account's settings, and :guilabel:`Save`.
+them unusable by using the **Deprecated** feature.
+
+To do so, check the :guilabel:`Deprecated` box in the account's settings, and save.
 
 .. seealso::
    * :doc:`cheat_sheet`

content/applications/finance/accounting/taxes/fiscal_positions.rst

@@ -3,114 +3,109 @@ Fiscal positions (tax and account mapping)
 ==========================================
 
 Default taxes and accounts are set on products and customers to create new transactions on the fly.
-However, depending on the customers' and providers' localization and business type, using different
-taxes and accounts for a transaction might be necessary.
+However, you might have to use different taxes and record the transactions on different accounts,
+according to your customers' and providers' localizations and business types.
 
-**Fiscal positions** allow the creation of rules to adapt the taxes and accounts used for a
-transaction automatically.
+**Fiscal Positions** allow you to create *sets of rules* to automatically adapt the taxes and the
+accounts used for a transaction.
 
-They can be applied :ref:`automatically <fiscal_positions/automatic>`, :ref:`manually
-<fiscal_positions/manual>`, or :ref:`assigned to a partner <fiscal_positions/partner>`.
+.. image:: fiscal_positions/fiscal-positions-intra-community.png
+   :align: center
+   :alt: Example: Belgian to Intra-Community tax mapping with Fiscal Positions in Odoo Accounting
+
+They can be applied in various ways:
+
+- :ref:`automatically applied, based on some rules <fiscal_positions/automatic>`
+- :ref:`manually applied on a transaction <fiscal_positions/partner>`
+- :ref:`assigned to a partner, on its contact form <fiscal_positions/transaction>`
 
 .. note::
-   Several default fiscal positions are available as part of your :ref:`fiscal localization
-   package <fiscal_localizations/packages>`.
+   A few Fiscal Positions are already preconfigured on your database, as part of your :ref:`fiscal
+   localization package <fiscal_localizations/packages>`.
 
 Configuration
 =============
 
- .. _fiscal_positions/mapping:
-
-Tax and account mapping
+Tax and Account Mapping
 -----------------------
 
-To edit or create a fiscal position, go to :menuselection:`Accounting --> Configuration --> Fiscal
-Positions`, and open the entry to modify or click on :guilabel:`New`.
+To edit or create a Fiscal Position, go to :menuselection:`Accounting --> Configuration --> Fiscal
+Positions`, and open the entry you want to modify or click on *Create*.
 
 The mapping of taxes and accounts is based on the default taxes and accounts defined in the
-product form.
+products' forms.
 
-- To map to another tax or account, fill out the right column (:guilabel:`Tax to Apply`/
-  :guilabel:`Account to Use Instead`).
-
-.. image:: fiscal_positions/fiscal-positions-tax-mapping.png
-   :align: center
-   :alt: Example of a fiscal position's tax mapping
-
-.. image:: fiscal_positions/fiscal-positions-account-mapping.png
-   :align: center
-   :alt: Example of a fiscal position's account mapping
-
-- To remove a tax, leave the field :guilabel:`Tax to Apply` empty.
-- To replace a tax with several other taxes, add multiple lines using the same :guilabel:`Tax on
-  Product`.
+- To map to another tax or account, fill out the right column (**Tax to Apply**/**Account to Use
+  Instead**).
+- To remove a tax, rather than replacing it with another, leave the field **Tax to Apply** empty.
+- To replace a tax with multiple other taxes, add multiple lines with the same **Tax on Product**.
 
 .. note::
    The mapping only works with *active* taxes. Therefore, make sure they are active by going to
    :menuselection:`Accounting --> Configuration --> Taxes`.
 
-Application
-===========
-
 .. _fiscal_positions/automatic:
 
 Automatic application
 ---------------------
 
-To automatically apply a fiscal position following a set of conditions, go to
-:menuselection:`Accounting --> Configuration --> Fiscal Positions`, open the fiscal position to
-modify, and tick :guilabel:`Detect Automatically`.
+You can configure your Fiscal Positions to be applied automatically, following a set of conditions.
 
-From there, several conditions can be activated:
+To do so, open the Fiscal Position you want to modify and click on **Detect Automatically**. You can
+configure a few conditions:
 
-- :guilabel:`VAT Required`: the customer's VAT number must be present on their contact form.
-- :guilabel:`Country Group` and :guilabel:`Country`: the fiscal position is only applied to the
-  selected country or country group.
+- **VAT Required**: The VAT number *must* be indicated in the customer's contact form.
+- **Country Group** / **Country**: The Fiscal Position is applied to these countries.
 
 .. image:: fiscal_positions/fiscal-positions-automatic.png
    :align: center
-   :alt: Example of a fiscal position automatic application settings
+   :alt: Example of settings to apply a Fiscal Position automatically
 
 .. note::
-   Taxes on **eCommerce orders** are automatically updated once the customer has logged in or filled
+   Taxes on **eCommerce orders** are automatically updated once the visitor has logged in or filled
    out their billing details.
 
 .. important::
-   The fiscal positions' **sequence** defines which fiscal position is applied if all conditions
-   set on multiple fiscal positions are met simultaneously.
+   The Fiscal Positions' **sequence** - the order in which they are arranged - defines which
+   Fiscal Position to apply if the conditions are met in multiple Fiscal Positions.
 
-   For example, suppose the first fiscal position in a sequence targets *country A* while the second
-   fiscal position targets a *country group* that comprises *country A*. In that case, only the
-   first fiscal position will be applied to customers from *country A*.
+   For example, if the first Fiscal Position targets *country A*, and the second Fiscal Position
+   targets a *Country Group* that also comprises *country A*, only the first Fiscal Position will be
+   applied to customers from *country A*.
 
-.. _fiscal_positions/manual:
+.. _fiscal_positions/application:
 
-Manual application
-------------------
-
-To manually select a fiscal position, open a sales order, invoice, or bill, go to the
-:guilabel:`Other Info` tab and select the desired :guilabel:`Fiscal Position` before adding product
-lines.
-
-.. image:: fiscal_positions/fiscal-positions-manual.png
-   :align: center
-   :alt: Selection of a fiscal position on a sales order, invoice, or bill
+Application
+===========
 
 .. _fiscal_positions/partner:
 
-Assign to a partner
--------------------
+Assign a Fiscal Position to a partner
+-------------------------------------
 
-To define which fiscal position must be used by default for a specific partner, go to
-:menuselection:`Accounting --> Customers --> Customers`, select the partner, open the
-:guilabel:`Sales & Purchase` tab, and select the :guilabel:`Fiscal Position`.
+You can manually define which Fiscal Position must be used by default for a specific partner.
 
-.. image:: fiscal_positions/fiscal-positions-customer.png
+To do so, open the partner's contact form, go to the **Sales & Purchase** tab, edit the **Fiscal
+Position** field, and click on *Save*.
+
+.. image:: fiscal_positions/fiscal-positions-partner.png
    :align: center
-   :alt: Selection of a fiscal position on a customer
+   :alt: Selection of a Fiscal Position on a Sales Order / Invoice / Bill in Odoo Accounting
+
+.. _fiscal_positions/transaction:
+
+Choose Fiscal Positions manually on Sales Orders, Invoices, and Bills
+---------------------------------------------------------------------
+
+To manually select which Fiscal Position to use for a new Sales Order, Invoice, or Bill, go to the
+**Other Info** tab and select the right **Fiscal Position** *before* adding product lines.
+
+.. image:: fiscal_positions/fiscal-positions-transaction.png
+   :align: center
+   :alt: Selection of a Fiscal Position on a Sales Order / Invoice / Bill in Odoo Accounting
 
 .. seealso::
 
   * :doc:`../taxes`
-  * :doc:`taxcloud`
+  * :doc:`taxcloud` (decommissioning TaxCloud integration in Odoo 17+)
   * :doc:`B2B_B2C`

content/applications/general/users.rst

@@ -16,4 +16,4 @@ can be applied. Users and access rights can be added and changed at any point.
    users/access_rights
    users/companies
    users/portal
-   users/odoo_account
+   users/delete_account

content/applications/general/users/delete_account.rst

@@ -0,0 +1,21 @@
+============================
+Deleting an Odoo.com Account
+============================
+
+To delete your Odoo.com account, access the delete option by clicking on the user icon. The delete
+option can be accessed by going to :menuselection:`My Account --> Edit Security Settings --> Delete
+Account`. It can also be accessed by going to https://www.odoo.com/my/home.
+
+.. danger::
+   Deleting an Odoo account is irreversible. Take caution when performing this action as the
+   Odoo.com account will not be retrievable.
+
+Upon clicking the :guilabel:`Delete Account` button, a pop-up window will appear, asking you to
+confirm the account deletion.
+
+.. image:: delete_account/delete-account.png
+   :align: center
+   :alt: Clicking on the Delete Account button will populate a window verifying the change.
+
+Confirm the deletion by entering the :guilabel:`password` and the :guilabel:`login` for the account
+being deleted. Click the :guilabel:`Delete Account` button to confirm the deletion.

content/applications/general/users/odoo_account.rst

@@ -1,78 +0,0 @@
-========================
-Odoo.com account changes
-========================
-
-This documentation is dedicated to edits made to an Odoo.com account. The following processes
-describe how to delete an Odoo.com account, and how to change the password on an Odoo.com account.
-
-Delete Odoo.com account
-=======================
-
-To delete an Odoo.com account, start by clicking the profile icon in the upper-right corner
-(represented by the username and icon) to reveal a drop-down menu. From the drop-down menu, select
-:guilabel:`My Odoo.com account`, which reveals the user portal.
-
-From the user portal, the delete option can be accessed by going to :menuselection:`My Account -->
-Edit Security Settings --> Delete Account`. It can also be accessed by going to
-`https://www.odoo.com/my/home <https://www.odoo.com/my/home>`_.
-
-.. danger::
-   Deleting an Odoo account is irreversible. Be careful performing this action, as the Odoo.com
-   account is **not** retrievable once deleted.
-
-Upon clicking the :guilabel:`Delete Account` button, a pop-up window appears, requesting
-confirmation for the account deletion.
-
-.. image:: odoo_account/delete-account.png
-   :align: center
-   :alt: Clicking on the Delete Account button will populate a window verifying the change.
-
-To confirm the deletion, enter the :guilabel:`Password` and the :guilabel:`Login` for the account
-being deleted. Then, click the :guilabel:`Delete Account` button to confirm the deletion.
-
-Odoo.com account password change
-================================
-
-To change an Odoo.com account password, first login into the Odoo.com user account from the Odoo.com
-login page. After logging-in, go to the upper-right corner of the screen, and click the :guilabel:`▼
-(down arrow)` icon next to the profile icon. Then, select :guilabel:`My Account`, and a portal
-dashboard appears.
-
-To change the Odoo.com password, click on the :guilabel:`Edit Security Settings` link, below the
-:menuselection:`Account Security` section. Next, make the necessary changes by typing in the current
-:guilabel:`Password`, :guilabel:`New Password`, and verify the new password. Lastly, click on
-:guilabel:`Change Password` to complete the password change.
-
-.. note::
-   If a customer would like to change the login, contact Odoo support `here
-   <https://www.odoo.com/help>`_.
-
-.. note::
-   Passwords for Odoo.com users and portal users remain separate, even if the same email address is
-   used.
-
-Add two-factor authentication
-=============================
-
-To add two-factor authentication, login into the Odoo.com user account from the Odoo.com login page.
-After logging-in, go to the upper-right corner of the screen, and click the :guilabel:`▼ (down
-arrow)` icon next to the :guilabel:`profile icon`. Then, select :guilabel:`My Account`, and a portal
-dashboard appears.
-
-If the user would like to turn on two-factor authentication (2FA) for Odoo.com access, click on the
-:guilabel:`Edit Security Settings` link below the :menuselection:`Account Security` section.
-
-Click on :guilabel:`Enable two-factor authentication` to turn on :abbr:`2FA (two-factor
-authentication)`. Then, confirm the current password in the :guilabel:`Password` field. Next, click
-on :guilabel:`Confirm Password`. Following that, activate :abbr:`2FA (two-factor authentication)` in
-a :abbr:`2FA (two-factor authentication)` app (Google Authenticator, Authy, etc.), by scanning the
-:guilabel:`QR code` or entering a :guilabel:`Verification Code`.
-
-Finally, click on :guilabel:`Enable two-factor authentication` to complete the setup.
-
-.. note::
-   Under :guilabel:`My Account` Odoo.com users can also access the following:
-
-   - :guilabel:`My Partner dashboard`
-   - :guilabel:`My In-App Services`
-   - :guilabel:`My Apps Dashboard`

content/applications/general/users/portal.rst

@@ -2,13 +2,11 @@
 Portal access
 =============
 
-.. _portal/main:
+Portal access is given to users who need the ability to view certain documents or information
+within an Odoo database.
 
-Portal access is given to users who need the ability to view certain documents or information within
-an Odoo database.
-
-Some common use cases for providing portal access include allowing customers to read/view any or all
-of the following in Odoo:
+Some common use cases for providing portal access include allowing customers to read/view any or
+all of the following in Odoo:
 
 - leads/opportunities
 - quotations/sales orders
@@ -28,14 +26,14 @@ of the following in Odoo:
 Provide portal access to customers
 ==================================
 
-From the main Odoo dashboard, select the :guilabel:`Contacts` application. If the contact is not yet
-created in the database, click on the :guilabel:`Create` button, enter the details of the contact,
-and then click :guilabel:`Save`. Otherwise, choose an existing contact, and then click on the
-:guilabel:`Action` drop-down menu located at the top-center of the interface.
+From the main Odoo dashboard, select the :guilabel:`Contacts` application. If the contact is not
+yet created in the database, click on the :guilabel:`Create` button, enter the details of the
+contact, and then click :guilabel:`Save`. Otherwise, choose an existing contact, and then click on
+the :guilabel:`Action` drop-down menu located at the top-center of the interface.
 
 .. image:: portal/grant-portal-access.png
    :align: center
-   :alt: Use the Contacts application to give portal access to users.
+   :alt: Use the Contacts application to give portal access to users
 
 Then select :guilabel:`Grant portal access`. A pop-up window appears, listing three fields:
 
@@ -65,103 +63,3 @@ user for that Odoo database.
    At any time, portal access can be revoked by navigating to the contact, clicking
    :menuselection:`Action --> Grant portal access`, and then unselecting the checkbox under the
    :guilabel:`In Portal` column and clicking :guilabel:`Apply`.
-
-.. _portal/login:
-
-Change portal username
-======================
-
-There may be times when a portal user wants to change their user login. This can be done by any user
-in the database with administrator access rights. The following process outlines the necessary steps
-to change the portal user login.
-
-.. seealso::
-   :doc:`See the documentation on setting access rights
-   </applications/general/users/access_rights>`.
-
-First, navigate to :menuselection:`Settings app --> Users`. Then, under :guilabel:`Filters`, select
-:guilabel:`Portal Users`, or select :guilabel:`Add Custom Filter` and set the following
-configuration :guilabel:`Groups` > :guilabel:`contains` > `portal`. After making this selection,
-search for (and open) the portal user that needs to be edited.
-
-Next, click :guilabel:`Edit` (if necessary), click into the :guilabel:`Email Address` field, and
-proceed to make any necessary changes to this field. The :guilabel:`Email Address` field is used to
-log into the Odoo portal.
-
-.. note::
-   Changing the :guilabel:`Email Address` (or login) only changes the *username* on the customer's
-   portal login.
-
-   In order to change the contact email, this change needs to take place on the contact template in
-   the *Contacts* app. Alternatively, the customer can change their email directly from the portal,
-   but the login **cannot** be changed. :ref:`See change customer info <portal/custinfo>`.
-
-Customer portal changes
-=======================
-
-There may be times when the customer would like to make changes to their contact information,
-password/security, or payment information attached to the portal account. This can be performed by
-the customer from their portal. The following process is how a customer can change their contact
-information.
-
-.. _portal/custinfo:
-
-Change customer info
---------------------
-
-First enter the username and password (login) into the database login page to access the portal user
-account. A portal dashboard will appear upon successfully logging in. Portal documents from the
-various installed Odoo applications will appear with the number count of each.
-
-.. seealso::
-   :ref:`Portal access documentation <portal/main>`.
-
-Next, navigate to the upper-right corner of the portal, and click the :guilabel:`Edit` button, next
-to the :guilabel:`Details` section. Then, change the pertinent information, and click
-:guilabel:`Confirm`.
-
-Change password
----------------
-
-First enter the username and password (login) into the database login page to access the portal user
-account. A portal dashboard will appear upon successfully logging in.
-
-If the customer would like to change their password for portal access, click on the :guilabel:`Edit
-Security Settings` link, below the :guilabel:`Account Security` section. Then, make the necessary
-changes, by typing in the current :guilabel:`Password`, :guilabel:`New Password`, and verify the new
-password. Lastly, click on :guilabel:`Change Password` to complete the password change.
-
-.. note::
-   If a customer would like to change the login, as documented above, contact the Odoo database
-   point-of-contact. :ref:`See above documentation on changing the portal username <portal/login>`.
-
-.. note::
-   Passwords for portal users and Odoo.com users remain separate, even if the same email address is
-   used.
-
-Add two-factor authentication
------------------------------
-
-First enter the username and password (login) into the database login page to access the portal user
-account. A portal dashboard will appear upon successfully logging in.
-
-If the customer would like to turn on two-factor authentication (2FA) for portal access, click on
-the :guilabel:`Edit Security Settings` link, below the :guilabel:`Account Security` section.
-
-Click on :guilabel:`Enable two-factor authentication` to turn on :abbr:`2FA (two-factor
-authentication)`. Confirm the current portal password in the :guilabel:`Password` field. Then, click
-on :guilabel:`Confirm Password`. Next, activate :abbr:`2FA (two-factor authentication)` in a
-:abbr:`2FA (two-factor authentication)` app (Google Authenticator, Authy, etc.), by scanning the
-:guilabel:`QR code` or entering a :guilabel:`Verification Code`.
-
-Finally, click :guilabel:`Enable two-factor authentication` to complete the setup.
-
-Change payment info
--------------------
-
-First enter the username and password (login) into the database login page to access the portal user
-account. A portal dashboard will appear upon successfully logging in.
-
-If the customer would like to manage payment options, navigate to the :guilabel:`Manage payment
-methods` in the menu on the right. Then, add the new payment information, and select :guilabel:`Add
-new card`.

content/applications/hr.rst

@@ -8,6 +8,5 @@ Human resources
 
    hr/attendances
    hr/employees
-   hr/fleet
    hr/payroll
    hr/recruitment

content/applications/hr/fleet.rst

@@ -1,14 +0,0 @@
-:nosearch:
-:show-content:
-:show-toc:
-
-=====
-Fleet
-=====
-
-Odoo *Fleet* organizes all the vehicles, contracts, and repairs of all the vehicles.
-
-.. toctree::
-   :titlesonly:
-
-   fleet/configuration

content/applications/hr/fleet/configuration.rst

@@ -1,266 +0,0 @@
-==================
-Configuration menu
-==================
-
-This document outlines all of the configurations and settings for the *Fleet* application, including
-:ref:`settings <fleet/configuration/settings>`, :ref:`manufacturers
-<fleet/configuration/manufacturers>`, :ref:`vehicle models <fleet/configuration/models>`, and
-:ref:`model categories <fleet/configuration/categories>`.
-
-.. _fleet/configuration/settings:
-
-Settings
-========
-
-To access the settings menu, go to :menuselection:`Fleet application --> Configuration -->
-Settings`. There are two settings that need configuration, the vehicle contract end date alert
-delay, and a new vehicle request limit.
-
-.. image:: configuration/fleet-settings.png
-   :align: center
-   :alt: Settings available for the Fleet application.
-
-End Date Contract Alert
------------------------
-
-The :guilabel:`End Date Contract Alert` field defines an alert delay for the persons responsible for
-vehicle contracts. The responsible person(s) will receive an email informing them a vehicle contract
-is about to expire in the number of days defined in this field.
-
-.. note::
-   To determine who the responsible person is for a contract, open an individual contract. The
-   person listed as :guilabel:`Responsible` under the :guilabel:`Contract Information` section of
-   the contract is the person who will receive the alert.
-
-   To access all contracts, navigate to :menuselection:`Fleet app --> Fleet --> Contracts` and all
-   contracts appear in the list. Click on a :guilabel:`Contract` to view it.
-
-   An individual contract can also be found by navigating to :menuselection:`Fleet app --> Fleet -->
-   Fleet` and clicking on an individual vehicle. On the vehicle form, click the
-   :guilabel:`Contracts` smart button at the top of the page. The contract(s) associated with this
-   vehicle only appears in the list. Click on an individual contract to open it. The
-   :guilabel:`Responsible` person is listed on the contract.
-
-New Vehicle Request
--------------------
-
-The :guilabel:`New Vehicle Request` field sets a limit on how many new vehicles are requested based
-on fleet availability. An employee filling out the salary configurator form (after being offered a
-position), will *not* be able to request a new car if the number of existing cars is greater than
-the number specified in the :guilabel:`New Vehicle Request` field. Enter the specific number limit
-for existing available cars in this field.
-
-.. example::
-   If the :guilabel:`New Vehicle Request` limit is set to 20 vehicles, and there are 25 vehicles
-   available, an employee would not be able to request a new vehicle. If there are only 10 cars
-   available, then the employee would be able to request a new vehicle.
-
-.. _fleet/configuration/manufacturers:
-
-Manufacturers
-=============
-
-Odoo *Fleet* comes pre-configured with sixty-six commonly used car and bicycle manufacturers in the
-database, along with their logos. To view the pre-loaded manufacturers, go to :menuselection:`Fleet
-app --> Configuration --> Manufacturers`.
-
-The manufacturers appear in a list view in alphabetical order. Each manufacturer's card lists how
-many specific models are configured for each particular manufacturer. Odoo comes with forty six
-pre-configured :ref:`models <fleet/configuration/models>` from four major auto manufacturers and one
-major bicycle manufacturer: Audi, BMW, Mercedes, Opel (cars), and Eddy Merckx (bicycle).
-
-.. image:: configuration/manufacturer.png
-   :align: center
-   :alt: Manufacturer card with the amount of models listed.
-
-Add a manufacturer
-------------------
-
-To add a new manufacturer to the database, click :guilabel:`Create`. A manufacturer form will load.
-Only two pieces of information are needed, the :guilabel:`Name` of the manufacturer, and the logo.
-Type the name of the manufacturer in the name field, and select an image to upload for the logo.
-When the information is entered, click :guilabel:`Save`.
-
-.. _fleet/configuration/models:
-
-Vehicle Models
-==============
-
-Many manufacturers have a variety of models that they produce. When adding a vehicle to the fleet,
-it is important to specify the vehicle model being added. Odoo comes with pre-configured car models
-from four major auto manufacturers, and one pre-configured bicycle model from one bicycle
-manufacturer: Audi, BMW, Mercedes, Opel (cars), and Eddy Merckx (bicycle). If a vehicle *other* than
-the pre-configured models from these manufacturers are part of a fleet, the model (and/or
-manufacturer) will need to be added to the database.
-
-Preconfigured Models
---------------------
-
-The following models are pre-loaded in Odoo and do not need to be added to the database:
-
-+-------+--------------+-------------+-----------+---------------+
-| AUDI  | BMW          | Eddy Merckx | Mercedes  | Opel          |
-+=======+==============+=============+===========+===============+
-| A1    | Serie 1      | SanRemo76   | Class A   | Agilia        |
-+-------+--------------+-------------+-----------+---------------+
-| A3    | Serie 3      |             | Class B   | Ampera        |
-+-------+--------------+-------------+-----------+---------------+
-| A4    | Serie 5      |             | Class C   | Antara        |
-+-------+--------------+-------------+-----------+---------------+
-| A5    | Serie 6      |             | Class CL  | Astra         |
-+-------+--------------+-------------+-----------+---------------+
-| A6    | Serie 7      |             | Class CLS | AstraGTC      |
-+-------+--------------+-------------+-----------+---------------+
-| A7    | Serie Hybrid |             | Class E   | Combo Tour    |
-+-------+--------------+-------------+-----------+---------------+
-| A8    | Serie M      |             | Class GL  | Corsa         |
-+-------+--------------+-------------+-----------+---------------+
-| Q3    | Serie X      |             | Class GLK | Insignia      |
-+-------+--------------+-------------+-----------+---------------+
-| Q5    | Serie Z4     |             | Class M   | Meriva        |
-+-------+--------------+-------------+-----------+---------------+
-| Q7    |              |             | Class R   | Mokka         |
-+-------+--------------+-------------+-----------+---------------+
-| TT    |              |             | Class S   | Zafira        |
-+-------+--------------+-------------+-----------+---------------+
-|       |              |             | Class SLK | Zafira Tourer |
-+-------+--------------+-------------+-----------+---------------+
-|       |              |             | Class SLS |               |
-+-------+--------------+-------------+-----------+---------------+
-
-.. _fleet/configuration/add-model:
-
-Add a new model
----------------
-
-New vehicle models can easily be added to the database. To add a new model, navigate to
-:menuselection:`Fleet app --> Configuration --> Vehicle Models`. Click :guilabel:`Create` and a
-vehicle model form will load. Enter the following information on the form, then click
-:guilabel:`Save`. Be advised, some fields are specific to Belgian based companies, so not all fields
-or sections may be visible depending on the location of the company.
-
-- :guilabel:`Model name`: enter the model name in the field.
-- :guilabel:`Manufacturer`: select the manufacturer from the drop-down menu. If the manufacturer is
-  not configured, type in the manufacturer and then click :guilabel:`Create` or :guilabel:`Create &
-  Edit`.
-- :guilabel:`Vehicle Type`: select one of two preconfigured vehicle types, either :guilabel:`Car` or
-  :guilabel:`Bike`, from the drop-down menu. The vehicle types are hardcoded in Odoo and are
-  integrated with the *Payroll* application since vehicles can be part of an employee's benefits.
-  Adding additional vehicle types is not possible as it will affect payroll.
-- :guilabel:`Category`: select the category the vehicle is categorized under from the drop-down
-  menu. To create a new category, type in the category and then click :guilabel:`Create (new
-  category)`.
-
-.. note::
-   When the manufacturer is selected, the logo for the manufacturer will automatically load in the
-   image box in the top right corner.
-
-Information tab
-~~~~~~~~~~~~~~~
-
-Model
-*****
-
-- :guilabel:`Seats Number`: enter how many passengers the vehicle can accommodate.
-- :guilabel:`Doors Number`: enter the number of doors the vehicle has.
-- :guilabel:`Color`: enter the color of the vehicle.
-- :guilabel:`Model Year`: enter the year the vehicle was manufactured.
-- :guilabel:`Trailer Hitch`: check this box if the vehicle has a trailer hitch installed.
-
-Salary
-******
-
-.. note::
-   The :guilabel:`Salary` section only appears for Belgian-based companies, and only if the company
-   has their localization setting set to Belgium. The cost values are all **monthly** with the
-   exception of the :guilabel:`Catalog Value (VAT Incl.)`.
-
-- :guilabel:`Can be requested`: check this box if employees can request this model vehicle.
-- :guilabel:`Catalog Value (VAT Incl.)`: enter the :abbr:`MSRP (Manufacturer's Suggested Retail
-  Price)` for the vehicle at the time of purchase or lease.
-- :guilabel:`C02 fee`: this value is automatically calculated based on Belgian laws and regulations,
-  and cannot be modified. The value is based on the value entered in the :guilabel:`CO2 Emissions`
-  field in the :guilabel:`Engine` section of the vehicle form.
-
-.. important::
-   Modifying the :guilabel:`CO2 Emissions` field will adjust the value in the :guilabel:`CO2 fee`
-   field.
-
-- :guilabel:`Cost (Depreciated)`: enter the monthly cost for the vehicle, which appears in the
-  salary configurator that is available to a future employee when they are offered a job position.
-  This value impacts the gross and net salary of the employee who is assigned to the vehicle. This
-  figure is depreciated over time according to local tax laws. The :guilabel:`Cost (Depreciated)`
-  does not depreciate automatically on the *vehicle model*, it only depreciates based on the
-  *contract* linked to a specific vehicle and not on the general model.
-- :guilabel:`Total Cost (Depreciated)`: this value is the :guilabel:`Cost (Depreciated)` and the
-  :guilabel:`C02 fee` fields combined, and also is depreciated over time.
-
-Engine
-******
-
-- :guilabel:`Fuel Type`: select the type of fuel the vehicle uses form the drop-down menu. The
-  options are :guilabel:`Diesel`, :guilabel:`Gasoline`, :guilabel:`Hybrid Diesel`, :guilabel:`Hybrid
-  Gasoline`, :guilabel:`Plug-in Hybrid Diesel`, :guilabel:`Plug-in Hybrid Gasoline`,
-  :guilabel:`CNG`, :guilabel:`LPG`, :guilabel:`Hydrogen`, or :guilabel:`Electric`.
-- :guilabel:`CO2 Emissions`: enter the average carbon dioxide emissions the vehicle produces in
-  grams per kilometer (g/km). This information is provided by the car manufacturer.
-- :guilabel:`CO2 Standard`: enter the standard amount of carbon dioxide in grams per kilometer
-  (g/km) for a similar sized vehicle.
-- :guilabel:`Transmission`: select the transmission type from the drop-down menu, either
-  :guilabel:`Manual` or :guilabel:`Automatic`.
-- :guilabel:`Power`: if the vehicle is electric or hybrid, enter the power the vehicle uses in
-  kilowatts (kW).
-- :guilabel:`Horsepower`: enter the vehicle's horsepower in this field.
-- :guilabel:`Horsepower Taxation`: enter the amount that is taxed based on the size of the vehicle's
-  engine. This is determined by local taxes and regulations, and varies depending on the location.
-  It is recommended to check with the accounting department to ensure this value is correct.
-- :guilabel:`Tax Deduction`: this field auto-populates according to the engine specifications, and
-  cannot be modified. The percentage is based on the localization settings and local tax laws.
-
-Vendors tab
-~~~~~~~~~~~
-
-Vehicle specific vendors, such as car dealerships, are not listed separately from other vendors. The
-vendors that a vehicle can be purchased from also appear in the list of vendors used by the
-*Purchase* app.
-
-The vendor(s) the vehicle can be purchased from may be added in this tab. To add a vendor, click
-:guilabel:`Add`, and a pop-up loads with a list of all the vendors currently in the database. Select
-the vendor to add by clicking the checkbox next to the vendor name, then click :guilabel:`Select`.
-There is no limit to the number of vendors that can be added to this list.
-
-If a vendor is not in the database, add a vendor by clicking :guilabel:`Create`. A vendor form will
-load. Enter the information in the vendor tab, then click :guilabel:`Save & Close` to add the vendor
-and close the window, or :guilabel:`Save & New` to add the current vendor and create another new
-vendor.
-
-.. image:: configuration/vendor.png
-   :align: center
-   :alt: Vendor form to fill out when adding a new vendor.
-
-.. _fleet/configuration/categories:
-
-Model Category
-==============
-
-To best organize a fleet, it is recommended to have vehicle models housed under a specific category,
-to more easily see what kinds of vehicles are in the fleet. Model categories are set on the
-:ref:`vehicle model form <fleet/configuration/add-model>`.
-
-To view all the models currently set up, navigate to :menuselection:`Fleet application -->
-Configuration --> Model Category`. All models are displayed in a list view.
-
-Add a new model category
-------------------------
-
-To add a new category, click :guilabel:`Create`. A new entry line appears at the bottom of the list.
-Type in the new category, then click :guilabel:`Save` to save the entry.
-
-To reorganize how the categories appear in the list, click on the up and down arrows to the left of
-the category to be moved, and drag the line to the desired position. The order of the list does not
-affect the database in any way. However, it may be preferable to view the vehicle categories in a
-specific order, for example, by size, or the numbers of passengers the vehicle can carry.
-
-.. image:: configuration/models.png
-   :align: center
-   :alt: List view of the models in the fleet.

content/applications/hr/payroll.rst

@@ -1,5 +1,4 @@
 :show-content:
-:show-toc:
 
 =======
 Payroll
@@ -369,7 +368,5 @@ Resume
 .. toctree::
    :titlesonly:
 
-   payroll/contracts
-   payroll/payslips
    payroll/work_entries
-   payroll/reporting
+   payroll/contracts

content/applications/hr/payroll/payslips.rst

@@ -1,386 +0,0 @@
-========
-Payslips
-========
-
-Payslips are created either by the employees themselves or their managers, and are approved by
-authorized employees (typically managers). Then, once payslips are approved, employees are issued
-payslips and are paid either by check or direct deposit, depending on how their employee profile is
-configured.
-
-The :guilabel:`Payslips` drop-down header of the :menuselection:`Payroll` application consists of
-three sections: :guilabel:`To Pay`, :guilabel:`All Payslips`, and :guilabel:`Batches`.
-
-These three sections provide all the tools needed to create payslips for employees, including
-individual payslips, a batch of payslips, or commission payslips.
-
-.. image:: payslips/payslips.png
-   :align: center
-   :alt: Payslips menu selection in Payroll.
-
-To pay
-======
-
-Click on :menuselection:`Payroll app --> Payslips --> To Pay` to see the payslips that need to be
-paid. On this page, Odoo displays the payslips that have not been generated yet, and can be created
-from this dashboard.
-
-.. image:: payslips/all-pay-slips.png
-   :align: center
-   :alt: View all payslips that need to be paid on the Payslips To Pay page.
-
-Each payslip will list the :guilabel:`Reference` number for the individual payslip, the
-:guilabel:`Employee` name, :guilabel:`Batch Name`, the :guilabel:`From` and :guilabel:`To` date
-range, the :guilabel:`Company`, the :guilabel:`Basic Wage`, :guilabel:`Net Wage`, and the
-:guilabel:`Status` of the payslip.
-
-Clicking on an individual payslip entry will show the details for the individual payslip.
-
-.. _payroll/new-payslip:
-
-Create new payslip
-------------------
-
-A new payslip can be created from the :guilabel:`Payslips To Pay` page (:menuselection:`Payroll app
---> Payslips --> To Pay`) or the :guilabel:`Employee Payslips` page (:menuselection:`Payroll app
---> Payslips --> All Payslips`), by clicking the :guilabel:`Create` button in the top-left corner.
-
-Clicking :guilabel:`Create` reveals a blank payslip form, wherein the necessary payslip information
-can be entered.
-
-Required fields
-~~~~~~~~~~~~~~~
-
-On the blank payslip form, a number of fields are required to be filled in with the necessary
-information. These required fields are represented by **bold** lines.
-
-.. image:: payslips/new-payslip.png
-   :align: center
-   :alt: The necessary fields for a new payslip.
-
-- :guilabel:`Employee`: Type in the name of an employee, or select the desired employee from the
-  drop-down list. Upon selecting an employee, several other fields on the payslip form may
-  auto-populate. Typically, after making a selection in the :guilabel:`Employee` field, Odoo
-  auto-populates the :guilabel:`Contract`, :guilabel:`Structure`, and :guilabel:`Payslip Name`
-  fields, but **only** if that information is already on that employee's form in the *Employees*
-  app.
-- :guilabel:`Period`: Click the default date to reveal a pop-up calendar. On this calendar, use the
-  :guilabel:`< (less-than)` and :guilabel:`> (greater than)` icons to select the desired month, and
-  click on the desired day to select that specific date as the start date for the payslip. Repeat
-  this process to add an end date for the payslip in the field below.
-- :guilabel:`Contract`: Using the drop-down menu, select the desired contract for the employee. Only
-  the available corresponding contracts for the selected employee appear as options.
-- :guilabel:`Structure`: Using the drop-down menu, select the salary structure type. Only the
-  available corresponding structures for the selected contract for that specific employee appear as
-  options.
-- :guilabel:`Payslip Name`: In the blank field, type in the name for the payslip. The name should be
-  short and descriptive, such as `April 2023`.
-- :guilabel:`Company`: In the :guilabel:`Accounting Information` tab, select the company the payslip
-  applies to from the :guilabel:`Company` drop-down menu.
-- :guilabel:`Salary Journal`: In the :guilabel:`Accounting Information` tab, enter the salary
-  journal in which the payment will be reflected, and found in the *Accounting* application.
-
-.. image:: payslips/new-payslip-tab.png
-   :align: center
-   :alt: The necessary fields for a new payslip in the Accounting Information tab.
-
-.. important::
-   It is recommended to check with the accounting department to ensure every entry that affects the
-   *Accounting* application is correct.
-
-Optional fields
-~~~~~~~~~~~~~~~
-
-- :guilabel:`Reference`: Any note or reference message for the new entry can be entered here.
-- :guilabel:`Company Car`: If applicable, select the company car from the drop-down.
-- :guilabel:`Worked Days`: In the :guilabel:`Worked Days \& Inputs` tab, the entries under
-  :guilabel:`Worked Days` (including the :guilabel:`Type`, :guilabel:`Description`,
-  :guilabel:`Number of Days`, :guilabel:`Number of Hours`, and :guilabel:`Amount`) are automatically
-  filled in, based on what was entered for the :guilabel:`Period`, :guilabel:`Contract`, and
-  :guilabel:`Structure` fields of the payslip form.
-- :guilabel:`Salary Computation`: The :guilabel:`Salary Computation` tab is automatically filled in
-  after the :guilabel:`Compute Sheet` button is clicked. Doing so displays all the wages,
-  deductions, taxes, etc. for the entry.
-- :guilabel:`Batch Name`: Located in the :guilabel:`Accounting Information` tab, select the payslip
-  batch this new payslip should be added to from the drop-down menu.
-- :guilabel:`Date Account`: Located in the :guilabel:`Accounting Information` tab, enter the date on
-  which the payslip should be posted, by clicking on the drop-down menu, and navigating to the
-  correct month and year using the :guilabel:`< > (less-than/greater-than)` icons in the calendar
-  pop-up window. Then, click on the desired date.
-- :guilabel:`Salary Journal`: This field, located in the :guilabel:`Accounting Information` tab,
-  represents the journal that the payslip will be logged in, and is automatically selected when the
-  :guilabel:`Contract` and :guilabel:`Structure` are entered in the payslip form.
-- :guilabel:`Accounting Entry`: This field, located in the :guilabel:`Accounting Information` tab,
-  is automatically filled in once the payslip is confirmed.
-
-Save and process new payslip
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-When all the necessary information on the payslip is entered, click :guilabel:`Save` to save the
-data, or click :guilabel:`Discard` to delete the entry.
-
-.. note::
-   Saving the entry is not required in order to compute the sheet, although it is considered best
-   practice to do so. The :guilabel:`Compute Sheet` button can be clicked without first saving the
-   payslip. Doing so will save the entry *and* compute the sheet.
-
-Click the :guilabel:`Compute Sheet` button to register all the
-information, and have the :guilabel:`Salary Computation` tab populated. If any modifications need to
-be made, click the :guilabel:`Edit` button, make the desired changes, then click the
-:guilabel:`Recompute Worked Days` button to have the changes reflected in the :guilabel:`Worked
-Days` and :guilabel:`Salary Computation` tabs.
-
-To print the payslip, click the :guilabel:`Print` button. To cancel the payslip, click the
-:guilabel:`Cancel Payslip` button.
-
-Once everything on the payslip form is correct, click the :guilabel:`Create Draft Entry` button to
-create the payslip. The chatter is automatically updated to show the email sent to the employee,
-along with a PDF copy of the payslip.
-
-.. image:: payslips/payslip-chatter.png
-   :align: center
-   :alt: The new payslip is emailed to the employee and the email appears in the chatter.
-
-Next, the payment must be sent to the employee. To do this, click the :guilabel:`Make Payment`
-button. Doing so reveals a pop-up form, in which the desired :guilabel:`Bank Journal` that the
-payment should be made against must be selected from a drop-down menu. Then, click the
-:guilabel:`Confirm` button to confirm the journal, and return to the payslip.
-
-.. image:: payslips/make-payment.png
-   :align: center
-   :alt: Click Make Payment to send the payment to the employee.
-
-If a payment needs to be cancelled or refunded, click the corresponding :guilabel:`Refund` or
-:guilabel:`Cancel Payslip` button, located at the top of the payslip form.
-
-.. important::
-   In order for a payslip to be paid, the employee *must* have a bank account entered in their
-   contact information. If there is no bank information, a payslip cannot be paid, and an error will
-   appear when the :guilabel:`Make Payment` button is clicked. Banking information can be found in
-   the :guilabel:`Private Information` tab on the employee's card. Edit the employee card, and add
-   banking information, if it is missing.
-
-   .. image:: payslips/banking.png
-      :align: center
-      :alt: Banking information can be entered in an employee's card.
-
-All payslips
-============
-
-To view all payslips regardless of status, go to :menuselection:`Payroll app --> Payslips --> All
-Payslips`. Here, all payslips are organized by batch (in a default list view).
-
-Click on the :guilabel:`▶ (arrow)` next to the individual batch name to view all the payslips in
-that particular batch, along with all the payslip details. The number of payslips in the batch is
-written in parenthesis after the batch name. The :guilabel:`Status` for each individual payslip
-appears on the far-right side, indicating if it is in :guilabel:`Draft Mode`, :guilabel:`Waiting`,
-or if it is :guilabel:`Done`.
-
-.. note::
-   - :guilabel:`Draft` indicates the payslip is created, and there is still time to make edits,
-     since the amounts are not calculated.
-   - `Waiting` indicates the payslip has been calculated and the salary details can be found in the
-     *Salary Computation* tab.
-   - `Done` indicates the payslip is calculated and ready to be paid.
-
-.. image:: payslips/all-payslips.png
-   :align: center
-   :alt: View all payslips organized by batches. Click on the arrow to expand each batch.
-
-Click on an individual payslip to view the details for that payslip on a separate page. Using the
-breadcrumb menu, click :guilabel:`Employee Payslips` to go back to the list view of all payslips.
-
-A new payslip can be created from the :guilabel:`Employee Payslips` page, by clicking the
-:guilabel:`Create` button in the upper-left corner. Doing so reveals a separate blank payslip form
-page. On that blank payslip form page, enter all the necessary information, as described in the
-:ref:`Create a new payslip <payroll/new-payslip>` section.
-
-To print PDF versions of payslips from the :guilabel:`Payslips to Pay` or :guilabel:`Employee
-Payslips` pages, first select the desired payslips by clicking on the individual checkbox next to
-each payslip to be printed. Or, click the box next to :guilabel:`Reference`, which selects all
-visible payslips on the page. Then, click the :guilabel:`Print` button to print the payslips.
-
-.. image:: payslips/print.png
-   :align: center
-   :alt: Click on the Print smart button to print payslips to a PDF.
-
-Payslips can also be exported to an Excel spreadsheet. When exporting, all payslips are exported
-regardless of whether some are selected or not. Click on the :guilabel:`Export All` button (download
-icon) to export all payslips to an Excel spreadsheet.
-
-.. image:: payslips/export.png
-   :align: center
-   :alt: Click on the Export All smart button to export all payslips to an Excel payslip.
-
-.. note::
-   Both *To Pay* and *All Payslips* display all the detailed information for each payslip.
-
-Batches
-=======
-
-To view payslips in batches, navigate to :menuselection:`Payroll app --> Payslips --> Batches` to
-display all the payslip batches that have been created. These payslip batches are displayed in a
-list view, by default.
-
-Each batch displays the :guilabel:`Name`, :guilabel:`Date From` and :guilabel:`Date To` dates,
-whether it was a :guilabel:`Credit note`, its :guilabel:`Status`, and the :guilabel:`Company`.
-
-.. image:: payslips/batches.png
-   :align: center
-   :alt: View displaying all batches created.
-
-Click on an individual batch to view the details for that batch on a separate page. On this batch
-detail page, modifications can be made. To make any modifications to a batch, click the
-:guilabel:`Edit` button. Then, proceed to make any necessary changes.
-
-When all desired changes have been made, click either :guilabel:`Save` to save the changes, or
-:guilabel:`Discard` to revert back to the original data.
-
-After modifications have been saved, click the :guilabel:`Generate Payslips` button to reveal a
-:guilabel:`Generate Payslips` pop-up form, in which payslips affected by the changes can be created
-or modified.
-
-All payslips associated with the batch are displayed in the employees section of the
-:guilabel:`Generate Payslips` pop-up. To filter the results by either the :guilabel:`Salary
-Structure` and/or the :guilabel:`Department`, select a salary structure and/or department from the
-respective drop-down menus.
-
-Only employees that match the selected :guilabel:`Salary Structure` and/or :guilabel:`Department`
-appear in the employees list. Click the :guilabel:`Generate` button at the bottom of the
-:guilabel:`Generate Payslips` pop-up window to generate the modified payslips, and close the pop-up
-window.
-
-.. image:: payslips/generate-payslips-batch.png
-   :align: center
-   :alt: Generate payslips from the edited batch.
-
-Back on the batch details page, click the :guilabel:`Create Draft Entry` smart button to create a
-draft of the payslips.
-
-.. image:: payslips/draft-from-batch.png
-   :align: center
-   :alt: Generate payslips from the edited batch.
-
-Once the draft payslips are created, the button changes to say :guilabel:`Make Payment`. Click the
-:guilabel:`Make Payment` button. A pop-up window appears, in which the bank journal information must
-be entered. Select the :guilabel:`Bank Journal` from the drop-down list, and click
-:guilabel:`Confirm` to process the payslips, and pay the employees.
-
-On the batch detail page, the number of payslips in the batch is accessible via the
-:guilabel:`Payslips` smart button, located in the top-right corner. Individual payslips for the
-batch can be viewed by clicking the :guilabel:`Payslips` smart button in the top-right corner.
-
-Use the breadcrumb menu to navigate back to the individual batch detail page, or back to the list of
-all batches.
-
-.. image:: payslips/payslip-batches.png
-   :align: center
-   :alt: Click the Payslips smart button to view the individual payslips in the batch.
-
-Create a new batch
-------------------
-
-To create a new batch of payslips from the :guilabel:`Payslips Batches` page
-(:menuselection:`Payroll app --> Payslips --> Batches`), click the :guilabel:`Create` button in the
-upper-left corner. Doing so reveals a blank payslip batch form on a separate page.
-
-On the new payslip batch form, enter the :guilabel:`Name` for the batch, and select the date range
-to which the batch applies, by clicking the :guilabel:`▼ (drop-down arrow)` icon in the
-:guilabel:`Period` fields, which reveals a calendar pop-up window. From this calendar pop-up window,
-navigate to the correct month, and click on the corresponding day for both the start and end dates.
-
-.. image:: payslips/new-batch-details.png
-   :align: center
-   :alt: Enter the details for the new batch.
-
-If the batch is a credit note, check the box next to :guilabel:`Credit Note`. Then, in the
-:guilabel:`Generation Date` field, select the date the payslips should be generated from a calendar
-pop-up window. This generated date is reflected in the accounting journal entries.
-
-Lastly, in the :guilabel:`Company` field, select the company these payslips are written against.
-
-When all the information on the payslip batch form is correct, click the :guilabel:`Save` button to
-save the information. To delete the entry, click the :guilabel:`Discard` button.
-
-To create the payslips for the newly-created batch, click the :guilabel:`Generate Payslips` button
-at the top of the form.
-
-When clicked, a pop-up window appears showing all the payslips that will be created. To remove any
-individual payslips, click the black :guilabel:`✖ (x mark)` icon at the far right of the payslip
-line.
-
-If a specific :guilabel:`Salary Structure` or :guilabel:`Department` needs to be specified for the
-batch, select them from the corresponding drop-down menus.
-
-Click the :guilabel:`Generate` button at the bottom of the pop-up window to create the payslips for
-the batch.
-
-.. image:: payslips/generate-payslips.png
-   :align: center
-   :alt: Generate payslips for the new batch.
-
-.. note::
-   On the :guilabel:`Generate Payslips` pop-up window, selecting a :guilabel:`Department` and/or
-   :guilabel:`Salary Structure` only displays payslips that apply to those specifically-selected
-   parameters.
-
-If there are any errors or issues preventing the payslips from being generated, an error message
-appears in the top-right section. This error box disappears on its own after several seconds, or the
-:guilabel:`✖ (x mark)` icon can be clicked to close the alert.
-
-To remedy the issue, make any necessary modifications (e.g. removing any payslip lines that cannot
-be processed), then click the :guilabel:`Generate` button again.
-
-Once the payslips have been successfully generated, the screen returns to the payslip batch form.
-
-From here, click the :guilabel:`Generate Draft Entry` button to change the payslips' status from
-:guilabel:`Draft` to :guilabel:`Done`.
-
-Once payslips have been generated, click the :guilabel:`Make Payment` button to process the
-payments. Doing so reveals a pop-up window, in which the proper banking information must be entered.
-In this pop-up window, select the appropriate :guilabel:`Bank Journal` from the drop-down menu, and
-enter the appropriate file name.
-
-When done, click the :guilabel:`Confirm` button to confirm the information, or click
-:guilabel:`Cancel` to discard.
-
-Generate commission payslips
-----------------------------
-
-Commission payslips can be generated directly from the :guilabel:`Payslips Batches` page
-(:menuselection:`Payroll app --> Payslips --> Batches`). To generate commission payslips from this
-page, click on the desired batch (or batches) to create commissions payslips for, then click the
-:guilabel:`Generate Commission Payslips` button.
-
-Doing so reveals a :guilabel:`Generate Commission Payslip` pop-up window, in which the necessary
-information **must** be filled out.
-
-.. image:: payslips/commission-details.png
-   :align: center
-   :alt: Enter the commission details.
-
-On this pop-up window, click on the drop-down menus, located beside the :guilabel:`Period` field, to
-reveal calendar pop-up windows. On these calendar pop-up windows, select the desired period for
-which the payslips are being generated. Using the :guilabel:`< (left)` and :guilabel:`> (right)`
-arrows, navigate to the correct month, and click on the date to select it.
-
-In the :guilabel:`Department` field, select the desired department from the drop-down menu.
-
-When a department is selected, the employees listed for that department appear in the
-:guilabel:`Employee` section.
-
-Under the :guilabel:`Employee` section, enter the :guilabel:`Commission Amount` for each employee in
-the appropriate column. To remove an employee, click the :guilabel:`🗑️ (trash)` icon to remove the
-line.
-
-Add a new entry by clicking :guilabel:`Add a Line`, and entering the :guilabel:`Employee` and the
-appropriate :guilabel:`Commission Amount`.
-
-Click the :guilabel:`Upload Your File` button to add a file, if necessary. Any file type is
-accepted.
-
-Using the drop-down menu beside the :guilabel:`Commission Type` field, select either
-:guilabel:`Classic Commission` or :guilabel:`Warrant`. :guilabel:`Classic` is the most typical of
-commission, while :guilabel:`Warrant` is primarily used for Belgium companies.
-
-Once all the commissions are properly entered, click the :guilabel:`Generate Payslips` button to
-create the commission payslips.

content/applications/hr/payroll/reporting.rst

@@ -1,219 +0,0 @@
-=========
-Reporting
-=========
-
-The :guilabel:`Reporting` section of the *Payroll* app offers a variety of reports to choose from.
-The :guilabel:`Payroll`, :guilabel:`Meal Vouchers`, :guilabel:`Attachment of Salary`, and
-:guilabel:`DMFA` reports are universal and available for all companies regardless of location. The
-:guilabel:`Paid Time Off Allocation`, :guilabel:`273S Sheet`, and :guilabel:`274.XX Sheets` reports
-are specific to Belgian companies only.
-
-To view a report, go to :menuselection:`Payroll --> Reporting` and click on the specific report.
-
-.. image:: reporting/reports.png
-   :align: center
-   :alt: Report dashboard view.
-
-If a report is unavailable to a company, a user error pops up, stating `You must be logged in to a
-Belgian company to use this feature.`
-
-At the top of each report, click on :guilabel:`Filters` to display the optional filters for the
-specific report. Filters show information that matches the specific filter parameters. For example,
-when selecting the :guilabel:`Last 365 Day Payslip` filter, only payslips for the last 365 days
-appear. All reports have the option to add a custom filter, and each have different default custom
-filter options. Select the parameters, then click the :guilabel:`Apply` button.
-
-.. image:: reporting/custom-filter.png
-   :align: center
-   :alt: Report dashboard view.
-
-Clicking on :guilabel:`Favorites` displays three options: :guilabel:`Save the current search`,
-:guilabel:`Add the search to the dashboard`, or :guilabel:`Insert the search to a Google
-spreadsheet`.
-
-.. image:: reporting/favorites.png
-   :align: center
-   :alt: Favorite options for reports.
-
-Payroll
--------
-
-Click on :menuselection:`Payroll --> Reporting --> Payroll` to display the :guilabel:`Payroll
-Analysis` report.
-
-.. image:: reporting/payroll-report.png
-   :align: center
-   :alt: Report dashboard view.
-
-This shows all the payslips generated in the last 365 days. The report can display metrics for a
-variety of parameters. Click the :guilabel:`Measures` box to view a drop-down menu with the various
-options to display. The options available include: :guilabel:`# Payslip`, :guilabel:`Basic Wage`,
-:guilabel:`Basic Wage for Time Off`, :guilabel:`Days of Paid Time Off`, :guilabel:`Days of
-Unforeseen Absence`, :guilabel:`Days of Unpaid Time Off`, :guilabel:`Gross Wage`, :guilabel:`Net
-Wage`, :guilabel:`Number of Days`, :guilabel:`Number of Hours`, :guilabel:`Work Days`,
-:guilabel:`Work Hours`, and :guilabel:`Count`.
-
-.. image:: reporting/measures.png
-   :align: center
-   :alt: Report dashboard view.
-
-Line chart
-~~~~~~~~~~
-
-A line chart is the default view for the *Payroll Analysis* report. If a different view was
-selected, click on the :guilabel:`Line Chart` icon (middle icon) in the menu bar to change the view
-back to a line chart. An option to display the line chart in ascending or descending order appears
-at the end of the options.
-
-.. image:: reporting/line-chart.png
-   :align: center
-   :alt: Report dashboard view.
-
-Bar chart
-~~~~~~~~~
-
-To display the data in a bar chart, click on the :guilabel:`Bar Chart` icon (first icon) in the menu
-bar.
-
-.. image:: reporting/bar-chart.png
-   :align: center
-   :alt: Report dashboard view.
-
-Click the :guilabel:`Stacked` icon to view the bar chart in a stacked format (where multiple values
-appear in each column). An option to display the columns in ascending or descending order appears at
-the end of the options.
-
-.. tip::
-   Clicking an option enables it. To disable the option, click it again. When the option is enabled
-   it appears grey. When it is inactive, it appears white.
-
-Pie chart
-~~~~~~~~~
-
-To display the data in a pie chart, click on the :guilabel:`Pie Chart` icon (last icon) in the menu
-bar. There are no additional options available in this view.
-
-.. image:: reporting/pie-chart.png
-   :align: center
-   :alt: Report dashboard view.
-
-Pivot table
-~~~~~~~~~~~
-
-The bottom half of the :guilabel:`Payroll Analysis` dashboard presents a pivot table no matter which
-type of chart is selected for the top of the dashboard. The default information displayed is the
-number of payslips, net wage, gross wage, days of paid time off, and days of unpaid time off. The
-information is divided by department. To display more information on the report, select the
-:guilabel:`Measures` drop-down menu, then click on any other items to display.
-
-.. image:: reporting/measures-bottom.png
-   :align: center
-   :alt: Report dashboard view.
-
-To sort the entries by a specific column, such as :guilabel:`Net Wage`, click on the column name
-twice. The first click selects the column, and the second click sorts the information in descending
-order.
-
-.. image:: reporting/net-wage.png
-   :align: center
-   :alt: To sort information by descending order, click the column head twice.
-
-To export the data in an XLSX format, click the :guilabel:`Download xlsx` icon. The information will
-be downloaded into an Excel spreadsheet.
-
-.. image:: reporting/export.png
-   :align: center
-   :alt: Download an Excel spreadsheet of the data by clicking the download button.
-
-The data can be inserted into a spreadsheet by clicking the :guilabel:`Insert in Spreadsheet`
-button. A pop-up appears asking which spreadsheet to place the information in. Select an existing
-spreadsheet or enter the name for a new spreadsheet. Click the :guilabel:`Confirm` button to move to
-a spreadsheet view with all the information populated.
-
-.. image:: reporting/spreadsheet.png
-   :align: center
-   :alt: Send the data to a spreadsheet.
-
-Once in the spreadsheet view, click on :guilabel:`File`, then select :guilabel:`Save` to save the
-data, or :guilabel:`Save as Template` to save the setting as a template to use in the future.
-
-.. note::
-   The *Documents* application must be installed in order to use the :guilabel:`Insert in
-   Spreadsheet` option.
-
-
-Meal Vouchers
--------------
-
-:guilabel:`Meal Vouchers` provides an overview of the meal vouchers used by employees, and can be
-shown by :guilabel:`Day`, :guilabel:`Week`, :guilabel:`Month`, :guilabel:`Quarter`, or
-:guilabel:`Year`. The default view is by month.
-
-.. image:: reporting/meal-vouchers.png
-   :align: center
-   :alt: Meal voucher
-
-To change the displayed view, click on :guilabel:`Total`. The data collapses, showing only the count
-column. Click on :guilabel:`Total` again, then hover over :guilabel:`Day`, then click on one of the
-other time-period options available.
-
-.. image:: reporting/voucher-day.png
-   :align: center
-   :alt: Meal voucher
-
-It is possible to compare the current meal voucher report to the one for the previous time period or
-the previous year. To view these comparisons, click on the :guilabel:`Comparison` drop-down menu at
-the top, then select either :guilabel:`Date: Previous Period` or :guilabel:`Date: Previous Year`.
-
-.. image:: reporting/meal-comparison.png
-   :align: center
-   :alt: Meal voucher
-
-To export the data in an XLSX format, click the :guilabel:`Download xlsx` icon. The information will
-be downloaded into an Excel spreadsheet.
-
-.. image:: reporting/voucher-download.png
-   :align: center
-   :alt: Download an Excel spreadsheet of the data by clicking the download button.
-
-The data can be inserted into a spreadsheet by clicking the :guilabel:`Insert in Spreadsheet`
-button. A pop-up appears asking which spreadsheet to place the information in. Select an existing
-spreadsheet or enter the name for a new spreadsheet. Click the :guilabel:`Confirm` button to move to
-a spreadsheet view with all the information populated.
-
-Once in the spreadsheet view, click on :guilabel:`File`, then select :guilabel:`Save` to save the
-data, or :guilabel:`Save as Template` to save the settings as a template to use in the future.
-
-.. note::
-   The *Documents* application must be installed in order to use the :guilabel:`Insert in
-   Spreadsheet` option.
-
-Attachment of Salary
---------------------
-
-The :guilabel:`Attachment of Salary` report shows all deductions or allocations per employee, such
-as child support payments and wage garnishments.
-
-.. image:: reporting/attachment-of-salary.png
-   :align: center
-   :alt: View the Attachment of Salary report that shows all salary garnishments.
-
-The employees are listed in the left-side column, while the different deductions are listed in the
-top row, organized by month.
-
-The report can be exported as a XLSX file, or inserted into a spreadsheet, using the corresponding
-buttons at the top.
-
-Clicking on the :guilabel:`Measures` button shows options for how the data is displayed.
-:guilabel:`Assignment of salary`, :guilabel:`Attachment of salary`, :guilabel:`Child support`, and
-:guilabel:`Count`, can all be selected or deselected by clicking on the item. If an item has a check
-mark, it is displayed.
-
-.. image:: reporting/attachment-measures.png
-   :align: center
-   :alt: Select the options that be displayed in the report.
-
-The salary attachment report can be compared to the one for the previous time period or the previous
-year. To view these comparisons, click on the on the :guilabel:`Comparison` drop-down menu at the
-top, then select either :guilabel:`Payslip End Date: Previous Period` or :guilabel:`Payslip End
-Date: Previous Year`.

content/applications/inventory_and_mrp/inventory/barcode/operations/gs1_usage.rst

@@ -144,7 +144,7 @@ numbers.
       * - GS1 Barcode (lot #)
         - LOT0002
       * - Full GS1 barcode
-        - 0120611628936004 3000000050 10LOT0002
+        - 01206116289360043 000000050 10LOT0002
 
    :ref:`If the configuration is correct <barcode/operations/troubleshooting>`, `50/50`
    :guilabel:`Units` processed will be displayed and the :guilabel:`Validate` button turns green.

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

@@ -1,96 +1,87 @@
 ========================
-Get started with Discuss
+Get Started with Discuss
 ========================
 
-Odoo *Discuss* is an internal communication app that allows users to connect through messages,
-notes, and file sharing, either through a persistent chat window that works across applications, or
-through the dedicated *Discuss* dashboard.
+Discuss allows you to bring all of your company’s communication together through messages, notes,
+and chat. Share information, projects, files, prioritize tasks, and stay connected with colleagues
+and partners throughout applications. Forge better relationships, increase productivity and
+transparency by promoting a convenient way of communicating.
 
 .. _discuss_app/notification_preferences:
 
-Choose notifications preference
-===============================
+Choose your notifications preference
+====================================
 
-Access user-specific preferences for the *Discuss* app by navigating to :menuselection:`Settings app
---> Users --> User --> Preferences tab`.
+Access your *Preferences* and choose how you would like your notifications to be handled.
 
-.. image:: get_started/preferences-user.png
+.. image:: get_started/change_preferences.png
    :align: center
-   :alt: View of the Preferences tab for Odoo Discuss.
+   :alt: View of the preferences page for Odoo Discuss
 
-By default, the :guilabel:`Notification` field is set as :guilabel:`Handle by Emails`. With this
-setting enabled, a notification email will be sent by Odoo every time a message is sent from the
-chatter, a note is sent with an `@` mention (from chatter), or a notification is sent for a record
-that the user follows. Something that triggers a notification is changing of the stage (if an email\
-is configured to be sent, for example if the task is set to :guilabel:`Done`).
+| By default, the field is set as *Handle by Emails* making messages, notes, and notifications where
+  you were mentioned or that you follow, to be sent through email. By choosing *Handle in Odoo*,
+  they are shown in the *Inbox*.
+| Messages can then be *Marked as Todo*, *Replied*, or *Marked as Read*.
 
-By choosing :guilabel:`Handle in Odoo`, the above notifications are shown in the *Discuss* app's
-*inbox*. Messages can have the following actions taken on them: respond with an emoji by clicking
-:guilabel:`Add a Reaction`, or reply to the message by clicking on :guilabel:`Reply`. Additional
-actions may include starring the message by clicking :guilabel:`Marked as Todo`, or pinning the
-message by selecting :guilabel:`Pin` or even mark the message as unread by selecting
-:guilabel:`Marked as unread`.
-
-.. image:: get_started/reactions-discuss.png
+.. image:: get_started/inbox_actions.png
    :align: center
-   :alt: View of an inbox message and its action options in Odoo Discuss.
+   :alt: View of an inbox message and its action options in Odoo Discuss
 
-Clicking :guilabel:`Mark as Todo` on a message causes it to appear on the :guilabel:`Starred` page,
-while clicking :guilabel:`Mark as Read` moves the message to :guilabel:`History`.
+The messages tagged as *Mark as Todo* are also shown in *Starred*, while the ones *Marked as Read*
+are moved to *History*.
 
-.. image:: get_started/starred-messages.png
+.. image:: get_started/starred_messages.png
    :align: center
-   :alt: View of messages marked as todo in Odoo Discuss.
+   :alt: View of messages marked as todo in Odoo Discuss
 
-Start chatting
+Start Chatting
 ==============
 
-The first time a user logs in to their account, OdooBot sends a message asking for permission to
-send desktop notifications for chats. If accepted, the user will receive push notifications on their
-desktop for the messages they receive, regardless of where the user is in Odoo.
+The first time you log in to your account, OdooBot sends you a message asking for permission to
+receive desktop notifications to chats. If accepted, you receive push notifications to the messages
+sent to you despite of where you are in Odoo.
 
-.. image:: get_started/odoobot-push.png
+.. image:: get_started/odoobot_push.png
    :align: center
    :alt: View of the messages under the messaging menu emphasizing the request for push
-         notifications for Odoo Discuss.
+         notifications for Odoo Discuss
 
 .. tip::
-   To stop receiving desktop notifications, reset the notifications settings of the browser.
+   To stop receiving desktop notifications, reset the notifications settings of your browser.
 
-To start a chat, go to the :menuselection:`Discuss` app and click on the :guilabel:`+ (plus)` icon
-next to :guilabel:`Direct Messages` or :guilabel:`Channels` in the left menu of the dashboard.
+To start a chat, click on *New Message* on the *Messaging Menu*, or go to *Discuss* and send a
+*Direct Message*.
 
-.. image:: get_started/channels-direct-messages.png
+.. image:: get_started/channels_direct_messages.png
    :align: center
    :height: 400
-   :alt: View of Discuss's panel emphasizing the titles channels and direct messages in Odoo
-         Discuss.
+   :alt: View of discuss’s panel emphasizing the titles channels and direct messages in Odoo Discuss
 
-A company can also easily create :doc:`public and private channels
-</applications/productivity/discuss/overview/team_communication>`.
+You can also create :doc:`public and private channels <team_communication>`.
 
-Mentions in the chat and on the chatter
+Mentions in the chat and on the Chatter
 ---------------------------------------
 
-To mention a user within a chat or the chatter, type `@user-name`; to refer to a channel, type
-`#channel-name`. The user mentioned will be notified in their *inbox* or through an email, depending
-on their communication settings.
+| To mention a user within a chat or the chatter type *@user-name*; to refer to a channel, type
+  *#channel-name*.
+| A notification is sent to the user mentioned either to his *Inbox* or through email, depending
+  on his settings.
 
-.. image:: get_started/chat-windows.png
+.. image:: get_started/chat_windows.png
    :align: center
-   :alt: View of a couple of chat window messages for Odoo Discuss.
+   :alt: View of a couple of chat window messages for Odoo Discuss
 
 .. tip::
    When a user is mentioned, the search list (list of names) suggests values first based on the
-   task's followers, and secondly on employees. If the record being searched does not match with
+   task’s followers, and secondly on *Employees*. If the record being searched does not match with
    either a follower or employee, the scope of the search becomes all partners.
 
-User status
+Chat status
 -----------
 
 It is helpful to see what colleagues are up to and how quickly they can respond to messages by
-checking their *status*. The status is shown on the left side of a contact's name on the
-:guilabel:`Discuss` sidebar, on the *messaging menu* and when listed in the *chatter*.
+checking their *Status*. The status is shown on the left side of a contact’s names on Discuss’
+sidebar and on the *Messaging menu*.
 
 - Green = online
 - Orange = away
@@ -100,8 +91,8 @@ checking their *status*. The status is shown on the left side of a contact's nam
 .. image:: get_started/status.png
    :align: center
    :height: 300
-   :alt: View of the contacts' status for Odoo Discuss.
+   :alt: View of the contacts’ status for Odoo Discuss
 
 .. seealso::
-   - :doc:`/applications/productivity/discuss/overview/team_communication`
-   - :doc:`/applications/productivity/discuss/overview/plan_activities`
+   - :doc:`team_communication`
+   - :doc:`/applications/general/email_communication/email_servers`