[FIX] iot/studio: fix typo and improve wording

Resolve issues identified during translation

X-original-commit: 294c02bdb3

Makefile

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

conf.py

@@ -22,7 +22,7 @@ copyright = 'Odoo S.A.'
 # `version` is the version info for the project being documented, acts as replacement for |version|,
 # also used in various other places throughout the built documents.
 # `release` is the full version, including alpha/beta/rc tags. Acts as replacement for |release|.
-version = release = 'master'
+version = release = 'saas-17.4'
 
 # `current_branch` is the technical name of the current branch.
 # E.g., saas-15.4 -> saas-15.4; 12.0 -> 12.0, master -> master (*).
@@ -231,17 +231,13 @@ 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-18.1': "Odoo Online",
+    '18.0': "Odoo 18",
+    'saas-17.4': "Odoo Online",
     'saas-17.2': "Odoo Online",
-    'saas-17.1': "Odoo Online",
     '17.0': "Odoo 17",
-    'saas-16.4': "Odoo Online",
-    'saas-16.3': "Odoo Online",
-    'saas-16.2': "Odoo Online",
-    'saas-16.1': "Odoo Online",
     '16.0': "Odoo 16",
-    'saas-15.2': "Odoo Online",
     '15.0': "Odoo 15",
-    '14.0': "Odoo 14",
 }
 
 # The language names that should be shown in the language switcher, if the config option `languages`
@@ -252,11 +248,13 @@ languages_names = {
     'es': 'ES',
     'fr': 'FR',
     'it': 'IT',
-    'ko': 'KO',
+    'ja': 'JA',
+    'ko': 'KR',
     'nl': 'NL',
     'pt_BR': 'PT',
     'ro': 'RO',
     'sv': 'SV',
+    'th': 'TH',
     'uk': 'UA',
     'zh_CN': 'ZH (CN)',
     'zh_TW': 'ZH (TW)'
@@ -391,6 +389,9 @@ def setup(app):
     app.add_config_value('is_remote_build', None, 'env')  # Whether the build is remotely deployed
     app.add_config_value('source_read_replace_vals', {}, 'env')
     app.connect('source-read', source_read_replace)
+    # TODO uncomment after moving to >= v7.2.5 to also substitute placeholders in included  files.
+    #  See https://github.com/sphinx-doc/sphinx/commit/ff1831
+    #  app.connect('include-read', source_read_replace)
 
     app.add_lexer('json', JsonLexer)
     app.add_lexer('xml', XmlLexer)

content/administration/odoo_accounts.rst

@@ -23,7 +23,7 @@ Edit Security Settings --> Delete Account`. It can also be accessed by going to
 Upon clicking the :guilabel:`Delete Account` button, a pop-up window appears, requesting
 confirmation for the account deletion.
 
-.. image:: odoo_account/delete-account.png
+.. image:: odoo_accounts/delete-account.png
    :align: center
    :alt: Clicking on the Delete Account button will populate a window verifying the change.
 

content/administration/odoo_online.rst

@@ -46,7 +46,7 @@ Trigger a database upgrade.
 
 .. seealso::
    For more information about the upgrade process, check out the :ref:`Odoo Online upgrade
-   documentation <upgrade/request-test-database>`.
+   documentation <upgrade-request-test>`.
 
 .. _odoo_online/duplicate:
 

content/administration/odoo_sh/advanced/frequent_technical_questions.rst

@@ -29,3 +29,32 @@ We advise that:
 - Your scheduled actions should be
   `idempotent <https://stackoverflow.com/a/1077421/3332416>`_: they must not
   cause side-effects if they are started more often than expected.
+
+.. _ip-address-change:
+
+How can I automate tasks when an IP address change occurs?
+----------------------------------------------------------
+
+**Odoo.sh notifies project administrators of IP address changes.**
+Additionally, when the IP address of a production instance changes, an HTTP `GET` request is made
+to the path `/_odoo.sh/ip-change` with the new IP address included as a query string parameter
+(`new`), along with the previous IP address as an additional parameter (`old`).
+
+This mechanism allows custom actions to be applied in response to the IP address change
+(e.g., sending an email, contacting a firewall API, configuring database objects, etc.)
+
+For security reasons, the `/_odoo.sh/ip-change` route is accessible only internally by the platform
+itself and returns a `403` response if accessed through any other means.
+
+Here is a pseudo-implementation example:
+
+.. code-block:: python
+
+    class IPChangeController(http.Controller):
+
+        @http.route('/_odoo.sh/ip-change', auth='public')
+        def ip_change(self, old=None, new=None):
+            _logger.info("IP address changed from %s to %s", old, new)
+            # Then perform whatever action required for your use case, e.g., update an
+            # ir.config_parameter, send an email, contact an external firewall service's API, ...
+            return 'ok'

content/administration/odoo_sh/getting_started/branches.rst

@@ -402,9 +402,9 @@ we are considering the feature if there is enough demand.
 
 In case the domain of your users email addresses use SPF (Sender Policy Framework) or DKIM
 (DomainKeys Identified Mail), don't forget to authorize Odoo as a sending host in your domain name
-settings to increase the deliverability of your outgoing emails.
-The configuration steps are explained in the documentation about :ref:`SPF
-<email_communication/spf_compliant>` and :ref:`DKIM <email_communication/dkim_compliant>`.
+settings to increase the deliverability of your outgoing emails. The configuration steps are
+explained in the documentation about :ref:`SPF <email-domain-spf>` and :ref:`DKIM
+<email-domain-dkim>`.
 
 .. Warning::
   Forgetting to configure your SPF or DKIM to authorize Odoo as a sending host can lead to the

content/administration/odoo_sh/getting_started/settings.rst

@@ -33,17 +33,17 @@ Manage the Github users who can access your project.
 .. image:: settings/interface-settings-collaborators.png
    :align: center
 
-There are two levels of users:
+There are three levels of users:
 
-* Admin: has access to all features of Odoo.sh.
-* User: does not have access to the project settings nor to the production and staging databases.
+- :guilabel:`Admin`: has access to all features of an Odoo.sh project.
 
-The user group is meant for developers who can make modifications in your code but are not allowed
-to access the production data. Users of this group cannot connect to the production and staging
-databases using the *1-click connect* feature, but they can of course use their regular account on
-these databases if they have one, using their regular credentials.
+- :guilabel:`Tester`: has access to the *Staging* and *Development* databases and their tooling.
+  This role is for users conducting User Acceptance Tests. Testers can work with copies of
+  production data but cannot access the production database through the Odoo.sh tooling.
 
-In addition, they cannot use the webshell nor have access to the server logs.
+- :guilabel:`Developer`: has access only to the *Development* databases and their tooling. This
+  role is for developers who propose code modifications but are not allowed to access production
+  and staging databases through the Odoo.sh tooling.
 
 .. list-table::
    :header-rows: 1
@@ -51,83 +51,145 @@ In addition, they cannot use the webshell nor have access to the server logs.
 
    * -
      -
-     - User
+     - Developer
+     - Tester
      - Admin
    * - Development
      - History
      - |green|
      - |green|
+     - |green|
    * -
      - 1-click connect
      - |green|
      - |green|
+     - |green|
    * -
      - Logs
      - |green|
      - |green|
+     - |green|
    * -
      - Shell/SSH
      - |green|
      - |green|
+     - |green|
    * -
      - Mails
      - |green|
      - |green|
-   * -
-     - Upgrade
-     - |green|
      - |green|
    * -
      - Settings
      - |green|
      - |green|
-   * - Production & Staging
+     - |green|
+   * - Staging
      - History
      - |green|
      - |green|
+     - |green|
    * -
      - 1-click connect
      -
      - |green|
+     - |green|
    * -
      - Logs
      -
      - |green|
+     - |green|
    * -
      - Shell/SSH
      -
      - |green|
+     - |green|
    * -
      - Mails
      -
      - |green|
+     - |green|
    * -
      - Monitoring
      -
      - |green|
+     - |green|
    * -
      - Backups
      -
+     -
      - |green|
    * -
      - Upgrade
      -
      - |green|
+     - |green|
    * -
      - Settings
-     - |green|\*
+     -
+     - |green|
+     - |green|
+   * - Production
+     - History
+     - |green|
+     - |green|
+     - |green|
+   * -
+     - 1-click connect
+     -
+     -
+     - |green|
+   * -
+     - Logs
+     -
+     -
+     - |green|
+   * -
+     - Shell/SSH
+     -
+     -
+     - |green|
+   * -
+     - Mails
+     -
+     -
+     - |green|
+   * -
+     - Monitoring
+     -
+     -
+     - |green|
+   * -
+     - Backups
+     -
+     -
+     - |green|
+   * -
+     - Upgrade
+     -
+     -
+     - |green|
+   * -
+     - Settings
+     -
+     -
      - |green|
    * - Status
      -
      - |green|
      - |green|
+     - |green|
    * - Settings
+     -
      -
      -
      - |green|
 
-.. note::
-    \* Only in staging branches
+.. warning::
+   Those roles only apply to the usage of Odoo.sh. It is important to reflect the user roles
+   attribution within the repository on GitHub.  Please refer to the GitHub documentation section on
+   `Managing a branch protection rule <https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/managing-protected-branches/managing-a-branch-protection-rule>`_
+   for detailed guidance.
 
 .. |green| raw:: html
 
@@ -149,15 +211,32 @@ Allow public access to your development builds.
 .. image:: settings/interface-settings-public.png
    :align: center
 
-If activated, this option exposes the Builds page publicly, allowing visitors to connect to your
-development builds.
-
-In addition, visitors have access to the logs, shell and mails of your development builds.
+If activated, this option exposes the Builds page publicly, allowing visitors to view logs of development builds.
 
 Production and staging builds are excluded, visitors can only see their status.
 
 .. _odoosh-gettingstarted-settings-modules-installation:
 
+GitHub commit statuses
+======================
+
+This option enables Odoo.sh to push commit statuses to your GitHub repository when a build is
+created or updated. It requires a GitHub token with permissions to push commit statuses to the
+repository. Refer to `GitHub's documentation on personal access tokens <https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens>`_
+for instructions to create yours.
+
+.. note::
+    GitHub's **fine-grained personal tokens** have an expiration date and will be disabled if they
+    fail to update the commit status. You can replace the token at any time on Odoo.sh.
+
+The commit statuses pushed to GitHub can have the following contexts:
+
+- :guilabel:`ci/odoo.sh (dev)`: status of a development build
+- :guilabel:`ci/odoo.sh (staging)`: status of a staging build
+- :guilabel:`ci/odoo.sh (production)`: status of a production build
+- :guilabel:`ci/odoo.sh (test_ci)`: testing the token from the Settings page will push a test
+  status on the last commit of your repository
+
 Custom domains
 ==============
 

content/administration/on_premise.rst

@@ -61,8 +61,8 @@ To resolve the issue:
   your **network and firewall settings** allow the Odoo server to open outgoing connections
   towards:
 
-  - `services.odoo.com` on port `443` (or `80`)
-  - for older deployments, `services.openerp.com` on port `443` (or `80`)
+  - Odoo 18.0 and above: `services.odoo.com` on port `80`
+  - Odoo 17.0 and below: `services.openerp.com` on port `80`
 
   These ports must be kept open even after registering a database, as the update notification runs
   once a week.
@@ -85,12 +85,6 @@ To resolve the issue, either:
   displayed in the message to validate the upsell quotation and pay for the extra users.
 - :ref:`Deactivate users <users/deactivate>` and **reject** the upsell quotation.
 
-.. important::
-   If you are on a monthly subscription plan, the database will automatically update to reflect the
-   added user(s). If you are on a yearly or multi-year plan, an expiration banner will appear in the
-   database. You can create the upsell quotation by clicking the banner to update the subscription
-   or `send a support ticket <https://www.odoo.com/help>`_ to resolve the issue.
-
 Once your database has the correct number of users, the expiration message disappears automatically
 after a few days, when the next verification occurs.
 

content/administration/on_premise/email_gateway.rst

@@ -33,7 +33,6 @@ In you alias config (:file:`/etc/aliases`):
    - `Postfix aliases <http://www.postfix.org/aliases.5.html>`_
    - `Postfix virtual <http://www.postfix.org/virtual.8.html>`_
 
-
 For Exim
 --------
 
@@ -47,5 +46,5 @@ For Exim
    - `Exim <https://www.exim.org/docs.html>`_
 
 .. tip::
-   If you don't have access/manage your email server, use :ref:`inbound messages
-   <email_communication/inbound_messages>`.
+   If you do not have access/manage your email server, use :ref:`incoming mail servers
+   <email-inbound-custom-domain-incoming-server>`.

content/administration/on_premise/packages.rst

@@ -132,7 +132,7 @@ be downloaded from the `Odoo download page <https://www.odoo.com/page/download>`
    .. group-tab:: Fedora
 
       .. note::
-         Odoo {CURRENT_MAJOR_VERSION} 'rpm' package supports Fedora 36.
+         Odoo {CURRENT_MAJOR_VERSION} 'rpm' package supports Fedora 38.
 
       Once downloaded, the package can be installed using the 'dnf' package manager:
 

content/administration/supported_versions.rst

@@ -31,90 +31,60 @@ This matrix shows the support status of every version.
      - On-Premise
      - Release date
      - End of support
-   * - Odoo saas~17.2
+   * - Odoo SaaS 18.1
      - |green|
      - N/A
      - N/A
+     - January 2025
+     -
+   * - **Odoo 18.0**
+     - |green|
+     - |green|
+     - |green|
+     - October 2024
+     - October 2027 (planned)
+   * - Odoo SaaS 17.4
+     - |red|
+     - N/A
+     - N/A
+     - July 2024
+     - October 2024
+   * - Odoo SaaS 17.2
+     - |red|
+     - N/A
+     - N/A
      - April 2024
-     -
-   * - Odoo saas~17.1
-     - |green|
-     - N/A
-     - N/A
-     - January 2024
-     -
+     - October 2024
    * - **Odoo 17.0**
      - |green|
      - |green|
      - |green|
      - November 2023
      - October 2026 (planned)
-   * - Odoo saas~16.4
-     - |red|
-     - N/A
-     - N/A
-     - August 2023
-     -
-   * - Odoo saas~16.3
-     - |red|
-     - N/A
-     - N/A
-     - June 2023
-     -
-   * - Odoo saas~16.2
-     - |red|
-     - N/A
-     - N/A
-     - March 2023
-     -
-   * - Odoo saas~16.1
-     - |red|
-     - N/A
-     - N/A
-     - February 2023
-     -
    * - **Odoo 16.0**
      - |green|
      - |green|
      - |green|
      - October 2022
-     - November 2025 (planned)
-   * - Odoo saas~15.2
-     - |red|
-     - N/A
-     - N/A
-     - March 2022
-     - January 2023
-   * - Odoo saas~15.1
-     - |red|
-     - N/A
-     - N/A
-     - February 2022
-     - July 2022
+     - October 2025 (planned)
    * - **Odoo 15.0**
-     - |green|
-     - |green|
-     - |green|
+     - |red|
+     - |red|
+     - |red|
      - October 2021
-     - November 2024 (planned)
+     - October 2024
    * - **Odoo 14.0**
      - |red|
      - |red|
      - |red|
      - October 2020
      - November 2023
-   * - **Odoo 13.0**
-     - |red|
-     - |red|
-     - |red|
-     - October 2019
-     - October 2022
    * - Older versions
      - |red|
      - |red|
      - |red|
-     - Before 2019
-     - Before 2022
+     - Before 2020
+     - Before 2023
 
 .. admonition:: Legend
 

content/administration/upgrade.rst

@@ -2,31 +2,55 @@
 Upgrade
 =======
 
-An upgrade is the process of moving your database from an older version to a newer :doc:`supported
-version <supported_versions>` (e.g., Odoo 14.0 to Odoo 16.0). Frequently upgrading is essential as
-each version comes with new and improved features, bug fixes, and security patches.
+An upgrade involves moving a database from an older version to a newer supported version (e.g., from
+Odoo 16.0 to Odoo 18.0). Regular upgrades are crucial as each version offers new features, bug
+fixes, and security patches. Using a :doc:`supported version <supported_versions>` is strongly
+recommended. Each major version is supported for three years.
 
-.. _upgrade_faq/rolling_release:
+Depending on the hosting type and Odoo version used, a database upgrade can be **mandatory**.
+
+.. tabs::
+
+   .. group-tab:: Odoo Online
+
+      - If a database is on a **major version** (e.g., 16.0, 17.0, 18.0), an upgrade is mandatory
+        every two years.
+      - If a database is on a **minor version** (e.g., 17.1, 17.2, 17.4), an upgrade is mandatory
+        a few weeks after the next version is released. Minor versions are usually released every
+        two months.
+
+   .. group-tab:: Odoo.sh
+
+      After the initial three years of support, you will have another two years to complete the
+      upgrade. You will be notified when an upgrade is required.
+
+      .. image:: upgrade/odoo-sh-message.png
+         :alt: The "unsupported version" popup on Odoo.sh.
+
+   .. group-tab:: On-premise
+
+      You can stay on the same version indefinitely, even if it is not recommended. Note that the
+      smaller the version gap, the easier the upgrade should be.
 
 .. spoiler:: Automatic upgrades: Odoo Online's Rolling Release process
 
-   The Rolling Release process allows Odoo Online customers to upgrade their database directly from
-   a message prompt sent to the database administrator as soon as a new version is released. The
-   invitation to upgrade is only sent if no issues are detected during the automatic tests.
+   You will receive a notification in your database a few weeks before a mandatory upgrade will be
+   automatically carried out. You are in control of the process as long as the deadline is not
+   reached.
 
    .. image:: upgrade/rr-upgrade-message.png
       :alt: The upgrade message prompt on the top right of the database
 
-   It is strongly recommended to manually :ref:`test the upgrade first <upgrade/test_your_db>`.
-   Clicking :guilabel:`I want to test first` redirects to `the database manager
-   <https://www.odoo.com/my/databases/>`_, where it is possible to request an upgraded test database
-   and check it for any discrepancies.
+   Concretely, Odoo’s Upgrade Team performs a silent test upgrade of every database that should be
+   upgraded. If the test is successful and lasts less than 20 minutes, you can directly trigger the
+   upgrade from the database. If the test fails, you can test an upgrade using the `database manager
+   <https://www.odoo.com/my/databases>`_.
 
-   It is **not** recommended to click :guilabel:`Upgrade Now` without testing first, as it
-   immediately triggers the live production database upgrade.
+   When you are invited to upgrade, it is strongly recommended to :ref:`request an upgraded test
+   database <upgrade-request-test>` first and spend time :ref:`testing <upgrade-testing>` it.
 
-   If the Rolling Release process detects an issue with the upgrade, it will be deactivated until
-   the issue is resolved.
+   An automatic upgrade to the next version will be triggered if no action is taken before the
+   specified due date.
 
 An upgrade does not cover:
 
@@ -40,36 +64,40 @@ An upgrade does not cover:
    If your database contains custom modules, it cannot be upgraded until a version of your custom
    modules is available for the target version of Odoo. For customers maintaining their own custom
    modules, we recommend to parallelize the process by :ref:`requesting an upgraded database
-   <upgrade/request-test-database>` while also :doc:`upgrading the source code of your custom
+   <upgrade-request-test>` while also :doc:`upgrading the source code of your custom
    modules </developer/howtos/upgrade_custom_db>`.
 
+.. _upgrade-nutshell:
+
 Upgrading in a nutshell
------------------------
+=======================
 
 #. Request an upgraded test database (see :ref:`obtaining an upgraded test database
-   <upgrade/request-test-database>`).
+   <upgrade-request-test>`).
 #. If applicable, upgrade the source code of your custom module to be compatible with the new
    version of Odoo (see :doc:`/developer/howtos/upgrade_custom_db`).
 #. Thoroughly test the upgraded database (see :ref:`testing the new version of the database
