[IMP] tests: make post_install the default

[IMP] Quality: Take a Picture check Shop Floor
closes odoo/documentation#7573 X-original-commit: 93b47e7896 Signed-off-by: John Holton (hojo) <hojo@odoo.com> Signed-off-by: Zachary Straub (zst) <zst@odoo.com>
2024-01-30 14:29:26 +01:00 · 2024-01-30 09:18:04 +00:00 · 2024-01-30 09:18:00 +00:00 · 2024-01-29 20:00:14 +00:00 · 2024-01-29 20:00:14 +00:00 · 2024-01-29 20:00:11 +00:00
1115 changed files with 283830 additions and 2523836 deletions
@@ -1,70 +1,122 @@
 [main]
 host = https://www.transifex.com

-[o:odoo:p:odoo-16-doc:r:administration]
-file_filter = locale/<lang>/LC_MESSAGES/administration.po
-source_file = locale/sources/administration.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:administration]
+file_filter            = locale/<lang>/LC_MESSAGES/administration.po
+source_file            = locale/sources/administration.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = administration
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en

-[o:odoo:p:odoo-16-doc:r:applications]
-file_filter = locale/<lang>/LC_MESSAGES/applications.po
-source_file = locale/sources/applications.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:applications]
+file_filter            = locale/<lang>/LC_MESSAGES/applications.po
+source_file            = locale/sources/applications.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = applications
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en

-[o:odoo:p:odoo-16-doc:r:finance]
-file_filter = locale/<lang>/LC_MESSAGES/finance.po
-source_file = locale/sources/finance.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:finance]
+file_filter            = locale/<lang>/LC_MESSAGES/finance.po
+source_file            = locale/sources/finance.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = finance
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en

-[o:odoo:p:odoo-16-doc:r:general]
-file_filter = locale/<lang>/LC_MESSAGES/general.po
-source_file = locale/sources/general.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:general]
+file_filter            = locale/<lang>/LC_MESSAGES/general.po
+source_file            = locale/sources/general.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = general
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en

-[o:odoo:p:odoo-16-doc:r:hr]
-file_filter   = locale/<lang>/LC_MESSAGES/hr.po
-source_file   = locale/sources/hr.pot
-type          = POT
-minimum_perc  = 0
-resource_name = hr
+[o:odoo:p:odoo-17-doc:r:index]
+file_filter            = locale/<lang>/LC_MESSAGES/index.po
+source_file            = locale/sources/index.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = index
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en

-[o:odoo:p:odoo-16-doc:r:index]
-file_filter = locale/<lang>/LC_MESSAGES/index.po
-source_file = locale/sources/index.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:inventory_and_mrp]
+file_filter            = locale/<lang>/LC_MESSAGES/inventory_and_mrp.po
+source_file            = locale/sources/inventory_and_mrp.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = inventory_and_mrp
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en

-[o:odoo:p:odoo-16-doc:r:inventory_and_mrp]
-file_filter = locale/<lang>/LC_MESSAGES/inventory_and_mrp.po
-source_file = locale/sources/inventory_and_mrp.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:marketing]
+file_filter            = locale/<lang>/LC_MESSAGES/marketing.po
+source_file            = locale/sources/marketing.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = marketing
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en

-[o:odoo:p:odoo-16-doc:r:marketing]
-file_filter = locale/<lang>/LC_MESSAGES/marketing.po
-source_file = locale/sources/marketing.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:productivity]
+file_filter            = locale/<lang>/LC_MESSAGES/productivity.po
+source_file            = locale/sources/productivity.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = productivity
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en

-[o:odoo:p:odoo-16-doc:r:productivity]
-file_filter = locale/<lang>/LC_MESSAGES/productivity.po
-source_file = locale/sources/productivity.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:sales]
+file_filter            = locale/<lang>/LC_MESSAGES/sales.po
+source_file            = locale/sources/sales.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = sales
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en

-[o:odoo:p:odoo-16-doc:r:sales]
-file_filter = locale/<lang>/LC_MESSAGES/sales.po
-source_file = locale/sources/sales.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:services]
+file_filter            = locale/<lang>/LC_MESSAGES/services.po
+source_file            = locale/sources/services.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = services
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en

-[o:odoo:p:odoo-16-doc:r:services]
-file_filter = locale/<lang>/LC_MESSAGES/services.po
-source_file = locale/sources/services.pot
-source_lang = en
-
-[o:odoo:p:odoo-16-doc:r:user_settings]
-file_filter = locale/<lang>/LC_MESSAGES/settings.po
-source_file = locale/sources/settings.pot
-source_lang = en
-
-[o:odoo:p:odoo-16-doc:r:websites]
-file_filter = locale/<lang>/LC_MESSAGES/websites.po
-source_file = locale/sources/websites.pot
-source_lang = en
+[o:odoo:p:odoo-17-doc:r:user_settings]
+file_filter            = locale/<lang>/LC_MESSAGES/settings.po
+source_file            = locale/sources/settings.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = settings
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en

+[o:odoo:p:odoo-17-doc:r:websites]
+file_filter            = locale/<lang>/LC_MESSAGES/websites.po
+source_file            = locale/sources/websites.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = websites
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
@@ -26,7 +26,7 @@ SOURCE_DIR     = content

 HTML_BUILD_DIR = $(BUILD_DIR)/html
 ifdef VERSIONS
-  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/16.0
+  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/master
 endif
 ifneq ($(CURRENT_LANG),en)
  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/$(CURRENT_LANG)
@@ -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 = '16.0'
+version = release = 'master'

 # `current_branch` is the technical name of the current branch.
 # E.g., saas-15.4 -> saas-15.4; 12.0 -> 12.0, master -> master (*).