-   <upgrade/test_your_db>`).
-#. Report any issue encountered during the testing to Odoo by `submitting a ticket for an issue
-   related to my future upgrade (I am testing an upgrade) <https://odoo.com/help?stage=migration>`_.
+   <upgrade-testing>`).
+#. Report any issue encountered during the testing to Odoo by going to the `Support page and
+   selecting "An issue related to my future upgrade (I am testing an upgrade)"
+   <https://www.odoo.com/help?stage=migration>`_.
 #. Once all issues are resolved and you are confident that the upgraded database can be used as
    your main database without any issues, plan the upgrade of your production database.
 #. Request the upgrade for the production database, rendering it unavailable for the time it takes
-   to complete the process (see :ref:`upgrading the production database <upgrade/upgrade-prod>`).
-#. Report any issue encountered during the upgrade to Odoo by `submitting a ticket for an issue
-   related to my upgrade (production) <https://odoo.com/help?stage=post_upgrade>`_.
+   to complete the process (see :ref:`upgrading the production database <upgrade-production>`).
+#. Report any issue encountered during the upgrade to Odoo by going to the `Support page and
+   selecting "An issue related to my upgrade (production)"
+   <https://www.odoo.com/help?stage=post_upgrade>`_.
 
-.. _upgrade/request-test-database:
+.. _upgrade-request-test:
 
 Obtaining an upgraded test database
------------------------------------
+===================================
 
-The `Upgrade page <https://upgrade.odoo.com/>`_ is the main platform for requesting an upgraded
+The `Upgrade page <https://upgrade.odoo.com>`_ is the main platform for requesting an upgraded
 database. However, depending on the hosting type, you can upgrade from the command line
-(on-premise), the `Odoo Online database manager <https://odoo.com/my/databases>`_, or your `Odoo.sh
-project <https://odoo.sh/project>`_.
+(on-premise), the Odoo Online `database manager <https://www.odoo.com/my/databases>`_, or your
+`Odoo.sh project <https://www.odoo.sh/project>`_.
 
 .. note::
    The Upgrade platform follows the same `Privacy Policy <https://www.odoo.com/privacy>`_ as the
@@ -81,7 +109,7 @@ project <https://odoo.sh/project>`_.
    .. group-tab:: Odoo Online
 
       Odoo Online databases can be manually upgraded via the `database manager
-      <https://odoo.com/my/databases>`_.
+      <https://www.odoo.com/my/databases>`_.
 
       The database manager displays all databases associated with the user's account. Databases
       not on the most recent version of Odoo display an arrow in a circle icon next to their name,
@@ -115,8 +143,7 @@ project <https://odoo.sh/project>`_.
       .. image:: upgrade/odoo-sh-staging.png
          :alt: Odoo.sh project and tabs
 
-      The **latest production daily automatic backup** is then sent to the `upgrade platform
-      <https://upgrade.odoo.com>`_.
+      The **latest production daily automatic backup** is then sent to the Upgrade platform.
 
       Once the upgrade platform is done upgrading the backup and uploading it on the branch, it is
       put in a **special mode**: each time a **commit is pushed** on the branch, a **restore
@@ -142,6 +169,21 @@ project <https://odoo.sh/project>`_.
 
          $ python <(curl -s https://upgrade.odoo.com/upgrade) test -d <your db name> -t <target version>
 
+      .. note::
+         This command has some requirements on the environment it runs in:
+
+         - Some external commands that must be provided by the operating system, normally found in
+           any Linux distribution (including WSL). An error will be displayed if one or several of
+           them are missing.
+         - The system user that executes the command needs to be configured with access to the
+           database. Please refer to the PostgreSQL documentation of the `client environment
+           <https://www.postgresql.org/docs/current/libpq-envars.html>`_ or the `client password
+           file <https://www.postgresql.org/docs/current/libpq-pgpass.html>`_ for this requirement.
+         - The script needs to be able to reach one or multiple servers of the upgrade platform
+           both on TCP port 443 and to any random TCP port in the range between 32768 and 60999.
+           This can be in conflict with your restrictive firewall and may need an exception added
+           to the firewall configuration.
+
       The following command can be used to display the general help and the main commands:
 
       .. code-block:: console
@@ -149,7 +191,7 @@ project <https://odoo.sh/project>`_.
          $ python <(curl -s https://upgrade.odoo.com/upgrade) --help
 
       An upgraded test database can also be requested via the `Upgrade page
-      <https://upgrade.odoo.com/>`_.
+      <https://upgrade.odoo.com>`_.
 
       .. important::
          In databases where custom modules are installed, their source code must be up-to-date with
@@ -175,22 +217,20 @@ project <https://odoo.sh/project>`_.
 .. note::
    You can request multiple test databases if you wish to test an upgrade more than once.
 
-.. _upgrade/upgrade_report:
-
 .. note::
    When an upgrade request is completed, an upgrade report is attached to the successful upgrade
    email, and it becomes available in the Discuss app for users who are part of the "Administration
    / Settings" group. This report provides important information about the changes introduced by
    the new version.
 
-.. _upgrade/test_your_db:
+.. _upgrade-testing:
 
 Testing the new version of the database
----------------------------------------
+=======================================
 
-It is essential to spend some time testing the upgraded test database to ensure that you are not
-stuck in your day-to-day activities by a change in views, behavior, or an error message once the
-upgrade goes live.
+It is essential to test the upgraded test database to ensure that you are not stuck in your
+day-to-day activities by a change in views, behavior, or an error message once the upgrade goes
+live.
 
 .. note::
    Test databases are neutralized, and some features are disabled to prevent them from impacting the
@@ -245,9 +285,10 @@ working correctly and to get more familiar with the new version.
    This list is **not** exhaustive. Extend the example to your other apps based on your use of Odoo.
 
 If you face an issue while testing your upgraded test database, you can request the assistance of
-Odoo by `submitting a ticket for an issue related to my future upgrade (I am testing an upgrade)
-<https://odoo.com/help?stage=migration>`_. In any case, it is essential to report any problem
-encountered during the testing to fix it before upgrading your production database.
+Odoo by going to the `Support page and selecting "An issue related to my future upgrade (I am
+testing an upgrade)" <https://www.odoo.com/help?stage=migration>`_. In any case, it is essential to
+report any problem encountered during the testing to fix it before upgrading your production
+database.
 
 You might encounter significant differences with standard views, features, fields, and models during
 testing. Those changes cannot be reverted on a case-by-case basis. However, if a change introduced
@@ -265,12 +306,12 @@ module to make it compatible with the new version of Odoo.
    - Server actions in the action menu on form views, as well as by selecting multiple records on
      list views
 
-.. _upgrade/upgrade-prod:
+.. _upgrade-production:
 
 Upgrading the production database
----------------------------------
+=================================
 
-Once the :ref:`tests <upgrade/test_your_db>` are completed and you are confident that the upgraded
+Once the :ref:`tests <upgrade-testing>` are completed and you are confident that the upgraded
 database can be used as your main database without any issues, it is time to plan the go-live day.
 
 Your production database will be unavailable during its upgrade. Therefore, we recommend planning
@@ -288,15 +329,15 @@ day before upgrading the production database is also recommended.**
    - Business interruptions (e.g., no longer having the possibility to validate an action)
    - Poor customer experience (e.g., an eCommerce website that does not work correctly)
 
-The process of upgrading a production database is similar to upgrading a test database with a few
-exceptions.
+The process of upgrading a production database is similar to upgrading a test database, but with a
+few exceptions.
 
 .. tabs::
 
    .. group-tab:: Odoo Online
 
       The process is similar to :ref:`obtaining an upgraded test database
-      <upgrade/request-test-database>`, except for the purpose option, which must be set to
+      <upgrade-request-test>`, except for the purpose option, which must be set to
       :guilabel:`Production` instead of :guilabel:`Test`.
 
       .. warning::
@@ -306,8 +347,8 @@ exceptions.
 
    .. group-tab:: Odoo.sh
 
-      The process is similar to :ref:`obtaining an upgraded test database
-      <upgrade/request-test-database>` on the :guilabel:`Production` branch.
+      The process is similar to :ref:`obtaining an upgraded test database <upgrade-request-test>` on
+      the :guilabel:`Production` branch.
 
       .. image:: upgrade/odoo-sh-prod.png
          :alt: View from the upgrade tab
@@ -337,7 +378,8 @@ exceptions.
          $ python <(curl -s https://upgrade.odoo.com/upgrade) production -d <your db name> -t <target version>
 
       An upgraded production database can also be requested via the `Upgrade page
-      <https://upgrade.odoo.com/>`_.
+      <https://upgrade.odoo.com>`_.
+
       Once the database is uploaded, any modification to your production database will **not** be
       present on your upgraded database. This is why we recommend not using it during the upgrade
       process.
@@ -347,14 +389,14 @@ exceptions.
          a filestore. Therefore, the upgraded database filestore must be merged with the production
          filestore before deploying the new version.
 
-In case of an issue with your production database, you can request the assistance of Odoo by
-`submitting a ticket for an issue related to my upgrade (production)
-<https://odoo.com/help?stage=post_upgrade>`_.
+In case of an issue with your production database, you can request the assistance of Odoo by going
+to the `Support page and selecting "An issue related to my upgrade (production)"
+<https://www.odoo.com/help?stage=post_upgrade>`_.
 
-.. _upgrade/sla:
+.. _upgrade-sla:
 
 Service-level agreement (SLA)
------------------------------
+=============================
 
 With Odoo Enterprise, upgrading a database to the most recent version of Odoo is **free**, including
 any support required to rectify potential discrepancies in the upgraded database.
@@ -363,8 +405,10 @@ Information about the upgrade services included in the Enterprise Licence is ava
 :ref:`Odoo Enterprise Subscription Agreement <upgrade>`. However, this section clarifies what
 upgrade services you can expect.
 
+.. _upgrade-sla-covered:
+
 Upgrade services covered by the SLA
-===================================
+-----------------------------------
 
 Databases hosted on Odoo's cloud platforms (Odoo Online and Odoo.sh) or self-hosted (On-Premise) can
 benefit from upgrade services at all times for:
@@ -378,16 +422,16 @@ benefit from upgrade services at all times for:
 Upgrade services are limited to the technical conversion and adaptation of a database (standard
 modules and data) to make it compatible with the version targeted by the upgrade.
 
+.. _upgrade-sla-not-covered:
+
 Upgrade services not covered by the SLA
-=======================================
+---------------------------------------
 
 The following upgrade-related services are **not** included:
 
 - the **cleaning** of pre-existing data and configurations while upgrading;
-- the upgrade of **custom modules created in-house or by third parties**, including Odoo partners;
-- lines of **code added to standard modules**, i.e., customizations created outside the Studio app,
-  code entered manually, and :ref:`automated actions using Python code
-  <studio/automated-actions/action>`; and
+- the upgrade of **additional modules not covered by a maintenance contract** that are created
+  in-house or by third parties, including Odoo partners; and
 - **training** on using the upgraded version's features and workflows.
 
 .. seealso::

content/applications/essentials.rst

@@ -10,3 +10,4 @@ Odoo essentials
    essentials/contacts
    essentials/export_import_data
    essentials/in_app_purchase
+   essentials/keyboard_shortcuts

content/applications/essentials/export_import_data.rst

@@ -2,6 +2,9 @@
 Export and import data
 ======================
 
+.. |list| replace:: :icon:`oi-view-list` :guilabel:`(list)` icon
+.. |actions| replace:: :icon:`fa-cog` :guilabel:`Actions`
+
 In Odoo, it is sometimes necessary to export or import data for running reports, or for data
 modification. This document covers the export and import of data into and out of Odoo.
 
@@ -20,9 +23,9 @@ can aid in reporting on activities, although, Odoo provides a precise and easy r
 each available application.
 
 With Odoo, the values can be exported from any field in any record. To do so, activate the list view
-(:guilabel:`≣ (four horizontal lines)` icon), on the items that need to be exported, and then
-select the records that should be exported. To select a record, tick the checkbox next to the
-corresponding record. Finally, click on :guilabel:`⚙️ Action`, and then :guilabel:`Export`.
+(|list|), on the items that need to be exported, then select the records that should be exported. To
+select a record, tick the checkbox next to the corresponding record. Finally, click on |actions|,
+then :guilabel:`Export`.
 
 .. image:: export_import_data/list-view-export.png
    :align: center
@@ -36,9 +39,10 @@ several options for the data to export:
    :alt: Overview of options to consider when exporting data in Odoo..
 
 #. With the :guilabel:`I want to update data (import-compatable export)` option ticked, the system
-   only shows the fields that can be imported. This is helpful in the case where the existing
-   records need to be updated. This works like a filter. Leaving the box unticked, gives many more
-   field options because it shows all the fields, not just the ones that can be imported.
+   only shows the fields that can be imported. This is helpful in the case where the :ref:`existing
+   records need to be updated <essentials/update-data>`. This works like a filter. Leaving the box
+   unticked, gives many more field options because it shows all the fields, not just the ones that
+   can be imported.
 #. When exporting, there is the option to export in two formats: `.csv` and `.xls`. With `.csv`,
    items are separated by a comma, while `.xls` holds information about all the worksheets in a
    file, including both content and formatting.
@@ -70,7 +74,8 @@ Import data into Odoo
 =====================
 
 Importing data into Odoo is extremely helpful during implementation, or in times where data needs to
-be updated in bulk. The following documentation covers how to import data into an Odoo database.
+be :ref:`updated in bulk <essentials/update-data>`. The following documentation covers how to import
+data into an Odoo database.
 
 .. warning::
    Imports are permanent and **cannot** be undone. However, it is possible to use filters (`created
@@ -158,6 +163,9 @@ Once the template is downloaded, proceed to follow these steps:
    using the fields that should be imported. This way, if there is not a sample import template,
    the names are accurate.
 
+
+.. _essentials/external-id:
+
 Import from another application
 -------------------------------
 
@@ -166,7 +174,8 @@ from previous software to facilitate the transition to Odoo.
 
 Setting an ID is not mandatory when importing, but it helps in many cases:
 
-- Update imports: import the same file several times without creating duplicates.
+- :ref:`Update imports <essentials/update-data>`: import the same file several times without
+  creating duplicates.
 - :ref:`Import relation fields <export_import_data/relation-fields>`.
 
 To recreate relationships between different records, the unique identifier from the original
@@ -176,10 +185,7 @@ When another record is imported that links to the first one, use **XXX/ID** (XXX
 the original unique identifier. This record can also be found using its name.
 
 .. warning::
-   It should be noted that there will be a conflict if two or more records have the same name.
-
-The :guilabel:`External ID` (ID) can also be used to update the original import, if modified data
-needs to be re-imported later, therefore, it is a good practice to specify it whenever possible.
+   It should be noted that conflicts occur if two (or more) records have the same *External ID*.
 
 Field missing to map column
 ---------------------------
@@ -476,3 +482,43 @@ The two files produced are ready to be imported in Odoo without any modification
 imported these two :abbr:`CSV (Comma-separated Values)` files, there are four contacts and three
 companies (the first two contacts are linked to the first company). Keep in mind to first import
 the companies, and then the people.
+
+.. _essentials/update-data:
+
+Update data in Odoo
+===================
+
+Existing data can be updated in bulk through a data import, as long as the :ref:`External ID
+<essentials/external-id>` remains consistent.
+
+Prepare data export
+-------------------
+
+To update data through an import, first navigate to the data to be updated, and select the |list| to
+activate list view. On the far-left side of the list, tick the checkbox for any record to be
+updated. Then, click |actions|, and select :icon:`fa-upload` :guilabel:`Export` from the drop-down
+menu.
+
+On the resulting :guilabel:`Export Data` pop-up window, tick the checkbox labeled, :guilabel:`I want
+to update data (import-compatible export)`. This automatically includes the *External ID* in the
+export. Additionally, it limits the :guilabel:`Fields to export` list to **only** include fields
+that are able to be imported.
+
+.. note::
+   The :guilabel:`External ID` field does **not** appear in the :guilabel:`Fields to export` list
+   unless it is manually added, but it is still included in the export. However, if the :guilabel:`I
+   want to update data (import-compatible export)` checkbox is ticked, it is included in the export.
+
+Select the required fields to be included in the export using the :ref:`options <export-data>` on
+the pop-up window, then click :guilabel:`Export`.
+
+Import updated data
+-------------------
+
+After exporting, make any necessary changes to the data file. When the file is ready, it can be
+:ref:`imported <import-data>` by following the same process as a normal data import.
+
+.. danger::
+   When updating data, it is extremely important that the *External ID* remain consistent, as
+   this is how the system identifies a record. If an ID is altered, or removed, the system may add a
+   duplicate record, instead of updating the existing one.

content/applications/essentials/in_app_purchase.rst

@@ -89,7 +89,7 @@ settings. To use a service, simply interact with it wherever it appears in the d
    - :doc:`Lead mining <../sales/crm/acquire_leads/lead_mining>`
    - :doc:`Enrich your contacts base with Partner Autocomplete
      <../sales/crm/optimize/partner_autocomplete>`
-   - :doc:`SMS essentials <../marketing/sms_marketing/essentials/sms_essentials>`
+   - :doc:`SMS Marketing <../marketing/sms_marketing>`
 
 .. _in_app_purchase/credits:
 
@@ -119,7 +119,7 @@ Credits are purchased in *Packs* from the `Odoo IAP Catalog
    The number of credits consumed depends on the length of the SMS and the country of destination.
 
    For more information, refer to the :doc:`SMS Pricing and FAQ
-   <../marketing/sms_marketing/pricing/pricing_and_faq>` documentation.
+   <../marketing/sms_marketing/pricing_and_faq>` documentation.
 
 .. _iap/buying_credits:
 

content/applications/essentials/keyboard_shortcuts.rst

@@ -0,0 +1,86 @@
+==================
+Keyboard shortcuts
+==================
+
+Users in Odoo can utilize several keyboard shortcuts to navigate through modules, execute actions,
+and manage data.
+
+.. tip::
+   Hold :kbd:`Ctrl` to view the keyboard shortcuts assigned to each element on the interface.
+
+   .. image:: keyboard_shortcuts/menu-shortcuts.png
+      :align: center
+      :alt: A selection of keyboard shortcuts in Odoo.
+
+.. important::
+   Some keyboard shortcuts may not be available on different versions of Odoo or effective depending
+   on browsers, extensions, or other individual settings.
+
+Keyboard shortcuts by operating system
+======================================
+
+Below is a list of some of the most commonly used keyboard shortcuts within Odoo, listed by
+operating system.
+
+.. list-table::
+   :header-rows: 1
+   :stub-columns: 1
+
+   * - Description
+     - Windows / Linux
+     - macOS
+   * - Previous breadcrumb
+     - :kbd:`Alt` + :kbd:`B`
+     - :kbd:`Ctrl` + :kbd:`B`
+   * - Create new record
+     - :kbd:`Alt` + :kbd:`C`
+     - :kbd:`Ctrl` + :kbd:`C`
+   * - Odoo Home Page
+     - :kbd:`Alt` + :kbd:`H`
+     - :kbd:`Ctrl` + :kbd:`H`
+   * - Discard changes
+     - :kbd:`Alt` + :kbd:`J`
+     - :kbd:`Ctrl` + :kbd:`J`
+   * - Save changes
+     - :kbd:`Alt` + :kbd:`S`
+     - :kbd:`Ctrl` + :kbd:`S`
+   * - Next page
+     - :kbd:`Alt` + :kbd:`N`
+     - :kbd:`Ctrl` + :kbd:`N`
+   * - Previous page
+     - :kbd:`Alt` + :kbd:`P`
+     - :kbd:`Ctrl` + :kbd:`P`
+   * - Search
+     - :kbd:`Alt` + :kbd:`Q`
+     - :kbd:`Ctrl` + :kbd:`Q`
+   * - Select menus
+     - :kbd:`Alt` + :kbd:`1-9`
+     - :kbd:`Ctrl` + :kbd:`1-9`
+   * - Create a new To-Do
+     - :kbd:`Alt` + :kbd:`Shift` + :kbd:`T`
+     - :kbd:`Ctrl` + :kbd:`Shift` + :kbd:`T`
+   * - Search a Knowledge article
+     - :kbd:`Alt` + :kbd:`F`
+     - :kbd:`Ctrl` + :kbd:`F`
+   * - Share a Knowledge article
+     - :kbd:`Alt` + :kbd:`Shift` + :kbd:`S`
+     - :kbd:`Ctrl` + :kbd:`Shift` + :kbd:`S`
+   * - Open command palette
+     - :kbd:`Ctrl` + :kbd:`K`
+     - :kbd:`Command` + :kbd:`K`
+
+.. tip::
+   After opening the command palette, search using the following keyboard shortcuts:
+
+   - :kbd:`/`: search for menus, applications, and modules.
+   - :kbd:`@`: search for users.
+   - :kbd:`#`: search for **Discuss** channels.
+   - :kbd:`?`: search for **Knowledge** articles.
+
+   Enter a name (or term) in the search bar, or use the arrow keys to scroll through the available
+   options. Then, click :kbd:`Ctrl` + :kbd:`Enter` to open the selected app, module, or menu in a
+   new tab.
+
+   .. image:: keyboard_shortcuts/command-palete.png
+      :align: center
+      :alt: The command palette in Odoo, with the menu search option selected.

content/applications/essentials/search.rst

@@ -181,6 +181,75 @@ It is possible to *customize groups* by using a field present on the model. To d
    cluster, the next one that is added further divides the main group's categories, and so on.
    Furthermore, filters and groups can be used together to refine the view even more.
 
+.. _search/comparison:
+
+Comparison
+==========
+
+Certain reporting dashboards include a :guilabel:`Comparison` section in the drop-down menus of
+their :guilabel:`Search...` bars. This includes the :doc:`Overall Equipment Effectiveness
+<../inventory_and_mrp/manufacturing/reporting/oee>` report for the *Manufacturing* app, and the
+:doc:`Purchase <../inventory_and_mrp/purchase/advanced/analyze>` report for the *Purchase* app,
+among others.
+
+The options in the :icon:`fa-adjust` :guilabel:`Comparison` section are used to compare data from
+two different time periods. There are two comparison options to choose from: :guilabel:`(Time
+Filter): Previous Period` and :guilabel:`(Time Filter): Previous Year`.
+
+.. important::
+   For some reports, the :guilabel:`Comparison` section **only** appears in the
+   :guilabel:`Search...` bar drop-down menu if one (or more) time periods have been selected in the
+   :guilabel:`Filters` column. This is because, if no time period is specified, there is nothing to
+   compare.
+
+   Additionally, some reports only allow use of the :guilabel:`Comparison` feature when the
+   :icon:`fa-pie-chart` :guilabel:`(pie chart)` graph type, or the :icon:`oi-view-pivot`
+   :guilabel:`(pivot)` view, is selected. A :guilabel:`Comparison` option can be selected even if
+   another view is enabled, but doing so does **not** change the way data is displayed on the
+   report.
+
+.. image:: search/comparison-section.png
+   :align: center
+   :alt: The Search... bar for the production analysis report.
+
+To view data using one of the two comparisons, begin by selecting a time period in the
+:guilabel:`Filters` column of the :guilabel:`Search...` bar drop-down menu. Then, select either
+:guilabel:`(Time Filter): Previous Period` or :guilabel:`(Time Filter): Previous Year` in the
+:guilabel:`Comparison` section.
+
+With one of the :guilabel:`Comparison` options enabled, the report compares the data for the
+selected period, with the data for the same unit of time (month, quarter, year), one period or year
+prior. The way the data is displayed depends on the selected view:
+
+- The :icon:`fa-bar-chart` :guilabel:`(bar chart)` shows two bars, side-by-side, for each unit of
+  time for the selected time period. The left bar represents the selected time period, while the
+  right bar represents the previous time period.
+- The :icon:`fa-line-chart` :guilabel:`(line chart)` is displayed with two lines, one representing
+  the selected time period, and the other representing the previous time period.
+- The :icon:`fa-pie-chart` :guilabel:`(pie chart)` appears as a large circle with a smaller circle
+  inside. The larger circle represents the selected time period, while the smaller circle represents
+  the previous time period.
+- The :icon:`oi-view-pivot` :guilabel:`(pivot table)` is displayed with each column split into two
+  smaller columns. The right column represents the selected time period, while the left column
+  represents the previous time period.
+
+.. example::
+   In the :guilabel:`Production Analysis` report of the :menuselection:`Manufacturing` app, data for
+   the second quarter of 2024 is compared to data for the second quarter of 2023. :guilabel:`Q2` is
+   selected in the :guilabel:`End Date` filter section of the :guilabel:`Search...` bar drop-down
+   menu. In the :guilabel:`Comparison` section, :guilabel:`End Date: Previous Year` is selected.
+
+   The current year is 2024, so the larger circle shows data for the second quarter (Q2) of 2024.
+   The smaller circle shows data for the second quarter (Q2) of 2023, which is the same time period,
+   but one *year* prior.
+
+   If :guilabel:`End Date: Previous Period` is selected instead, the smaller circle shows data for
+   the first quarter (Q1) of 2024, which is the same time period, but one *period* prior.
+
+   .. image:: search/comparison.png
+      :align: center
+      :alt: The comparison view of the Production Analysis report.
+
 .. _search/favorites:
 
 Favorites

content/applications/finance/accounting.rst

@@ -211,7 +211,7 @@ available methods are standard price, average price, :abbr:`LIFO (Last-In, First
 :abbr:`FIFO (First-In, First-Out).`
 
 .. seealso::
-   :doc:`../inventory_and_mrp/inventory/warehouses_storage/inventory_valuation/inventory_valuation_config`
+   :doc:`../inventory_and_mrp/inventory/product_management/inventory_valuation/inventory_valuation_config`
 
 Retained earnings
 =================

content/applications/finance/accounting/bank.rst

@@ -36,6 +36,8 @@ follow the instructions.
 .. seealso::
    :doc:`bank/bank_synchronization`
 
+.. _bank_accounts/create:
+
 Create a bank account
 ---------------------
 
@@ -108,6 +110,8 @@ You can edit the currency used to enter the statements.
 .. seealso::
    :doc:`get_started/multi_currency`
 
+.. _accounting/bank/account-number:
+
 Account number
 --------------
 
@@ -191,4 +195,3 @@ Payments` tab. To display the outstanding accounts column, click on the toggle b
    bank/reconciliation
    bank/reconciliation_models
    bank/foreign_currency
-   bank/cash_register

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

@@ -42,7 +42,7 @@ First synchronization
 ---------------------
 
 You can start synchronization either by going to the Accounting app and
-:menuselection:`Accounting Dashboard --> Configuration --> Banks: Add a Bank Account`.
+:menuselection:`Accounting --> Configuration --> Add a Bank Account`.
 
 Now you can search for your bank institution. Select it and follow the steps to synchronize with it.
 
@@ -70,19 +70,19 @@ By default, transactions fetched from an online source are grouped inside the sa
 one bank statement is created per month. You can change the bank statement creation periodicity
 in your journal settings.
 
-You can find all your synchronizations by going to :menuselection:`Accounting Dashboard -->
-Configuration --> Accounting: Online Synchronization`.
+To view all your synchronizations, activate the :ref:`developer mode <developer-mode>` and go to
+:menuselection:`Accounting --> Configuration --> Online Synchronization`.
 
 Synchronize manually
 --------------------
 
 After your first synchronization, the created journals are synchronized by default every 12 hours.
-If you wish, you can synchronize manually by clicking on the :guilabel:`Synchronize Now` button on
-the dashboard.
+If you wish, you can synchronize them manually by clicking on the :guilabel:`Synchronize Now` button
+on the dashboard.
 
-Or you can go to :menuselection:`Accounting Dashboard --> Configuration -->
-Accounting: Online Synchronization`, select your institution and then click on the
-:guilabel:`fetch transactions` button.
+Alternatively, activate the :ref:`developer mode <developer-mode>`, go to
+:menuselection:`Accounting --> Configuration --> Online Synchronization`, select your institution,
+and then click the :guilabel:`Fetch transactions` button.
 
 .. important::
    Some institutions do not allow transactions to be fetched automatically. For such institutions,
@@ -96,9 +96,10 @@ Issues
 Synchronization in error
 ------------------------
 
-To report a connection error to the `Odoo support <https://www.odoo.com/help>`_, go to
-:menuselection:`Accounting Dashboard--> Configuration --> Accounting: Online Synchronization`,
-select the connection that failed, and copy the error description and the reference.
+To report a connection error to the `Odoo support <https://www.odoo.com/help>`_, activate the
+:ref:`developer mode <developer-mode>`, go to :menuselection:`Accounting --> Configuration -->
+Online Synchronization`, select the connection that failed, and copy the error description and the
+reference.
 
 Synchronization disconnected
 ----------------------------
@@ -128,14 +129,14 @@ Finally, make sure all your users refresh their Odoo page by pressing CTRL+F5.
 
 .. Note::
 
-   - All previous synchronizations are disconnected during the installation and won't work anymore.
-   - You can find them directly in the synchronization menu
-     (:menuselection:`Accounting Dashboard --> Configuration -->
-     Accounting: Online Synchronization`). It is not possible to resynchronize these connections;
-     you have to make new ones.
-   - Do not uninstall `account_online_sync`, which is the previous module for online
+   - All previous synchronizations are disconnected during the installation and will not work
+     anymore. To view them, activate the :ref:`developer mode <developer-mode>` and go to
+     :menuselection:`Accounting --> Configuration --> Online Synchronization`). It is not possible
+     to resynchronize these connections; you have to make new ones.
+   - Do not uninstall the `account_online_sync` module, which is the previous module for online
      synchronization. The new one overrides it.
-   - By default, `account_online_synchronization` is installed automatically with Accounting.
+   - By default, the `account_online_synchronization` module is installed automatically with
+     Accounting.
 
 FAQ
 ===
@@ -145,11 +146,11 @@ The synchronization is not working in real-time. Is that normal?
 
 The process is not intended to work in real-time as third party providers synchronize your accounts
 at different intervals. To force the synchronization and fetch the statements, go to your
-:guilabel:`Accounting Dashboard`, and click on the :guilabel:`Synchronize Now` button. You can also
-synchronize and fetch transactions through :menuselection:`Accounting Dashboard -->
-Configuration --> Accounting: Online Synchronization`. Some providers only allow one refresh per
-day, so it is possible that clicking on :guilabel:`Synchronize Now` does not get your latest
-transactions if you already performed such action earlier in the day.
+:guilabel:`Accounting Dashboard`, and click on the :guilabel:`Synchronize Now` button. Synchronize
+and fetch transactions by activating the :ref:`developer mode <developer-mode>` and going to
+:menuselection:`Accounting --> Configuration --> Online Synchronization`. Some providers only allow
+one refresh per day, so it is possible that clicking on :guilabel:`Synchronize Now` does not get
+your latest transactions if you already performed such action earlier in the day.
 
 A transaction can be visible on your bank account but not be fetched if it has the status
 :guilabel:`Pending`. Only transactions with the :guilabel:`Posted` status will be retrieved. If the
@@ -158,9 +159,9 @@ transaction is not **Posted** yet, you will have to wait until the status change
 Is the Online Bank Synchronization feature included in my contract?
 -------------------------------------------------------------------
 
-- **Community Version**: No, this feature is not included in the Community Version.
-- **Online Version**: Yes, even if you benefit from the One App Free contract.
-- **Enterprise Version**: Yes, if you have a valid enterprise contract linked to your database.
+- **Community Edition**: No, this feature is not included in the Community Version.
+- **Online Edition**: Yes, even if you benefit from the One App Free contract.
+- **Enterprise Edition**: Yes, if you have a valid enterprise contract linked to your database.
 
 Some banks have a status "Beta." What does this mean?
 -----------------------------------------------------
@@ -186,9 +187,9 @@ Why don't I see any transactions?
 ---------------------------------
 
 During your first synchronization, you selected the bank accounts you decided to synchronize with
-Odoo. If you didn't synchronize any of your accounts, you can go to
-:menuselection:`Accounting Dashboard --> Configuration --> Accounting: Online Synchronization` to
-click on the :guilabel:`Fetch Account` button on the connection.
+Odoo. If you didn't synchronize any of your accounts, activate the :ref:`developer mode
+<developer-mode>`, go to :menuselection:`Accounting --> Configuration --> Online Synchronization`,
+and click the :guilabel:`Fetch Account` button on the connection.
 
 There may also be no new transactions.
 
@@ -198,9 +199,9 @@ database, please `submit a support ticket <https://www.odoo.com/help>`_.
 How can I update my bank credentials?
 -------------------------------------
 
-You can update your credentials by going to :menuselection:`Accounting Dashboard -->
-Configuration --> Accounting: Online Synchronization`,open the connection you want to update your
-credentials and click on the :guilabel:`Update Credentials` button.
+To update your credentials, activate the :ref:`developer mode <developer-mode>` and go to
+:menuselection:`Accounting --> Configuration --> Online Synchronization`. Open the connection you
+want to update your credentials and click the :guilabel:`Update Credentials` button.
 
 .. toctree::
    :titlesonly:

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

@@ -7,7 +7,6 @@ in one place. It offers non-intrusive connectivity to ASPSPs' official APIs acro
 storing data.
 
 .. image:: enablebanking/enablebanking.png
-   :align: center
    :alt:   Enable Banking logo
 
 **Odoo** synchronizes directly with banks to get access to all bank transactions and automatically
@@ -30,7 +29,6 @@ Link bank accounts with Odoo
    :guilabel:`Continue authentication`;
 
    .. image:: enablebanking/enablebankingauth.png
-      :align: center
       :alt: Enable Banking authentication page
 
 #. Finally, you are redirected to your bank's login page.

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

@@ -6,15 +6,11 @@ Ponto
 place and directly see all their transactions within one app. It is a third-party solution that is
 continuously expanding the number of bank institutions that can be synchronized with Odoo.
 
-.. image:: ponto/ponto-logo.png
-   :align: center
-   :alt: Logo of the Ponto brand
-
 **Odoo** can synchronize directly with your bank to get all bank statements imported automatically
 into your database.
 
 Ponto is a paid third-party provider that can handle the synchronization between your bank accounts
-and Odoo. `Its pricing is 4€/month per account/integration <https://myponto.com/en#pricing>`_.
+and Odoo.
 
 .. seealso::
    - :doc:`../bank_synchronization`
@@ -31,34 +27,29 @@ Link your bank accounts with Ponto
 #. Once you are logged in, create an *organization*.
 
    .. image:: ponto/ponto-organization.png
-      :align: center
       :alt: Fill out the form to add an organization in Ponto.
 
-#. | Go to :menuselection:`Accounts --> Live`, and click on *Add account*.
-   | You might have to add your **Billing Information** first.
+#. Go to :menuselection:`Accounts --> Live`, and click :guilabel:`Add account`. You might have to
+   add your **Billing Information** first.
 #. Select your country, your bank institutions, give your consent to Ponto, and follow the steps
    on-screen to link your bank account with your Ponto account.
 
    .. image:: ponto/ponto-add-account.png
-      :align: center
       :alt: Add bank accounts to your Ponto account.
 
-#. Make sure to add all bank accounts you want to synchronize with your Odoo database before moving
-   on to the next steps.
+#. Add all bank accounts you want to synchronize with your Odoo database and move to the next steps.
 
 Link your Ponto account with your Odoo database
 -----------------------------------------------
 
 #. Go to :menuselection:`Accounting --> Configuration --> Add a Bank Account`.
-#. Search your institution, make sure to select the right institution. By selecting the institution,
-   you can verify that the third party provider is Ponto.
-#. Click on *Connect* and follow the steps.
-#. At some point, you will have to authorize the accounts you want to access in Odoo. Please select
-   **all the accounts** you want to synchronize. Even the ones coming from other banking
-   institutions.
+#. Search for your institution and select it so you can verify that the third party provider is
+   Ponto.
+#. Click :guilabel:`Connect` and follow the steps.
+#. Select **all accounts** you want to access and synchronize in Odoo, even the ones coming from
+   other banking institutions.
 
    .. image:: ponto/ponto-select-accounts.png
-      :align: center
       :alt: Selection of the accounts you wish to synchronize with Odoo.
 
 #. Finish the flow.
@@ -70,26 +61,26 @@ Link your Ponto account with your Odoo database
 Update your synchronization credentials
 ---------------------------------------
 
-You might have to update your Ponto credentials or modify the synchronization settings.
+To update your Ponto credentials or modify the synchronization settings, activate the
+:ref:`developer mode <developer-mode>`, go to :menuselection:`Accounting --> Configuration -->
+Online Synchronization`, and select the institution from which you want to fetch the other
+accounts. Click :guilabel:`Fetch Accounts` to start the flow.
 
-To do so, go to :menuselection:`Accounting --> Configuration --> Online Synchronization` and select
-the institution you want to fetch the other accounts. Click on *Fetch Accounts* button to start the
-flow.
-
-During the update, select **all the accounts** you want to synchronize, even the ones coming
-from other banking institutions.
+.. note::
+   During the update, select **all accounts** you want to synchronize, even the ones coming from
+   other banking institutions.
 
 Fetch new accounts
 ------------------
 
-You might want to add new online accounts to your connection.
+To add new online accounts to your connection, activate the :ref:`developer mode <developer-mode>`,
+go to :menuselection:`Accounting --> Configuration --> Online Synchronization`, and select the
+institution from which you want to fetch the other accounts. Click :guilabel:`Fetch Accounts` to
+start the flow.
 
-To do so, go to :menuselection:`Accounting --> Configuration --> Online Synchronization` and select
-the institution you want to fetch the other accounts. Click on *Fetch Accounts* button to start the
-flow.
-
-Don't forget to keep authorization for existing accounts (for all institutions that you
-have synchronized with Ponto).
+.. note::
+   Don't forget to keep authorization for existing accounts (for all institutions that you have
+   synchronized with Ponto).
 
 FAQ
 ===