@@ -213,7 +213,6 @@ sphinx.transforms.i18n.docname_to_domain = (
 # is populated. If a version is passed to `versions` but is not listed here, it will not be shown.
 versions_names = {
    'master': "Master",
-    'saas-17.1': "Odoo Online",
    '17.0': "Odoo 17",
    'saas-16.4': "Odoo Online",
    'saas-16.3': "Odoo Online",
@@ -235,7 +234,6 @@ languages_names = {
    'it': 'IT',
    'nl': 'NL',
    'pt_BR': 'PT',
-    'ro': 'RO',
    'uk': 'UA',
    'zh_CN': 'ZH (CN)',
    'zh_TW': 'ZH (TW)'
@@ -8,63 +8,56 @@ Geo IP
 Installation
 ============

-.. warning::
-   Please note that the installation depends on your computer's operating system and distribution.
-   We will assume that a Linux operating system is being used.
+#. Download both the GeoLite2 City and Country
+   `databases <https://dev.maxmind.com/geoip/geoip2/geolite2/>`_. You should end up with two files
+   called :file:`GeoLite2-City.mmdb` and :file:`GeoLite2-Country.mmdb`.

-#. Install `geoip2 <https://pypi.org/project/geoip2/>`__ Python library
-    .. code-block:: bash
+#. Move the files to the folder :file:`/usr/share/GeoIP/`.

-      pip install geoip2
+   .. code-block:: bash

-#. Download the `GeoLite2 City database <https://dev.maxmind.com/geoip/geoip2/geolite2/>`_. You
-   should end up with a file called ``GeoLite2-City.mmdb``
-#. Move the file to the folder ``/usr/share/GeoIP/``
-    .. code-block:: bash
-
-        mv ~/Downloads/GeoLite2-City.mmdb /usr/share/GeoIP/
+       mv ~/Downloads/GeoLite2-City.mmdb /usr/share/GeoIP/
+       mv ~/Downloads/GeoLite2-Country.mmdb /usr/share/GeoIP/

 #. Restart the server

 .. note::
-   If you can't/don't want to locate the geoip database in ``/usr/share/GeoIP/``, you can use the
-   ``--geoip-db`` option of the Odoo command line interface. This option takes the absolute path to
-   the GeoIP database file and uses it as the GeoIP database. For example:
+   If you don't want to locate the geoip database in :file:`/usr/share/GeoIP/`, use the
+   :option:`--geoip-city-db <odoo-bin --geoip-city-db>` and
+   :option:`--geoip-country-db <odoo-bin --geoip-country-db>` options of the Odoo command line
+   interface. These options take the absolute path to the GeoIP database file and use it as the
+   GeoIP database. For example:

   .. code-block:: bash

-      ./odoo-bin --geoip-db= ~/Downloads/GeoLite2-City.mmdb
+      ./odoo-bin --geoip-city-db= ~/Downloads/GeoLite2-City.mmdb

   .. seealso::
      - :doc:`CLI documentation </developer/reference/cli>`.

-.. warning::
-   ``GeoIP`` Python library can also be used. However this version is discontinued since January
-   1.    See `GeoLite Legacy databases are now discontinued
-   <https://support.maxmind.com/geolite-legacy-discontinuation-notice/>`_
+Test GeoIP geolocation in your Odoo website
+===========================================

-How to test GeoIP geolocation in your Odoo website
-==================================================
+Edit a web page to include some geo-ip information such as the country name of the current
+request IP address. To do so:

-1. Go to your website. Open the web page that you want to test ``GeoIP``.
-2. Choose :menuselection:`Customize --> HTML/CSS/JS Editor`.
-3. Add the following piece of XML in the page :
+#. Go to your website. Open the web page that you want to test ``GeoIP``.
+#. Choose :menuselection:`Customize --> HTML/CSS/JS Editor`.
+#. Add the following piece of XML in the page :

-.. code-block:: xml
+   .. code-block:: xml

-    <h1 class="text-center" t-esc="request.session.get('geoip')"/>
+       <h1 class="text-center" t-esc="request.geoip.country.name or 'geoip failure'"/>

-You should end up with a dictionary indicating the location of the IP address.
+#. Save and refresh the page.

-.. image:: geo_ip/on-premise_geo-ip-installation01.png
-    :align: center
+Geo-ip is working if you read your country name displayed in bold in the middle of the page.

-.. note::
-   If the curly braces are empty ``{}``, it can be for any of the following reasons :
+In case you read "**geoip failure**" instead then the geolocalization failed. The common causes are:

-   - The browsing IP address is the localhost (``127.0.0.1``) or a local area network one
-     (``192.168.*.*``)
-   - If a reversed proxy is used, make sure to configure it correctly. See :option:`proxy mode
-     <odoo-bin --proxy-mode>`
-   - ``geoip2`` is not installed or the GeoIP database file wasn't found
-   - The GeoIP database was unable to resolve the given IP address
+#. The browsing IP address is the localhost (``127.0.0.1``) or a local area network one. If you
+   don't know, you can access your website using mobile data.
+#. You are using a reverse-proxy (apache, nginx) in front of Odoo but didn't start Odoo with the
+   proxy-mode enabled. See :option:`proxy mode <odoo-bin --proxy-mode>`.
+#. The GeoIP database is corrupt, missing or unaccessible. In such case a warning was logged in the
+   server logs.
@@ -16,8 +16,8 @@ Official **Community** and **Enterprise** packages can be downloaded from the `O
 <https://www.odoo.com/page/download>`_.

 .. note::
-   It is required to be logged in as a paying on-premise customer or partner to download the
-   Enterprise packages.
+   It is required to be logged in as a paying customer or partner to download the Enterprise
+   packages.

 .. _install/packages/linux:

@@ -118,7 +118,11 @@ Prepare
 Python
 ~~~~~~

-Odoo requires **Python 3.7** or later to run.
+Odoo requires **Python 3.10** or later to run.
+
+.. versionchanged:: 17
+    Minimum requirement updated from Python 3.7 to Python 3.10.
+

 .. tabs::

@@ -31,18 +31,12 @@ This matrix shows the support status of every version.
     - On-Premise
     - Release date
     - End of support
-   * - Odoo saas~17.1
-     - |green|
-     - N/A
-     - N/A
-     - January 2024
-     -
   * - **Odoo 17.0**
     - |green|
     - |green|
     - |green|
     - November 2023
-     - October 2026 (planned)
+     - November 2026 (planned)
   * - Odoo saas~16.4
     - |green|
     - N/A
@@ -96,6 +96,12 @@ gains and losses after reconciling the journal items.
 .. seealso::
   :doc:`Manage a bank in a foreign currency <accounting/bank/foreign_currency>`

+Branch management
+=================
+
+Multiple branches can be managed thanks to multi-company hierarchies. This allows to post journal
+entries on each branch as well as setting up a common lock date managed by the main company.
+
 International standards
 =======================

@@ -215,6 +221,8 @@ and loss balance is automatically reported on the balance sheet report.
 .. seealso::
   :doc:`Accounting Cheat Sheet <accounting/get_started/cheat_sheet>`

+.. _fiduciaries:
+
 Fiduciaries
 ===========

@@ -51,19 +51,20 @@ Now you can search for your bank institution. Select it and follow the steps to
   web browser doesn't block pop-ups and that your ad-blocker is disabled.

 .. important::
-   When choosing the date for the first bank statement synchronization, pick the date when you
-   start recording accounting transaction on your Odoo accounting database. For example, if you
-   import your closing balance in Odoo on the 31/12/2022 and you start recording accounting
-   transactions on the 01/01/2023, your synchronization date should be 01/01/2023.
+   When setting up the bank statement synchronization, Odoo automatically starts recording the
+   accounting transactions from the last transaction’s date +1 day (if the last transaction day is
+   31/12/2022, the recording starts on 01/01/2023). If the journal contains no transaction, Odoo
+   retrieves transactions as far back as possible. You can limit how far back Odoo retrieves
+   transactions by opening the Accounting app, going to :menuselection:`Accounting --> Lock Dates`,
+   and setting a date in the :guilabel:`Journal Entries Lock Date` field.

 You must provide a phone number during your first synchronization to secure your account. We ask for
 such information because we don't want your data falling into the wrong hands. Therefore, if we
 detect suspicious activities on your account, we block all requests coming from your account, and
 you need to reactivate it using that phone number.

-The third-party provider may request more information in order to connect with your
-bank institution.
-This information is not stored on Odoo's servers.
+The third-party provider may request more information in order to connect with your bank
+institution. This information is not stored on Odoo's servers.

 By default, transactions fetched from an online source are grouped inside the same statement, and
 one bank statement is created per month. You can change the bank statement creation periodicity
@@ -106,7 +107,7 @@ If your connection with the proxy is disconnected, you can reconnect with the pr
 :guilabel:`Fetch Account` button.

 .. note::
-   If you are unable to reconnect using the :guilabel:`Fetch Account` button, please contact the
+   If you are unable to reconnect using the :guilabel:`Reconnect` button, please contact the
   `support <https://www.odoo.com/help>`_ directly with your client id or the reference of the error
   listed in the chatter.

@@ -69,13 +69,13 @@ Transactions can be matched automatically with the use of :doc:`reconciliation m
   :ref:`matching existing entries <reconciliation/existing-entries>`, :ref:`manual operations
   <reconciliation/manual-operations>`, :ref:`batch payments <reconciliation/batch-payments>`, and
   :ref:`reconciliation model buttons <reconciliation/button>`.
-#. If the resulting entry isn't fully balanced, balance it by adding another existing counterpart
+#. If the resulting entry is not fully balanced, balance it by adding another existing counterpart
   entry or writing it off with a :ref:`manual operation <reconciliation/manual-operations>`.
 #. Click the :guilabel:`Validate` button to confirm the reconciliation and move to the next
   transaction.

 .. tip::
-   If you aren't sure how to reconcile a particular transaction and would like to deal with it
+   If you are not sure how to reconcile a particular transaction and would like to deal with it
   later, use the :guilabel:`To Check` button instead. All transactions marked as :guilabel:`To
   Check` can be displayed using the :guilabel:`To Check` filter.

@@ -112,7 +112,7 @@ has a search bar that allows you to search for specific batch payments.
 Manual operations
 -----------------

-If there isn't an existing entry to match the selected transaction, you may instead wish to
+If there is not an existing entry to match the selected transaction, you may instead wish to
 reconcile the transaction manually by choosing the correct account and amount. Then, complete any
 of the relevant optional fields.

@@ -123,6 +123,10 @@ of the relevant optional fields.
   account by clicking on the new line in the resulting entry section and selecting the
   :guilabel:`Account` to record the open balance.

+.. note::
+   Lines are silently reconciled unless a write-off entry is required, which launches a
+   reconciliation wizard.
+
   .. image:: reconciliation/fully-paid.png
      :alt: Click on fully paid to manually set an invoice as entirely paid.

@@ -5,7 +5,7 @@ Cash discounts and tax reduction
 **Cash discounts** are reductions in the amount a customer must pay for goods or services offered as
 an incentive for paying their invoice promptly. These discounts are typically a percentage of the
 total invoice amount and are applied if the customer pays within a specified time. Cash discounts
-can help the company maintain a steady cash flow.
+can help a company maintain a steady cash flow.

 .. example::
   You issue a €100 invoice on the 1st of January. The full payment is due within 30 days, and you
@@ -17,15 +17,46 @@ can help the company maintain a steady cash flow.
 A :ref:`tax reduction <cash-discounts/tax-reductions>` can also be applied depending on the country
 or region.

+.. seealso::
+   - :doc:`payment_terms`
+   - :doc:`../payments`
+
 .. _cash-discounts/configuration:

 Configuration
 =============

-To grant cash discounts to customers, you must first set up the :ref:`type of tax reduction
-<cash-discounts/tax-reductions>`, verify the :ref:`gain and loss accounts
-<cash-discounts/gain-loss-accounts>`, and configure new :ref:`payment terms
-<cash-discounts/payment-terms>`.
+To grant cash discounts to customers, you must first verify the :ref:`gain and loss accounts
+<cash-discounts/gain-loss-accounts>`. Then, configure :ref:`payment terms
+<cash-discounts/payment-terms>` and add a cash discount by checking the :guilabel:`Early Discount`
+checkbox and filling in the discount percentage, discount days, and :ref:`tax
+reduction <cash-discounts/tax-reductions>` fields.
+
+.. _cash-discounts/gain-loss-accounts:
+
+Cash discount gain/loss accounts
+--------------------------------
+
+With a cash discount, the amount you earn depends on whether the customer benefits from the cash
+discount or not. This inevitably leads to gains and losses, which are recorded on default accounts.
+
+To modify these accounts, go to :menuselection:`Accounting --> Configuration --> Settings`, and, in
+the :guilabel:`Default Accounts` section, select the accounts you want to use for the
+:guilabel:`Cash Discount Gain account` and :guilabel:`Cash Discount Loss account`.
+
+.. _cash-discounts/payment-terms:
+
+Payment terms
+-------------
+
+Cash discounts are defined on :doc:`payment terms <payment_terms>`. Configure them to your liking by
+going to :menuselection:`Accounting --> Configuration --> Payment Terms`, and make sure to fill out
+the discount percentage, discount days, and :ref:`tax reduction <cash-discounts/tax-reductions>`
+fields.
+
+.. image:: cash_discounts/payment-terms.png
+   :alt: Configuration of payment terms named "2/7 Net 30". The field "Description on Invoices"
+         reads: "Payment terms: 30 Days, 2% Early Payment Discount under 7 days".

 .. _cash-discounts/tax-reductions:

@@ -33,24 +64,24 @@ Tax reductions
 --------------

 Depending on the country or region, the base amount used to compute the tax can vary, which can lead
-to a **tax reduction**.
+to a **tax reduction**. Since tax reductions are set on individual payment terms, each term can use
+a specific tax reduction.

-To configure how the tax reduction is applied, go to :menuselection:`Accounting --> Configuration
--> Settings`, and in the :guilabel:`Taxes` section, in the :guilabel:`Cash Discount Tax Reduction`
-feature, select one of the three following options:
+To configure how the tax reduction is applied, go to a payment term with the :guilabel:`Early
+Discount` checkbox enabled, and select one of the three following options:

-Always (upon invoice)
-  The tax is always reduced. The base amount used to compute the tax is the discounted amount,
-  whether the customer benefits from the discount or not.
+- Always (upon invoice)
+    The tax is always reduced. The base amount used to compute the tax is the discounted amount,
+    whether the customer benefits from the discount or not.

-On early payment
-  The tax is reduced only if the customer pays early. The base amount used to compute the tax is the
-  same as the sale: if the customer benefits from the reduction, then the tax is reduced. This means
-  that, depending on the customer, the tax amount can vary after the invoice is issued.
+- On early payment
+    The tax is reduced only if the customer pays early. The base amount used to compute the tax is the
+    same as the sale: if the customer benefits from the reduction, then the tax is reduced. This means
+    that, depending on the customer, the tax amount can vary after the invoice is issued.

-Never
-  The tax is never reduced. The base amount used to compute the tax is the full amount, whether the
-  customer benefits from the discount or not.
+- Never
+    The tax is never reduced. The base amount used to compute the tax is the full amount, whether the
+    customer benefits from the discount or not.

 .. example::

@@ -70,10 +101,10 @@ Never
              - Computation
            * - 8th of January
              - €118.58
-              - (€98 + (21% of €98))
+              - €98 + (21% of €98)
            * - 31st of January
              - €120.58
-              - (€100 + (21% of €98))
+              - €100 + (21% of €98)

      .. tab:: On early payment

@@ -85,10 +116,10 @@ Never
              - Computation
            * - 8th of January
              - €118.58
-              - (€98 + (21% of €98))
+              - €98 + (21% of €98)
            * - 31st of January
              - €121.00
-              - (€100 + (21% of €100))
+              - €100 + (21% of €100)

      .. tab:: Never

@@ -100,10 +131,10 @@ Never
              - Computation
            * - 8th of January
              - €119.00
-              - (€98 + (21% of €100))
+              - €98 + (21% of €100)
            * - 31st of January
              - €121.00
-              - (€100 + (21% of €100))
+              - €100 + (21% of €100)

 .. note::
   - :ref:`Tax grids <tax-returns/tax-grids>`, which are used for the tax report, are correctly
@@ -112,41 +143,12 @@ Never
   - The **type of cash discount tax reduction** may be correctly pre-configured, depending on your
     :ref:`fiscal localization package <fiscal_localizations/packages>`.

-.. _cash-discounts/gain-loss-accounts:
-
-Cash discount gain/loss accounts
--------------------------------
-
-With a cash discount, the amount you earn depends on whether the customer benefits from the cash
-discount or not. This inevitably leads to gains and losses, which are recorded on default accounts.
-
-To modify these accounts, go to :menuselection:`Accounting --> Configuration --> Settings`, and in
-the :guilabel:`Default Accounts` section, select the accounts you want to use for the
-:guilabel:`Cash Discount Gain account` and :guilabel:`Cash Discount Loss account`.
-
-.. _cash-discounts/payment-terms:
-
-Payment terms
-------------
-
-Cash discounts are defined on :doc:`payment terms <payment_terms>`. Configure them to your liking by
-going to :menuselection:`Accounting --> Configuration --> Payment Terms`, and make sure to fill out
-the fields :guilabel:`Discount %` and :guilabel:`Discount Days`.
-
-.. image:: cash_discounts/payment-terms.png
-   :align: center
-   :alt: Configuration of payment terms named "2/7 Net 30". The field "Description on Invoices"
-         reads: "Payment terms: 30 Days, 2% Early Payment Discount under 7 days".
-
-.. seealso::
-   :doc:`payment_terms`
-
 .. _cash-discounts/customer-invoice:

 Apply a cash discount to a customer invoice
 ===========================================

-Apply a cash discount to a customer invoice by selecting the :ref:`payment terms you created
+On a customer invoice, apply a cash discount by selecting the :ref:`payment terms you created
 <cash-discounts/payment-terms>`. Odoo automatically computes the correct amounts, tax amounts, due
 dates, and accounting records.

@@ -154,26 +156,23 @@ Under the :guilabel:`Journal Items` tab, you can display the discount details by
 "toggle" button and adding the :guilabel:`Discount Date` and :guilabel:`Discount Amount` columns.

 .. image:: cash_discounts/invoice-journal-entry.png
-   :align: center
   :alt: An invoice of €100.00 with "2/7 Net 30" selected as payment terms. The "Journal Items" tab
         is open, and the "Discount Date" and "Discount Amount" columns are displayed.

-The discount amount and due date are also displayed on the generated invoice sent to the customer.
+The discount amount and due date are also displayed on the generated invoice report sent to the
+customer if the :guilabel:`Show installment dates` option is checked on the payment terms.

 .. image:: cash_discounts/invoice-print.png
-   :align: center
-   :alt: An invoice of €100.00 with the following text added to the terms and conditions: "30 Days,
-         2% Early Payment Discount under 7 days. 118.58 € due if paid before 01/08/2023."
+   :alt: An invoice of €100.00 with the following text added to the terms and conditions: "30
+         Days, 2% Early Payment Discount under 7 days. 118.58 € due if paid before 01/08/2023."

 Payment reconciliation
 ----------------------

-When you record a payment or reconcile your bank statements, Odoo takes the customer payment's date
-into account to define if they can benefit from the cash discount or not.
+When you record a :doc:`payment <../payments>` or :doc:`reconcile your bank transactions
+<../bank/reconciliation>`, Odoo takes the customer payment's date into account to determine if the
+customer can benefit from the cash discount or not.

 .. note::
-   If your customer pays the discount amount *after* the discount date, you can always decide
-   whether to mark the invoice as fully paid with a write-off or as partially paid.
-
-.. seealso::
-   :doc:`../payments`
+   If your customer pays the discount amount *after* the discount date, you can always decide to
+   mark the invoice as fully paid with a write-off or as partially paid.
@@ -21,6 +21,8 @@ vendors because of modifications to confirmed customer invoices or vendor bills.
   :doc:`return </applications/sales/sales/products_prices/returns>` if a storable product is
   returned.

+.. _accounting/issue-credit-note:
+
 Issue a credit note
 ===================

@@ -30,7 +32,7 @@ way as an invoice form.

 However, most of the time, credit notes are generated directly from the related invoices. To do so,
 go to :menuselection:`Accounting --> Customers --> Invoices`, open the related **customer invoice**,
-and click on :guilabel:`Add Credit Note`.
+and click on :guilabel:`Credit Note`.

 You can choose between three options:

@@ -72,12 +74,15 @@ prefilled with the same details from the original invoice.

 This is the option to **modify** the content of a *validated* invoice.

+.. _accounting/issue-debit-note:
+
 Issue a debit note
 ==================

 You can create a debit note from scratch by going to :menuselection:`Accounting --> Customers -->
 Invoices` or by clicking on the related invoice you wish to issue a debit note for. On the invoice
-form view, click :guilabel:`Add debit note`, fill in the information, and click :guilabel:`Create`.
+form view, click :guilabel:`Cog icon (⚙) --> Debit Note`, fill in the information, and click
+:guilabel:`Create Debit Note`.

 Record a vendor refund
 ======================
@@ -86,7 +91,7 @@ Record a vendor refund

 You can either create a credit note from scratch by going to :menuselection:`Accounting --> Vendors
 --> Refund`, and by clicking on :guilabel:`Create`; or by opening the related **vendor bill**, and
-clicking on :guilabel:`Add Credit Note`.
+clicking on :guilabel:`Credit Note`.

 Record a debit note
 ===================
@@ -94,8 +99,8 @@ Record a debit note
 **Debit notes** from vendors are recorded in a similar way to how they are issued to customers:

 Go to :menuselection:`Accounting --> Vendors --> Bills`, open the related bill you wish to record a
-debit note for, and click :guilabel:`Add debit note`. Fill in the information, and click
-:guilabel:`Create debit note`.
+debit note for, and click :guilabel:`Cog icon (⚙) --> Debit Note`. Fill in the information, and click
+:guilabel:`Create Debit Note`.

 Journal entries
 ===============
@@ -2,194 +2,175 @@
 Deferred revenues
 =================

-**Deferred revenues**, or **unearned revenue**, are payments made in advance by customers for
-products yet to deliver or services yet to render.
+**Deferred revenues**, or **unearned revenues**, are invoices addressed to customers
+for goods yet to be delivered or services yet to be rendered.

-Such payments are a **liability** for the company that receives them since it still owes its
-customers these products or services. The company cannot report them on the current **Profit and
-Loss statement**, or *Income Statement*, since the payments will be effectively earned in the future.
+The company cannot report them on the current **profit and loss statement**, or *income statement*,
+since the goods and services will be effectively delivered/rendered in the future.

-These future revenues must be deferred on the company's balance sheet until the moment in time they
-can be **recognized**, at once or over a defined period, on the Profit and Loss statement.
+These future revenues must be deferred on the company's balance sheet among the current liabilities
+until they can be **recognized**, at once or over a defined period, on the profit and loss
+statement.

-For example, let's say we sell a five-year extended warranty for $ 350. We already receive the money
-now but haven't earned it yet. Therefore, we post this new income in a deferred revenue account and
-decide to recognize it on a yearly basis. Each year, for the next 5 years, $ 70 will be recognized
-as revenue.
+For example, let's say a business sells a software license of $1200 for 1 year. They immediately
+invoice it to the customer but can't consider it earned yet, as the future months of licensing have
+not yet been delivered. Therefore, they post this new revenue in a deferred revenue account and
+recognize it on a monthly basis. Each month, for the next 12 months, $100 will be recognized as
+revenue.

-Odoo Accounting handles deferred revenues by spreading them in multiple entries that are
-automatically created in *draft mode* and then posted periodically.
+Odoo Accounting handles deferred revenues by spreading them in multiple entries that are posted
+periodically.

 .. note::
   The server checks once a day if an entry must be posted. It might then take up to 24 hours before
-   you see a change from *draft* to *posted*.
+   you see a change from :guilabel:`Draft` to :guilabel:`Posted`.

-Prerequisites
+Configuration
 =============

-Such transactions must be posted on a **Deferred Revenue Account** rather than on the default income
-account.
+Make sure the default settings are correctly configured for your business. To do so, go to
+:menuselection:`Accounting --> Configuration --> Settings`. The following options are available:

-Configure a Deferred Revenue Account
------------------------------------
+Journal
+  The deferral entries are posted in this journal.
+Deferred Expense Account
+  Expenses are deferred on this Current Asset account until they are recognized.
+Deferred Revenue Account
+  Revenues are deferred on this Current Liability account until they are recognized.
+Generate Entries
+  By default, Odoo :ref:`automatically generates <customer_invoices/deferred/generate_on_validation>`
+  the deferral entries when you post a customer invoice. However, you can also choose to
+  :ref:`generate them manually <customer_invoices/deferred/generate_manually>` by selecting the
+  :guilabel:`Manually & Grouped` option instead.
+Amount Computation
+  Suppose an invoice of $1200 must be deferred over 12 months. The :guilabel:`Equal per month`
+  computation accounts for $100 each month, while the :guilabel:`Based on days` computation
+  accounts for different amounts depending on the number of days in each month.

-To configure your account in the **Chart of Accounts**, go to :menuselection:`Accounting -->
-Configuration --> Chart of Accounts`, click on *Create*, and fill out the form.
+.. _customer_invoices/deferred/generate_on_validation:

-.. image:: deferred_revenues/deferred_revenues01.png
-   :align: center
-   :alt: Configuration of a Deferred Revenue Account in Odoo Accounting
+Generate deferral entries on validation
+=======================================
+
+.. tip::
+   Make sure the :guilabel:`Start Date` and :guilabel:`End Date` fields are visible in the
+   :guilabel:`Invoice Lines` tab. In most cases, the :guilabel:`Start Date` should be in the same
+   month as the :guilabel:`Invoice Date`.
+
+For each line of the invoice that should be deferred, specify the start and end dates of the
+deferral period.
+
+If the :guilabel:`Generate Entries` field in the **Settings** is set to :guilabel:`On invoice/bill
+validation`, Odoo automatically generates the deferral entries when the invoice is validated. Click
+the :guilabel:`Deferred Entries` smart button to see them.
+
+One entry, dated on the same day as the invoice, moves the invoice amounts from the income account
+to the deferred account. The other entries are deferral entries which, month after month, move
+the invoice amounts from the deferred account to the income account to recognize the revenue.
+
+.. example::
+   You can defer a January invoice of $1200 over 12 months by specifying a start date of 01/01/2023
+   and an end date of 12/31/2023. At the end of August, $800 is recognized as an income,
+   whereas $400 remains on the deferred account.
+
+Reporting
+=========
+
+The deferred revenue report computes an overview of the necessary deferral entries for each account.
+To access it, go to :menuselection:`Accounting --> Reporting --> Deferred Revenue`.
+
+To view the journal items of each account, click on the account name and then :guilabel:`Journal
+Items`.
+
+.. image:: deferred_revenues/deferred_revenue_report.png
+   :alt: Deferred revenue report

 .. note::
-   This account's type must be either *Current Liabilities* or *Non-current Liabilities*
+    Only invoices whose accounting date is before the end of the period of the report
+    are taken into account.

-Post an income to the right account
-----------------------------------
+.. _customer_invoices/deferred/generate_manually:

-Select the account on a draft invoice
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Generate grouped deferral entries manually
+==========================================

-On a draft invoice, select the right account for all the products of which the incomes must be
-deferred.
+If you have a lot of deferred revenues and wish to reduce the number of journal entries created, you
+can generate deferral entries manually. To do so, set the :guilabel:`Generate Entries` field in the
+**Settings** to :guilabel:`Manually & Grouped`. Odoo then aggregates the deferred amounts in a
+single entry.

-.. image:: deferred_revenues/deferred_revenues02.png
-   :align: center
-   :alt: Selection of a Deferred Revenue Account on a draft invoice in Odoo Accounting
+At the end of each month, go to :menuselection:`Accounting --> Reporting --> Deferred Revenue` and
+click the :guilabel:`Generate Entries` button. This generates two deferral entries:

-Choose a different Income Account for specific products
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- One dated at the end of the month which aggregates, for each account, all the deferred amounts
+  of that month. This means that a part of the deferred revenue is recognized at the end of that
+  period.
+- The reversal of this created entry, dated on the following day (i.e., the first day of the
+  next month) to cancel the previous entry.

-Start editing the product, go to the *Accounting* tab, select the right **Income Account**, and
-save.
+.. example::
+   There are two invoices:

-.. image:: deferred_revenues/deferred_revenues03.png
-   :align: center
-   :alt: Change of the Income Account for a product in Odoo
+   - Invoice A: $1200 to be deferred from 01/01/2023 to 12/31/2023
+   - Invoice B: $600 to be deferred from 01/01/2023 to 12/31/2023

-.. tip::
-   It is possible to automate the creation of revenue entries for these products (see:
-   `Automate the Deferred Revenues`_).
+   In January
+      At the end of January, after clicking the :guilabel:`Generate Entries` button, there are the
+      following entries:

-Change the account of a posted journal item
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+      - Entry 1 dated on the 31st January:

-To do so, open your Sales Journal by going to
-:menuselection:`Accounting --> Accounting --> Sales`, select the journal item you
-want to modify, click on the account, and select the right one.
+        - Line 1: Expense account -1200 -600 = **-1800** (cancelling the total of both invoices)
+        - Line 2: Expense account 100 + 50 = **150** (recognizing 1/12 of invoice A and invoice B)
+        - Line 3: Deferred account 1800 - 150 = **1650** (amount that has yet to be deferred later
+          on)

-.. image:: deferred_revenues/deferred_revenues04.png
-   :align: center
-   :alt: Modification of a posted journal item's account in Odoo Accounting
+      - Entry 2 dated on the 1st February, the reversal of the previous entry:

-Deferred Revenues entries
-=========================
+        - Line 1: Expense account **1800**
+        - Line 2: Deferred account **-150**
+        - Line 3: Expense account **-1650**

-Create a new entry
------------------
+   In February
+      At the end of February, after clicking the :guilabel:`Generate Entries` button, there are the
+      following entries:

-A **Deferred Revenues entry** automatically generates all journal entries in *draft mode*. They are
-then posted one by one at the right time until the full amount of the income is recognized.
+      - Entry 1 dated on the 28th February:

-To create a new entry, go to :menuselection:`Accounting --> Accounting --> Deferred Revenues`, click
-on *Create*, and fill out the form.
+        - Line 1: Expense account -1200 -600 = **-1800** (cancelling the total of both invoices)
+        - Line 2: Expense account 200 + 100 = **300** (recognizing 2/12 of invoice A and invoice B)
+        - Line 3: Deferred account 1800 - 300 = **1500** (amount that has yet to be deferred later
+          on)

-Click on **select related purchases** to link an existing journal item to this new entry. Some
-fields are then automatically filled out, and the journal item is now listed under the **Related
-Sales** tab.
+      - Entry 2 dated on the 1st March, the reversal of the previous entry.

-.. image:: deferred_revenues/deferred_revenues05.png
-   :align: center
-   :alt: Deferred Revenue entry in Odoo Accounting
+   From March to October
+      The same computation is done for each month until October.

-Once done, you can click on *Compute Revenue* (next to the *Confirm* button) to generate all the
-values of the **Revenue Board**. This board shows you all the entries that Odoo will post to
-recognize your revenue, and at which date.
+   In November
+      At the end of November, after clicking the :guilabel:`Generate Entries` button, there are the
+      following entries:

-.. image:: deferred_revenues/deferred_revenues06.png
-   :align: center
-   :alt: Revenue Board in Odoo Accounting
+      - Entry 1 dated on the 30th November:

-What does "Prorata Temporis" mean?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        - Line 1: Expense account -1200 -600 = **-1800** (cancelling the total of both invoices)
+        - Line 2: Expense account 1100 + 550 = **1650** (recognizing 11/12 of invoice A and invoice
+          B)
+        - Line 3: Deferred account 1800 - 1650 = **150** (amount that has yet to be deferred later
+          on)

-The **Prorata Temporis** feature is useful to recognize your revenue the most accurately possible.
+      - Entry 2 dated on the 1st December, the reversal of the previous entry.

-With this feature, the first entry on the Revenue Board is computed based on the time left between
-the *Prorata Date* and the *First Recognition Date* rather than the default amount of time between
-recognitions.
+   In December
+      There is no need to generate entries in December. Indeed, if we do the computation for
+      December, we have an amount of 0 to be deferred.

-For example, the Revenue Board above has its first revenue with an amount of $ 4.22 rather than
-$ 70.00. Consequently, the last entry is also lower and has an amount of $ 65.78.
+   In total
+      If we aggregate everything, we would have:

-Deferred Entry from the Sales Journal
-------------------------------------
+      - invoice A and invoice B
+      - two entries (one for the deferral and one for the reversal) for each month from January to
+        November

-You can create a deferred entry from a specific journal item in your **Sales Journal**.
-
-To do so, open your Sales Journal by going to
-:menuselection:`Accounting --> Accounting --> Sales`, and select the journal item you want to defer.
-Make sure that it is posted in the right account (see:
-`Change the account of a posted journal item`_).
-
-Then, click on *Action*, select **Create Deferred Entry**, and fill out the form the same way you
-would do to `create a new entry`_.
-
-.. image:: deferred_revenues/deferred_revenues07.png
-   :align: center
-   :alt: Create Deferred Entry from a journal item in Odoo Accounting
-
-Deferred Revenue Models
-=======================
-
-You can create **Deferred Revenue Models** to create your Deferred Revenue entries faster.
-
-To create a model, go to :menuselection:`Accounting --> Configuration --> Deferred Revenue Models`,
-click on *Create*, and fill out the form the same way you would do to create a new entry.
-
-.. tip::
-   You can also convert a *confirmed Deferred Revenue entry* into a model by
-   opening it from :menuselection:`Accounting --> Accounting --> Deferred
-   Revenues` and then, by clicking on the button *Save Model*.
-
-Apply a Deferred Revenue Model to a new entry
---------------------------------------------
-
-When you create a new Deferred Revenue entry,  fill out the **Deferred Revenue Account** with the
-right recognition account.
-
-New buttons with all the models linked to that account appear at the top of the form. Clicking on a
-model button fills out the form according to that model.
-
-.. image:: deferred_revenues/deferred_revenues08.png
-   :align: center
-   :alt: Deferred Revenue model button in Odoo Accounting
-
-.. _deferred-revenues-automation:
-
-Automate the Deferred Revenues
-==============================
-
-When you create or edit an account of which the type is either *Current Liabilities* or *Non-current
-Liabilities*, you can configure it to defer the revenues that are credited on it automatically.
-
-You have three choices for the **Automate Deferred Revenue** field:
-
-#. **No:** this is the default value. Nothing happens.
-#. **Create in draft:** whenever a transaction is posted on the account, a draft *Deferred Revenues
-   entry* is created, but not validated. You must first fill out the form in
-   :menuselection:`Accounting --> Accounting --> Deferred Revenues`.
-#. **Create and validate:** you must also select a Deferred Revenue Model (see:
-   `Deferred Revenue Models`_). Whenever a transaction is posted on the account, a *Deferred
-   Revenues entry* is created and immediately validated.
-
-.. image:: deferred_revenues/deferred_revenues09.png
-   :align: center
-   :alt: Automate Deferred Revenue on an account in Odoo Accounting
-
-.. tip::
-   You can, for example, select this account as the default **Income Account** of a product to fully
-   automate its sale. (see: `Choose a different Income Account for specific products`_).
-
-.. seealso::
-   * :doc:`../get_started/chart_of_accounts`
-   * `Odoo Academy: Deferred Revenues (Recognition) <https://www.odoo.com/r/EWO>`_
+      Therefore, at the end of December, invoices A and B are fully recognized as income
+      only once in spite of all the created entries thanks to the reversal mechanism.
@@ -20,64 +20,258 @@ Odoo supports, among others, the following formats.

   * - Format Name
     - Applicability
-   * - Factur-X (PDF/A-3)
-     - For French and German companies
-   * - Peppol BIS Billing 3.0 (UBL)
-     - For companies whose countries are part of the `EAS list
-       <https://docs.peppol.eu/poacc/billing/3.0/codelist/eas/>`_
-   * - E-FFF
-     - For Belgian companies
+   * - Factur-X (CII)
+     - All customers
+   * - Peppol BIS Billing 3.0
+     - All customers
   * - XRechnung (UBL)
-     - For German companies
+     - All customers
   * - Fattura PA (IT)
-     - For Italian companies
+     - Italian companies
   * - CFDI (4.0)
-     - For Mexican companies
+     - Mexican companies
   * - Peru UBL 2.1
-     - For Peruvian companies
+     - Peruvian companies
   * - SII IVA Llevanza de libros registro (ES)
-     - For Spanish companies
+     - Spanish companies
   * - UBL 2.1 (Columbia)
-     - For Colombian companies
+     - Colombian companies
   * - Egyptian Tax Authority
-     - For Egyptian companies
+     - Egyptian companies
   * - E-Invoice (IN)
-     - For Indian companies
+     - Indian companies
   * - NLCIUS (Netherlands)
-     - For Dutch companies
+     - Dutch companies
   * - EHF 3.0
-     - For Norwegian companies
+     - Norwegian companies
   * - SG BIS Billing 3.0
-     - For Singaporean companies
+     - Singaporean companies
   * - A-NZ BIS Billing 3.0
-     - For Australian/New Zealand companies
+     - All customers
+
+.. note::
+   - The **Factur-X (CII)** format enables validation checks on the invoice and generates PDF/A-3
+     compliant files.
+   - Every PDF generated by Odoo includes an integrated **Factur-X** XML file.

 .. seealso::
-   :ref:`fiscal_localizations/packages`
+   :doc:`../../fiscal_localizations`

 .. _e-invoicing/configuration:

 Configuration
 =============

-Go to :menuselection:`Accounting --> Configuration --> Journals --> Customer Invoices --> Advanced
-Settings --> Electronic Invoicing` and enable the formats you need for this journal.
+By default, the format available in the :ref:`send window <e-invoicing/generation>` depends on your
+customer's country.

-.. image:: electronic_invoicing/formats.png
-   :align: center
-   :alt: Select the EDI format you need
+You can define a specific e-invoicing format for each customer. To do so, go to
+:menuselection:`Accounting --> Customers --> Customers`, open the customer form, go to the
+:guilabel:`Accounting` tab and select the appropriate format.

-Once an electronic invoicing format is enabled, XML documents are generated when clicking on
-:guilabel:`Confirm` in documents such as invoices, credit notes, etc. These documents are either
-visible in the attachment section, or embedded in the PDF.
+.. image:: electronic_invoicing/customer-form.png
+   :alt: Select an EDI format for a specific customer
+
+National electronic invoicing
+-----------------------------
+
+Depending on your company's country (e.g., :doc:`Italy <../../fiscal_localizations/italy>`,
+:doc:`Spain <../../fiscal_localizations/spain>`, :doc:`Mexico
+<../../fiscal_localizations/mexico>`, etc.), you may be required to issue e-invoicing documents in
+a specific format for all your invoices. In this case, you can define a default e-invoicing format
+for your sales journal.
+
+To do so, go to :menuselection:`Accounting --> Configuration --> Journals`, open your sales journal,
+go to the :guilabel:`Advanced Settings` tab, and enable the formats you need for this journal.
+
+.. _e-invoicing/generation:
+
+E-invoices generation
+=====================
+
+From a confirmed invoice, click :guilabel:`Send & Print` to open the send window. Check the
+e-invoicing option to generate and attach the e-invoice file.
+
+.. image:: electronic_invoicing/send-window.png
+   :alt: The Peppol option is checked and an e-invoicing XML file is attached to the email.
+
+Peppol
+======
+
+The `Peppol <https://peppol.org/about/>`_ network ensures the exchange of documents and information
+between enterprises and governmental authorities. It is primarily used for electronic invoicing, and
+its access points (connectors to the Peppol network) allow enterprises to exchange electronic
+documents.
+
+Odoo is an **access point** and an :abbr:`SMP (Service Metadata Publisher)`, enabling electronic
+invoicing transactions without the need to send invoices and bills by email or post.
+
+If not done yet, :ref:`install <general/install>` the :guilabel:`Peppol` module (`account_peppol`).
+
+.. important::
+   - Peppol registration is **free** and available in Odoo Community
+   - You can send **Customer Invoices** and **Credit Notes** and receive **Vendor Bills** and
+     **Refunds** via Peppol.
+   - You can send in one of the following supported document formats: **BIS Billing 3.0, XRechnung
+     CIUS, NLCIUS**.
+   - | The following **countries** are eligible for **Peppol registration in Odoo**:
+     | Andorra, Albania, Austria, Bosnia and Herzegovina, Belgium, Bulgaria, Switzerland, Cyprus,
+       Czech Republic, Germany, Denmark, Estonia, Spain, Finland, France, United Kingdom, Greece,
+       Croatia, Hungary, Ireland, Iceland, Italy, Liechtenstein, Lithuania, Luxembourg, Latvia,
+       Monaco, Montenegro, North Macedonia, Malta, Netherlands, Norway, Poland, Portugal, Romania,
+       Serbia, Sweden, Slovenia, Slovakia, San Marino, Turkey, Holy See (Vatican City State)
+
+Registration
+------------
+
+Go to :menuselection:`Accounting --> Configuration --> Settings`. If you do not have the
+Peppol module installed, first tick the :guilabel:`Enable PEPPOL` checkbox and then **manually
+save**.
+
+.. image:: electronic_invoicing/peppol-install.png
+   :alt: Peppol module installation
+
+Fill in the following information:
+
+- :guilabel:`Peppol EAS`. This is the Peppol Electronic Address Scheme and usually depends on your
+  company's country. Odoo often prefills this with the most commonly used EAS code in your country.
+  For example, the preferred EAS code for most companies in Belgium is 0208.
+- :guilabel:`Peppol Endpoint`. This is usually a Company Registry number or a VAT number.
+- :guilabel:`Phone Number`, including the country code (e.g., `+32` in Belgium)
+- :guilabel:`Primary contact email`
+
+.. seealso::
+   - `Peppol EAS - European Commision <https://ec.europa.eu/digital-building-blocks/wikis/display/DIGITAL/Code+lists/>`_
+   - `Peppol Endpoint - OpenPeppol eDEC Code Lists <https://docs.peppol.eu/edelivery/codelists/>`_
+     (open the "Participant Identifier Schemes" as HTML page)
+
+If you are migrating from another access point, insert the :guilabel:`Migration key` from the
+previous provider.
+
+.. image:: electronic_invoicing/peppol-settings.png
+   :alt: Configuration for peppol
+
+Finally, click :guilabel:`Validate registration`. If you want to explore or demo Peppol, you can
+choose to register in :guilabel:`Demo` mode. Otherwise, select :guilabel:`Live`.
+
+   .. image:: electronic_invoicing/peppol-demo-mode.png
+      :alt: Peppol demo mode selection

 .. note::
-   - For E-FFF, the xml file only appears after having generated the PDF (:guilabel:`Print` or
-     :guilabel:`Send & Print` button), since the PDF needs to be embedded inside the xml.
-   - Every PDF generated from Odoo contains a :guilabel:`Factur-X` XML file (for interoperability purpose).
-     For German and French companies, the option :guilabel:`Factur-X (PDF/A-3)` in addition enables
-     validation checks on the invoice and generates a PDF/A-3 compliant file, required by plaftorms like Chorus Pro.
-   - The formats available depend on the country registered in your company's :guilabel:`General
-     Information`.
-   - Odoo supports the **Peppol BIS Billing 3.0** format that can be used via existing access
-     points.
+   When testing Peppol, the system parameter `account_peppol.edi.mode` can be changed to `test`.
+   Then, a radio button appears with the option to register on the test server.
+
+   .. image:: electronic_invoicing/peppol-system-parameter.png
+      :alt: Peppol test mode parameter
+
+   .. image:: electronic_invoicing/peppol-test-mode-settings.png
+      :alt: Peppol test mode selection
+
+Now, you can request a verification code to be sent to you by clicking :guilabel:`Verify phone
+number`.
+
+.. image:: electronic_invoicing/peppol-registration-verify.png
+   :alt: phone validation request verification
+
+A text message containing a code is sent to the phone number provided to finalize the verification
+process.
+
+.. image:: electronic_invoicing/phone-registration.png
+   :alt: phone validation
+
+Once you enter the code and click :guilabel:`Confirm`, you can see that your registration is pending
+activation. From this point onwards, the default journal for receiving Vendor Bills can be set.
+
+.. image:: electronic_invoicing/peppol-registration-pending.png
+   :alt: pending application
+
+It should be automatically activated within a day.
+
+.. tip::
+   It is also possible to manually trigger the cron that checks the registration status by going to
+   :menuselection:`Settings --> Technical --> Scheduled Actions --> PEPPOL\: update participant
+   status`.
+
+Your application status should be updated soon after you are registered on the Peppol network.
+
+.. image:: electronic_invoicing/peppol-registration-active.png
+   :alt: active application
+
+All invoices and vendor bills can now be sent directly using the Peppol network.
+
+Contact verification
+--------------------
+
+Before sending an invoice to a contact using the Peppol network, it is necessary to verify that they
+are also registered as a Peppol participant.
+
+To do so, go to :menuselection:`Accounting --> Customers --> Customers` and open the customer's
+form. Then go to :menuselection:`Accounting tab --> Electronic Invoicing`, select the correct
+format, and make sure their :guilabel:`Peppol EAS code` and the :guilabel:`Endpoint` are filled in.
+Then, click :guilabel:`Verify`. If the contact exists on the network, their Peppol endpoint validity
+is set to Valid.
+
+.. image:: electronic_invoicing/peppol-contact-verify.png
+   :alt: verify contact registration
+
+.. important::
+   While Odoo prefills both the EAS code and the Endpoint number based on the information available
+   for a contact, it is better to confirm these details directly with the contact.
+
+It is possible to verify the Peppol participant status of several customers at once.
+To do so, go to :menuselection:`Accounting --> Customers --> Customers` and switch to the list view.
+Select the customers you want to verify and then click :menuselection:`Actions --> Verify Peppol`.
+
+Send invoices
+-------------
+
+Once ready to send an invoice via the Peppol network, simply click :guilabel:`Send & Print` on the
+invoice form. To queue multiple invoices, select them in the list view and click
+:menuselection:`Actions --> Send & Print`; they will be sent in a batch later on. Both
+:guilabel:`BIS Billing 3.0` and :guilabel:`Send via PEPPOL` checkboxes need to be ticked.
+
+.. image:: electronic_invoicing/peppol-send-print.png
+   :alt: Send peppol invoice
+
+Posted invoices that can be sent via Peppol are marked as :guilabel:`Peppol Ready`.
+To display them, use the :guilabel:`Peppol Ready` filter or access the Accounting dashboard and
+click :guilabel:`Peppol ready invoices` on the corresponding sales journal.
+
+.. image:: electronic_invoicing/peppol-ready-invoices.png
+   :alt: Filter Peppol ready invoices
+
+Once the invoices are sent via Peppol, the status is changed to :guilabel:`Processing`. The
+status is changed to `Done` after they have been successfully delivered to the contact's Access
+Point.
+
+.. image:: electronic_invoicing/peppol-message-processing.png
+   :alt: Peppol message status
+
+.. tip::
+   By default, the Peppol status column is hidden on the Invoices list view. You can choose to have
+   it displayed by selecting it from the optional columns, accessible from the top right corner of
+   the Invoices list view.
+
+A cron runs regularly to check the status of these invoices. It is possible to check the status
+before the cron runs by clicking :guilabel:`Fetch Peppol invoice status` in the corresponding
+sales journal on the Accounting dashboard.
+
+.. image:: electronic_invoicing/peppol-fetch-message-status.png
+   :alt: Fetch invoice Peppol status
+
+Receive vendor bills
+--------------------
+
+Once a day, a cron checks whether any new documents have been sent to you via the Peppol network.
+These documents are imported, and the corresponding vendor bills are created automatically as
+drafts.
+
+.. image:: electronic_invoicing/peppol-receive-bills.png
+   :alt: peppol receive bills
+
+If you want to retrieve incoming Peppol documents before the cron runs, you can do so from the
+Accounting dashboard on the main Peppol purchase journal that you set up in the settings. Just click
+:guilabel:`Fetch from Peppol`.
+
+.. image:: electronic_invoicing/peppol-fetch-bills.png
+   :alt: Fetch bills from Peppol
@@ -25,7 +25,9 @@ transportation, insurance, customs clearance, and other relevant aspects of the
   - **DDP**: Delivered duty paid

 .. seealso::
-   :doc:`../reporting/intrastat`
+   - :doc:`../reporting/intrastat`
+   - :doc:`../customer_invoices`
+   - :doc:`../vendor_bills`

 .. _incoterms/invoices:

@@ -35,6 +37,16 @@ Define an Incoterm
 To define an Incoterm manually, create an invoice or bill, click the :guilabel:`Other Info` tab, and
 select the :guilabel:`Incoterm`.

+Incoterm location
+-----------------
+
+A location relevant to the chosen Incoterm can be added to the invoice or bill under
+:guilabel:`Other Info` in the :guilabel:`Incoterm Location` field.
+
+.. example::
+   If the chosen Incoterm code is `CIF` (Cost, Insurance, Freight), the associated location might be
+   the destination port where the goods will be delivered.
+
 .. _incoterms/default:

 Default Incoterm configuration
@@ -49,43 +49,41 @@ To create new payment terms, follow these steps:

 #. Go to :menuselection:`Accounting --> Configuration --> Payment Terms` and click on
   :guilabel:`New`.
-#. Enter a name in the :guilabel:`Payment Terms` field. This field is the name displayed in the
-   database and is not customer-facing.
-#. Enter the text to be displayed on the document (sales order, invoice, etc.) in the
-   :guilabel:`Description on the Invoice` field.
-#. Tick the :guilabel:`Display terms on invoice` checkbox to display a breakdown of each payment and
-   its due date on the invoice report, if desired.
-#. In the :guilabel:`Terms` section, add a set of rules (terms) to define what needs to be paid and
-   by which due date(s). Defining terms automatically calculates the payments' due date(s). This is
-   particularly helpful for managing **installment plans** (:dfn:`payment terms with multiple
+#. Enter a name in the :guilabel:`Payment Terms` field. This field is the name displayed both
+   internally and on sales orders.
+#. Tick the :guilabel:`Early Discount` checkbox and fill out the discount percentage, discount days,
+   and :ref:`tax reduction <cash-discounts/tax-reductions>` fields to add a :doc:`cash discount
+   <cash_discounts>`, if desired.
+#. In the :guilabel:`Due Terms` section, add a set of rules (terms) to define what needs to be paid
+   and by which due date(s). Defining terms automatically calculates the payments' due date(s). This
+   is particularly helpful for managing **installment plans** (:dfn:`payment terms with multiple
   terms`).

-   To add a term, click on :guilabel:`Add a line`, define its :guilabel:`Due Type` and
-   :guilabel:`Value`, and fill out the appropriate fields to define when the term is due, including
-   any :doc:`discounts <cash_discounts>`. Due dates are calculated by taking the invoice/bill date,
-   first adding the :guilabel:`Months`, and then adding the :guilabel:`Days`. If the :guilabel:`End
-   of month` toggle is enabled, the due date will then be the end of that month, plus any
-   :guilabel:`Days after End of month`.
+   To add a term, click on :guilabel:`Add a line`, define the discount's value and type in the
+   :guilabel:`Due` fields, then fill out the :guilabel:`After` fields to determine the due date.
+#. Enter the text to be displayed on the document (sales order, invoice, etc.) in the gray textbox
+   in the :guilabel:`Preview` column.
+#. Tick the :guilabel:`Show installment dates` checkbox to display a breakdown of each payment and
+   its due date on the invoice report, if desired.

 .. tip::
   To instead specify a number of days *before the end of the month*, use a negative value in the
-   :guilabel:`Days after End of month` field.
+   :guilabel:`After` field.

-To test that your payment terms are configured correctly, enter an invoice amount and invoice date
-in the :guilabel:`Example` section to generate the payments that would be due and their due dates
+To test that your payment terms are configured correctly, enter an invoice date on the
+:guilabel:`Example` line to generate the payments that would be due and their due dates
 using these payment terms.

 .. important::
-   - Terms are computed in the order of their due dates.
-   - The **balance** should always be used for the last line.
+   Terms are computed in the order of their due dates.

 .. example::
-   In the following example, 30% is due on the day of issuance, and the balance is due at the end of
-   the following month.
+   In the following example, 30% is due on the day of issuance, and the remaining 70% is due at the
+   end of the following month.

   .. image:: payment_terms/configuration.png
-      :alt: Example of Payment Terms. The last line is the balance due on the 31st of the following
-            month.
+      :alt: Example of Payment Terms. The first line is the 30% due immediately. The second line is
+            the remaining 70% due at the end of the following month.

 Using payment terms
 ===================
@@ -126,7 +124,7 @@ due date into account, rather than just the balance due date. It also helps to g
            distinct due dates

   In this example, an invoice of $1000 has been issued with the following payment terms: *30% is
-   due on the day of issuance, and the balance is due at the end of the following month.*
+   due on the day of issuance, and the remaining 70% is due at the end of the following month.*

   +----------------------+-------------+---------+---------+
   | Account              | Due date    | Debit   | Credit  |
@@ -4,11 +4,13 @@ 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`.
+:menuselection:`Accounting --> Configuration --> Chart of Accounts`.

 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:`(⋮)`.
+
+.. image:: chart_of_accounts/drop-down.png
+   :alt: Drop-down toggle button

 .. image:: chart_of_accounts/chart-of-accounts-sort.png
   :alt: Group the accounts by type in Odoo Accounting
@@ -21,7 +23,7 @@ determines which :doc:`fiscal localization package <../../fiscal_localizations>`
 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`,
+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`).

@@ -90,13 +92,12 @@ corresponding type from the following list:
 |Other          | Other        | Off-Balance Sheet       |
 +---------------+--------------+-------------------------+

-Assets, deferred expenses, and deferred revenues automation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Assets
+~~~~~~

-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** can **automate** the creation of :ref:`asset <assets-automation>` entries.
+To **automate** entries, click :guilabel:`View` on an account line and go to the
+:guilabel:`Automation` tab.

 You have three choices for the :guilabel:`Automation` tab:

@@ -109,14 +110,14 @@ You have three choices for the :guilabel:`Automation` tab:
 Default taxes
 -------------

-In the :guilabel:`Setup` menu of an account, select a **default tax** to be applied when this
+In the :guilabel:`View` menu of an account, select a **default tax** to 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`
+:guilabel:`View`, click the :guilabel:`Tags` field and select an existing tag or :guilabel:`Create`
 a new one.

 Account groups
@@ -126,7 +127,7 @@ Account groups
 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`.
+:guilabel:`View`.

 Create account groups manually
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -136,7 +137,7 @@ Create account groups manually
   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
+:menuselection:`Accounting --> 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.

@@ -144,8 +145,8 @@ that you must enter the same code prefix in both :guilabel:`From` and :guilabel:
   :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`.
+:menuselection:`Accounting --> Reporting --> Trial Balance`, then open the :guilabel:`Options` menu
+and select :guilabel:`Hierarchy and Subtotals`.

 .. image:: chart_of_accounts/chart-of-accounts-groups.png
   :alt: Account Groups in the Trial Balance in Odoo Accounting
@@ -110,14 +110,14 @@ click the drop-down menu button (:guilabel:`⋮`), and select :guilabel:`Payment
 Batch payments matching
 -----------------------

-You can use the batch reconciliation feature to reconcile several outstanding payments or invoices
-simultaneously for a specific customer or vendor. Go to :menuselection:`Accounting --> Reporting -->
-Aged Receivable / Aged Payable`. You can see all transactions that have not been reconciled yet for
-that partner, and when you select a customer or vendor, the :guilabel:`Reconcile` option is
-displayed.
+You can use the **batch reconciliation feature** to reconcile several outstanding payments or
+invoices simultaneously for a specific customer or vendor. Go to your **Accounting Dashboard** and
+open your **bank journal**. In the **bank reconciliation** view, select a **transaction**, and click
+the :guilabel:`Batch Payments` tab. From here, you can reconcile your
+:doc:`batch payments <payments/batch>` with your outstanding payments or invoices.

 .. image:: payments/reconcile-option.png
-   :alt: See the reconcile option.
+   :alt: The batch payment reconcile option.

 Registering a partial payment
 =============================
@@ -151,3 +151,4 @@ have the transaction finalized and the invoice or bill marked as :guilabel:`Paid
   payments/pay_sepa
   payments/pay_checks
   payments/forecast
+   payments/trusted_accounts
@@ -25,7 +25,6 @@ window, select the :guilabel:`Journal` linked to your bank account and :guilabel
 the :guilabel:`Payment Method`, and click :guilabel:`Create Payment`.

 .. image:: batch/batch-payments.png
-   :align: center
   :alt: Registering a customer payment as part of a batch deposit

 Add payments to a batch deposit
@@ -36,14 +35,12 @@ Payments`, and click :guilabel:`New`. Next, select the :guilabel:`Bank` and choo
 Deposit` as the :guilabel:`Payment Method`.

 .. image:: batch/batch-customer-payment.png
-   :align: center
   :alt: Filling out a new inbound batch payment form

 Click :guilabel:`Add a line`. In the pop-up window, tick all payments to include in the batch
 deposit, then click :guilabel:`Select`.

 .. image:: batch/batch-lines-selection.png
-   :align: center
   :alt: Selecting all payments to include in the batch deposit

 Once done, click :guilabel:`Validate` to finalize the batch deposit.
@@ -60,7 +57,6 @@ Items` on the related bank account. Go to the :guilabel:`Batch Payments` tab to
 batch and click :guilabel:`Validate` to finalize the process.

 .. image:: batch/batch-reconciliation.png
-   :align: center
   :alt: Reconciling the batch payment with all its transactions

 .. note::
@@ -50,17 +50,16 @@ SEPA Direct Debit as a payment method
 -------------------------------------

 SDD can be used as a payment method both on your **eCommerce** or on the **Customer Portal** by
-activating SDD as a **Payment Provider**. With this method, your customers can create and sign their
-mandates themselves.
+activating SDD as a **Payment Provider**. With this method, your customers can create their mandates.
+To ensure the validity of the information given by the customer, they will have to confirm each
+mandate with one successful bank transfer of the expected amount.

-To do so, go to :menuselection:`Accounting --> Configuration --> Payment Providers`, click on *SEPA
-Direct Debit*, and set it up according to your needs.
-To do so, go to :menuselection:`Accounting app --> Configuration --> Payment Acquirers`, click on
+To do so, go to :menuselection:`Accounting app --> Configuration --> Payment Providers`, click on
 :guilabel:`SEPA Direct Debit`.

 .. important::
-   Make sure to change the :guilabel:`State` field to :guilabel:`Enabled`, and to check
-   :guilabel:`Online Signature`, as this is necessary to let your customers sign their mandates.
+   Make sure to change the :guilabel:`State` field to :guilabel:`Enabled` and set the provider as
+   "Published" so that it is available for your customers.

 Customers using SDD as payment method get prompted to add their IBAN, email address, and to sign
 their SEPA Direct Debit mandate.
@@ -33,7 +33,7 @@ and statement to move the amount from the **Outstanding Receipt** account to the
   You can create a new payment method named *Checks* if you would like to identify such payments
   quickly. To do so, go to :menuselection:`Accounting --> Configuration --> Journals --> Bank`,
   click the :guilabel:`Incoming Payments` tab, and :guilabel:`Add a line`. As :guilabel:`Payment
-   Method`, select :guilabel:`Manual`, enter `Checks` as name, and :guilabel:`Save`.
+   Method`, select :guilabel:`Manual`, and enter `Checks` as name.

 .. _checks/reconciliation-bypass:

@@ -2,146 +2,72 @@
 Internal transfers
 ==================

-In Odoo, internal money transfers can be made in a few clicks. You need at least either two bank
-accounts, two cash journals, or one bank account and one cash journal.
+Internal money transfers can be handled in Odoo. At least two bank accounts are needed to make
+internal transfers.
+
+.. seealso::
+   :doc:`How to add an additional bank account <../bank>`

 Configuration
 =============

 An internal transfer account is automatically created on your database based on your company's
-localization and depending on your country’s legislation. If needed, the default :guilabel:`Internal
-transfer account` can be modified by going to :menuselection:`Accounting app --> Configuration -->
-Settings` and then under the :guilabel:`Default Accounts` section.
-
-.. note::
-   At least two bank accounts are needed to make internal transfers. Refer to
-   :doc:`Bank and cash accounts section <../bank>` to see how to add an additional bank
-   account to your database.
+localization and depending on your country’s legislation. To modify the default :guilabel:`Internal
+transfer account`, go to :menuselection:`Accounting --> Configuration --> Settings` and scroll down
+to the :guilabel:`Default Accounts` section.

 Register an internal transfer from one bank to another
 ======================================================

-Let's say you have two bank accounts registered on your database and you want to transfer 1,000 USD
-from Bank A to Bank B.
+If you want to transfer money from one bank to another, access the Accounting Dashboard, click the
+drop-down selection button (:guilabel:`⋮`) on the bank from which you want to make the transfer,
+then click :guilabel:`Payments`. Select or create a payment, tick the :guilabel:`Internal Transfer`
+checkbox, and select a :guilabel:`Destination Journal` before you :guilabel:`Confirm` the internal
+transfer.

-Log an internal transfer
------------------------
+The money is now booked in the transfer account and another payment is automatically created in the
+destination journal.

-From the Accounting Dashboard, click on the drop-down selection button (:guilabel:`⋮`) on one of
-your banks. In the :guilabel:`New` column click on :guilabel:`Internal Transfer` and enter the
-information related to the transfer.
+.. example::

-.. image:: internal_transfers/internal_transfer.png
-   :align: center
-   :alt: Fill in the information related to your internal transfer
+   - Bank journal (Bank A)

-.. note::
-   Fill in the :guilabel:`Memo` field for automatic reconciliation.
+     .. list-table::
+        :header-rows: 1
+        :stub-columns: 1

-:guilabel:`Save` and :guilabel:`Confirm` to register your internal transfer. The money is now booked
-in the transfer account and another payment is **automatically** created in the destination journal
-(Bank B).
+        * - **Account**
+          - **Debit**
+          - **Credit**
+        * - Outstanding Payments account
+          -
+          - $1,000
+        * - **Internal transfer account**
+          - **$1,000**
+          -

-Bank journal (Bank A)
-~~~~~~~~~~~~~~~~~~~~~
+   - Bank journal (Bank B)

-.. list-table::
-   :header-rows: 1
-   :stub-columns: 1

-   * - **Account**
-     - **Debit**
-     - **Credit**
-   * - Outstanding Payments account
-     -
-     - $1,000
-   * - **Internal transfer account**
-     - **$1,000**
-     -
+     .. list-table::
+        :header-rows: 1
+        :stub-columns: 1

-Automated booking - Bank journal (BANK B)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        * - **Account**
+          - **Debit**
+          - **Credit**
+        * - Outstanding Receipts account
+          - $1,000
+          -
+        * - **Internal transfer account**
+          -
+          - **$1,000**

-.. list-table::
-   :header-rows: 1
-   :stub-columns: 1
+   There is **one outstanding payment** and **one outstanding receipt** pending in your two bank
+   account journals because the bank statement confirming the sending and receiving of the money
+   has not been booked yet.

-   * - **Account**
-     - **Debit**
-     - **Credit**
-   * - Outstanding Receipts account
-     - $1,000
-     -
-   * - **Internal transfer account**
-     -
-     - **$1,000**
-
-.. note::
-   There are one outstanding payment and one outstanding receipt pending in your two bank account
-   journals, because the bank statement confirming the sending and receiving of the money has not
-   been booked yet.
-
-.. image:: internal_transfers/outstanding-payments-receipts.png
-   :align: center
-   :alt: Outstanding Payments/Receipts pending bank statement booking
-
-.. _interbank/import-and-reconcile:
-
-Manage and reconcile bank statements
------------------------------------
-
-The next step is to book the bank statements to finalize the transaction by creating,
-:doc:`importing <../bank/transactions>`, or :doc:`synchronizing <../bank/bank_synchronization>` your
-:guilabel:`Transactions lines`. Fill in the :guilabel:`Ending balance` and click on the
-:guilabel:`Reconcile` button.
-
-.. image:: internal_transfers/transactions-line.png
-   :align: center
-   :alt: Transaction lines to be filled in prior to reconciliation
+Once this is done, you can book and reconcile your bank statement lines as usual.

 .. seealso::
   :doc:`../bank/reconciliation`
-
-In the next window, choose counterparts for the payment - in this example, the outstanding payment
-account - then click :guilabel:`Validate`.
-
-.. image:: internal_transfers/bank-reconciliation.png
-   :align: center
-   :alt: Reconcile your payment
-
-Bank journal entry
-~~~~~~~~~~~~~~~~~~
-
-.. list-table::
-   :header-rows: 1
-   :stub-columns: 1
-
-   * - **Account**
-     - **Debit**
-     - **Credit**
-   * - Outstanding Payment
-     - $1,000
-     -
-   * - Bank Account (BANK A)
-     -
-     - **$1,000**
-
-The same steps must be repeated once you receive the bank statement related to Bank B. Book and
-reconcile your bank statement lines.
-
-Bank journal entry
-~~~~~~~~~~~~~~~~~~
-
-.. list-table::
-   :header-rows: 1
-   :stub-columns: 1
-
-   * - **Account**
-     - **Debit**
-     - **Credit**
-   * - Outstanding Receipt
-     -
-     - $1,000
-   * - Bank Account (BANK B)
-     - **$1,000**
-     -
@@ -0,0 +1,61 @@
+=============================
+Trusted accounts (send money)
+=============================
+
+To protect users from sending money to scammers, vendor bank account numbers must be marked as
+trusted before you can use them to make an outgoing payment.
+
+To do so, open the vendor bank account and click on the :guilabel:`Send Money` toggle switch button.
+
+.. image:: trusted_accounts/send-money-toggle.png
+   :align: center
+   :alt: Example of a vendor bank account with the "Send Money" toggle button switched to "trusted."
+
+.. note::
+   All accounts are initially marked as untrusted.
+
+Phishing attacks
+================
+
+A **phishing attack** is an online scam designed to trick individuals or companies into giving away
+sensitive information or money by sending out fraudulent communication. Fraudsters pretend to be
+legitimate companies and may use partial information to give credibility to their requests.
+
+There are several types of phishing attacks, including **invoice fraud**. In this case, the
+fraudster pretends to be a genuine supplier following up on unpaid bills or sending a new invoice,
+but with different payment information than usual and with fake contact details.
+
+To protect yourself from these types of phishing attacks, remain vigilant when you receive
+unexpected invoices or payment requests.
+
+.. important::
+   In case of doubt, **we recommend contacting the vendor by phone**. Make sure to call an official
+   phone number by searching yourself, as the URLs, email addresses, and phone numbers written in
+   the communication you received may be fake.
+
+Elements to check
+-----------------
+
+There are several elements you can check by yourself when you receive an outgoing payment request to
+a new account:
+
+Communication style
+  Fraudulent emails and invoices often use a different communication style, such as **different
+  wording**, and may include **spelling and grammatical mistakes**. Examine and **compare** them
+  with previous ones that you know to be authentic (e.g., payment instructions, language, company
+  logo, etc.).*
+
+Urgency
+  Invoice frauds often use **urgent or threatening language** and change the **payment deadline**.
+  Check if you really received a late payment reminder previously.
+
+Type of account
+  A company is unlikely to replace a bank account with a **money transfer service**.
+
+Email and links domain names
+  Double-check the **email address domain** (`example@domain.com`). However, be wary that fraudsters
+  can make their email addresses look genuine or even hack email addresses from your vendor's
+  employees or even someone within your own organization.
+
+  Hover over the links in your email and check that the URLs they redirect to are genuine. Your
+  internet browser usually displays the link's target at the bottom left of the window.
@@ -7,8 +7,9 @@ Reporting
 Main reports available
 ======================

-Odoo includes **generic** and **dynamic** reports available for all countries, regardless of the
-:doc:`localization package <../../finance/fiscal_localizations>` installed:
+Besides the reports created specifically in each localisation module, a
+few very useful **generic** and **dynamic reports** are available for all
+countries :

 -  **Balance Sheet**
 -  **Profit and Loss**
@@ -18,136 +19,136 @@ Odoo includes **generic** and **dynamic** reports available for all countries, r
 -  **Aged Receivable**
 -  **Cash Flow Statement**
 -  **Tax Report**
+-  **Bank Reconciliation**

-Reports can be **annotated, printed, and drilled down** to see details (payments, invoices,
-journal items, etc.) by clicking the **down** arrow. Reports can also be exported to **PDF** or
-**XLSX** format by clicking :guilabel:`PDF` or :guilabel:`XLSX` at the top of the page.
+You can annotate every reports to print them and report to your adviser.
+Export to xls to manage extra analysis. Drill down in the reports to see
+more details (payments, invoices, journal items, etc.).

-.. image:: reporting/reporting-annotate.png
-   :alt: Annotate reports.
-
-You can compare values across periods by using the :guilabel:`Comparison` menu and selecting the
-periods you want to compare.
-
-.. image:: reporting/reporting-comparison.png
-   :alt: Comparison menu to compare time periods.
+You can also compare values with another period. Choose how many periods
+you want to compare the chosen time period with. You can choose up to 12
+periods back from the date of the report if you don't want to use the
+default **Previous 1 Period** option.

 .. _reporting/balance-sheet:

 Balance Sheet
 -------------

-The **Balance Sheet** shows a snapshot of your organization's assets, liabilities, and equity at a
-particular date.
+The **Balance Sheet** shows a snapshot of the assets, liabilities and equity
+of your organisation as at a particular date.

-.. image:: reporting/reporting-balance-sheet.png
-   :alt: Balance sheet report of Odoo.
-
-.. _reporting/profit-and-loss:
+.. image:: reporting/main_reports09.png

 Profit and Loss
 ---------------

-The **Profit and Loss** report (or **Income Statement**) shows your company's net income by
-deducting expenses from revenue for the reporting period.
+The **Profit and Loss** report (or **Income Statement**) shows your
+organisation's net income, by deducting expenses from revenue for the
+report period.

-.. image:: reporting/reporting-profit-and-loss.png
-   :alt: Profit and Loss report of Odoo
-
-.. _reporting/executive-summary:
+.. image:: reporting/main_reports10.png

 Executive Summary
 -----------------

-The **Executive Summary** allows a quick look at all the important figures to run your company.
+The **Executive Summary** allows for a quick look at all the important
+figures you need to run your company.

-In basic terms, this is what each item in the following section reports:
+In very basic terms, this is what each of the items in this section is
+reporting :

 - **Performance:**
    - **Gross profit margin:**
-        The contribution of all sales made by your business **minus** any direct costs needed to
-        make those sales (labor, materials, etc.).
+        The contribution each individual sale made
+        by your business less any direct costs needed to make those sales
+        (things like labour, materials, etc).
    - **Net profit margin:**
-        The contribution of all sales made by your business **minus** any direct costs needed to
-        make those sales *and* fixed overheads your company has (electricity, rent, taxes
-        to be paid as a result of those sales, etc.).
-    - **Return on investment (per annum):**
-        The ratio of net profit made to the amount of assets the company used to make those profits.
+        The contribution each individual sale made by
+        your business less any direct costs needed to make those sales,
+        as well as any fixed overheads your company has (things like
+        rent, electricity, taxes you need to pay as a result of those
+        sales).
+    - **Return on investment (p.a.):**
+        The ratio of net profit made, to the
+        amount of assets the company used to make those profits.
 - **Position:**
-    - **Average debtors days:**
-        The average number of days it takes your customers to (fully) pay you across all your
-        customer invoices.
-    - **Average creditors days:**
-        The average number of days it takes you to (fully) pay your suppliers across all your bills.
-    - **Short-term cash forecast:**
-        How much cash is expected in or out of your business in the next month, i.e., the balance of
-        your **Sales account** for the month **minus** the balance of your **Purchases account** for
-        the month.
+    - **Average debtor days:**
+        The average number of days it takes your
+        customers to pay you (fully), across all your customer invoices.
+    - **Average creditor days:**
+        The average number of days it takes you to
+        pay your suppliers (fully) across all your bills.
+    - **Short term cash forecast:**
+        How much cash is expected in or out of
+        your organisation in the next month i.e. balance of your **Sales
+        account** for the month less the balance of your **Purchases account**
+        for the month.
    - **Current assets to liabilities:**
-        Also referred to as **current ratio**, this is the ratio of current assets (:dfn:`assets
-        that could be turned into cash within a year`) to the current liabilities (:dfn:`liabilities
-        that will be due in the next year`). It is typically used to measure a company's ability to
-        service its debt.
+        Also referred to as **current ratio**, this is the ratio
+        of current assets (assets that could be
+        turned into cash within a year) to the current liabilities
+        (liabilities which will be due in the next year). This is
+        typically used as as a measure of a company's ability to service
+        its debt.

-.. image:: reporting/reporting-executive-summary.png
-   :alt: Executive summary report in Odoo.
-
-.. _reporting/general-ledger:
+.. image:: reporting/main_reports01.png

 General Ledger
 --------------

-The **General Ledger Report** shows all transactions from all accounts for a chosen date range. The
-initial summary report shows each account's totals; from here, you can view a detailed transaction
-report or any exceptions. This report helps check every transaction that occurred during a specific
-period.
+The **General Ledger Report** shows all transactions from all accounts for a
+chosen date range. The initial summary report shows the totals for each
+account and from there you can view a detailed transaction report or any
+exceptions. This report is useful for checking every transaction that
+occurred during a certain period of time.

-.. image:: reporting/reporting-general-ledger.png
-   :alt: General Ledger report in Odoo.
+.. image:: reporting/main_reports05.png

 .. _reporting/aged-payable:

 Aged Payable
 ------------

-Run the **Aged Payable Details** report to display information on individual bills, credit notes,
-and overpayments you owe and how long these have gone unpaid.
+Run the **Aged Payable Details** report to display information on individual
+bills, credit notes and overpayments owed by you, and how long these
+have gone unpaid.

-.. image:: reporting/reporting-aged-payable.png
-   :alt: Aged Payable report in Odoo.
+.. image:: reporting/main_reports02.png

 .. _reporting/aged-receivable:

 Aged Receivable
 ---------------

-The **Aged Receivables** report shows the sales invoices awaiting payment during a selected month
-and several months prior.
+The **Aged Receivables** report shows the sales invoices that were awaiting
+payment during a selected month and several months prior.

-.. image:: reporting/reporting-aged-receivable.png
-   :alt: Aged Receivable report in Odoo.
-
-.. _reporting/cash-flow-statement:
+.. image:: reporting/main_reports07.png

 Cash Flow Statement
 -------------------

-The **Cash Flow Statement** shows how changes in balance sheet accounts and income affect cash and
-cash equivalents and breaks the analysis down to operating, investing, and financing activities.
+The **Cash Flow Statement** shows how changes in balance sheet accounts and
+income affect cash and cash equivalents, and breaks the analysis down to
+operating, investing and financing activities.

-.. image:: reporting/reporting-cash-flow-statement.png
-   :alt: Cash Flow Statement report in Odoo.
+.. image:: reporting/main_reports03.png

 .. _reporting/tax-report:

 Tax Report
 ----------

-This report allows you to see the **net** and **tax amounts** for all the taxes grouped by type
-(sale/purchase).
+This report allows you to see the **net** and **tax amounts** for all the taxes
+grouped by type (sale/purchase).

-.. image:: reporting/reporting-tax-report.png
-   :alt: Tax report in Odoo.
+.. image:: reporting/main_reports04.png
+
+Bank Reconciliation
+-------------------
+
+.. image:: reporting/main_reports06.png

 .. toctree::
   :titlesonly:
@@ -13,36 +13,34 @@ supports all kinds of uses and computations.
 Default taxes
 =============

-**Default Taxes** define which taxes are automatically selected when there is no
-other indication about which tax to use. For example, Odoo prefills the **Taxes** field with the
-Default Taxes when you create a new product or add a new line on an invoice.
-
-.. image:: taxes/default-invoice-line.png
-   :alt: Odoo fills out the Tax field automatically according to the Default Taxes
-
-To change your **Default Taxes**, go to :menuselection:`Accounting --> Configuration --> Settings
--> Taxes --> Default Taxes`, select the appropriate taxes for your default **Sales Tax** and
-**Purchase Tax**, and click on *Save*.
+**Default taxes** define which taxes are automatically selected when creating a new product. They
+are also used to prefill the :guilabel:`Taxes` field when adding a new line on an invoice in
+:ref:`Accounting Firms <fiduciaries>` mode.

 .. image:: taxes/default-configuration.png
+   :alt: Odoo fills out the Tax field automatically according to the Default Taxes
+
+To change your **default taxes**, go to :menuselection:`Accounting --> Configuration --> Settings
+--> Taxes --> Default Taxes`, select the appropriate taxes for your default sales tax and purchase
+tax, and click on :guilabel:`Save`.
+
+.. image:: taxes/default-taxes.png
   :alt: Define which taxes to use by default on Odoo

 .. note::
-   **Default Taxes** are automatically set up according to the country selected at the creation of
+   **Default taxes** are automatically set up according to the country selected at the creation of
   your database, or when you set up a :ref:`fiscal localization package
   <fiscal_localizations/packages>` for your company.

 .. _taxes/list_activation:

-Activate Sales Taxes from the List view
+Activate sales taxes from the list view
 =======================================

 As part of your :ref:`fiscal localization package <fiscal_localizations/packages>`, most of your
-country's sales taxes are already preconfigured on your database. However, only a few of them are
-activated by default, so that you can activate only the ones relevant for your business.
-
-To activate Sale Taxes, go to :menuselection:`Accounting --> Configuration --> Taxes` and use the
-*Activate* toggle button to activate or deactivate a tax.
+country's sales taxes are already preconfigured on your database. However, only a few taxes are
+activated by default. To activate taxes relevant to your business, go to :menuselection:`Accounting
+--> Configuration --> Taxes` and enable the toggle button under the :guilabel:`Active` column.

 .. image:: taxes/list.png
   :alt: Activate pre-configured taxes in Odoo Accounting
@@ -52,46 +50,32 @@ To activate Sale Taxes, go to :menuselection:`Accounting --> Configuration --> T
 Configuration
 =============

-To edit or create a **Tax**, go to :menuselection:`Accounting --> Configuration --> Taxes` and open
-a tax or click on *Create*.
+To edit or create a **tax**, go to :menuselection:`Accounting --> Configuration --> Taxes` and open
+a tax or click on :guilabel:`New`.

 .. image:: taxes/edit.png
   :alt: Edition of a tax in Odoo Accounting

-.. _taxes/labels:
-
-.. important::
-   Taxes have three different labels, each one having a specific use. Refer to the following table to
-   see where they are displayed.
-
-   +------------------+-------------------------+-------------------------+
-   | :ref:`Tax Name   | :ref:`Label on Invoice  | :ref:`Tax Group         |
-   | <taxes/name>`    | <taxes/label-invoices>` | <taxes/tax-group>`      |
-   +==================+=========================+=========================+
-   | Back end         | *Taxes* column on       | Above the *Total* line  |
-   |                  | exported invoices       | on exported invoices    |
-   +------------------+-------------------------+-------------------------+
-
-Basic Options
+Basic options
 -------------

 .. _taxes/name:

-Tax Name
+Tax name
 ~~~~~~~~

-The **Tax Name** as you want to display it for backend users. This is the :ref:`label
-<taxes/labels>` you see while editing Sales Orders, Invoices, Products, etc.
+The **tax name** is displayed for backend users in the :guilabel:`Taxes` field in
+:doc:`sales orders <../../sales/sales>`, :doc:`invoices <customer_invoices>`, product forms, etc.

 .. _taxes/computation:

-Tax Computation
+Tax computation
 ~~~~~~~~~~~~~~~

 - **Group of Taxes**

-  The tax is a combination of multiple sub-taxes. You can add as many taxes you want, in the order
-  you want them to be applied.
+  The tax is a combination of multiple sub-taxes. You can add as many taxes as you want, in the
+  order you want them to be applied.

  .. important::
     Make sure that the tax sequence is correct, as the order in which they are may impact the
@@ -101,75 +85,93 @@ Tax Computation
 - **Fixed**

  The tax has a fixed amount in the default currency. The amount remains the same, regardless of the
-  Sales Price.
+  sales price.

-  For example, a product has a Sales Price of $1000, and we apply a *$10 fixed* tax. We then have:
+.. example::
+   A product has a sales price of $1000, and we apply a $10 *fixed* tax. We then have:

-  +-------------+-------------+----------+----------+
-  | Product's   | Price       | Tax      | Total    |
-  | Sales Price | without tax |          |          |
-  +=============+=============+==========+==========+
-  | 1,000       | 1,000       | 10       | 1,010.00 |
-  +-------------+-------------+----------+----------+
+   +-------------+-------------+----------+----------+
+   | Product     | Price       | Tax      | Total    |
+   | sales price | without tax |          |          |
+   +=============+=============+==========+==========+
+   | 1,000       | 1,000       | 10       | 1,010.00 |
+   +-------------+-------------+----------+----------+

- **Percentage of Price**
+- **Percentage of price**

-  The *Sales Price* is the taxable basis: the tax's amount is computed by multiplying the Sales
-  Price by the tax's percentage.
+  The *sales price* is the taxable basis: the tax amount is computed by multiplying the sales price
+  by the tax percentage.

-  For example, a product has a Sales Price of $1000, and we apply a *10% of Price* tax. We then
-  have:
+.. example::
+   A product has a sales price of $1000, and we apply a *10% of Price* tax. We then have:

-  +-------------+-------------+----------+----------+
-  | Product's   | Price       | Tax      | Total    |
-  | Sales Price | without tax |          |          |
-  +=============+=============+==========+==========+
-  | 1,000       | 1,000       | 100      | 1,100.00 |
-  +-------------+-------------+----------+----------+
+   +-------------+-------------+----------+----------+
+   | Product     | Price       | Tax      | Total    |
+   | sales price | without tax |          |          |
+   +=============+=============+==========+==========+
+   | 1,000       | 1,000       | 100      | 1,100.00 |
+   +-------------+-------------+----------+----------+

 - **Percentage of Price Tax Included**

-  The *Total* is the taxable basis: the tax's amount is a percentage of the Total.
+  The **total** is the taxable basis: the tax amount is a percentage of the total.

-  For example, a product has a Sales Price of $1000, and we apply a *10% of Price Tax Included* tax.
-  We then have:
+.. example::
+   A product has a Sales Price of $1000, and we apply a *10% of Price Tax Included* tax. We then
+   have:

-  +-------------+-------------+----------+----------+
-  | Product's   | Price       | Tax      | Total    |
-  | Sales Price | without tax |          |          |
-  +=============+=============+==========+==========+
-  | 1,000       | 1,000       | 111.11   | 1,111.11 |
-  +-------------+-------------+----------+----------+
+   +-------------+-------------+----------+----------+
+   | Product     | Price       | Tax      | Total    |
+   | sales price | without tax |          |          |
+   +=============+=============+==========+==========+
+   | 1,000       | 1,000       | 111.11   | 1,111.11 |
+   +-------------+-------------+----------+----------+
+
+- **Python code**
+
+  A tax defined as **Python code** consists of two snippets of Python code that are executed in a
+  local environment containing data such as the unit price, product or partner.
+  :guilabel:`Python Code` defines the amount of the tax, and :guilabel:`Applicable Code` defines if
+  the tax is to be applied. The formula is found at the bottom of the :guilabel:`Definition` tab.
+
+.. example::
+   :guilabel:`Python Code`: `result = price_unit * 0.10`
+   :guilabel:`Applicable Code`: `result = true`

 .. _taxes/active:

 Active
 ~~~~~~

-Only **Active** taxes can be added to new documents.
+Only **active** taxes can be added to new documents.

 .. important::
   It is not possible to delete taxes that have already been used. Instead, you can deactivate them
   to prevent future use.

 .. note::
-   This field can be modified from the *List View*. See :ref:`above <taxes/list_activation>` for
-   more information.
+   This field can be modified from the :ref:`list view <taxes/list_activation>`.

 .. _taxes/scope:

-Tax Scope
-~~~~~~~~~
+Tax type
+~~~~~~~~

-The **Tax Scope** determines the tax's application, which also restricts where it is displayed.
+The :guilabel:`Tax Type` determines the tax application, which also restricts where it is displayed.

- **Sales**: Customer Invoices, Product's Customer Taxes, etc.
- **Purchase**: Vendor Bills, Product's Vendor Taxes, etc.
+- **Sales**: Customer invoices, product customer taxes, etc.
+- **Purchase**: Vendor bills, product vendor taxes, etc.
 - **None**

 .. tip::
-   You can use **None** for taxes that you want to include in a :ref:`Group of Taxes
-   <taxes/computation>` but that you don't want to list along with other Sales or Purchase taxes.
+   You can use :guilabel:`None` for taxes that you want to include in a :ref:`Group of Taxes
+   <taxes/computation>` but that you do not want to list along with other sales or purchase taxes.
+
+Tax scope
+~~~~~~~~~
+
+The :guilabel:`Tax Scope` restricts the use of taxes to a type of product, either **goods** or
+**services**.

 .. _taxes/definition-tab:

@@ -177,105 +179,118 @@ Definition tab
 --------------

 Allocate with precision the amount of the taxable basis or percentages of the computed tax to
-multiple accounts and Tax Grids.
+multiple accounts and tax grids.

 .. image:: taxes/definition.png
   :alt: Allocate tax amounts to the right accounts and tax grids

 - **Based On**:

-  - Base: the price on the invoice line
-  - % of tax: a percentage of the computed tax.
+  - :guilabel:`Base`: the price on the invoice line
+  - :guilabel:`% of tax`: a percentage of the computed tax.

- **Account**: if defined, an additional Journal Item is recorded.
- **Tax Grids**:  used to generate :doc:`Tax Reports <reporting/tax_returns>`
+- **Account**: if defined, an additional journal item is recorded.
+- **Tax Grids**:  used to generate :doc:`tax reports <reporting/tax_returns>`
  automatically, according to your country's regulations.

 .. _taxes/advanced-tab:

-Advanced Options tab
+Advanced options tab
 --------------------

 .. _taxes/label-invoices:

-Label on Invoices
+Label on invoices
 ~~~~~~~~~~~~~~~~~

-The label of the tax, as displayed on each invoice line in the **Taxes** column. This is the
-:ref:`label <taxes/labels>` visible to *front end* users, on exported invoices, on their Customer
-Portals, etc.
+The tax label is displayed on each invoice line in the :guilabel:`Taxes` column. This is visible to
+*front-end* users on exported invoices, in customer portals, etc.

 .. image:: taxes/invoice-label.png
-   :alt: The Label on Invoices is displayed on each invoice line
+   :alt: The label on invoices is displayed on each invoice line

 .. _taxes/tax-group:

-Tax Group
+Tax group
 ~~~~~~~~~

-Select to which **Tax Group** the tax belongs. The Tax Group name is the :ref:`label
-<taxes/labels>` displayed above the *Total* line on exported invoices, and the Customer Portals.
+Select which **tax group** the tax belongs to. The tax group name is the displayed above the
+**total** line on exported invoices and in customer portals.

 Tax groups include different iterations of the same tax. This can be useful when you must record
-differently the same tax according to :doc:`Fiscal Positions <taxes/fiscal_positions>`.
+the same tax differently according to :doc:`fiscal positions <taxes/fiscal_positions>`.

-.. image:: taxes/invoice-tax-group.png
-   :alt: The Tax Group name is different from the Label on Invoices
+.. example::

-In the example above, we see a 0% tax for Intra-Community customers in Europe. It records amounts on
-specific accounts and with specific tax grids. Still, to the customer, it is a 0% tax. That's why
-the :ref:`Label on the Invoice <taxes/label-invoices>` indicates *0% EU*, and the Tax Group name,
-above the *Total* line, indicates *0%*.
+   .. image:: taxes/invoice-tax-group.png
+      :alt: The Tax Group name is different from the Label on Invoices
+
+   In the example above, the :guilabel:`0% EU S` tax for intra-community customers in Europe records
+   the amount on specific accounts and tax grids. However, it remains a 0% tax to the customer. This
+   is why the label indicates :guilabel:`0% EU S`, and the tax group name above the
+   :guilabel:`Total` line indicates :guilabel:`VAT 0%`.
+
+.. important::
+   Taxes have three different labels, each one having a specific use. Refer to the following table
+   to see where they are displayed.
+
+   +------------------+-------------------------+-------------------------+
+   | :ref:`Tax Name   | :ref:`Label on Invoice  | :ref:`Tax Group         |
+   | <taxes/name>`    | <taxes/label-invoices>` | <taxes/tax-group>`      |
+   +==================+=========================+=========================+
+   | Backend          | :guilabel:`Taxes` column| Above the               |
+   |                  | on exported invoices    | :guilabel:`Total` line  |
+   |                  |                         | on exported invoices    |
+   +------------------+-------------------------+-------------------------+

 .. _taxes/analytic-cost:

-Include in Analytic Cost
+Include in analytic cost
 ~~~~~~~~~~~~~~~~~~~~~~~~

-With this option activated, the tax's amount is assigned to the same **Analytic Account** as the
+With this option activated, the tax amount is assigned to the same **analytic account** as the
 invoice line.

 .. _taxes/included-in-price:

-Included in Price
+Included in price
 ~~~~~~~~~~~~~~~~~

-With this option activated, the total (including the tax) equals the **Sales Price**.
+With this option activated, the total (including the tax) equals the **sales price**.

-:dfn:`Total = Sales Price = Computed Tax-Excluded price + Tax`
+`Total = Sales Price = Computed Tax-Excluded price + Tax`

-For example, a product has a Sales Price of $1000, and we apply a *10% of Price* tax, which is
-*included in the price*. We then have:
+.. example::
+   A product has a sales price of $1000, and we apply a *10% of Price* tax, which is *included in
+   the price*. We then have:

-+-------------+-------------+----------+----------+
-| Product's   | Price       | Tax      | Total    |
-| Sales Price | without tax |          |          |
-+=============+=============+==========+==========+
-| 1,000       | 900.10      | 90.9     | 1,000.00 |
-+-------------+-------------+----------+----------+
+   +-------------+-------------+----------+----------+
+   | Product     | Price       | Tax      | Total    |
+   | sales price | without tax |          |          |
+   +=============+=============+==========+==========+
+   | 1,000       | 900.10      | 90.9     | 1,000.00 |
+   +-------------+-------------+----------+----------+

 .. note::
   If you need to define prices accurately, both tax-included and tax-excluded, please refer to the
   following documentation: :doc:`taxes/B2B_B2C`.

 .. note::
-   - **Invoices**: By default, the Line Subtotals displayed on your invoices are *Tax-Excluded*. To
-     display *Tax-Included* Line Subtotals, go to :menuselection:`Accounting --> Configuration -->
-     Settings --> Customer Invoices`, and select *Tax-Included* in the **Line Subtotals Tax
-     Display** field, then click on *Save*.
-   - **eCommerce**: By default, the prices displayed on your eCommerce website are *Tax-Excluded*.
-     To display *Tax-Included* prices, go to :menuselection:`Website --> Configuration --> Settings
-     --> Pricing`, and select *Tax-Included* in the **Product Prices** field, then click on *Save*.
+   By default, only the :guilabel:`Tax excluded` column is displayed on invoices. To display the
+   :guilabel:`Tax included` column, click the **dropdown toggle** button and check
+   :guilabel:`Tax incl.`.
+
+   .. image:: taxes/toggle-button.png

 .. _taxes/base-subsequent:

-Affect Base of Subsequent Taxes
+Affect base of subsequent taxes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 With this option, the total tax-included becomes the taxable basis for the other taxes applied to
 the same product.

-You can configure a new :ref:`Group of Taxes <taxes/computation>` to include this tax, or add it
+You can configure a new :ref:`group of taxes <taxes/computation>` to include this tax or add it
 directly to a product line.

 .. image:: taxes/subsequent-line.png
@@ -293,10 +308,9 @@ directly to a product line.
      :alt: The taxes' sequence in Odoo determines which tax is applied first

 .. seealso::
-
  - :doc:`taxes/fiscal_positions`
  - :doc:`taxes/B2B_B2C`
-  - :doc:`taxes/taxcloud` (decommissioning TaxCloud integration in Odoo 17+)
+  - :doc:`taxes/taxcloud`
  - :doc:`reporting/tax_returns`

 .. toctree::
@@ -72,8 +72,11 @@ From there, several conditions can be activated:
   :alt: Example of a fiscal position automatic application settings

 .. note::
-   Taxes on **eCommerce orders** are automatically updated once the customer has logged in or filled
-   out their billing details.
+   - If the :doc:`Verify VAT Numbers <vat_verification>` feature is enabled, any fiscal positions
+     with :guilabel:`VAT required` enabled will require Intra-Community valid VAT numbers to apply
+     automatically.
+   - Taxes on **eCommerce orders** are automatically updated once the customer has logged in or
+     filled out their billing details.

 .. important::
   The fiscal positions' **sequence** defines which fiscal position is applied if all conditions
@@ -112,5 +115,4 @@ To define which fiscal position must be used by default for a specific partner,
 .. seealso::

  * :doc:`../taxes`
-  * :doc:`taxcloud` (decommissioning TaxCloud integration in Odoo 17+)
  * :doc:`B2B_B2C`
--- a/Show More
+++ b/Show More