@@ -102,7 +93,7 @@ You selected an institution from the list and did not authorize any accounts fro
 I have an error about that my authorization has expired
 -------------------------------------------------------
 
-Every **3 months** (90 days) you must re-authorize the connection between your bank account
+Every **6 months** (180 days) you must re-authorize the connection between your bank account
 and Ponto. This must be done from the `Ponto website <https://myponto.com>`_. If you do not
 do this, the synchronization will stop for these accounts.
 

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

@@ -6,11 +6,6 @@ Salt Edge
 from your bank accounts. It supports ~5000 institutions in more than 50
 countries.
 
-.. image:: saltedge/saltedge-logo.png
-   :align: center
-   :width: 50%
-   :alt: Salt Edge Logo
-
 Odoo can synchronize directly with your bank to get all bank statements imported
 automatically into your database.
 
@@ -34,20 +29,17 @@ Link your bank accounts with Odoo
    account.
 
    .. image:: saltedge/saltedge-contact-email.png
-      :align: center
       :alt: Email address to provide to Salt Edge for the creation of your account.
 
 #. After entering your email address, you are redirected to Salt Edge to continue
    the synchronization process.
 
    .. image:: saltedge/saltedge-login-page.png
-      :align: center
       :alt: Salt Edge Login page.
 
 #. Make sure you give your consent by checking the consent checkbox.
 
    .. image:: saltedge/saltedge-give-consent.png
-      :align: center
       :alt: Salt Edge give consent page.
 
 #. Complete the synchronization by following the steps.
@@ -56,11 +48,10 @@ Link your bank accounts with Odoo
 Update your credentials
 -----------------------
 
-You might have to update your Salt Edge credentials or modify the synchronization settings.
-
-To do so, go to :menuselection:`Accounting --> Configuration --> Online Synchronization` and
-select the institution you want to update credentials. Click on the *Update Credentials* button
-to start the flow and follow the steps.
+To update your Salt Edge credentials or modify the synchronization settings, activate the
+:ref:`developer mode <developer-mode>`, go to :menuselection:`Accounting --> Configuration -->
+Online Synchronization`, and select the institution you want to update credentials. Click
+:guilabel:`Update Credentials` to start the flow and follow the steps.
 
 Don't forget to check the consent checkbox. Otherwise, Odoo may not be able to access
 your information.
@@ -68,14 +59,14 @@ your information.
 Fetch new accounts
 ------------------
 
-You might want to add new online accounts to your connection.
+To add new online accounts to your connection, activate the :ref:`developer mode <developer-mode>`,
+go to :menuselection:`Accounting --> Configuration --> Online Synchronization`, and select the
+institution to fetch the new accounts. Click :guilabel:`Fetch Accounts` to start the flow and
+follow the steps.
 
-To do so, go to :menuselection:`Accounting --> Configuration --> Online Synchronization` and
-select the institution to fetch the new accounts. Click on the *Fetch Accounts* button
-to start the flow and follow the steps.
-
-Don't forget to check the consent checkbox. Otherwise, Odoo may not be able to access
-your information.
+.. note::
+   Don't forget to check the consent checkbox. Otherwise, Odoo may not be able to access your
+   information.
 
 FAQ
 ===
@@ -94,15 +85,15 @@ record.
 I have an error saying that I have already synchronized this account
 --------------------------------------------------------------------
 
-You have probably already synchronized your bank account with Salt Edge, please check on your `dashboard
-<https://www.saltedge.com/dashboard>`_ that you don't already have a connection with the same
-credentials.
+You have probably already synchronized your bank account with Salt Edge, please check on your
+`dashboard <https://www.saltedge.com/dashboard>`_ that you don't already have a connection with the
+same credentials.
 
-In case you already have a synchronization with the same credentials present on your Salt Edge
-dashboard and this synchronization has not been created with Odoo, please delete it and create it
-from your Odoo database.
+If you already have a synchronization with the same credentials present on your Salt Edge
+dashboard and this synchronization has not been created with Odoo, delete it and create it from your
+Odoo database.
 
-In case you already have a connection with the same credentials present on your Salt Edge dashboard
-and this synchronization was created with Odoo, you will normally be able to find it by going to
-:menuselection:`Accounting --> Configuration --> Online Synchronization`. Please make sure to do an
-*Update Credentials* to reactivate the connection.
+If you already have a connection with the same credentials present on your Salt Edge dashboard
+and this synchronization was created with Odoo, activate the :ref:`developer
+mode <developer-mode>`, go to :menuselection:`Accounting --> Configuration --> Online
+Synchronization`, and click :guilabel:`Update Credentials` to reactivate the connection.

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

@@ -1,56 +0,0 @@
-=============
-Cash register
-=============
-
-The cash register is a journal to register receivings and payments transactions.
-It calculates the total money in and out, computing the total balance.
-
-Configuration
-=============
-
-.. image:: cash_register/journal.png
-   :align: center
-
-1. Configure the Cash journal in :menuselection:`Accounting --> Configuration -->
-   Journals`.
-
-2. In the tab Journal Entries, the Default Debit and Credit Account can be
-   configured as well as the currency of the journal
-
-Usage
-=====
-
-How to register cash payments?
-------------------------------
-
-To register a cash payment specific to another customer, you should follow
-these steps:
-
-1. Go to :menuselection:`Accounting --> Dashboard --> Cash --> Register
-   Transactions`
-
-2. Fill in the start and ending balance
-
-3. Register the transactions, specifying the customers linked to the transaction
-
-Put money in
-------------
-
-Put money in is used to placed your cash manually before starting your
-transactions. From the Register Transactions window, go to :menuselection:`More
---> Put money in`
-
-.. image:: cash_register/put-money-in.png
-   :align: center
-
-Take money out
---------------
-
-Take money out is used to collect/get yor your cash manually after
-ending all your transactions. From the Register Transaction windows, go to :menuselection:`More
---> Take money out`
-
-.. image:: cash_register/put-money-out.png
-   :align: center
-
-The transactions will be added to the current cash payment registration.

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

@@ -21,25 +21,23 @@ Import transactions
 
 Odoo supports multiple file formats to import transactions:
 
-- SEPA recommended Cash Management format (CAMT.053);
-- Comma-separated values (.CSV);
-- Open Financial Exchange (.OFX);
-- Quicken Interchange Format (.QIF);
-- Belgium: Coded Statement of Account (.CODA).
+- SEPA recommended Cash Management format (CAMT.053)
+- Comma-separated values (CSV)
+- Open Financial Exchange (OFX)
+- Quicken Interchange Format (QIF)
+- Belgium: Coded Statement of Account (CODA)
 
-To import a file, go to the **Accounting Dashboard**, and in the :guilabel:`Bank` journal,
+To import a file, go to the :guilabel:`Accounting Dashboard`, and in the :guilabel:`Bank` journal,
 click on :guilabel:`Import File`.
 
 .. tip::
    Alternatively, you can also:
 
-   - click :guilabel:`⋮` on the :guilabel:`Bank` journal and select :guilabel:`Import file`;
-   - or access the transaction list by clicking :guilabel:`⋮` on the :guilabel:`Bank` journal and
-     selecting :guilabel:`Transactions`, then click the gear icon :guilabel:`(⚙)` and select
-     :guilabel:`Import records`.
-
-     .. image:: transactions/import-transactions.png
-        :alt: Import bank transactions from the bank journal
+   - click the :icon:`fa-ellipsis-v` :guilabel:`(ellipsis)` icon on the :guilabel:`Bank`
+     journal and select :guilabel:`Import file`;
+   - or access the transaction list by clicking the :icon:`fa-ellipsis-v` :guilabel:`(ellipsis)`
+     icon on the :guilabel:`Bank` journal and selecting :guilabel:`Transactions`, then click
+     the :icon:`fa-cog` :guilabel:`(gear)` icon and select :guilabel:`Import records`.
 
 Next, select the file and upload it.
 
@@ -75,22 +73,28 @@ on your business flow, you may want to record them for control purposes.
    account balance as of the date you begin synchronizing or importing transactions. This is
    necessary to ensure the accuracy of your accounting.
 
-To access a list of statements, go to your :guilabel:`Accounting Dashboard`, click on the vertical
-ellipsis (:guilabel:`⋮`) button next to the bank or cash journal you want to check, then on
-:guilabel:`Statements`
+To access a list of existing statements, go to the :guilabel:`Accounting Dashboard`, click the
+:icon:`fa-ellipsis-v` :guilabel:`(ellipsis)` icon next to the bank or cash journal you want to
+check, then click :guilabel:`Statements`.
+
+.. _transactions/statement-kanban:
 
 Statement creation from the kanban view
 ---------------------------------------
 
-Open the bank reconciliation view by clicking on the name of the bank journal, and identify the
-transaction corresponding to the last transaction of your bank statement. Click on the
-:guilabel:`STATEMENT` button when hovering on the upper separator line.
+Open the bank reconciliation (kanban) view from the :guilabel:`Accounting Dashboard` by clicking on
+the name of the bank journal and identify the transaction corresponding to the last (most recent)
+transaction of your bank statement. Click on the :guilabel:`Statement` button when hovering on the
+upper separator line to create a statement from that transaction down to the oldest transaction that
+is not yet part of a statement.
 
 .. image:: transactions/statements-kanban.png
-   :alt: A "STATEMENT" button is visible when hovering on the line separating two transactions.
+   :alt: A "Statement" button is visible when hovering on the line separating two transactions.
 
-Fill out the statement's details and save. The newly created statement includes the previous
-transactions following the last statement.
+In the :guilabel:`Create Statement` window, fill out the statement's :guilabel:`Reference`, verify
+its :guilabel:`Starting Balance` and :guilabel:`Ending Balance`, and click :guilabel:`Save`.
+
+.. _transactions/statement-list:
 
 Statement creation from the list view
 -------------------------------------
@@ -100,3 +104,35 @@ view. Select all the transactions corresponding to the bank statement, and, in t
 :guilabel:`Statement` column, select an existing statement or create a new one by typing its
 reference, clicking on :guilabel:`Create and edit...`, filling out the statement's details, and
 saving.
+
+.. _transactions/view-edit-print:
+
+Statement viewing, editing, and printing
+----------------------------------------
+
+To view an existing statement, click on the statement amount in the reconciliation (kanban) view or
+click on the statement name in the bank transaction list view. From here, you can edit the
+:guilabel:`Reference`, :guilabel:`Starting Balance`, or :guilabel:`Ending Balance`.
+
+.. note::
+   Manually updating the :guilabel:`Starting Balance` automatically updates the :guilabel:`Ending
+   Balance` based on the new value of the :guilabel:`Starting Balance` and the value of the
+   statement's transactions.
+
+.. warning::
+   If the :guilabel:`Starting Balance` doesn't equal the previous statement's :guilabel:`Ending
+   Balance`, or if the :guilabel:`Ending Balance` doesn't equal the running balance
+   (:guilabel:`Starting Balance` plus the statement's transactions), a warning appears explaining
+   the issue. To maintain flexibility, it is still possible to save without first resolving the
+   issue.
+
+To attach a digital copy (i.e., JPEG, PNG, or PDF) of the bank statement for enhanced recordkeeping,
+click the :icon:`fa-paperclip` :guilabel:`Attachments` button and select the file to attach.
+
+To generate and print a PDF of the bank statement, click the :guilabel:`Print` button (if accessed
+via the reconciliation view) or click on the :icon:`fa-cog`:guilabel:`(gear)` icon and click
+:icon:`fa-print`:guilabel:`Statement` (if accessed via the list view).
+
+.. note::
+   When a bank statement is generated to be printed, it is automatically added to the
+   :guilabel:`Attachments`.

content/applications/finance/accounting/customer_invoices.rst

@@ -4,225 +4,251 @@
 Customer invoices
 =================
 
-From Customer Invoice to Payments Collection
-============================================
+A customer invoice is a document issued by a company for products and/or services sold to a
+customer. It records receivables as they are sent to customers. Customer invoices can include
+amounts due for the goods and/or services provided, applicable sales taxes, shipping and handling
+fees, and other charges.
+Odoo supports multiple invoicing and payment workflows.
 
-Odoo supports multiple invoicing and payment workflows, so you can
-choose and use the ones that match your business needs. Whether you want
-to accept a single payment for a single invoice, or process a payment
-spanning multiple invoices and taking discounts for early payments, you
-can do so efficiently and accurately.
+.. seealso::
+   :doc:`/applications/finance/accounting/customer_invoices/overview`
 
-From Draft Invoice to Profit and Loss
--------------------------------------
+From draft invoice to profit and loss report, the process involves several steps once the goods (or
+services) have been ordered/shipped (or rendered) to a customer, depending on the invoicing policy:
 
-If we pick up at the end of a typical 'order to cash' scenario, after
-the goods have been shipped, you will: issue an invoice; receive
-payment; deposit that payment at the bank; make sure the Customer
-Invoice is closed; follow up if Customers are late; and finally present
-your Income on the Profit and Loss report and show the decrease in
-Assets on the Balance Sheet report.
+- :ref:`accounting/invoice/creation`
+- :ref:`accounting/invoice/confirmation`
+- :ref:`accounting/invoice/sending`
+- :ref:`accounting/invoice/paymentandreconciliation`
+- :ref:`accounting/invoice/followup`
+- :ref:`accounting/invoice/reporting`
 
-Invoicing in most countries occurs when a contractual obligation is met.
-If you ship a box to a customer, you have met the terms of the contract
-and can bill them. If your supplier sends you a shipment, they have met
-the terms of that contract and can bill you. Therefore, the terms of the
-contract is fulfilled when the box moves to or from the truck. At this
-point, Odoo supports the creation of what is called a Draft Invoice by
-Warehouse staff.
+.. _accounting/invoice/creation:
 
 Invoice creation
-----------------
+================
 
-Draft invoices can be manually generated from other documents such as
-Sales Orders, Purchase Orders,etc. Although you can create a draft
-invoice directly if you would like.
+Draft invoices can be created directly from documents like sales orders or purchase orders or
+manually from the :guilabel:`Customer Invoices` journal in the :guilabel:`Accounting Dashboard`.
 
-An invoice must be provided to the customer with the necessary
-information in order for them to pay for the goods and services ordered
-and delivered. It must also include other information needed to pay the
-invoice in a timely and precise manner.
+An invoice must include the required information to enable the customer to pay promptly for their
+goods and services. Make sure the following fields are appropriately completed:
 
-Draft invoices
---------------
+- :guilabel:`Customer`: When a customer is selected, Odoo automatically pulls information from the
+  customer record like the invoice address,
+  :doc:`preferred payment terms <customer_invoices/payment_terms>`,
+  :doc:`fiscal positions <taxes/fiscal_positions>`, receivable account, and more onto the invoice.
+  To change these values for this specific invoice, edit them directly on the invoice. To change
+  them for future invoices, change the values on the contact record.
+- :guilabel:`Invoice Date`: If not set manually, this field is automatically set as the current date
+  upon confirmation.
+- :guilabel:`Due Date` or :doc:`payment terms <customer_invoices/payment_terms>`: To specify when
+  the customer has to pay the invoice.
+- :guilabel:`Journal`: Is automatically set and can be changed if needed.
+- :doc:`Currency <get_started/multi_currency>`
+- :guilabel:`Product`: Click :guilabel:`Add a line` to add a product.
+- :guilabel:`Quantity`
+- :guilabel:`Price`
+- :doc:`Taxes <taxes>` (if applicable)
 
-The system generates invoice which are initially set to the Draft state.
-While these invoices remain unvalidated, they have no accounting impact within the system.
-There is nothing to stop users from creating their own draft invoices.
+.. tip::
+   To display the total amount of the invoice in words, go to :menuselection:`Accounting -->
+   Configuration --> Settings` and activate the :guilabel:`Total amount of invoice in letters`
+   option.
 
-Let's create a customer invoice with following information:
+The :guilabel:`Journal Items` tab displays the accounting entries created.
+Additional invoice information such as the :guilabel:`Customer Reference`, :doc:`Fiscal Positions
+<taxes/fiscal_positions>`, :doc:`Incoterms <customer_invoices/incoterms>`, and more can be added or
+modified in the :guilabel:`Other Info` tab.
 
-- Customer: Agrolait
-- Product: iMac
-- Quantity: 1
-- Unit Price: 100
-- Taxes: Tax 15%
+.. note::
+   Odoo initially creates invoices in :guilabel:`Draft` status. Draft invoices have no accounting
+   impact until they are :ref:`confirmed <accounting/invoice/confirmation>`.
 
-.. image:: customer_invoices/invoice01.png
+.. seealso::
+   :doc:`/applications/sales/sales/invoicing/proforma`
 
-.. image:: customer_invoices/invoice02.png
+.. _accounting/invoice/confirmation:
 
-The document is composed of three parts:
+Invoice confirmation
+====================
 
--  the top of the invoice, with customer information,
--  the main body of the invoice, with detailed invoice lines,
--  the bottom of the page, with detail about the taxes, and the totals.
+Click :guilabel:`Confirm` when the document is completed. The document's status changes to
+:guilabel:`Posted`, and a journal entry is generated based on the invoice configuration. On
+confirmation, Odoo assigns each document a unique number from a defined
+:ref:`sequence <accounting/invoice/sequence>`.
 
-Open or Pro-forma invoices
---------------------------
+.. note::
+   - Once confirmed, an invoice can no longer be updated. Click :guilabel:`Reset to draft` if
+     changes are needed.
+   - If required, invoices and other journal entries can be locked once posted
+     using the :ref:`Lock posted entries with hash <data-inalterability/lock>` feature.
 
-An invoice will usually include the quantity and the price of goods
-and/or services, the date, any parties involved, the unique invoice
-number, and any tax information.
+.. _accounting/invoice/sending:
 
-"Validate" the invoice when you are ready to approve it. The invoice
-then moves from the Draft state to the Open state.
+Invoice sending
+===============
 
-When you have validated an invoice, Odoo gives it a unique number from a
-defined, and modifiable, sequence.
+To send the invoice to the customer, click :guilabel:`Send & Print`. A :guilabel:`Configure your
+document layout` pop-up window will appear if a :ref:`default invoice layout
+<studio/pdf-reports/default-layout>` hasn't been customized. Then, select how to send this invoice
+to the customer in the :guilabel:`Send` window.
 
-.. image:: customer_invoices/invoice03.png
+To send and print multiple invoices, go to :menuselection:`Accounting --> Customers --> Invoices`
+and select them. Then click the :icon:`fa-cog` :guilabel:`Actions` menu and select
+:guilabel:`Send & Print`. A banner will appear on the selected invoices to indicate they are part of
+an ongoing send and print batch. This helps prevent the process from being triggered manually again,
+as it may take some time to complete for exceptionally large batches.
 
-Accounting entries corresponding to this invoice are automatically
-generated when you validate the invoice. You can see the details by
-clicking on the entry in the Journal Entry field in the "Other Info"
-tab.
+.. _accounting/invoice/paymentandreconciliation:
 
-.. image:: customer_invoices/invoice04.png
+Payment and reconciliation
+==========================
 
-Send the invoice to customer
-----------------------------
+In Odoo, an invoice is considered :guilabel:`Paid` when the associated accounting entry has been
+reconciled with a corresponding bank transaction.
 
-After validating the customer invoice, you can directly send it to the
-customer via the 'Send by email' functionality.
+.. seealso::
+   - :doc:`payments`
+   - :doc:`bank/reconciliation`
 
-.. image:: customer_invoices/invoice05.png
+.. _accounting/invoice/followup:
 
-A typical journal entry generated from a validated invoice will look
-like as follows:
+Payment follow-up
+=================
 
-+-----------------------+---------------+----------------+-------------+--------------+
-| **Account**           | **Partner**   | **Due date**   | **Debit**   | **Credit**   |
-+=======================+===============+================+=============+==============+
-| Accounts Receivable   | Agrolait      | 01/07/2015     | 115         |              |
-+-----------------------+---------------+----------------+-------------+--------------+
-| Taxes                 | Agrolait      |                |             | 15           |
-+-----------------------+---------------+----------------+-------------+--------------+
-| Sales                 |               |                |             | 100          |
-+-----------------------+---------------+----------------+-------------+--------------+
+Odoo's :doc:`follow-up actions <payments/follow_up>` help companies follow up on customer invoices.
+Different actions can be set up to remind customers to pay their outstanding invoices, depending on
+how much the customer is overdue. These actions are bundled into follow-up levels that trigger when
+an invoice is overdue by a certain number of days. If there are multiple overdue invoices for the
+same customer, the actions are performed on the most overdue invoice.
 
-Payment
--------
+.. _accounting/invoice/sequence:
 
-In Odoo, an invoice is considered to be paid when the associated
-accounting entry has been reconciled with the payment entries. If there
-has not been a reconciliation, the invoice will remain in the Open state
-until you have entered the payment.
+Sequence
+========
 
-A typical journal entry generated from a payment will look like as
-follows:
+The sequence that Odoo assigns to each document is a unique number made up of a prefix and a number.
+The prefix combines the journal code and the entry date and is used to group entries by period. The
+number is unique for each period and is used to identify the entry. The default sequence on customer
+invoices is INV/YYYY/number. In some specific cases,
+:ref:`resequencing <accounting/invoice/resequencing>` invoices might be necessary.
 
-+-----------------------+---------------+----------------+-------------+--------------+
-| **Account**           | **Partner**   | **Due date**   | **Debit**   | **Credit**   |
-+=======================+===============+================+=============+==============+
-| Bank                  | Agrolait      |                | 115         |              |
-+-----------------------+---------------+----------------+-------------+--------------+
-| Accounts Receivable   | Agrolait      |                |             | 115          |
-+-----------------------+---------------+----------------+-------------+--------------+
+.. _accounting/invoice/resequencing:
 
-Receive a partial payment through the bank statement
-----------------------------------------------------
+Resequencing
+------------
 
-You can manually enter your bank statements in Odoo, or you can import
-them in from a csv file or from several other predefined formats
-according to your accounting localisation.
+Resequencing is not possible:
 
-Create a bank statement from the accounting dashboard with the related
-journal and enter an amount of $100 .
+- When entries are before a lock date.
+- When the sequence leads to a duplicate.
+- When the :guilabel:`Invoice Date` doesn't match the date contained in the new sequence number,
+  e.g., if the sequence is changed to INV/2023/XXXXX for a document with an :guilabel:`Invoice Date`
+  of 2024.
 
-.. image:: customer_invoices/invoice06.png
+To change the invoice sequence with the structure INV/YYYY/MM/number, add `/MM` with the number of
+the month of the :guilabel:`Invoice date`. Odoo will recognize the "/" term as a month and update
+the future invoice sequence appropriately with the month of the :guilabel:`Invoice date`. For
+example, if the invoice date is January, change the sequence to `INV/2024/01/XXXXX`.
 
-Reconcile
----------
+In this case, if the :guilabel:`Invoice date` isn't aligned with the sequence number, a
+:guilabel:`Validation Error` message appears.
 
-Now let's reconcile!
+.. note::
 
-.. image:: customer_invoices/invoice07.png
+   - All sequence changes are logged in the chatter to keep the information.
+   - Sequence changes also affect the format of future invoices' sequences.
 
-You can now go through every transaction and reconcile them or you can mass reconcile with instructions at the bottom.
+.. _accounting/invoice/resequencing-one-invoice:
 
-After reconciling the items in the sheet, the related invoice will now
-display "You have outstanding payments for this customer. You can
-reconcile them to pay this invoice. "
+Resequencing a single invoice
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. image:: customer_invoices/invoice08.png
+To resequence the last confirmed invoice, click :guilabel:`Reset to Draft`, then change the
+sequence. The invoice now appears in red on the :guilabel:`Customer Invoices` list.
 
-.. image:: customer_invoices/invoice09.png
+.. _accounting/invoice/mass-resequencing:
 
-Apply the payment. Below, you can see that the payment has been added to
-the invoice.
+Mass-resequencing invoices
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. image:: customer_invoices/invoice10.png
+It can be helpful to resequence multiple invoice numbers. For example, when importing invoices from
+another invoicing or accounting system and the reference originates from the previous software,
+continuity for the current year must be maintained without restarting from the beginning.
 
-Payment Followup
-----------------
+.. note::
+   This feature is only available to users with administrator or advisor access.
 
-There's a growing trend of customers paying bills later and later.
-Therefore, collectors must make every effort to collect money and
-collect it faster.
+Follow these steps to resequence invoice numbers:
 
-Odoo will help you define your follow-up strategy. To remind customers
-to pay their outstanding invoices, you can define different actions
-depending on how severely overdue the customer is. These actions are
-bundled into follow-up levels that are triggered when the due date of an
-invoice has passed a certain number of days. If there are other overdue
-invoices for the same customer, the actions of the most overdue invoice
-will be executed.
+#. Activate the :ref:`developer mode <developer-mode>`.
+#. From the :guilabel:`Accounting Dashboard`, open the :guilabel:`Customer Invoices` journal.
+#. Select the invoices that need a new sequence.
+#. Click the :icon:`fa-cog` :guilabel:`Actions` menu and select :guilabel:`Resequence`.
+#. In the :guilabel:`Ordering` field, choose to
 
-By going to the customer record and diving into the "Overdue Payments"
-you will see the follow-up message and all overdue invoices.
+   - :guilabel:`Keep current order`: The order of the numbers remains the same.
+   - :guilabel:`Reorder by accounting date`: The number is reordered by accounting date.
+#. Set the :guilabel:`First New Sequence`.
+#. :guilabel:`Preview Modifications` and click :guilabel:`Confirm`.
 
-.. image:: customer_invoices/invoice11.png
+The first invoice using the new sequence appears in red in the :guilabel:`Customer Invoices` list.
 
-.. image:: customer_invoices/invoice12.png
+.. image:: customer_invoices/invoice-sequencing.png
+   :alt: Resequence options window
 
-.. _customer-invoices/aging-report:
+.. _accounting/invoice/reporting:
 
-Customer aging report:
-~~~~~~~~~~~~~~~~~~~~~~
+Reporting
+=========
 
-The customer aging report will be an additional key tool for the
-collector to understand the customer credit issues, and to prioritize
-their work.
+.. _accounting/invoice/partner-reports:
 
-Use the aging report to determine which customers are overdue and begin
-your collection efforts.
-
-.. image:: customer_invoices/invoice13.png
-
-Profit and loss
+Partner reports
 ---------------
 
-The Profit and Loss statement displays your revenue and expense details.
-Ultimately, this gives you a clear image of your Net Profit and Loss. It
-is sometimes referred to as the "Income Statement" or "Statement of
-Revenues and Expenses."
+.. _accounting/invoices/partner-ledger:
 
-.. image:: customer_invoices/invoice14.png
+Partner Ledger
+~~~~~~~~~~~~~~
+
+The :guilabel:`Partner Ledger` report shows the balance of customers and suppliers. To access it,
+go to :menuselection:`Accounting --> Reporting --> Partner Ledger`.
+
+.. _accounting/invoices/aging-report:
+
+Aged Receivable
+~~~~~~~~~~~~~~~
+
+To review outstanding customer invoices and their related due dates, use the
+:ref:`Aged Receivable <accounting/reporting/aged-receivable>` report. To access it, go to
+:menuselection:`Accounting --> Reporting --> Aged Receivable`.
+
+.. _accounting/invoices/aged-payable:
+
+Aged Payable
+~~~~~~~~~~~~
+
+To review outstanding vendor bills and their related due dates, use the
+:ref:`Aged Payable <accounting/reporting/aged-payable>` report. To access it, go to
+:menuselection:`Accounting --> Reporting --> Aged Payable`.
+
+.. _accounting/invoices/profit-and-loss:
+
+Profit and Loss
+---------------
+
+The :ref:`Profit and Loss <accounting/reporting/profit-and-loss>` statement shows details of income
+and expenses.
+
+.. _accounting/invoices/balance-sheet:
 
 Balance sheet
 -------------
 
-The balance sheet summarizes your company's liabilities,
-assets and equity at a specific moment in time.
-
-.. image:: customer_invoices/invoice15.png
-
-.. image:: customer_invoices/invoice16.png
-
-For example, if you manage your inventory using the perpetual accounting
-method, you should expect a decrease in account "Current Assets" once
-the material has been shipped to the customer.
+The :ref:`Balance Sheet <accounting/reporting/balance-sheet>` summarizes the company's assets,
+liabilities, and equity at a specific time.
 
 .. toctree::
    :titlesonly:

content/applications/finance/accounting/customer_invoices/customer_addresses.rst

@@ -18,8 +18,13 @@ To specify a sales order's invoice and delivery addresses, first go to :menusele
 
 On quotations and sales orders, there are now fields for :guilabel:`Invoice Address` and
 :guilabel:`Delivery Address`. If the customer has an invoice or delivery address listed on their
-contact record, the corresponding field will use that address by default, but any contact's address
-can be used instead.
+:ref:`contact record <sales/send_quotations/contact-form-config>`, the corresponding field uses that
+address, by default, but any contact's address can be used instead.
+
+.. seealso::
+   For more information, refer to the documentation on :ref:`Contact Form Configuration
+   <sales/send_quotations/contact-form-config>`.
+
 
 Invoice and deliver to different addresses
 ==========================================

content/applications/finance/accounting/customer_invoices/deferred_revenues.rst

@@ -33,19 +33,28 @@ Make sure the default settings are correctly configured for your business. To do
 
 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
+Deferred Revenue
   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.
+Based on
+  Suppose an invoice of $1200 must be deferred over 12 months.
+
+  - The :guilabel:`Months` option accounts for $100 each month prorated to the number of days in
+    that month (e.g., $50 for the first month if the :guilabel:`Start Date` is set to the 15th of
+    the month).
+
+  - The :guilabel:`Full Months` option considers each month started to be full (e.g., $100 for the
+    first month even if the :guilabel:`Start Date` is set to the 15th of the month); this means that
+    with the :guilabel:`Full Months` option, a full $100 is recognized in the first partial month,
+    eliminating the need for a 13th month to recognize any remainder as would be the case when using
+    the :guilabel:`Months` option.
+
+  - The :guilabel:`Days` option accounts for different amounts depending on the number of days in
+    each month (e.g., ~$102 for January and ~$92 for February).
 
 .. _customer_invoices/deferred/generate_on_validation:
 

content/applications/finance/accounting/customer_invoices/payment_terms.rst

@@ -116,7 +116,7 @@ for every computed *due date*.
 This makes for easier :doc:`follow-ups </applications/finance/accounting/payments/follow_up>` and
 :doc:`reconciliation </applications/finance/accounting/bank/reconciliation>` since Odoo takes each
 due date into account, rather than just the balance due date. It also helps to get an accurate
-:ref:`aged receivable report <customer-invoices/aging-report>`.
+:ref:`aged receivable report <accounting/invoices/aging-report>`.
 
 .. example::
    .. image:: payment_terms/journal-entry.png

content/applications/finance/accounting/get_started.rst

@@ -4,8 +4,8 @@
 Get started
 ===========
 
-When you first open your Odoo Accounting app, the *Accounting Overview* page welcomes you with a
-step-by-step onboarding banner, a wizard that helps you get started. This onboarding banner is
+When you first open your Odoo Accounting app, the :guilabel:`Accounting Dashboard` welcomes you with
+a step-by-step onboarding banner, a wizard that helps you get started. This onboarding banner is
 displayed until you choose to close it.
 
 The settings visible in the onboarding banner can still be modified later by going to
@@ -22,69 +22,22 @@ Accounting onboarding banner
 
 The step-by-step Accounting onboarding banner is composed of four steps:
 
-.. image:: get_started/setup_accounting_onboarding.png
+.. image:: get_started/accounting-onboarding-banner.png
    :alt: Step-by-step onboarding banner in Odoo Accounting
 
-#. :ref:`accounting-setup-company`
-#. :ref:`accounting-setup-bank`
 #. :ref:`accounting-setup-periods`
+#. :ref:`accounting-setup-bank`
+#. :ref:`accounting-setup-taxes`
 #. :ref:`accounting-setup-chart`
 
-.. _accounting-setup-company:
-
-Company Data
-------------
-
-This menu allows you to add your company’s details such as the name, address, logo, website, phone
-number, email address, and Tax ID, or VAT number. These details are then displayed on your documents,
-such as on invoices.
-
-.. image:: get_started/setup_company.png
-   :alt: Add your company's details in Odoo Accounting and Odoo Invoicing
-
-.. note::
-   You can also change these settings by going to :menuselection:`Settings --> General Settings -->
-   Settings --> Companies` and clicking on **Update Info**.
-
-.. _accounting-setup-bank:
-
-Bank Account
-------------
-
-Connect your bank account to your database and have your bank statements synced automatically. To do
-so, find your bank in the list, click on *Connect*, and follow the instructions on-screen.
-
-.. note::
-   :doc:`Click here <bank/bank_synchronization>` for more information about this feature.
-
-If your Bank Institution can’t be synchronized automatically, or if you prefer not to sync it with
-your database, you may also configure your bank account manually by clicking on *Create it*, and
-filling out the form.
-
-- **Name**: the bank account's name, as displayed on Odoo.
-- **Account Number**: your bank account number (IBAN in Europe).
-- **Bank**: click on *Create and Edit* to configure the bank's details. Add the bank institution's
-  name and its Identifier Code (BIC or SWIFT).
-- **Code**: this code is your Journal's *Short Code*, as displayed on Odoo. By default, Odoo creates
-  a new Journal with this Short Code.
-- **Journal**: This field is displayed if you have an existing Bank Journal that is not linked yet
-  to a bank account. If so, then select the *Journal* you want to use to record the financial
-  transactions linked to this bank account or create a new one by clicking on *Create and Edit*.
-
-.. note::
-   - You can add as many bank accounts as needed with this tool by going to :menuselection:`Accounting
-     --> Configuration`, and clicking on *Add a Bank Account*.
-   - :doc:`Click here <bank>` for more information about Bank
-     Accounts.
-
 .. _accounting-setup-periods:
 
 Accounting Periods
 ------------------
 
-Define here your **Fiscal Years**’ opening and closing dates, which are used to generate reports
-automatically, and your **Tax Return Periodicity**, along with a reminder to never miss a tax return
-deadline.
+Define the **Fiscal Years**’ opening and closing dates, which are used to generate reports
+automatically, and set your **Tax Return Periodicity**, along with a reminder to never miss a tax
+return deadline.
 
 By default, the opening date is set on the 1st of January and the closing date on the 31st of
 December, as this is the most common use.
@@ -93,6 +46,49 @@ December, as this is the most common use.
    You can also change these settings by going to :menuselection:`Accounting --> Configuration -->
    Settings --> Fiscal Periods` and updating the values.
 
+.. _accounting-setup-bank:
+
+Bank Account
+------------
+
+Connect your bank account to your database and have your bank statements synced automatically. To do
+so, find your bank in the list, click :guilabel:`Connect`, and follow the instructions on-screen.
+
+.. note::
+   :doc:`Click here <bank/bank_synchronization>` for more information about this feature.
+
+If your Bank Institution can’t be synchronized automatically, or if you prefer not to sync it with
+your database, you can also configure your bank account manually by typing its name, clicking
+:guilabel:`Create your Bank Account`, and filling out the form.
+
+- :guilabel:`Name`: the bank account's name, as displayed in Odoo.
+- :guilabel:`Account Number`: your bank account number (IBAN in Europe).
+- :guilabel:`Bank`: click :guilabel:`Create and edit` to configure the bank's details. Add the
+  bank institution's :guilabel:`Name` and its :guilabel:`Identifier Code` (BIC or SWIFT).
+- :guilabel:`Code`: this code is your Journal's :guilabel:`Short Code`, as displayed in Odoo.
+  By default, Odoo creates a new Journal with this short code.
+- :guilabel:`Journal`: This field is displayed if you have an existing bank journal that is not
+  linked yet to a bank account. If so, then select the :guilabel:`Journal` you want to use to record
+  the financial transactions linked to this bank account or create a new one by clicking
+  :guilabel:`Create and Edit`.
+
+.. note::
+   - You can add as many bank accounts as needed with this tool by going to
+     :menuselection:`Accounting --> Configuration --> Add a Bank Account`.
+   - :doc:`Click here <bank>` for more information about Bank Accounts.
+
+.. _accounting-setup-taxes:
+
+Taxes
+-----
+
+This menu allows you to create new taxes, (de)activate, or modify existing taxes. Depending on the
+:doc:`localization package <../fiscal_localizations>` installed on your database, taxes required for
+your country are already configured.
+
+.. note::
+   :doc:`Click here <taxes>` for more information about taxes.
+
 .. _accounting-setup-chart:
 
 Chart of Accounts
@@ -102,85 +98,83 @@ With this menu, you can add accounts to your **Chart of Accounts** and indicate
 opening balances.
 
 Basic settings are displayed on this page to help you review your Chart of Accounts. To access all
-the settings of an account, click on the *double arrow button* at the end of the line.
+the settings of an account, click on the :guilabel:`Setup` button at the end of the line.
 
 .. image:: get_started/setup_chart_of_accounts.png
    :alt: Setup of the Chart of Accounts and their opening balances in Odoo Accounting
 
 .. note::
-   :doc:`Click here <get_started/chart_of_accounts>` for more information on how to configure your Chart of
-   Accounts.
+   :doc:`Click here <get_started/chart_of_accounts>` for more information on how to configure your
+   Chart of Accounts.
 
 Invoicing onboarding banner
 ===========================
 
 There is another step-by-step onboarding banner that helps you take advantage of your Odoo Invoicing
-and Accounting apps. The *Invoicing onboarding banner* is the one that welcomes you if you use the
+and Accounting apps. The Invoicing onboarding banner is the one that welcomes you if you use the
 Invoicing app rather than the Accounting app.
 
 If you have Odoo Accounting installed on your database, you can reach it by going to
 :menuselection:`Accounting --> Customers --> Invoices`.
 
-The Invoicing onboarding banner is composed of four main steps:
+The Invoicing onboarding banner consists of four main steps:
 
-.. image:: get_started/setup_invoicing_onboarding.png
+.. image:: get_started/invoicing-onboarding-banner.png
    :alt: Step-by-step onboarding banner in Odoo Invoicing
 
 #. :ref:`invoicing-setup-company`
 #. :ref:`invoicing-setup-layout`
-#. :ref:`invoicing-setup-payment`
-#. :ref:`invoicing-setup-sample`
+#. :ref:`invoicing-setup-invoice`
+#. :ref:`invoicing-setup-payments`
 
 .. _invoicing-setup-company:
 
 Company Data
 ------------
 
-This form is the same as :ref:`the one presented in the Accounting onboarding banner
-<accounting-setup-company>`.
+Add your company’s details, such as the name, address, logo, website, phone number, email address,
+and Tax ID or VAT number. These details are then displayed on your documents, such as invoices.
+
+.. note::
+   You can also change the company's details by going to :menuselection:`Settings --> General
+   Settings`, scrolling down to the :guilabel:`Companies` section, and :guilabel:`Update Info`.
 
 .. _invoicing-setup-layout:
 
-Invoice Layout
+Documents Layout
+----------------
+
+Customize the :ref:`default invoice layout <studio/pdf-reports/default-layout>`.
+
+.. note::
+   You can also change the invoice layout by going to :menuselection:`Settings --> General
+   Settings`, scrolling down to the :guilabel:`Companies` section, and clicking :guilabel:`Configure
+   Document Layout`.
+
+.. _invoicing-setup-invoice:
+
+Create Invoice
 --------------
 
-With this tool, you can design the appearance of your documents by selecting which layout template,
-paper format, colors, font, and logo you want to use.
-
-You can also add your *Company Tagline* and the content of the documents’ *footer*. Note that Odoo
-automatically adds the company's phone number, email, website URL, and Tax ID (or VAT number) to the
-footer, according to the values you previously configured in the :ref:`Company Data
-<accounting-setup-company>`.
-
-.. image:: get_started/setup_document_layout.png
-   :alt: Document layout configuration in Odoo Invoicing
+Create your first invoice.
 
 .. tip::
    Add your **bank account number** and a link to your **General Terms & Condition** in the footer.
    This way, your contacts can find the full content of your GT&C online without having to print
    them on the invoices you issue.
 
-.. note::
-   These settings can also be modified by going to :menuselection:`Settings --> General Settings`,
-   under the *Business Documents* section.
+.. _invoicing-setup-payments:
 
-.. _invoicing-setup-payment:
+Online Payments
+---------------
 
-Payment Method
---------------
+Get started with Stripe and enable secure integrated credit and debit card payments within Odoo.
 
-This menu helps you configure the payment methods with which your customers can pay you.
+.. tip::
+   To use other payment providers, go to
+   :guilabel:`Invoicing --> Configuration --> Payment Providers` and
+   :doc:`enable the desired providers <../payment_providers>`.
 
-.. important::
-   Configuring a *Payment Provider* with this tool also activates the *Invoice Online Payment*
-   option automatically. With this, users can directly pay online, from their Customer Portal.
-
-.. _invoicing-setup-sample:
-
-Sample Invoice
---------------
-
-Send yourself a sample invoice by email to make sure everything is correctly configured.
 
 .. seealso::
    * :doc:`bank`
@@ -197,4 +191,4 @@ Send yourself a sample invoice by email to make sure everything is correctly con
    get_started/chart_of_accounts
    get_started/multi_currency
    get_started/avg_price_valuation
-   get_started/vat_units
+   get_started/tax_units

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

@@ -26,12 +26,12 @@ valuation <inventory/avg_price/leaving_inventory>`.
 .. note::
    This document addresses a specific use case for theoretical purposes. For instructions on how to
    set up and use |AVCO|, refer to the :doc:`inventory valuation configuration
-   <../../../inventory_and_mrp/inventory/warehouses_storage/inventory_valuation/inventory_valuation_config>`
+   <../../../inventory_and_mrp/inventory/product_management/inventory_valuation/inventory_valuation_config>`
    doc.
 
 .. seealso::
    - :doc:`Using inventory valuation
-     <../../../inventory_and_mrp/inventory/warehouses_storage/inventory_valuation/using_inventory_valuation>`
+     <../../../inventory_and_mrp/inventory/product_management/inventory_valuation/using_inventory_valuation>`
    - :ref:`Other inventory valuation methods <inventory/warehouses_storage/costing_methods>`
 
 Configuration
@@ -44,7 +44,7 @@ product category page, set :guilabel:`Costing Method` to `Average Cost (AVCO)` a
 
 .. seealso::
    :doc:`Inventory valuation configuration
-   <../../../inventory_and_mrp/inventory/warehouses_storage/inventory_valuation/inventory_valuation_config>`
+   <../../../inventory_and_mrp/inventory/product_management/inventory_valuation/inventory_valuation_config>`
 
 Using average cost valuation
 ============================
@@ -69,8 +69,9 @@ When new products arrive, the new average cost for each product is recomputed us
 - **Incoming Qty**: count of products arriving in the new shipment;
 - **Purchase Price**: estimated price of products at the reception of products (since vendor bills
   may arrive later). The amount includes not only the price for the products, but also added costs,
-  such as shipping, taxes, and :ref:`landed costs <inventory/reporting/landed_costs>`. At reception
-  of the vendor bill, this price is adjusted;
+  such as shipping, taxes, and :doc:`landed costs
+  <../../../inventory_and_mrp/inventory/product_management/inventory_valuation/landed_costs>`. At
+  reception of the vendor bill, this price is adjusted;
 - **Final Qty**: quantity of on-hand stock after the stock move.
 
 .. _inventory/avg_cost/definite_rule:

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

@@ -1,50 +1,35 @@
 =========
-VAT units
+Tax units
 =========
 
 .. important::
    This is only applicable to multi-company environments.
 
-A **VAT unit** is a group of VAT-taxable enterprises that are legally independent of each other but
+A **tax unit** is a group of VAT-taxable enterprises that are legally independent of each other but
 are closely linked financially, organizationally, and economically and therefore considered the same
-VAT-taxable enterprise. **VAT units** are not mandatory, but if created, constituent companies of
+VAT-taxable enterprise. **Tax units** are not mandatory, but if created, constituent companies of
 the unit must belong to the same **country**, use the same **currency**, and one company must be
-designated as the **representative** company of the **VAT unit**. **VAT units** receive a specific
+designated as the **representative** company of the **tax unit**. **Tax units** receive a specific
 **tax ID** intended only for **tax returns**. **Constituent** companies keep their **tax ID** used
 for **commercial purposes**.
 
 .. example::
    Enterprise **A** owes €300.000,00 of VAT taxes and enterprise **B** can recover €280.000,00 of
-   VAT taxes. They form up as a **VAT unit** so that the two amounts balance out and must conjointly
+   VAT taxes. They form up as a **tax unit** so that the two amounts balance out and must conjointly
    only pay €20.000,00 of VAT taxes.
 
 Configuration
 =============
 
-To configure a **VAT unit**, go to :menuselection:`Settings --> General Settings`, scroll down to
-the :guilabel:`Companies` section, and click :guilabel:`Manage Companies`. Select the company to
-serve the **representative** role, and in the :guilabel:`General Information` tab, fill in the
-mandatory fields for the .XML export when exporting the **tax report**: :guilabel:`Company Name`,
-:guilabel:`Address`, :guilabel:`VAT`, :guilabel:`Currency`, :guilabel:`Phone`, and
-:guilabel:`Email`.
-
-.. image:: vat_units/general.png
-   :align: center
-   :alt: General information tab
-
-Then, click on the :guilabel:`VAT Units` tab, :guilabel:`Add a line`, and either select an existing
-**VAT unit**, or create a new one. Enter a **name** for the unit, :guilabel:`Country` of the
-constituent companies and tax report, the :guilabel:`Companies`, the :guilabel:`Main Company` that
-serves the **representative** role, and the :guilabel:`Tax ID` of the **VAT unit**.
-
-.. image:: vat_units/vat-unit.png
-   :align: center
-   :alt: VAT units tab
+To create a **tax unit**, go to :menuselection:`Accounting --> Configuration --> Tax Units`, and
+click :guilabel:`New`. Enter a **name** for the unit, select a :guilabel:`Country`, the
+:guilabel:`Companies` to incorporate in the unit, the :guilabel:`Main Company`, and the
+:guilabel:`Tax ID` of the **constituent** company of that tax unit.
 
 Fiscal position
 ---------------
 
-As transactions between constituents of the same **VAT unit** are not subject to VAT, it is possible
+As transactions between constituents of the same **tax unit** are not subject to VAT, it is possible
 to create a :doc:`tax mapping (fiscal position) <../taxes/fiscal_positions>` to avoid the
 application of VAT on inter-constituent transactions.
 
@@ -61,13 +46,12 @@ Do the same for the :guilabel:`Account Mapping` tab if required, and repeat this
    Depending on your :doc:`localization package </applications/finance/fiscal_localizations>`, taxes
    may vary from the screenshot displayed.
 
-   .. image:: vat_units/fiscal-positions.png
-      :align: center
-      :alt: Tax mapping of fiscal position for VAT unit
+   .. image:: tax_units/fiscal-positions.png
+      :alt: Tax mapping of fiscal position for tax unit
 
 Then, assign the fiscal position by opening the **Contacts** app. Search for a **constituent**
 company, and open the contact's **card**. Click the :guilabel:`Sales & Purchase` tab, and in the
-:guilabel:`Fiscal Position` field, input the **fiscal position** created for the **VAT unit**.
+:guilabel:`Fiscal Position` field, input the **fiscal position** created for the **tax unit**.
 Repeat the process for each **constituent** company card form, on each company database.
 
 .. seealso::
@@ -76,11 +60,10 @@ Repeat the process for each **constituent** company card form, on each company d
 Tax report
 ==========
 
-The **representative** company can access the aggregated tax report of the **VAT unit** by going to
-:menuselection:`Accounting --> Reporting --> Tax Report`, and selecting the **VAT unit** in
+The **representative** company can access the aggregated tax report of the **tax unit** by going to
+:menuselection:`Accounting --> Reporting --> Tax Report`, and selecting the **tax unit** in
 :guilabel:`Tax Unit`. This report contains the aggregated transactions of all **constituents** and
 the .XML export contains the name and VAT number of the **main** company.
 
-.. image:: vat_units/report.png
-   :align: center
-   :alt: VAT unit tax report
+.. image:: tax_units/report.png
+   :alt: tax unit tax report

content/applications/finance/accounting/payments.rst

@@ -7,33 +7,35 @@ Payments
 In Odoo, payments can either be automatically linked to an invoice or bill or be stand-alone records
 for use at a later date:
 
-- If a payment is **linked to an invoice or bill**, it reduces/settles the amount due of the
-  invoice. You can have multiple payments related to the same invoice.
+- If a payment is **linked to an invoice or bill**, it reduces/settles the amount due on the
+  invoice. Multiple payments on the same invoice are possible.
 
 - If a payment is **not linked to an invoice or bill**, the customer has an outstanding credit with
-  your company, or your company has an outstanding debit with a vendor. You can use those
-  outstanding amounts to reduce/settle unpaid invoices/bills.
+  the company, or the company has an outstanding debit with a vendor. Those outstanding amounts
+  reduce/settle unpaid invoices/bills.
 
 .. seealso::
    - :doc:`Internal transfers <payments/internal_transfers>`
    - :doc:`bank/reconciliation`
    - `Odoo Tutorials: Bank Configuration
-     <https://www.odoo.com/slides/slide/bank-configuration-1880>`_
+     <https://www.odoo.com/slides/slide/bank-configuration-6832>`_
 
-.. _payments/register:
+.. _accounting/payments/from-invoice-bill:
 
 Registering payment from an invoice or bill
 ===========================================
 
-When clicking :guilabel:`Register payment` in a customer invoice or vendor bill, it generates a new
-journal entry and changes the amount due according to the payment amount. The counterpart is
-reflected in an :ref:`outstanding <bank/outstanding-accounts>` **receipts** or **payments** account.
-At this point, the customer invoice or vendor bill is marked as :guilabel:`In payment`. Then, when
-the outstanding account is reconciled with a bank statement line, the invoice or vendor bill changes
-to the :guilabel:`Paid` status.
+Clicking :guilabel:`Register payment` in a customer invoice or vendor bill generates a new journal
+entry and sets the amount due according to the payment amount. The counterpart is reflected in an
+:ref:`outstanding <bank/outstanding-accounts>` **receipts** or **payments** account. At this point,
+the customer invoice or vendor bill is marked as :guilabel:`In payment` or :ref:`Partially paid
+<accounting/payments/partial-payment>`. Then, when the outstanding account is reconciled with a bank
+transaction, the invoice or vendor bill changes to the :guilabel:`Paid` status.
 
-The information icon near the payment line displays more information about the payment. You can
-access additional information, such as the related journal, by clicking :guilabel:`View`.
+To open the :guilabel:`Journal Entry Info` window and display more information about the payment,
+click the :icon:`fa-info-circle` :guilabel:`(information)` icon in the footer of the
+:guilabel:`Invoice Lines` tab. To access additional information, such as the related journal entry,
+click :guilabel:`View`.
 
 .. image:: payments/information-icon.png
    :alt: See detailed information of a payment.
@@ -41,105 +43,155 @@ access additional information, such as the related journal, by clicking :guilabe
 .. note::
    - The customer invoice or vendor bill must be in the :guilabel:`Posted` status to register the
      payment.
-   - If you unreconcile a payment, it still appears in your books but is no longer linked to the
+   - If a payment is unreconciled, it still appears in the books but is no longer linked to the
      invoice.
-   - If you (un)reconcile a payment in a different currency, a journal entry is automatically
+   - If a payment is (un)reconciled in a different currency, a journal entry is automatically
      created to post the currency exchange gains/losses (reversal) amount.
-   - If you (un)reconcile a payment and an invoice having cash basis taxes, a journal entry is
-     automatically created to post the cash basis tax (reversal) amount.
+   - If a payment is (un)reconciled on an invoice with cash-basis taxes, a journal entry is
+     automatically created to post the cash-basis tax (reversal) amount.
 
 .. tip::
-   - If your main bank account is set as an :ref:`outstanding account
-     <bank/outstanding-accounts>`, and the payment is registered in Odoo (not through a related
-     bank statement), invoices and bills are directly registered as :guilabel:`Paid`.
+   If the main bank account is set as the :ref:`outstanding account <bank/outstanding-accounts>` on
+   the bank journal's payment method, registering the full payment on an invoice or bill moves the
+   invoice/bill directly to the :guilabel:`Paid` status without requiring bank reconciliation.
+
+.. _accounting/payments/not-tied:
 
 Registering payments not tied to an invoice or bill
 ===================================================
 
-When a new payment is registered via :menuselection:`Customers / Vendors --> Payments` menu, it is
-not directly linked to an invoice or bill. Instead, the account receivable or the account payable is
+When a new payment is registered via :menuselection:`Customers / Vendors --> Payments`, it is not
+directly linked to an invoice or bill. Instead, the account receivable or the account payable is
 matched with the **outstanding account** until it is manually matched with its related invoice or
-bill.
+bill. Then, :doc:`reconciling <bank/reconciliation>` the payment with the bank transaction completes
+the payment workflow.
 
-Matching invoices and bills with payments
------------------------------------------
+.. _accounting/payments/payments-matching:
 
-A blue banner appears when you validate a new invoice/bill and an **outstanding payment** exists for
-this specific customer or vendor. It can easily be matched from the invoice or bill by clicking
-:guilabel:`ADD` under :guilabel:`Outstanding Credits` or :guilabel:`Outstanding Debits`.
+Payments matching
+-----------------
+
+.. note::
+   During the :doc:`bank reconciliation <bank/reconciliation>` process, a remaining balance is
+   identified if the total debits and credits do not match when records are compared with bank
+   transactions. This balance must either be reconciled later or written off immediately.
+
+.. _accounting/payments/matching-invoices-bills:
+
+For a single invoice or bill
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A blue banner appears when validating a new invoice/bill and an **outstanding payment** exists for
+this specific customer or vendor. To match it with the invoice or bill, click :guilabel:`Add`
+under :guilabel:`Outstanding Credits` or :guilabel:`Outstanding Debits`.
 
 .. image:: payments/add-option.png
-   :alt: Shows the ADD option to reconcile an invoice or a bill with a payment.
+   :alt: Shows the Add option to reconcile an invoice or a bill with a payment.
 
-The invoice or bill is now marked as :guilabel:`In payment` until it is reconciled with its
-corresponding bank statement.
+The invoice or bill is then marked as :guilabel:`In payment` until the payment is :doc:`reconciled
+<bank/reconciliation>` with its corresponding :doc:`bank transaction(s) <bank/transactions>`.
 
-.. _payments/batch-payments:
+.. _accounting/payments/auto-reconcile-tool:
 
-Batch payment
--------------
+Matching payments
+~~~~~~~~~~~~~~~~~
 
-Batch payments allow you to group different payments to ease :doc:`reconciliation
-<bank/reconciliation>`. They are also useful when you deposit :doc:`checks <payments/checks>` to the
-bank or for :doc:`SEPA payments <payments/pay_sepa>`. To do so, go to :menuselection:`Accounting -->
-Customers --> Batch Payments` or :menuselection:`Accounting --> Vendors --> Batch Payments`. In the
-list view of payments, you can select and group several payments in a batch by clicking
-:menuselection:`Action --> Create Batch Payment`.
+The :guilabel:`Payments matching` or :guilabel:`Auto-reconcile` tool allows reconciling journal
+items with each other (i.e., payments with customer invoices or vendor bills) either individually or
+in batches. Access the :guilabel:`Accounting Dashboard`, click the :icon:`fa-ellipsis-v`
+(:guilabel:`dropdown menu`) button from the :guilabel:`Customer Invoices` or :guilabel:`Vendor
+Bills` journals, and select :guilabel:`Payments Matching`. Alternatively, go to
+:menuselection:`Accounting --> Accounting --> Reconcile`.
+
+To manually :guilabel:`Reconcile` journal items, select the individual items from the list view and
+click :guilabel:`Reconcile`.
+
+Auto-Reconcile Feature
+**********************
+
+To use the :guilabel:`Auto-Reconcile` feature, follow these steps:
+
+#. In the :guilabel:`Journal Items to reconcile` list view, click :guilabel:`Auto-Reconcile` next to
+   the receivable or payable account (or a specific contact's journal item in that account).
+#. In the :guilabel:`Find Entries to Reconcile Automatically` window, set the :guilabel:`Reconcile`
+   field depending on how you want to match journal items:
+
+   - :guilabel:`Opposite balances one by one`: Each debit journal item will be matched with the
+     corresponding credit journal item of the same value.
+   - :guilabel:`Accounts with zero balances`: All reconciled journal items will have the same
+     matching number.
+
+#. Click :guilabel:`Launch`.
+
+Invoices and bills are automatically matched to their corresponding payments and marked as
+:guilabel:`In payment` until they are :doc:`reconciled <bank/reconciliation>` with their
+corresponding :doc:`bank transactions <bank/transactions>`.
+
+.. _accounting/payments/group-payments:
+
+Registering payments on multiple invoices or bills (group payments)
+===================================================================
+
+To register payments on multiple invoices/bills, follow these steps:
+
+#. Go to :menuselection:`Accounting --> Customers --> Invoices/Credit Notes` or
+   :menuselection:`Accounting --> Vendors --> Bills/Refunds`.
+#. In the list view, select the relevant invoices/credit notes or bills/refunds.
+#. Click :icon:`fa-cog` :guilabel:`Actions` and select :guilabel:`Register Payment`.
+#. In the :guilabel:`Register Payment` window, select the :guilabel:`Journal`, the
+   :guilabel:`Payment Method`, and the :guilabel:`Payment Date`.
+#. To combine all payments from the same contact into a single payment, enable the :guilabel:`Group
+   Payments` option, or leave it unchecked to create separate payments.
+#. Click :guilabel:`Create payment`.
+
+The invoices or bills are then marked as :guilabel:`In payment` until the bank transactions are
+:doc:`reconciled <bank/reconciliation>` with the payments.
+
+.. _accounting/payments/batch-payments:
+
+Registering a single payment for multiple customers or vendors (batch payments)
+===============================================================================
+
+Batch payments allow grouping payments from multiple contacts to ease
+:doc:`reconciliation <bank/reconciliation>`. They are also useful when depositing :doc:`checks
+<payments/checks>` to the bank or for generating bank payment files such as :doc:`SEPA
+<payments/pay_sepa>` or :ref:`NACHA <l10n_us/nacha>`. To do so, go to :menuselection:`Accounting -->
+Customers --> Payments` or :menuselection:`Accounting --> Vendors --> Payments`. In the payments
+list view, select the payments to be grouped in a batch, click :icon:`fa-cog` :guilabel:`Actions`,
+and select :guilabel:`Create Batch Payment`.
 
 .. seealso::
   - :doc:`payments/batch`
   - :doc:`payments/batch_sdd`
 
-.. _payments/matching:
-
-Payments matching
------------------
-
-The :guilabel:`Payments matching` tool opens all unreconciled customer invoices or vendor bills and
-allows you to process them individually, matching all payments and invoices in one place. You can
-reach this tool from the :menuselection:`Accounting Dashboard --> Customer Invoices / Vendor Bills`,
-click the drop-down menu button (:guilabel:`⋮`), and select :guilabel:`Payments Matching`, or go to
-:menuselection:`Accounting --> Accounting --> Reconciliation`.
-
-.. image:: payments/payments-journal.png
-   :alt: Payments matching menu in the drop-down menu.
-
-.. note::
-   During the :doc:`reconciliation <bank/reconciliation>`, if the sum of the debits and credits does
-   not match, there is a remaining balance. This either needs to be reconciled at a later date or
-   needs to be written off directly.
-
-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 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: The batch payment reconcile option.
+.. _accounting/payments/partial-payment:
 
 Registering a partial payment
 =============================
 
-To register a **partial payment**, click :guilabel:`Register payment` from the related invoice or
-bill, and enter the amount received or paid. Upon entering the amount, a prompt appears to decide
-whether to :guilabel:`Keep open` the invoice or bill, or :guilabel:`Mark as fully paid`. Select
-:guilabel:`Keep open` and click :guilabel:`Create payment`. The invoice or bill is now marked as
-:guilabel:`Partial`. Select :guilabel:`Mark as fully paid` if you wish to settle the invoice or bill
-with a difference in the amount.
+To register a partial payment, click on :guilabel:`Register Payment` from the related invoice or
+bill. In the case of a partial payment (when the :guilabel:`Amount` paid is less than the total
+remaining amount on the invoice or the bill), the :guilabel:`Payment Difference` field displays the
+outstanding balance. There are two options:
 
-.. image:: payments/payment-difference.png
-   :alt: Partial payment of an invoice or bill.
+- :guilabel:`Keep open`: Keep the invoice or the bill open and mark it with a :guilabel:`Partial`
+  banner;
+- :guilabel:`Mark as fully paid`: Select an account in the :guilabel:`Post Difference In` field and
+  change the :guilabel:`Label` if needed. A journal entry will be created to balance the accounts
+  payable or receivable with the selected account.
 
-Reconciling payments with bank statements
-=========================================
+.. image:: payments/partial-payment.png
+   :alt: register a partial payment
+
+.. _accounting/payments/reconciling-payments:
+
+Reconciling payments with bank transactions
+===========================================
 
 Once a payment has been registered, the status of the invoice or bill is :guilabel:`In payment`. The
-next step is :doc:`reconciling <bank/reconciliation>` it with the related bank statement line to
-have the transaction finalized and the invoice or bill marked as :guilabel:`Paid`.
+next step is :doc:`reconciling <bank/reconciliation>` the payment with the related :doc:`bank
+transaction <bank/transactions>` line to finalize the payment workflow and mark the invoice or bill
+as :guilabel:`Paid`.
 
 .. toctree::
    :titlesonly:

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

@@ -16,6 +16,8 @@ Go to :menuselection:`Accounting --> Configuration --> Settings --> Customer Pay
 Deposit multiple payments in batch
 ==================================
 
+.. _batch-payments/register-payments:
+
 Register payments
 -----------------
 

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

@@ -91,5 +91,5 @@ select :guilabel:`Process follow-ups`.
 
 .. seealso::
    - :doc:`/applications/essentials/in_app_purchase`
-   - :doc:`/applications/marketing/sms_marketing/pricing/pricing_and_faq`
+   - :doc:`/applications/marketing/sms_marketing/pricing_and_faq`
    - :doc:`../customer_invoices/snailmail`

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

@@ -30,8 +30,9 @@ Non-EEA territories:
 - Jersey;
 - Isle of Man.
 
-When paying a bill in Odoo, you can select SEPA mandates as a payment option. At the day's end,
-you can generate the SEPA file containing all bank wire transfers and send it to the bank.
+When paying a bill in Odoo, you can select SEPA mandates as a payment option. At the end of the day,
+you can generate the SEPA file containing all bank wire transfers and upload it to your online
+banking interface to process the payments.
 
 By default, the file follows the SEPA Credit Transfer **'pain.001.001.03'** specifications. This is
 a well-defined standard among banks. However, for Swiss and German companies, other formats are used
@@ -69,7 +70,7 @@ the BIC (bank identifier code) in the :guilabel:`Journal Entries` tab.
 Registering payments
 --------------------
 
-You can register and vendor payments made with SEPA. To do so, go to :menuselection:`Accounting -->
+You can register any vendor payments made with SEPA. To do so, go to :menuselection:`Accounting -->
 Vendors --> Payments`. When creating your payment, select :guilabel:`SEPA Credit Transfer` as the
 :guilabel:`Payment Method`.
 

content/applications/finance/accounting/reporting.rst

@@ -4,157 +4,130 @@
 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 :
+-  :ref:`accounting/reporting/balance-sheet`
+-  :ref:`accounting/reporting/profit-and-loss`
+-  :ref:`accounting/reporting/executive-summary`
+-  :ref:`accounting/reporting/general-ledger`
+-  :ref:`accounting/reporting/aged-receivable`
+-  :ref:`accounting/reporting/aged-payable`
+-  :ref:`accounting/reporting/cash-flow-statement`
+-  :ref:`accounting/reporting/tax-report`
 
--  **Balance Sheet**
--  **Profit and Loss**
--  **Executive Summary**
--  **General Ledger**
--  **Aged Payable**
--  **Aged Receivable**
--  **Cash Flow Statement**
--  **Tax Report**
--  **Bank Reconciliation**
+To expand the lines of a report and view its details, click the :icon:`fa-caret-right`
+(:guilabel:`right arrow`) on the left. Then click the :icon:`fa-caret-down` (:guilabel:`down arrow`)
+to the right of the account, journal entry, payment, invoice, etc. to :guilabel:`Annotate` and view
+the details.
 
-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 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.
+To export reports in PDF or XLSX format, click :guilabel:`PDF` at the top or click the
+:icon:`fa-caret-down` (:guilabel:`down arrow`) icon next to the :guilabel:`PDF` button and
+select :guilabel:`XLSX`.
 
-.. _reporting/balance-sheet:
+To compare values across periods, click the :guilabel:`Comparison` menu and select the periods you
+want to compare.
 
-Balance Sheet
--------------
-
-The **Balance Sheet** shows a snapshot of the assets, liabilities and equity
-of your organisation as at a particular date.
-
-.. image:: reporting/main_reports09.png
+.. image:: reporting/reporting-comparison.png
+   :alt: Comparison menu to compare time periods.
 
 .. _accounting/reporting/balance-sheet:
 
+Balance Sheet
+=============
+
+The :guilabel:`Balance Sheet` shows a snapshot of your organization's assets, liabilities, and
+equity at a particular date.
+
+.. _accounting/reporting/profit-and-loss:
+
 Profit and Loss
----------------
+===============
 
-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/main_reports10.png
+The :guilabel:`Profit and Loss` report (or **Income Statement**) shows your company's net income by
+deducting expenses from revenue for the reporting period.
 
 .. _accounting/reporting/executive-summary:
 
 Executive Summary
------------------
+=================
 
-The **Executive Summary** allows for a quick look at all the important
-figures you need to run your company.
+The :guilabel:`Executive Summary` provides an overview of all the important figures for overseeing
+your company's performance.
 
-In very basic terms, this is what each of the items in this section is
-reporting :
+It includes the following items:
 
-- **Performance:**
-    - **Gross profit margin:**
-        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 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 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 (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.
+- :guilabel:`Performance`:
+    - :guilabel:`Gross profit margin`:
+        The contribution of all sales your business makes **minus** any direct costs needed to
+        make those sales (labor, materials, etc.).
+    - :guilabel:`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.).
+    - :guilabel:`Return on investment (per annum)`:
+        The ratio of the net profit to the amount of assets the company used to make those profits.
+- :guilabel:`Position`:
+    - :guilabel:`Average debtors days`:
+        The average number of days it takes your customers to (fully) pay you across all your
+        customer invoices.
+    - :guilabel:`Average creditors days`:
+        The average number of days it takes you to (fully) pay your suppliers across all your bills.
+    - :guilabel:`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.
+    - :guilabel:`Current assets to liabilities`:
+        Also referred to as the **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.
 
-.. image:: reporting/main_reports01.png
+.. _accounting/reporting/general-ledger:
 
 General Ledger
---------------
+==============
 
-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.
+The :guilabel:`General Ledger` report shows all transactions from all accounts for a selected date
+range. The initial summary report shows the totals for each account. To expand an account and view
+its details, click the :icon:`fa-caret-right` (:guilabel:`right arrow`) on the left.
+This report is useful for reviewing each transaction that occurred during a specific period.
 
-.. 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 owed by you, and how long these
-have gone unpaid.
-
-.. image:: reporting/main_reports02.png
-
-.. _reporting/aged-receivable:
+.. _accounting/reporting/aged-receivable:
 
 Aged Receivable
----------------
+===============
 
-The **Aged Receivables** report shows the sales invoices that were awaiting
-payment during a selected month and several months prior.
+The :guilabel:`Aged Receivable` report shows the sales invoices awaiting payment during a selected
+month and several months prior.
 
-.. image:: reporting/main_reports07.png
+.. _accounting/reporting/aged-payable:
+
+Aged Payable
+============
+
+The :guilabel:`Aged Payable` report displays information on individual bills, credit notes, and
+overpayments you owe and how long these have gone unpaid.
 
 .. _accounting/reporting/cash-flow-statement:
 
 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 :guilabel:`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/main_reports03.png
-
-.. _reporting/tax-report:
+.. _accounting/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).
-
-.. image:: reporting/main_reports04.png
-
-Bank Reconciliation
--------------------
-
-.. image:: reporting/main_reports06.png
+The :guilabel:`Tax Report` shows the :guilabel:`NET` and :guilabel:`TAX` amounts for all the
+taxes grouped by type (:guilabel:`Sales`/:guilabel:`Purchases`).
 
 .. toctree::
    :titlesonly:

content/applications/finance/accounting/reporting/budget.rst

@@ -1,5 +1,5 @@
 ================
-Financial budget
+Analytic budgets
 ================
 
 Managing budgets is an essential part of running a business. Budgets help people become more