[IMP] web: update documentation of patch function

This commit updates the documentation of the patch function
with the changes done in https://github.com/odoo/odoo/pull/125716.

conf.py

@@ -195,7 +195,7 @@ todo_include_todos = False
 intersphinx_mapping = {
     'pillow': ('https://pillow.readthedocs.io/en/stable/', None),
     'python': ('https://docs.python.org/3/', None),
-    'werkzeug': ('https://werkzeug.palletsprojects.com/en/1.0.x/', None),
+    'werkzeug': ('https://werkzeug.palletsprojects.com/en/2.3.x/', None),
 }
 
 github_user = 'odoo'
@@ -213,6 +213,7 @@ 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-16.3': "Odoo Online",
     'saas-16.2': "Odoo Online",
     'saas-16.1': "Odoo Online",
     '16.0': "Odoo 16",
@@ -317,13 +318,16 @@ latex_documents = [
      'Odoo Enterprise Subscription Agreement (ES)', '', 'howto'),
     ('legal/terms/i18n/partnership_tex_es',
      'odoo_partnership_agreement_es.tex', 'Odoo Partnership Agreement (ES)', '', 'howto'),
+
+    ('legal/terms/i18n/enterprise_tex_pt_BR', 'odoo_enterprise_agreement_pt_BR.tex',
+     'Odoo Enterprise Subscription Agreement (PT)', '', 'howto'),
 ]
 
 # List of languages that have legal translations (excluding EN). The keys must be in
 # `languages_names`. These translations will have a link to their versions of the legal
 # contracts, instead of the default EN one. The main legal documents are not part of the
 # translations since they have legal meaning.
-legal_translations = ['de', 'es', 'fr', 'nl']
+legal_translations = ['de', 'es', 'fr', 'nl', 'pt_BR']
 
 # The name of an image file (relative to this directory) to place at the top of the title page.
 latex_logo = 'static/img/odoo_logo.png'

content/administration/install/deploy.rst

@@ -43,7 +43,7 @@ Configuration samples
 
 * Show only databases with names beginning with 'mycompany'
 
-in ``/etc/odoo.conf`` set:
+in :ref:`the configuration file <reference/cmdline/config_file>` set:
 
 .. code-block:: ini
 
@@ -55,7 +55,7 @@ in ``/etc/odoo.conf`` set:
   was sent to ``www.mycompany.com`` or ``mycompany.co.uk``, but not
   for ``www2.mycompany.com`` or ``helpdesk.mycompany.com``.
 
-in ``/etc/odoo.conf`` set:
+in :ref:`the configuration file <reference/cmdline/config_file>` set:
 
 .. code-block:: ini
 
@@ -150,7 +150,7 @@ Configuration sample
 * with 'pwd' as a password
 * filtering only db with a name beginning with 'mycompany'
 
-in ``/etc/odoo.conf`` set:
+in :ref:`the configuration file <reference/cmdline/config_file>` set:
 
 .. code-block:: ini
 
@@ -238,7 +238,7 @@ Configuration sample
 * We'll use 8 workers + 1 for cron. We'll also use a monitoring system to measure cpu load, and check if it's between 7 and 7.5 .
 * RAM = 9 * ((0.8*150) + (0.2*1024)) ~= 3Go RAM for Odoo
 
-in ``/etc/odoo.conf``:
+in :ref:`the configuration file <reference/cmdline/config_file>`:
 
 .. code-block:: ini
 
@@ -273,7 +273,7 @@ Configuration sample
 * Redirect http requests to https
 * Proxy requests to odoo
 
-in ``/etc/odoo.conf`` set:
+in :ref:`the configuration file <reference/cmdline/config_file>` set:
 
 .. code-block:: ini
 

content/administration/install/install.rst

@@ -282,14 +282,6 @@ SSH. If you do not know the difference between the two, the best option is most
 are following the :doc:`Getting started </developer/tutorials/getting_started>` developer tutorial,
 or plan on contributing to Odoo source code, choose SSH.
 
-.. note::
-   **The Enterprise Git repository does not contain the full Odoo source code**. It is only a
-   collection of extra add-ons. The main server code is in the Community version. Running the
-   Enterprise version actually means running the server from the Community version with the
-   addons-path option set to the folder with the Enterprise version. You need to clone both the
-   Community and Enterprise repository to have a working Odoo Enterprise installation. See
-   :ref:`setup/install/editions` to get access to the Enterprise repository.
-
 .. tabs::
 
    .. group-tab:: Windows
@@ -351,7 +343,8 @@ or plan on contributing to Odoo source code, choose SSH.
    collection of extra add-ons. The main server code is in the Community version. Running the
    Enterprise version actually means running the server from the Community version with the
    addons-path option set to the folder with the Enterprise version. You need to clone both the
-   Community and Enterprise repository to have a working Odoo Enterprise installation.
+   Community and Enterprise repository to have a working Odoo Enterprise installation. See
+   :ref:`setup/install/editions` to get access to the Enterprise repository.
 
 .. _setup/install/source/prepare:
 
@@ -365,7 +358,7 @@ Python
 
    .. group-tab:: Windows
 
-      Odoo requires Python 3.7 or later to run. Visit `Python's download page <https://www.python.org/downloads/windows/>`_
+      Odoo requires Python 3.8 or later to run. Visit `Python's download page <https://www.python.org/downloads/windows/>`_
       to download and install the latest version of Python 3 on your machine.
 
       During installation, check **Add Python 3 to PATH**, then click **Customize Installation** and make
@@ -387,7 +380,7 @@ Python
 
    .. group-tab:: Linux
 
-      Odoo requires Python 3.7 or later to run. Use your package manager to download and install Python 3
+      Odoo requires Python 3.8 or later to run. Use your package manager to download and install Python 3
       on your machine if it is not already done.
 
       .. note::
@@ -406,7 +399,7 @@ Python
 
    .. group-tab:: Mac OS
 
-      Odoo requires Python 3.7 or later to run. Use your preferred package manager (homebrew_, macports_)
+      Odoo requires Python 3.8 or later to run. Use your preferred package manager (homebrew_, macports_)
       to download and install Python 3 on your machine if it is not already done.
 
       .. note::
@@ -645,6 +638,8 @@ Dependencies
    <the wkhtmltopdf download page_>`_ for it to support headers and footers. See our `wiki
    <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_ for more details on the various versions.
 
+.. _setup/install/source/running_odoo:
+
 Running Odoo
 ------------
 

content/administration/maintain/azure_oauth.rst

@@ -13,7 +13,7 @@ personal email address or an address created by a custom domain.
 
 .. seealso::
    - :doc:`/applications/general/auth/azure`
-   - :doc:`/applications/general/calendars/outlook/outlook_calendar`
+   - :doc:`/applications/productivity/calendar/outlook`
 
 Setup in Microsoft Azure Portal
 ===============================
@@ -47,7 +47,7 @@ API permissions
 ---------------
 
 The :guilabel:`API permissions` should be set next. Odoo will need specific API permissions to be
-able to read (IMAP) and send (IMAP) emails in the Microsoft 365 setup. First, click the
+able to read (IMAP) and send (SMTP) emails in the Microsoft 365 setup. First, click the
 :guilabel:`API permissions` link, located in the left menu bar. Next, click on the :guilabel:`(+)
 Add a Permission` button and select :guilabel:`Microsoft Graph` under :guilabel:`Commonly Used
 Microsoft APIs`. After, select the :guilabel:`Delegated Permissions` option.

content/administration/maintain/domain_names.rst

@@ -71,7 +71,7 @@ way to verify the ownership of your domain name is by adding a DNS record. You c
 other providers.
 
 .. seealso::
-   - :doc:`/applications/websites/website/optimize/seo`
+   - :doc:`/applications/websites/website/pages/seo`
    - `Google Search Console Help - Verify your site ownership <https://support.google.com/webmasters/answer/9008080>`_
    - `Bing Webmaster Tools - Add and Verify site <https://www.bing.com/webmasters/help/add-and-verify-site-12184f8b>`_
 

content/administration/maintain/enterprise.rst

@@ -1,9 +1,9 @@
 
 .. _setup/enterprise:
 
-===============================
-Upgrade Community to Enterprise
-===============================
+===================================
+Switch from Community to Enterprise
+===================================
 
 Depending on your current installation, there are multiple ways to upgrade
 your community version.
@@ -98,7 +98,7 @@ On Windows
 
   .. code-block:: console
 
-    $ odoo.exe -d <database_name> -i web_enterprise --stop-after-init
+    $ ..\python\python.exe odoo-bin -d <database_name> -i web_enterprise --stop-after-init
 
 * No need to manually launch the server, the service is running.
   You should be able to connect to your Odoo Enterprise instance using your usual

content/administration/maintain/google_oauth.rst

@@ -13,7 +13,7 @@ email address or an address created by a custom domain.
 
 .. seealso::
    - :doc:`/applications/general/auth/google`
-   - :doc:`/applications/general/calendars/google/google_calendar_credentials`
+   - :doc:`/applications/productivity/calendar/google`
 
 Setup in Google
 ===============
@@ -21,64 +21,87 @@ Setup in Google
 Create a new project
 --------------------
 
-To get started, go to the `Google API Platform
-<https://console.cloud.google.com/apis/credentials/consent>`_. Log in with your *Google Workspace*
-account if you have one, otherwise log in with your personal Gmail account (this should match the
-email address you want to configure in Odoo).
+To get started, go to the `Google API Console <https://console.developers.google.com>`_. Log in
+with your *Google Workspace* account if you have one, otherwise log in with your personal Gmail
+account (this should match the email address you want to configure in Odoo).
 
-After that, click on :guilabel:`Create Project`, located on the far right of the OAuth consent
-screen. If a project has already been created in this account, then the :guilabel:`New Project`
-option will be located on the top left under the :guilabel:`Select a project` drop-down menu.
+After that, click on :guilabel:`Create Project`, located on the far right of the :guilabel:`OAuth
+consent screen`. If a project has already been created in this account, then the :guilabel:`New
+Project` option will be located on the top right under the :guilabel:`Select a project` drop-down
+menu.
 
-On the :guilabel:`New Project` screen, rename the :guilabel:`Project name` to `Odoo` and browse for
-the :guilabel:`Location`. Set the :guilabel:`Location` as the `Google Workspace` organization. If
-you are using a personal Gmail account, then leave the :guilabel:`Location` as `No Organization`.
+On the :menuselection:`New Project` screen, rename the :guilabel:`Project name` to `Odoo` and
+browse for the :guilabel:`Location`. Set the :guilabel:`Location` as the *Google Workspace
+organization*. If you are using a personal Gmail account, then leave the :guilabel:`Location` as
+:guilabel:`No Organization`.
 
 .. image:: google_oauth/new-project.png
    :align: center
-   :alt: Project Name and Location for Google Oauth.
+   :alt: Project Name and Location for Google OAuth.
 
-Click on :guilabel:`Create` to finish this step. On the next screen, :guilabel:`User Type` options,
-select the :guilabel:`External` option, and then click on :guilabel:`Create` again, which will
-finally navigate to the :guilabel:`Edit app registration` page.
+Click on :guilabel:`Create` to finish this step.
+
+OAuth consent screen
+--------------------
+
+If the page doesn't redirect to the :menuselection:`User Type` options, click on :guilabel:`OAuth
+consent screen` in the left menu.
+
+Under :guilabel:`User Type` options, select the appropriate :guilabel:`User Type`, and then click on
+:guilabel:`Create` again, which will finally navigate to the :menuselection:`Edit app registration`
+page.
+
+.. warning::
+   *Personal* Gmail Accounts are only allowed to be **External** User Type, which means Google may
+   require an approval, or for *Scopes* to be added on. However, using a *Google WorkSpace* account
+   allows for **Internal** User Type to be used.
+
+   Note, as well, that while the API connection is in the *External* testing mode, then no approval is
+   necessary from Google. User limits in this testing mode is set to 100 users.
 
 Edit app registration
 ---------------------
 
-- On the :guilabel:`Oauth consent screen` step, under the :guilabel:`App information` section,
-  enter `Odoo` in the :guilabel:`App name` field. Select the organization's email address under the
-  :guilabel:`User support` email field.
-- Next, under :menuselection:`App Domain --> Authorized domains`, click on :guilabel:`Add Domain`
-  and enter `odoo.com`.
-- After that, under the :guilabel:`Developer contact information` section, enter the organization's
-  email address. Google uses this email address to notify the organization about any changes to
-  your project.
-- Next, click on the :guilabel:`Save and Continue` button.
-- Then, skip the :guilabel:`Scopes` page by scrolling to the bottom and clicking on
-  :guilabel:`Save and Continue`.
-- Next, add the email being configured under the :guilabel:`Test users` step by clicking on
-  :guilabel:`Add Users` and then the :guilabel:`Save and Continue` button. A summary of the
-  :guilabel:`App registration` appears.
-- Finally, scroll to the bottom and click on :guilabel:`Back to Dashboard`.
+Next we will configure the app registration of the project.
+
+On the :guilabel:`OAuth consent screen` step, under the :guilabel:`App information` section, enter
+`Odoo` in the :guilabel:`App name` field. Select the organization's email address under the
+:guilabel:`User support` email field.
+
+Next, under :menuselection:`App Domain --> Authorized domains`, click on :guilabel:`Add Domain` and
+enter `odoo.com`.
+
+After that, under the :guilabel:`Developer contact information` section, enter the organization's
+email address. Google uses this email address to notify the organization about any changes to your
+project.
+
+Next, click on the :guilabel:`Save and Continue` button. Then, skip the :menuselection:`Scopes` page
+by scrolling to the bottom and clicking on :guilabel:`Save and Continue`.
+
+If continuing in testing mode (External), add the email addresses being configured under the
+:guilabel:`Test users` step, by clicking on :guilabel:`Add Users`, and then the :guilabel:`Save and
+Continue` button. A summary of the app registration appears.
+
+Finally, scroll to the bottom and click on :guilabel:`Back to Dashboard` to finish setting up the
+project.
 
 Create Credentials
 ------------------
 
-Now that you have set up the project, you need to create credentials, which includes the
-:guilabel:`Client ID` and :guilabel:`Client Secret`. First, click on :guilabel:`Credentials` in the
-left sidebar menu.
+Now that the project is set up, credentials should be created, which includes the *Client ID* and
+*Client Secret*. First, click on :guilabel:`Credentials` in the left sidebar menu.
 
-Then, click on :guilabel:`Create Credentials` in the top menu and select
-:guilabel:`OAuth client ID` from the dropdown menu.
+Then, click on :guilabel:`Create Credentials` in the top menu and select :guilabel:`OAuth client ID`
+from the dropdown menu.
 
 - Under :guilabel:`Application Type`, select :guilabel:`Web Application` from the dropdown menu.
-- In the :guilabel:`Client ID` field, enter `Odoo`.
+- In the :guilabel:`Name` field, enter `Odoo`.
 - Under the :guilabel:`Authorized redirect URIs` label, click the button :guilabel:`ADD URI`, and
-  then input `https://yourdbname.odoo.com/google_gmail/confirm` in the :guilabel:`URIs 1` field. Be
-  sure to replace the *yourdbname* part of the URL with your actual Odoo database name.
-- Next, click on :guilabel:`Create` to generate an OAuth :guilabel:`Client ID` and
-  :guilabel:`Client Secret`. Finally, copy each generated value for later use when configuring in
-  Odoo, and then navigate to the Odoo database.
+  then input `https://yourdbname.odoo.com/google_gmail/confirm` in the :guilabel:`URIs 1` field.
+  Be sure to replace the *yourdbname* part of the URL with the actual Odoo database name.
+- Next, click on :guilabel:`Create` to generate an OAuth :guilabel:`Client ID` and :guilabel:`Client
+  Secret`. Finally, copy each generated value for later use when configuring in Odoo, and then
+  navigate to the Odoo database.
 
 .. image:: google_oauth/client-credentials.png
    :align: center
@@ -91,32 +114,37 @@ Enter Google Credentials
 ------------------------
 
 First, open Odoo and navigate to the :guilabel:`Apps` module. Then, remove the :guilabel:`Apps`
-filter from the search bar and type in `Google`. Install the module called :guilabel:`Google Gmail`.
+filter from the search bar and type in `Google`. Install the module called :guilabel:`Google
+Gmail`.
 
 Next, navigate to :menuselection:`Settings --> General Settings`, and under the :guilabel:`Discuss`
-section, ensure that the checkbox for :guilabel:`Custom Email Servers` is checked. This populates a
-new option for :guilabel:`Gmail Credentials`. Then, copy and paste the :guilabel:`Client ID` and
-:guilabel:`Client Secret` into the respective fields and :guilabel:`Save` the settings.
+section, ensure that the checkbox for :guilabel:`Custom Email Servers` or :guilabel:`External Email
+Servers` is checked. This populates a new option for :guilabel:`Gmail Credentials` or :guilabel:`Use
+a Gmail Sever`. Then, copy and paste the respective values into the :guilabel:`Client ID` and
+:guilabel:`Client Secret` fields and :guilabel:`Save` the settings.
 
 Configure outgoing email server
 -------------------------------
 
-After that, on the :guilabel:`General Settings` page, under :guilabel:`Custom Email Servers`, click
-:guilabel:`Outgoing Email Servers` to configure the external Gmail account.
+To configure the external Gmail account, return to the top of the :guilabel:`Custom Email Servers`
+setting and then click the :guilabel:`Outgoing Email Servers` link.
 
 .. image:: google_oauth/outgoing-servers.png
    :align: center
    :alt: Configure Outgoing Email Servers in Odoo.
 
-Then, :guilabel:`Create` a new email server and select the option for :guilabel:`Gmail`. Next, fill
-in the :guilabel:`Description` (can be anything) and the email :guilabel:`Username` and click on
-:guilabel:`Connect your Gmail account`.
+Then, click on :guilabel:`New` or :guilabel:`Create` to create a new email server, and fill in the
+:guilabel:`Name`, :guilabel:`Description`, and the email :guilabel:`Username` (if required).
 
-A new window from :guilabel:`Google` opens to complete the authorization process. Select the
+Next, click on :guilabel:`Gmail OAuth Authentication` or :guilabel:`Gmail` (under the
+:guilabel:`Authenticate with` or :guilabel:`Connection` section). Finally, click on
+:guilabel:`Connect your Gmail Account`.
+
+A new window labeled :guilabel:`Google` opens to complete the authorization process. Select the
 appropriate email address that is being configured in Odoo.
 
-If the email address is a personal account, an extra step pops up, click :guilabel:`Continue` to
-allow the verification and connect the Gmail account to Odoo.
+If the email address is a personal account, then an extra step pops up, so click
+:guilabel:`Continue` to allow the verification and connect the Gmail account to Odoo.
 
 Then, allow Odoo to access the Google account by clicking on :guilabel:`Continue` or
 :guilabel:`Allow`. After that, the page navigates back to the newly configured outgoing email
@@ -127,9 +155,8 @@ server in Odoo. The configuration automatically loads the token in Odoo, and a t
    :align: center
    :alt: Configure Outgoing Email Servers in Odoo.
 
-Finally, save the settings and :guilabel:`Test the Connection`. A confirmation message should
-appear. The Odoo database can now send safe, secure emails through Google using OAuth
-authentication.
+Finally, :guilabel:`Test the Connection`. A confirmation message should appear. The Odoo database
+can now send safe, secure emails through Google using OAuth authentication.
 
 Google OAuth FAQ
 ================
@@ -137,8 +164,8 @@ Google OAuth FAQ
 Production VS Testing Publishing Status
 ---------------------------------------
 
-Choosing :guilabel:`Production` as the :guilabel:`Publishing Status` (instead of Testing) will
-display the following warning message:
+Choosing :guilabel:`Production` as the :guilabel:`Publishing Status` (instead of
+:guilabel:`Testing`) will display the following warning message:
 
 .. image:: google_oauth/published-status.png
    :align: center
@@ -158,39 +185,35 @@ populate.
    :align: center
    :alt: 403 Access Denied Error.
 
-To correct this error, return to the :guilabel:`OAuth consent screen` under
-:guilabel:`APIs & Services` and add test user(s) to the app. Add the email that you are configuring
-in Odoo.
+To correct this error, return to the :guilabel:`OAuth consent screen` under :guilabel:`APIs &
+Services` and add test user(s) to the app. Add the email that you are configuring in Odoo.
 
 Gmail Module not updated
 ------------------------
 
-If the :guilabel:`Gmail Module` in Odoo has not been updated to the latest version, then a
+If the *Google Gmail* module in Odoo has not been updated to the latest version, then a
 :guilabel:`Forbidden` error message populates.
 
 .. image:: google_oauth/forbidden-error.png
    :align: center
    :alt: Forbidden you don't have the permission to access the requested resource.
 
-To correct this error, go to the :guilabel:`Apps` module and clear out the search terms. Then,
-search for `Gmail` or `Google` and upgrade the :guilabel:`Google Gmail` module. Finally, click on
-the three dots on the upper right of the module and select :guilabel:`Upgrade`.
+To correct this error, go to the :menuselection:`Apps` module and clear out the search terms. Then,
+search for `Gmail` or `Google` and upgrade the :guilabel:`Google Gmail` module. Finally, click
+on the three dots on the upper right of the module and select :guilabel:`Upgrade`.
 
 Application Type
 ----------------
 
-When creating the :guilabel:`Credentials` (OAuth Client ID and Client Secret), if
-:guilabel:`Desktop App` is selected for the :guilabel:`Application Type`, an
-:guilabel:`Authorization Error` appears.
+When creating the credentials (OAuth *Client ID* and *Client Secret*), if :guilabel:`Desktop App` is
+selected for the :guilabel:`Application Type`, an :guilabel:`Authorization Error` appears.
 
 .. image:: google_oauth/error-400.png
    :align: center
    :alt: Error 400 Redirect URI Mismatch.
 
 To correct this error, delete the credentials already created and create new credentials, selecting
-:guilabel:`Web Application` for the :guilabel:`Application Type`. Then, under
-:guilabel:`Authorized redirect URIs`, click :guilabel:`ADD URI` and type:
-`https://yourdbname.odoo.com/google_gmail/confirm` in the field.
-
-.. note::
-   Replace *yourdbname* in the URL with the Odoo database name.
+:guilabel:`Web Application` for the :guilabel:`Application Type`. Then, under :guilabel:`Authorized
+redirect URIs`, click :guilabel:`ADD URI` and type:
+`https://yourdbname.odoo.com/google_gmail/confirm` in the field, being sure to replace *yourdbname*
+in the URL with the Odoo database name.

content/administration/maintain/odoo_online.rst

@@ -2,25 +2,15 @@
 Odoo Online database management
 ===============================
 
-To manage a database, sign in to https://www.odoo.com and access the `database management page
-<https://www.odoo.com/my/databases>`_ by clicking on the user icon, then on
-:guilabel:`My Databases`.
+To manage a database, go to the `database manager <https://www.odoo.com/my/databases>`_ and sign in
+as the database administrator.
 
-.. image:: odoo_online/my-databases.png
-   :align: center
-   :alt: Clicking on the user icon opens a drop-down menu. "My databases" button is highlighted.
+All the main database management options are available by clicking the database name, except the
+upgrade option, which can be accessed by clicking the **arrow in a circle** icon next to the
+database name. It is only displayed if an upgrade is available.
 
-.. note::
-   Make sure to connect as the administrator of the database that changes will be made on.
-
-.. image:: odoo_online/dropdown-menu.png
-   :align: right
-   :alt: Clicking on the gear icon opens the drop-down menu.
-
-Open the drop-down menu next to the database that changes will be made on by clicking on the gear
-icon.
-
-Several actions are available:
+.. image:: odoo_online/database-manager.png
+   :alt: Accessing the database management options
 
 - :ref:`odoo_online/upgrade`
 - :ref:`odoo_online/duplicate`
@@ -37,39 +27,24 @@ Several actions are available:
 Upgrade
 =======
 
-If the database is *not* on the latest **Online version**, the administrator should receive an
-invitation to :doc:`upgrade <../upgrade>` the database. A :guilabel:`Rolling Release`` button on the
-database's main screen proposes an upgrade to the latest version (e.g., 14.0 to 16.1).
-
-.. important::
-   - | **If the Odoo database's version is lower than the latest major release:**
-     | The database must be upgraded within two months. After these two months, an automatic
-       upgrade is initiated.
-   - | **If the Odoo database's version is equal to or higher than the latest major release:**
-     | Disregard the invitation to upgrade as the database probably wouldn't benefit from new
-       features every two months.
-
-.. note::
-   Versions that are not supported anymore become deprecated and need to be updated to avoid
-   security issues. Odoo recommends that the company initiate the upgrade, as this method allows for
-   the company to request a test upgrade of the database to check for any discrepancies.
+Trigger a database upgrade.
 
 .. seealso::
-   - :doc:`../upgrade`
-   - :doc:`supported_versions`
+   For more information about the upgrade process, check out the :doc:`Odoo Online upgrade
+   documentation <../upgrade/odoo_online>`.
 
 .. _odoo_online/duplicate:
 
 Duplicate
 =========
 
-This allows to make an exact copy of the database to be able to perform testing without compromising
-the daily operations.
+Create an exact copy of the database, which can be used to perform testing without compromising
+daily operations.
 
 .. important::
-   - By checking :guilabel:`For testing purposes`, all external communication (emails, payments,
-     delivery orders, etc.) are disabled by default on the duplicated database.
-   - Duplicate databases expire automatically after 15 days.
+   - By checking :guilabel:`For testing purposes`, all external actions (emails, payments, delivery
+     orders, etc.) are disabled by default on the duplicated database.
+   - Duplicated databases expire automatically after 15 days.
 
 .. _odoo_online/rename:
 
@@ -83,28 +58,31 @@ Rename the database and its URL.
 Download
 ========
 
-Instantly download a ZIP file with a backup of the database.
+Download a ZIP file containing a backup of the database.
 
 .. note::
-   Databases are backed up daily according to the `Odoo Cloud SLA
+   Databases are backed up daily as per the `Odoo Cloud Hosting SLA
    <https://www.odoo.com/cloud-sla>`_.
 
 .. _odoo_online/domains:
 
-Domains
-=======
+Domain names
+============
 
-Configure custom domains to access the database via another URL.
+Use a custom :doc:`domain name <domain_names>` to access the database via another URL.
 
-.. seealso::
-   - :doc:`domain_names`
+.. tip::
+   You can :ref:`register a domain name for free <domain-name/odoo-register>`.
 
 .. _odoo_online/tags:
 
 Tags
 ====
 
-Add tags to sort your databases out. You can search the tags in the search bar.
+Add tags to easily identify and sort your databases.
+
+.. tip::
+   You can search for tags in the search bar.
 
 .. _odoo_online/delete:
 
@@ -114,44 +92,43 @@ Delete
 Delete a database instantly.
 
 .. danger::
-   Deleting a database means that all data is permanently lost. The deletion is instant and for all
-   users. It is recommended to create a backup of the database before deleting it.
+   Deleting a database means that all data is permanently lost. The deletion is instant and applies
+   to all users. It is recommended to create a backup of the database before deleting it.
 
-Carefully read the warning message that pops up and proceed only if the implications of deleting a
-database are fully understood:
+Carefully read the warning message and only proceed if the implications of deleting a database are
+fully understood.
 
 .. image:: odoo_online/delete.png
-   :align: center
-   :alt: A warning message is prompted before deleting a database.
+   :alt: The warning message displayed before deleting a database
 
 .. note::
    - Only an administrator can delete a database.
-   - The database name is immediately available for a new database.
-   - It is not possible to delete a database if it is expired or linked to a subscription. If
-     needed, please get in touch with `Odoo Support <https://www.odoo.com/help>`_.
+   - The database name is immediately made available to anyone.
+   - Deleting a database if it has expired or is linked to a subscription is impossible. In that
+     case, contact `Odoo Support <https://www.odoo.com/help>`_.
 
 .. _odoo_online/contact-support:
 
-Contact Support
-===============
+Contact us
+==========
 
-Access the Odoo `support page <https://www.odoo.com/help>`_ with your database's details already
+Access the `Odoo.com support page <https://www.odoo.com/help>`_ with the database's details already
 pre-filled.
 
 .. _odoo_online/users:
 
-Invite / Remove Users
+Invite / remove users
 =====================
 
-To invite users, fill out the email address of the new user and click on :guilabel:`Invite`. To add
-multiple users, click on :guilabel:`Add more users`.
+To invite users, fill out the new user's email address and click :guilabel:`Invite`. To add multiple
+users, click :guilabel:`Add more users`.
 
 .. image:: odoo_online/invite-users.png
-   :align: center
-   :alt: Clicking on "Add more users" adds additional email fields.
+   :alt: Inviting a user on a database
 
-To remove users, select the users to remove and click on :guilabel:`Remove`.
+To remove users, select them and click :guilabel:`Remove`.
 
 .. seealso::
-   - :doc:`/applications/general/users/manage_users`
-   - :doc:`/applications/general/users/delete_account`
+   - :doc:`../../applications/general/users/manage_users`
+   - :doc:`../../applications/general/users/delete_account`
+

content/administration/maintain/supported_versions.rst

@@ -23,47 +23,136 @@ This matrix shows the support status of every version.
 
 **Major releases are in bold type.**
 
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-|                 | Odoo Online | Odoo.sh  | On-Premise  | Release date   | End of support         |
-+=================+=============+==========+=============+================+========================+
-| Odoo saas~16.2  | |green|     | N/A      | N/A         | March 2023     | June 2023 (planned)    |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo saas~16.1  | |green|     | N/A      | N/A         | February 2023  | April 2023             |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 16.0**   | |green|     | |green|  | |green|     | October 2022   | October 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              |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 15.0**   | |green|     | |green|  | |green|     | October 2021   | October 2024 (planned) |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 14.0**   | |green|     | |green|  | |green|     | October 2020   | October 2023 (planned) |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 13.0**   | |red|       | |red|    | |red|       | October 2019   | October 2022           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo saas~12.3  | |red|       | N/A      | N/A         | August 2019    |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 12.0**   | |red|       | |red|    | |red|       | October 2018   | October 2021           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo saas~11.3  | |red|       | N/A      | N/A         | April 2018     |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 11.0**   | |red|       | |red|    | |red|       | October 2017   | October 2020           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 10.saas~15 | |red|       | N/A      | N/A         | March 2017     |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 10.saas~14 | |red|       | N/A      | N/A         | January 2017   |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 10.0**   | |red|       | |red|    | |red|       | October 2016   | October 2019           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 9.saas~11  | |red|       | N/A      | N/A         | May 2016       |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 9.0**    | |red|       | N/A      | |red|       | October 2015   | October 2018           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 8.saas~6   | |red|       | N/A      | N/A         | February 2015  |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 8.0**    | |red|       | N/A      | |red|       | September 2014 | October 2017           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
+.. list-table::
+   :header-rows: 1
+   :widths: auto
+
+   * -
+     - Odoo Online
+     - Odoo.sh
+     - On-Premise
+     - Release date
+     - End of support
+   * - Odoo saas~16.3
+     - |green|
+     - N/A
+     - N/A
+     - June 2023
+     - September 2023 (planned)
+   * - Odoo saas~16.2
+     - |green|
+     - N/A
+     - N/A
+     - March 2023
+     - July 2023 (planned)
+   * - Odoo saas~16.1
+     - |red|
+     - N/A
+     - N/A
+     - February 2023
+     - April 2023
+   * - **Odoo 16.0**
+     - |green|
+     - |green|
+     - |green|
+     - October 2022
+     - October 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
+   * - **Odoo 15.0**
+     - |green|
+     - |green|
+     - |green|
+     - October 2021
+     - October 2024 (planned)
+   * - **Odoo 14.0**
+     - |green|
+     - |green|
+     - |green|
+     - October 2020
+     - October 2023 (planned)
+   * - **Odoo 13.0**
+     - |red|
+     - |red|
+     - |red|
+     - October 2019
+     - October 2022
+   * - Odoo saas~12.3
+     - |red|
+     - N/A
+     - N/A
+     - August 2019
+     -
+   * - **Odoo 12.0**
+     - |red|
+     - |red|
+     - |red|
+     - October 2018
+     - October 2021
+   * - Odoo saas~11.3
+     - |red|
+     - N/A
+     - N/A
+     - April 2018
+     -
+   * - **Odoo 11.0**
+     - |red|
+     - |red|
+     - |red|
+     - October 2017
+     - October 2020
+   * - Odoo 10.saas~15
+     - |red|
+     - N/A
+     - N/A
+     - March 2017
+     -
+   * - Odoo 10.saas~14
+     - |red|
+     - N/A
+     - N/A
+     - January 2017
+     -
+   * - **Odoo 10.0**
+     - |red|
+     - |red|
+     - |red|
+     - October 2016
+     - October 2019
+   * - Odoo 9.saas~11
+     - |red|
+     - N/A
+     - N/A
+     - May 2016
+     -
+   * - **Odoo 9.0**
+     - |red|
+     - N/A
+     - |red|
+     - October 2015
+     - October 2018
+   * - Odoo 8.saas~6
+     - |red|
+     - N/A
+     - N/A
+     - February 2015
+     -
+   * - **Odoo 8.0**
+     - |red|
+     - N/A
+     - |red|
+     - September 2014
+     - October 2017
 
 .. note::
 

content/administration/odoo_sh/getting_started/settings.rst

@@ -45,41 +45,101 @@ these databases if they have one, using their regular credentials.
 
 In addition, they cannot use the webshell nor have access to the server logs.
 
-+---------------------+-----------------+-----------+-----------+
-|                     |                 | User      | Admin     |
-+=====================+=================+===========+===========+
-|Development          | History         |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | 1-click connect |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Logs            |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Shell/SSH       |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Mails           |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Settings        |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|Production & Staging | History         |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | 1-click connect |           |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Logs            |           |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Shell/SSH       |           |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Mails           |           |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Monitoring      |           |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Backups         |           |     X     |
-+---------------------+-----------------+-----------+-----------+
-|                     | Settings        |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|Status               |                 |     X     |     X     |
-+---------------------+-----------------+-----------+-----------+
-|Settings             |                 |           |     X     |
-+---------------------+-----------------+-----------+-----------+
+.. list-table::
+   :header-rows: 1
+   :widths: auto
+
+   * -
+     -
+     - User
+     - Admin
+   * - Development
+     - History
+     - |green|
+     - |green|
+   * -
+     - 1-click connect
+     - |green|
+     - |green|
+   * -
+     - Logs
+     - |green|
+     - |green|
+   * -
+     - Shell/SSH
+     - |green|
+     - |green|
+   * -
+     - Mails
+     - |green|
+     - |green|
+   * -
+     - Upgrade
+     - |green|
+     - |green|
+   * -
+     - Settings
+     - |green|
+     - |green|
+   * - Production & Staging
+     - History
+     - |green|
+     - |green|
+   * -
+     - 1-click connect
+     -
+     - |green|
+   * -
+     - Logs
+     -
+     - |green|
+   * -
+     - Shell/SSH
+     -
+     - |green|
+   * -
+     - Mails
+     -
+     - |green|
+   * -
+     - Monitoring
+     -
+     - |green|
+   * -
+     - Backups
+     -
+     - |green|
+   * -
+     - Upgrade
+     -
+     - |green|
+   * -
+     - Settings
+     - |green|\*
+     - |green|
+   * - Status
+     -
+     - |green|
+     - |green|
+   * - Settings
+     -
+     -
+     - |green|
+
+.. note::
+    \* Only in staging branches
+
+.. |green| raw:: html
+
+   <span class="text-success" style="font-size: 32px; line-height: 0.5">●</span>
+
+.. |orange| raw:: html
+
+   <span class="text-warning" style="font-size: 32px; line-height: 0.5">●</span>
+
+.. |red| raw:: html
+
+   <span class="text-danger" style="font-size: 32px; line-height: 0.5">●</span>
 
 Public Access
 =============

content/administration/upgrade.rst

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

content/administration/upgrade/odoo_online.rst

@@ -2,29 +2,91 @@
 Odoo Online
 ===========
 
-Requesting a test upgrade
-=========================
+Odoo databases can be manually upgraded directly from the main Odoo website. To upgrade an Odoo
+database, navigate to the `database manager <https://www.odoo.com/my/databases>`_ page and sign in.
 
-#. Go to your `database manager <https://www.odoo.com/my/databases/>`_
-#. Click on your profile icon and select *My Databases*.
+The database manager page displays all of the Odoo databases associated with the user's account. Any
+databases that are not already on the most recent version of Odoo display an **arrow in a circle**
+icon next to the database name, indicating that the database can be upgraded.
 
-   .. image:: odoo_online/accessing-my-databases.png
-      :alt: Selecting My Databases under my profile
+.. image:: odoo_online/databases-page.png
+   :align: center
+   :alt: The database manager page with an upgrade button next to the name of a database.
 
-#. Click on the up arrow button next to your main database name to proceed to the test upgrade.
+.. important::
+   - If the database's version is **lower** than the latest major release: the database must be
+     upgraded within two months. After these two months, an automatic upgrade is initiated.
+   - If the database's version is **equal** to or **higher** than the latest major release:
+     you can disregard the invitation to upgrade, as the database probably would not benefit from
+     new features every two months.
 
-   .. image:: odoo_online/upgrade-option.png
-      :alt: Selecting the action settings icon
+If a database is *not* on the latest online version, its administrator should receive an invitation
+to upgrade on the database's dashboard, displayed as an **arrow in a circle**.
 
-#. In the pop-up message that appears, select the target version and then :guilabel:`Test` as
-   purpose.
+.. image:: odoo_online/database-notification.png
+   :alt: Invitation to upgrade on the database dashboard.
 
-   .. note::
-      The :guilabel:`Production` purpose doesn't appear if you didn't test your upgraded database at
-      least once.
+.. note::
+   Versions that are not supported anymore become deprecated and must be updated to avoid
+   security issues. It is recommended to initiate the upgrade yourself and not wait for the
+   automatic upgrade, as the former method allows you to request a test upgrade of the database to
+   check for any discrepancies.
 
-#. This triggers the automated upgrade process. A confirmation email is then sent to you with the
-   the link to the upgraded database or to provide information if the upgrade failed.
+Test database
+=============
 
-   .. note::
-      You can also see and access your test database from your *My Databases* page.
+Click on the **arrow in a circle** icon to start the upgrade process. On the :guilabel:`Upgrade your
+database` pop-up, select the version of Odoo that the platform will be upgraded to. In the
+:guilabel:`Email to notify` field, enter an email address that will receive email notifications
+about the database upgrade.
+
+There is also a :guilabel:`Purpose` section on the pop-up that is used to specify the reason for the
+upgrade. However, at this stage of the process, the only selectable option is :guilabel:`Test`, as
+Odoo requires users to create a test copy of the upgraded database before converting the actual
+database.
+
+.. image:: odoo_online/upgrade-pop-up.png
+   :align: center
+   :alt: The "Upgrade your database" pop-up.
+
+After filling out the form, click the :guilabel:`Upgrade` button. The pop-up disappears and the
+database being upgraded shows a red :guilabel:`Upgrade in progress` tag next to its name. An email
+confirming that the upgrade is in progress is also sent to the email address specified on the
+pop-up.
+
+.. image:: odoo_online/upgrade-in-progress.png
+   :align: center
+   :alt: The "Upgrade in progress" tag next to the database name.
+
+Once the upgrade is complete, a new test database appears on the `database manager
+<https://www.odoo.com/my/databases>`_ page. To access the test database, click the drop-down arrow
+(:guilabel:`⯆`) to the left of the main database's name. Doing so makes the test version appear
+below it. Finally, click the green :guilabel:`Connect` button on the right side of the test
+version's row to go to the database.
+
+.. image:: odoo_online/test-database.png
+   :align: center
+   :alt: A test database on the database manager page.
+
+Except for being on the newer version of Odoo, the test database is an exact copy of the one being
+upgraded. It is important to do extensive testing in this database to ensure that the upgrade has
+not altered or corrupted any data, and that all workflows still proceed as expected.
+
+Production database
+===================
+
+After confirming the integrity of the new version, return to the `database manager
+<https://www.odoo.com/my/databases>`_ page. Once again, click on the **arrow in a circle** icon next
+to the database being upgraded. The :guilabel:`Upgrade your database` pop-up appears as before,
+except that there is now a :guilabel:`Production` option under the :guilabel:`Purpose` section.
+
+Select the :guilabel:`Production` option and then click :guilabel:`Upgrade` to begin the upgrade
+process. As before, a notification email is sent to the email address provided and a red
+:guilabel:`Upgrade in progress` tag appears next to the name of the database.
+
+The production database is then taken offline and will be upgraded automatically. The time it takes
+to upgrade the production database should be similar to the time that was necessary to upgrade the
+test database. Make sure to inform database users of the scheduled downtime.
+
+After the upgrade is finished, the :guilabel:`Upgrade in progress` tag disappears and the database
+is upgraded to the version specified.

content/applications/finance/accounting.rst

@@ -1,7 +1,4 @@
-:nosearch:
 :show-content:
-:hide-page-toc:
-:show-toc:
 
 ========================
 Accounting and Invoicing
@@ -15,17 +12,229 @@ development with features such as AI-powered invoice recognition, synchronizatio
 accounts, smart matching suggestions, etc.
 
 .. seealso::
-   - `Odoo Tutorials: Accounting <https://www.odoo.com/slides/accounting-19>`_
-   - :doc:`Accounting Cheat Sheet <accounting/getting_started/cheat_sheet>`
+   `Odoo Tutorials: Accounting <https://www.odoo.com/slides/accounting-19>`_
 
+.. cards::
+
+   .. card:: Get started
+      :target: accounting/get_started
+      :large:
+
+      Basic concepts of accounting and initial setup of your accounting
+
+   .. card:: Taxes
+      :target: accounting/taxes
+
+      Taxes, fiscal positions, and integrations
+
+   .. card:: Customer invoices
+      :target: accounting/customer_invoices
+
+      Customer invoices, payment terms, and electronic invoicing
+
+   .. card:: Vendor bills
+      :target: accounting/vendor_bills
+
+      Vendor bills, assets, and invoice digitization (OCR)
+
+   .. card:: Payments
+      :target: accounting/payments
+
+      Invoices and bills payments (online, checks, batches) and follow-up on invoices
+
+   .. card:: Bank and cash accounts
+      :target: accounting/bank
+
+      Bank synchronization, reconciliation, and cash registers
+
+   .. card:: Reporting
+      :target: accounting/reporting
+
+      Reporting, declarations, and analytic accounting
+
+Double-entry bookkeeping
+========================
+
+Odoo automatically creates all the underlying journal entries for all accounting transactions (e.g.,
+customer invoices, vendor bills, point-of-sales orders, expenses, inventory valuations, etc.).
+
+Odoo uses the double-entry bookkeeping system, whereby every entry needs a corresponding and
+opposite counterpart in a different account, with one account debited and the other credited.
+It ensures that all transactions are recorded accurately and consistently and that the accounts
+always balance.
+
+.. seealso::
+   :doc:`Accounting Cheat Sheet <accounting/get_started/cheat_sheet>`
+
+Accrual and cash basis
+======================
+
+Both accrual and cash basis accounting are supported in Odoo. This allows reporting income and
+expense either when the transaction occurs (accrual basis) or when the payment is made or received
+(cash basis).
+
+.. seealso::
+   :doc:`Cash basis <accounting/taxes/cash_basis>`
+
+Multi-company
+=============
+
+Several companies can be managed within the same database. Each company has its :doc:`chart of
+accounts <accounting/get_started/chart_of_accounts>`, which is also useful to generate consolidation
+reports. Users can access several companies but can only work on a single company's accounting at a
+time.
+
+Multi-currency environment
+==========================
+
+A :doc:`multi-currency <accounting/get_started/multi_currency>` environment with an automated
+exchange rate to ease international transactions is available in Odoo. Every transaction is recorded
+in the company's default currency; for transactions occurring in another currency, Odoo stores both
+the value in the company's currency and the transactions' currency value. Odoo generates currency
+gains and losses after reconciling the journal items.
+
+.. seealso::
+   :doc:`Manage a bank in a foreign currency <accounting/bank/foreign_currency>`
+
+International standards
+=======================
+
+Odoo Accounting supports more than 70 countries. It provides the central standards and mechanisms
+common to all nations, and thanks to country-specific modules, local requirements are fulfilled.
+Fiscal positions exist to address regional specificities like the chart of accounts, taxes, or any
+other requirements.
+
+.. seealso::
+   :doc:`Fiscal localization packages <fiscal_localizations>`
+
+Accounts receivable and payable
+===============================
+
+By default, there is a single account for the account receivable entries and one for the account
+payable entries. As transactions are linked to your **contacts**, you can run a report per customer,
+vendor, or supplier.
+
+The **Partner Ledger** report displays the balance of your customers and suppliers. It is available
+by going to :menuselection:`Accounting --> Reporting --> Partner Ledger`.
+
+Reporting
+=========
+
+The following financial :doc:`reports <accounting/reporting>` are available and updated in
+real-time:
+
++-----------------------------------------------+
+|               Financial reports               |
++============+==================================+
+| Statement  | Balance sheet                    |
+|            +----------------------------------+
+|            | Profit and loss                  |
+|            +----------------------------------+
+|            | Cash flow statement              |
+|            +----------------------------------+
+|            | Tax report                       |
+|            +----------------------------------+
+|            | ES sales list                    |
++------------+----------------------------------+
+| Audit      | General ledger                   |
+|            +----------------------------------+
+|            | Trial balance                    |
+|            +----------------------------------+
+|            | Journal report                   |
+|            +----------------------------------+
+|            | Intrastat report                 |
+|            +----------------------------------+
+|            | Check register                   |
++------------+----------------------------------+
+| Partner    | Partner ledger                   |
+|            +----------------------------------+
+|            | Aged receivable                  |
+|            +----------------------------------+
+|            | Aged payable                     |
++------------+----------------------------------+
+| Management | Invoice analysis                 |
+|            +----------------------------------+
+|            | Unrealized currency gains/losses |
+|            +----------------------------------+
+|            | Depreciation schedule            |
+|            +----------------------------------+
+|            | Disallowed expenses              |
+|            +----------------------------------+
+|            | Budget analysis                  |
+|            +----------------------------------+
+|            | Product margins                  |
+|            +----------------------------------+
+|            | 1099 report                      |
++------------+----------------------------------+
+
+.. tip::
+   :doc:`Create and customize reports <accounting/reporting/customize>` with Odoo's report engine.
+
+Tax report
+----------
+
+Odoo computes all accounting transactions for the specific tax period and uses these totals to
+calculate the tax obligation.
+
+.. important::
+   Once the tax report has been generated for a period, Odoo locks it and prevents the creation of
+   new journal entries involving VAT. Any correction to customer invoices or vendor bills has to
+   be recorded in the next period.
+
+.. note::
+   Depending on the country's localization, an XML version of the tax report can be generated to be
+   uploaded to the VAT platform of the relevant taxation authority.
+
+Bank synchronization
+====================
+
+The bank synchronization system directly connects with your bank institution to automatically
+import all transactions into your database. It gives an overview of your cash flow without logging
+into an online banking system or waiting for paper bank statements.
+
+.. seealso::
+   :doc:`Bank synchronization <accounting/bank/bank_synchronization>`
+
+Inventory valuation
+===================
+
+Both periodic (manual) and perpetual (automated) inventory valuations are supported in Odoo. The
+available methods are standard price, average price, :abbr:`LIFO (Last-In, First-Out)` and
+:abbr:`FIFO (First-In, First-Out).`
+
+.. seealso::
+   :doc:`View the impact of the valuation methods on transactions
+   <../inventory_and_mrp/inventory/management/reporting/inventory_valuation_config>`
+
+Retained earnings
+=================
+
+Retained earnings are the portion of income retained by a business. Odoo calculates current year
+earnings in real-time, so no year-end journal or rollover is required. The profit
+and loss balance is automatically reported on the balance sheet report.
+
+.. seealso::
+   :doc:`Accounting Cheat Sheet <accounting/get_started/cheat_sheet>`
+
+Fiduciaries
+===========
+
+The :guilabel:`Accounting Firms` mode can be activated by going to :menuselection:`Accounting -->
+Configuration --> Settings --> Accounting Firms mode`. When enabled:
+
+- The document's sequence becomes editable on all documents;
+- The :guilabel:`Total (tax incl.)` field appears to speed up and control the encoding by automating
+  line creation with the right account and tax;
+- :guilabel:`Invoice Date` and :guilabel:`Bill Date` are pre-filled when encoding a transaction.
+- A :guilabel:`Quick encoding` option is available for customer invoices and vendor bills.
 
 .. toctree::
    :titlesonly:
 
-   accounting/getting_started
-   accounting/receivables
-   accounting/payables
+   accounting/get_started
+   accounting/taxes
+   accounting/customer_invoices
+   accounting/vendor_bills
+   accounting/payments
    accounting/bank
-   accounting/taxation
    accounting/reporting
-   accounting/others

content/applications/finance/accounting/bank.rst

@@ -1,14 +1,194 @@
-:nosearch:
+:show-content:
 
+======================
+Bank and cash accounts
+======================
+
+You can manage as many bank or cash accounts as needed on your database. Configuring them well
+allows you to have all your banking data up-to-date and ready for :doc:`reconciliation
+<bank/reconciliation>` with your journal entries.
+
+In Odoo Accounting, each bank account has a dedicated journal set to post all entries in a dedicated
+account. Both the journal and the account are automatically created and configured whenever you add
+a bank account.
+
+.. note::
+   Cash journals and accounts must be configured manually.
+
+Bank journals are displayed by default on the :guilabel:`Accounting Dashboard` in the form of cards
+which include action buttons.
+
+.. image:: bank/card.png
+   :alt: Bank journals are displayed on the Accounting Dashboard and contain action buttons
+
+.. _bank_accounts/manage:
+
+Manage your bank and cash accounts
+==================================
+
+Connect your bank for automatic synchronization
+-----------------------------------------------
+
+To connect your bank account to your database, go to :menuselection:`Accounting --> Configuration
+--> Banks: Add a Bank Account`, select your bank in the list, click on :guilabel:`Connect`, and
+follow the instructions.
+
+.. seealso::
+   :doc:`bank/bank_synchronization`
+
+Create a bank account
+---------------------
+
+If your banking institution is not available in Odoo, or if you don't want to connect your bank
+account to your database, you can configure your bank account manually.
+
+To manually add a bank account, go to :menuselection:`Accounting --> Configuration --> Banks:
+Add a Bank Account`, click on :guilabel:`Create it` (at the bottom right), and fill out the form.
+
+.. note::
+   - Odoo automatically detects the bank account type (e.g., IBAN) and enables some features
+     accordingly.
+   - A default bank journal is available and can be used to configure your bank account by going to
+     :menuselection:`Accounting --> Configuration --> Accounting: Journals --> Bank`. Open it and
+     edit the different fields to match your bank account information.
+
+Create a cash journal
+---------------------
+
+To create a new cash journal, go to :menuselection:`Accounting --> Configuration --> Accounting:
+Journals`, click on :guilabel:`Create` and select :guilabel:`Cash` in the :guilabel:`Type` field.
+
+For more information on the accounting information fields, read the
+:ref:`bank_accounts/configuration` section of this page.
+
+.. note::
+   A default cash journal is available and can be used straight away. You can review it by going to
+   :menuselection:`Accounting --> Configuration --> Accounting: Journals --> Cash`.
+
+Edit an existing bank or cash journal
+-------------------------------------
+
+To edit an existing bank journal, go to :menuselection:`Accounting --> Configuration --> Accounting:
+Journals` and select the journal you want to modify.
+
+.. _bank_accounts/configuration:
+
+Configuration
 =============
-Bank and cash
-=============
+
+You can edit the accounting information and bank account number according to your needs.
+
+.. image:: bank/bank-journal-config.png
+   :alt: Manually configure your bank information
+
+.. seealso::
+   - :doc:`get_started/multi_currency`
+   - :doc:`bank/transactions`
+
+.. _bank_accounts/suspense:
+
+Suspense account
+----------------
+
+Bank statement transactions are posted on the :guilabel:`Suspense Account` until the final
+reconciliation allows finding the right account.
+
+Profit and loss accounts
+------------------------
+
+The :guilabel:`Profit Account` is used to register a profit when the ending balance of a cash
+register differs from what the system computes, while the :guilabel:`Loss Account` is used to
+register a loss when the ending balance of a cash register differs from what the system computes.
+
+Currency
+--------
+
+You can edit the currency used to enter the statements.
+
+.. seealso::
+   :doc:`get_started/multi_currency`
+
+Account number
+--------------
+
+If you need to **edit your bank account details**, click on the external link arrow next to your
+:guilabel:`Account Number`. On the new page, click on the external link arrow next to your
+:guilabel:`Bank` and update your bank information accordingly. These details are used when
+registering payments.
+
+.. image:: bank/bank-account-number.png
+   :alt: Edit your bank information
+
+Bank feeds
+----------
+
+:guilabel:`Bank Feeds` defines how the bank statements are registered. Three options are available:
+
+- :guilabel:`Undefined yet`, which should be selected when you don’t know yet if you will
+  synchronize your bank account with your database or not.
+- :guilabel:`Import (CAMT, CODA, CSV, OFX, QIF)`, which should be selected if you want to import
+  your bank statement using a different format.
+- :guilabel:`Automated Bank Synchronization`, which should be selected if your bank is synchronized
+  with your database.
+
+.. seealso::
+   - :doc:`bank/bank_synchronization`
+   - :doc:`bank/transactions`
+
+.. _bank/outstanding-accounts:
+
+Outstanding accounts
+====================
+
+By default, payments are registered through transitory accounts named **outstanding accounts**,
+before being recorded in your bank account.
+
+- An **outstanding payments account** is where outgoing payments are posted until they are linked
+  with a withdrawal from your bank statement.
+- An **outstanding receipts account** is where incoming payments are posted until they are linked
+  with a deposit from your bank statement.
+
+These accounts should be of :ref:`type <chart-of-account/type>` :guilabel:`Current Assets`.
+
+.. note::
+   The movement from an outstanding account to a bank account is done automatically when you
+   reconcile the bank account with a bank statement.
+
+Default accounts configuration
+------------------------------
+
+The outstanding accounts are defined by default. If necessary, you can update them by going to
+:menuselection:`Accounting --> Configuration --> Settings --> Default Accounts` and update your
+:guilabel:`Outstanding Receipts Account` and :guilabel:`Outstanding Payments Account`.
+
+Bank and cash journals configuration
+------------------------------------
+
+You can also set specific outstanding accounts for any journal with the :ref:`type
+<chart-of-account/type>` :guilabel:`Bank` or :guilabel:`Cash`.
+
+From your :guilabel:`Accounting Dashboard`, click on the menu selection ⋮ of the journal you want to
+configure, and click on :guilabel:`Configuration`, then open the :guilabel:`Incoming/Outgoing
+Payments` tab. To display the outstanding accounts column, click on the toggle button and check the
+:guilabel:`Outstanding Receipts/Payments accounts`, then update the account.
+
+.. image:: bank/toggle-button.png
+   :align: center
+   :alt: Select the toggle button and click on outstanding Accounts
+
+.. note::
+   - If you do not specify an outstanding payments account or an outstanding receipts account for a
+     specific journal, Odoo uses the default outstanding accounts.
+   - If your main bank account is added as an outstanding receipts account or outstanding payments
+     account, when a payment is registered, the invoice or bill's status is directly set to
+     :guilabel:`Paid`.
 
 .. toctree::
    :titlesonly:
 
-   bank/setup
    bank/bank_synchronization
    bank/transactions
    bank/reconciliation
-   bank/interbank
+   bank/reconciliation_models
+   bank/foreign_currency
+   bank/cash_register

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

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

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

@@ -1,6 +1,6 @@
-======================
-Manage a cash register
-======================
+=============
+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.
@@ -8,7 +8,7 @@ It calculates the total money in and out, computing the total balance.
 Configuration
 =============
 
-.. image:: manage_cash_register/journal.png
+.. image:: cash_register/journal.png
    :align: center
 
 1. Configure the Cash journal in :menuselection:`Accounting --> Configuration -->
@@ -40,7 +40,7 @@ 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:: manage_cash_register/put-money-in.png
+.. image:: cash_register/put-money-in.png
    :align: center
 
 Take money out
@@ -50,7 +50,7 @@ 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:: manage_cash_register/put-money-out.png
+.. 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/reconciliation.rst

@@ -1,11 +1,95 @@
-:nosearch:
-
 ===================
 Bank reconciliation
 ===================
 
-.. toctree::
-   :titlesonly:
+Overview
+========
 
-   reconciliation/use_cases
-   reconciliation/reconciliation_models
+Matching your bank statements with your accounting records can be a tedious task. You need to find the corresponding invoices, compare the amounts and partners' details with those in the bank statement. These steps can take a lot of time. Luckily, with Odoo you can very easily match your invoices or any other payment document with your bank statements.
+
+Two options of the reconciliation process exist in Odoo.
+
+1. We can directly specify the payment on the invoice
+2. We can reconcile open invoices with bank statements
+
+Configuration
+=============
+
+No special configuration is necessary to record invoices. All we need
+to do is to install the accounting app.
+
+.. image:: reconciliation/use01.png
+
+Use cases
+=========
+
+Case 1: Payments registration
+-----------------------------
+
+We received the proof of payment of our invoice in the amount of 2100 euros issued to
+Smith & Co.
+
+We start at our issued Invoice of 2100 euros for Smith & Co. Because the
+sold product is a service we demand an immediate payment. Our accountant
+only handles bank statements at the end of week, so we have to mark
+this invoice as paid immediately in order to indicate that we can start rendering services to our
+customer.
+
+Our customer send us a payment confirmation. We can thus register a
+payment and mark the invoice as paid.
+
+.. image:: reconciliation/use02.png
+
+By clicking on **register payment,** we are telling Odoo that our
+customer has paid the Invoice. We thus have to specify the amount and the
+payment method.
+
+.. image:: reconciliation/use03.png
+
+Now we can always find the payment details in the Invoice by clicking on the
+:menuselection:`Info --> Open Payment`.
+
+.. image:: reconciliation/use04.png
+
+The invoice has been paid and **the reconciliation has been done
+automatically.**
+
+Case 2: Bank statements reconciliations
+---------------------------------------
+
+We start at our issued Invoice of 3000 euros for Smith & Co. Let's also
+assume that other Invoices are open for different customers.
+
+.. image:: reconciliation/use05.png
+
+We receive our bank statement and find that not only the invoice issued to Smith & Co has
+been paid, but the one to Buzz of 92 euros as well.
+
+**Import** or **Create** the bank statements. Please refer to the
+documents from the Bank Feeds section.
+
+.. image:: reconciliation/use06.png
+
+On the dashboard, click on **Reconcile # Items**
+
+.. image:: reconciliation/use07.png
+
+If everything was right (correct partner name, right amount) odoo will
+do the reconciliations **automatically**.
+
+.. image:: reconciliation/use08.png
+
+If some issues are found, you will need to take **manual actions**.
+
+For example, if the partner is missing from your bank statement, just
+fill it in :
+
+.. image:: reconciliation/use09.png
+
+If the payment is done with a down payment, just check if it is all
+right and validate all related payments :
+
+.. image:: reconciliation/use10.png
+
+.. seealso::
+   :doc:`bank_synchronization`

content/applications/finance/accounting/bank/reconciliation/use_cases.rst

@@ -1,105 +0,0 @@
-=======================================
-Bank reconciliation process - use cases
-=======================================
-
-Overview
-========
-
-Matching your bank statements with your accounting records can be a tedious task. You need to find the corresponding invoices, compare the amounts and partners' details with those in the bank statement. These steps can take a lot of time. Luckily, with Odoo you can very easily match your invoices or any other payment document with your bank statements.
-
-Two options of the reconciliation process exist in Odoo.
-
-1. We can directly specify the payment on the invoice
-2. We can reconcile open invoices with bank statements
-
-Configuration
-=============
-
-No special configuration is necessary to record invoices. All we need
-to do is to install the accounting app.
-
-.. image:: use_cases/use01.png
-   :align: center
-
-Use cases
-=========
-
-Case 1: Payments registration
------------------------------
-
-We received the proof of payment of our invoice in the amount of 2100 euros issued to
-Smith & Co.
-
-We start at our issued Invoice of 2100 euros for Smith & Co. Because the
-sold product is a service we demand an immediate payment. Our accountant
-only handles bank statements at the end of week, so we have to mark
-this invoice as paid immediately in order to indicate that we can start rendering services to our
-customer.
-
-Our customer send us a payment confirmation. We can thus register a
-payment and mark the invoice as paid.
-
-.. image:: use_cases/use02.png
-   :align: center
-
-By clicking on **register payment,** we are telling Odoo that our
-customer has paid the Invoice. We thus have to specify the amount and the
-payment method.
-
-.. image:: use_cases/use03.png
-   :align: center
-
-Now we can always find the payment details in the Invoice by clicking on the
-:menuselection:`Info --> Open Payment`.
-
-.. image:: use_cases/use04.png
-   :align: center
-
-The invoice has been paid and **the reconciliation has been done
-automatically.**
-
-Case 2: Bank statements reconciliations
----------------------------------------
-
-We start at our issued Invoice of 3000 euros for Smith & Co. Let's also
-assume that other Invoices are open for different customers.
-
-.. image:: use_cases/use05.png
-   :align: center
-
-We receive our bank statement and find that not only the invoice issued to Smith & Co has
-been paid, but the one to Buzz of 92 euros as well.
-
-**Import** or **Create** the bank statements. Please refer to the
-documents from the Bank Feeds section.
-
-.. image:: use_cases/use06.png
-   :align: center
-
-On the dashboard, click on **Reconcile # Items**
-
-.. image:: use_cases/use07.png
-   :align: center
-
-If everything was right (correct partner name, right amount) odoo will
-do the reconciliations **automatically**.
-
-.. image:: use_cases/use08.png
-   :align: center
-
-If some issues are found, you will need to take **manual actions**.
-
-For example, if the partner is missing from your bank statement, just
-fill it in :
-
-.. image:: use_cases/use09.png
-   :align: center
-
-If the payment is done with a down payment, just check if it is all
-right and validate all related payments :
-
-.. image:: use_cases/use10.png
-   :align: center
-
-.. seealso::
-   :doc:`../bank_synchronization`

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

@@ -12,7 +12,7 @@ with recurrent entries such as bank fees.
 
 .. note::
    Reconciliation Models are also useful to handle *Cash Discounts*. Please refer to
-   :doc:`this documentation <../../receivables/customer_invoices/cash_discounts>` for more
+   :doc:`this documentation <../customer_invoices/cash_discounts>` for more
    information.
 
 .. _reconciliation_models_types:
@@ -124,6 +124,6 @@ line*.
 
 .. seealso::
 
-   - :doc:`use_cases`
-   - :doc:`../bank_synchronization`
-   - :doc:`../../receivables/customer_invoices/cash_discounts`
+   - :doc:`reconciliation`
+   - :doc:`bank_synchronization`
+   - :doc:`../customer_invoices/cash_discounts`

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

@@ -1,13 +0,0 @@
-:nosearch:
-
-=====
-Setup
-=====
-
-.. toctree::
-   :titlesonly:
-
-   setup/bank_accounts
-   setup/outstanding_accounts
-   setup/manage_cash_register
-   setup/foreign_currency

content/applications/finance/accounting/bank/setup/bank_accounts.rst

@@ -1,136 +0,0 @@
-======================
-Bank and cash accounts
-======================
-
-You can manage as many bank or cash accounts as needed on your database. Configuring them well
-allows you to have all your banking data up-to-date and ready for :doc:`reconciliation
-<../reconciliation/use_cases>` with your journal entries.
-
-In Odoo Accounting, each bank account has a dedicated journal set to post all entries in a dedicated
-account. Both the journal and the account are automatically created and configured whenever you add
-a bank account.
-
-.. note::
-   Cash journals and accounts must be configured manually.
-
-Bank journals are displayed by default on the :guilabel:`Accounting Dashboard` in the form of cards
-which include action buttons.
-
-.. image:: bank_accounts/card.png
-   :align: center
-   :alt: Bank journals are displayed on the Accounting Dashboard and contain action buttons
-
-.. _bank_accounts/manage:
-
-Manage your bank and cash accounts
-==================================
-
-Connect your bank for automatic synchronization
------------------------------------------------
-
-To connect your bank account to your database, go to :menuselection:`Accounting --> Configuration
---> Banks: Add a Bank Account`, select your bank in the list, click on :guilabel:`Connect`, and
-follow the instructions.
-
-.. seealso::
-   :doc:`../bank_synchronization`
-
-Create a bank account
----------------------
-
-If your banking institution is not available in Odoo, or if you don't want to connect your bank
-account to your database, you can configure your bank account manually.
-
-To manually add a bank account, go to :menuselection:`Accounting --> Configuration --> Banks:
-Add a Bank Account`, click on :guilabel:`Create it` (at the bottom right), and fill out the form.
-
-.. note::
-   - Odoo automatically detects the bank account type (e.g., IBAN) and enables some features
-     accordingly.
-   - A default bank journal is available and can be used to configure your bank account by going to
-     :menuselection:`Accounting --> Configuration --> Accounting: Journals --> Bank`. Open it and
-     edit the different fields to match your bank account information.
-
-Create a cash journal
----------------------
-
-To create a new cash journal, go to :menuselection:`Accounting --> Configuration --> Accounting:
-Journals`, click on :guilabel:`Create` and select :guilabel:`Cash` in the :guilabel:`Type` field.
-
-For more information on the accounting information fields, read the
-:ref:`bank_accounts/configuration` section of this page.
-
-.. note::
-   A default cash journal is available and can be used straight away. You can review it by going to
-   :menuselection:`Accounting --> Configuration --> Accounting: Journals --> Cash`.
-
-Edit an existing bank or cash journal
--------------------------------------
-
-To edit an existing bank journal, go to :menuselection:`Accounting --> Configuration --> Accounting:
-Journals` and select the journal you want to modify.
-
-.. _bank_accounts/configuration:
-
-Configuration
-=============
-
-You can edit the accounting information and bank account number according to your needs.
-
-.. image:: bank_accounts/bank-journal-config.png
-   :align: center
-   :alt: Manually configure your bank information
-
-.. seealso::
-   - :doc:`../../others/multi_currency`
-   - :doc:`../transactions`
-   - :doc:`../../bank/setup/outstanding_accounts`
-
-Suspense account
-----------------
-
-Bank statement transactions are posted on the :guilabel:`Suspense Account` until the final
-reconciliation allows finding the right account.
-
-Profit and loss accounts
-------------------------
-
-The :guilabel:`Profit Account` is used to register a profit when the ending balance of a cash
-register differs from what the system computes, while the :guilabel:`Loss Account` is used to
-register a loss when the ending balance of a cash register differs from what the system computes.
-
-Currency
---------
-
-You can edit the currency used to enter the statements.
-
-.. seealso::
-   :doc:`../../others/multi_currency`
-
-Account number
---------------
-
-If you need to **edit your bank account details**, click on the external link arrow next to your
-:guilabel:`Account Number`. On the new page, click on the external link arrow next to your
-:guilabel:`Bank` and update your bank information accordingly. These details are used when
-registering payments.
-
-.. image:: bank_accounts/bank-account-number.png
-   :align: center
-   :alt: Edit your bank information
-
-Bank feeds
-----------
-
-:guilabel:`Bank Feeds` defines how the bank statements are registered. Three options are available:
-
-- :guilabel:`Undefined yet`, which should be selected when you don’t know yet if you will
-  synchronize your bank account with your database or not.
-- :guilabel:`Import (CAMT, CODA, CSV, OFX, QIF)`, which should be selected if you want to import
-  your bank statement using a different format.
-- :guilabel:`Automated Bank Synchronization`, which should be selected if your bank is synchronized
-  with your database.
-
-.. seealso::
-   - :doc:`../bank_synchronization`
-   - :doc:`../transactions`

content/applications/finance/accounting/bank/setup/outstanding_accounts.rst

@@ -1,49 +0,0 @@
-====================
-Outstanding accounts
-====================
-
-By default, payments are registered through transitory accounts named **outstanding accounts**,
-before being recorded in your bank account.
-
-- An **outstanding payments account** is where outgoing payments are posted until they are linked
-  with a withdrawal from your bank statement.
-- An **outstanding receipts account** is where incoming payments are posted until they are linked
-  with a deposit from your bank statement.
-
-These accounts should be of :ref:`type <chart-of-account/type>` :guilabel:`Current Assets`.
-
-.. note::
-   The movement from an outstanding account to a bank account is done automatically when you
-   reconcile the bank account with a bank statement.
-
-Configuration
-=============
-
-Default accounts configuration
-------------------------------
-
-The outstanding accounts are defined by default. If necessary, you can update them by going to
-:menuselection:`Accounting --> Configuration --> Settings --> Default Accounts` and update your
-:guilabel:`Outstanding Receipts Account` and :guilabel:`Outstanding Payments Account`.
-
-Bank and cash journals configuration
-------------------------------------
-
-You can also set specific outstanding accounts for any journal with the :ref:`type
-<chart-of-account/type>` :guilabel:`Bank` or :guilabel:`Cash`.
-
-From your :guilabel:`Accounting Dashboard`, click on the menu selection ⋮ of the journal you want to
-configure, and click on :guilabel:`Configuration`, then open the :guilabel:`Incoming/Outgoing
-Payments` tab. To display the outstanding accounts column, click on the toggle button and check the
-:guilabel:`Outstanding Receipts/Payments accounts`, then update the account.
-
-.. image:: outstanding_accounts/toggle-button.png
-   :align: center
-   :alt: Select the toggle button and click on outstanding Accounts
-
-.. note::
-   - If you do not specify an outstanding payments account or an outstanding receipts account for a
-     specific journal, Odoo uses the default outstanding accounts.
-   - If your main bank account is added as an outstanding receipts account or outstanding payments
-     account, when a payment is registered, the invoice or bill's status is directly set to
-     :guilabel:`Paid`.

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

@@ -8,10 +8,13 @@ and reconciling them with the ones recorded in your accounting.
 :doc:`Bank synchronization <bank_synchronization>` automates the process. However, if you do not
 want to use it or if your bank is not yet supported, other options exist:
 
-- :ref:`Import bank transactions <import-statements>` delivered by your bank;
-- :ref:`Register bank transactions <register-transactions>` manually.
+- :ref:`Import bank transactions <transactions/import>` delivered by your bank;
+- :ref:`Register bank transactions <transactions/register>` manually.
 
-.. _import-statements:
+.. note::
+   :ref:`Grouping transactions by statement <transactions/statements>` is optional.
+
+.. _transactions/import:
 
 Import transactions
 ===================
@@ -28,15 +31,17 @@ To import a file, go to the :guilabel:`Accounting Dashboard`, and in the :guilab
 click on :guilabel:`Import Transactions`.
 
 .. image:: transactions/import-transactions.png
-   :align: center
-   :alt: Import bank transactions from bank journal
+   :alt: Import bank transactions from the bank journal
 
 Next, select the file and upload it.
 
-After setting the necessary formatting options and mapping the needed columns, you can run a
-:guilabel:`Test` and :guilabel:`Import` your bank transactions.
+After setting the necessary formatting options and mapping the file columns with their related Odoo
+fields, you can run a :guilabel:`Test` and :guilabel:`Import` your bank transactions.
 
-.. _register-transactions:
+.. seealso::
+   :doc:`/applications/general/export_import_data`
+
+.. _transactions/register:
 
 Register bank transactions manually
 ===================================
@@ -44,3 +49,46 @@ Register bank transactions manually
 You can also record your bank transactions manually. To do so, go to :guilabel:`Accounting
 Dashboard`, click on the :guilabel:`Bank` journal, and then on :guilabel:`New`. Make sure to fill
 out the :guilabel:`Partner` and :guilabel:`Label` fields to ease the reconciliation process.
+
+.. _transactions/statements:
+
+Statements
+==========
+
+A **bank statement** is a document provided by a bank or financial institution that lists the
+transactions that have occurred in a particular bank account over a specified period of time.
+
+In Odoo Accounting, it is optional to group transactions by their related statement, but depending
+on your business flow, you may want to record them for control purposes.
+
+.. important::
+   If you want to compare the ending balances of your bank statements with the ending balances of
+   your financial records, *don't forget to create an opening transaction* to record the bank
+   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`
+
+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.
+
+.. image:: transactions/statements-kanban.png
+   :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.
+
+Statement creation from the list view
+-------------------------------------
+
+Open the list of transactions by clicking on the name of the bank journal and switching to the list
+view. Select all the transactions corresponding to the bank statement, and, in the
+: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.

content/applications/finance/accounting/customer_invoices.rst

@@ -1,4 +1,9 @@
-============================================
+:show-content:
+
+=================
+Customer invoices
+=================
+
 From Customer Invoice to Payments Collection
 ============================================
 
@@ -9,7 +14,7 @@ spanning multiple invoices and taking discounts for early payments, you
 can do so efficiently and accurately.
 
 From Draft Invoice to Profit and Loss
-=====================================
+-------------------------------------
 
 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
@@ -27,7 +32,7 @@ point, Odoo supports the creation of what is called a Draft Invoice by
 Warehouse staff.
 
 Invoice creation
-================
+----------------
 
 Draft invoices can be manually generated from other documents such as
 Sales Orders, Purchase Orders,etc. Although you can create a draft
@@ -39,7 +44,7 @@ and delivered. It must also include other information needed to pay the
 invoice in a timely and precise manner.
 
 Draft invoices
-==============
+--------------
 
 The system generates invoice which are initially set to the Draft state.
 While these invoices
@@ -55,11 +60,9 @@ Let's create a customer invoice with following information:
 - Unit Price: 100
 - Taxes: Tax 15%
 
-.. image:: customer_invoice/invoice01.png
-   :align: center
+.. image:: customer_invoices/invoice01.png
 
-.. image:: customer_invoice/invoice02.png
-   :align: center
+.. image:: customer_invoices/invoice02.png
 
 The document is composed of three parts:
 
@@ -68,7 +71,7 @@ The document is composed of three parts:
 -  the bottom of the page, with detail about the taxes, and the totals.
 
 Open or Pro-forma invoices
-==========================
+--------------------------
 
 An invoice will usually include the quantity and the price of goods
 and/or services, the date, any parties involved, the unique invoice
@@ -80,25 +83,22 @@ then moves from the Draft state to the Open state.
 When you have validated an invoice, Odoo gives it a unique number from a
 defined, and modifiable, sequence.
 
-.. image:: customer_invoice/invoice03.png
-   :align: center
+.. image:: customer_invoices/invoice03.png
 
 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.
 
-.. image:: customer_invoice/invoice04.png
-   :align: center
+.. image:: customer_invoices/invoice04.png
 
 Send the invoice to customer
-============================
+----------------------------
 
 After validating the customer invoice, you can directly send it to the
 customer via the 'Send by email' functionality.
 
-.. image:: customer_invoice/invoice05.png
-   :align: center
+.. image:: customer_invoices/invoice05.png
 
 A typical journal entry generated from a validated invoice will look
 like as follows:
@@ -114,7 +114,7 @@ like as follows:
 +-----------------------+---------------+----------------+-------------+--------------+
 
 Payment
-=======
+-------
 
 In Odoo, an invoice is considered to be paid when the associated
 accounting entry has been reconciled with the payment entries. If there
@@ -133,7 +133,7 @@ follows:
 +-----------------------+---------------+----------------+-------------+--------------+
 
 Receive a partial payment through the bank statement
-====================================================
+----------------------------------------------------
 
 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
@@ -142,16 +142,14 @@ according to your accounting localisation.
 Create a bank statement from the accounting dashboard with the related
 journal and enter an amount of $100 .
 
-.. image:: customer_invoice/invoice06.png
-   :align: center
+.. image:: customer_invoices/invoice06.png
 
 Reconcile
-=========
+---------
 
 Now let's reconcile!
 
-.. image:: customer_invoice/invoice07.png
-   :align: center
+.. image:: customer_invoices/invoice07.png
 
 You can now go through every transaction and reconcile them or you can mass reconcile with instructions at the bottom.
 
@@ -159,20 +157,17 @@ 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. "
 
-.. image:: customer_invoice/invoice08.png
-   :align: center
+.. image:: customer_invoices/invoice08.png
 
-.. image:: customer_invoice/invoice09.png
-   :align: center
+.. image:: customer_invoices/invoice09.png
 
 Apply the payment. Below, you can see that the payment has been added to
 the invoice.
 
-.. image:: customer_invoice/invoice10.png
-   :align: center
+.. image:: customer_invoices/invoice10.png
 
 Payment Followup
-================
+----------------
 
 There's a growing trend of customers paying bills later and later.
 Therefore, collectors must make every effort to collect money and
@@ -189,14 +184,14 @@ will be executed.
 By going to the customer record and diving into the "Overdue Payments"
 you will see the follow-up message and all overdue invoices.
 
-.. image:: customer_invoice/invoice11.png
-   :align: center
+.. image:: customer_invoices/invoice11.png
 
-.. image:: customer_invoice/invoice12.png
-   :align: center
+.. image:: customer_invoices/invoice12.png
+
+.. _customer-invoices/aging-report:
 
 Customer aging report:
-----------------------
+~~~~~~~~~~~~~~~~~~~~~~
 
 The customer aging report will be an additional key tool for the
 collector to understand the customer credit issues, and to prioritize
@@ -205,32 +200,44 @@ their work.
 Use the aging report to determine which customers are overdue and begin
 your collection efforts.
 
-.. image:: customer_invoice/invoice13.png
-   :align: center
+.. image:: customer_invoices/invoice13.png
 
 Profit and loss
-===============
+---------------
 
 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."
 
-.. image:: customer_invoice/invoice14.png
-   :align: center
+.. image:: customer_invoices/invoice14.png
 
 Balance sheet
-=============
+-------------
 
 The balance sheet summarizes your company's liabilities,
 assets and equity at a specific moment in time.
 
-.. image:: customer_invoice/invoice15.png
-   :align: center
+.. image:: customer_invoices/invoice15.png
 
-.. image:: customer_invoice/invoice16.png
-   :align: center
+.. 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.
+
+.. toctree::
+   :titlesonly:
+
+   customer_invoices/overview
+   customer_invoices/customer_addresses
+   customer_invoices/payment_terms
+   customer_invoices/terms_conditions
+   customer_invoices/cash_discounts
+   customer_invoices/credit_notes
+   customer_invoices/cash_rounding
+   customer_invoices/deferred_revenues
+   customer_invoices/electronic_invoicing
+   customer_invoices/snailmail
+   customer_invoices/epc_qr_code
+   customer_invoices/incoterms

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

@@ -176,4 +176,4 @@ into account to define if they can benefit from the cash discount or not.
    whether to mark the invoice as fully paid with a write-off or as partially paid.
 
 .. seealso::
-   :doc:`../customer_payments/recording`
+   :doc:`../payments`

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

@@ -0,0 +1,39 @@
+==============================
+Delivery and invoice addresses
+==============================
+
+Companies often have multiple locations, and it is common that a customer invoice should be sent to
+one address and the delivery should be sent to another. Odoo's **Customer Addresses** feature is
+designed to handle this scenario by making it easy to specify which address to use for each case.
+
+.. seealso::
+   :doc:`overview`
+
+Configuration
+=============
+
+To specify a sales order's invoice and delivery addresses, first go to :menuselection:`Accounting
+--> Configuration --> Settings`. In the :guilabel:`Customer Invoices` section, enable
+:guilabel:`Customer Addresses` and click :guilabel:`Save`.
+
+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.
+
+Invoice and deliver to different addresses
+==========================================
+
+Delivery orders and their delivery slip reports use the address set as the :guilabel:`Delivery
+Address` on the sales order. By default, invoice reports show both the shipping address and the
+invoice address to assure the customer that the delivery is going to the correct location.
+
+Emails also go to different addresses. The quotation and sales order are sent to the main contact's
+email, as usual, but the invoice is sent to the email of the address set as the
+:guilabel:`Invoice Address` on the sales order.
+
+.. note::
+   - Reports, such as the delivery slip and invoice report, can be :doc:`customized using Studio
+     </applications/productivity/studio/pdf_reports>`.
+   - If :doc:`Send by Post <snailmail>` is checked when you click :guilabel:`Send & Print`, the
+     invoice will be mailed to the invoice address.

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

@@ -191,5 +191,5 @@ You have three choices for the **Automate Deferred Revenue** field:
    automate its sale. (see: `Choose a different Income Account for specific products`_).
 
 .. seealso::
-   * :doc:`../../getting_started/initial_configuration/chart_of_accounts`
+   * :doc:`../get_started/chart_of_accounts`
    * `Odoo Academy: Deferred Revenues (Recognition) <https://www.odoo.com/r/EWO>`_

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

@@ -0,0 +1,123 @@
+================================================================
+Electronic invoicing (:abbr:`EDI (electronic data interchange)`)
+================================================================
+
+EDI, or electronic data interchange, is the inter-company communication of business documents, such
+as purchase orders and invoices, in a standard format. Sending documents according to an EDI
+standard ensures that the machine receiving the message can interpret the information correctly.
+Various EDI file formats exist and are available depending on your company's country.
+
+EDI feature enables automating the administration between companies and might also be required by
+some governments for fiscal control or to facilitate the administration.
+
+Electronic invoicing of your documents such as customer invoices, credit notes or vendor bills is
+one of the application of EDI.
+
+Odoo supports, among others, the following formats.
+
+.. list-table::
+   :header-rows: 1
+
+   * - Format Name
+     - Applicability
+   * - Factur-X (CII)
+     - All customers
+   * - Peppol BIS Billing 3.0
+     - All customers
+   * - XRechnung (UBL)
+     - All customers
+   * - Fattura PA (IT)
+     - Italian companies
+   * - CFDI (4.0)
+     - Mexican companies
+   * - Peru UBL 2.1
+     - Peruvian companies
+   * - SII IVA Llevanza de libros registro (ES)
+     - Spanish companies
+   * - UBL 2.1 (Columbia)
+     - Colombian companies
+   * - Egyptian Tax Authority
+     - Egyptian companies
+   * - E-Invoice (IN)
+     - Indian companies
+   * - NLCIUS (Netherlands)
+     - Dutch companies
+   * - EHF 3.0
+     - Norwegian companies
+   * - SG BIS Billing 3.0
+     - Singaporean companies
+   * - A-NZ BIS Billing 3.0
+     - All customers
+
+.. note::
+   - The **Factur-X (CII)** format enables validation checks on the invoice and generates PDF/A-3
+     compliant files.
+   - Every PDF generated by Odoo includes an integrated **Factur-X** XML file.
+
+.. seealso::
+   :doc:`../../fiscal_localizations`
+
+.. _e-invoicing/configuration:
+
+Configuration
+=============
+
+By default, the format available in the :ref:`send window <e-invoicing/generation>` depends on your
+customer's country.
+
+You can define a specific e-invoicing format for each customer. To do so, go to
+:menuselection:`Accounting --> Customers --> Customers`, open the customer form, go to the
+:guilabel:`Accounting` tab and select the appropriate format.
+
+.. image:: electronic_invoicing/customer-form.png
+   :alt: Select an EDI format for a specific customer
+
+Peppol formats
+--------------
+
+Use the fields :guilabel:`Peppol e-address (EAS)` and :guilabel:`Peppol Endpoint` to identify the
+recipient in the Peppol Network.
+
+.. seealso::
+   `Peppol BIS Billing 3.0 - Electronic Address Scheme (EAS) code list
+   <https://docs.peppol.eu/poacc/billing/3.0/codelist/eas/>`_
+
+.. example::
+   .. list-table::
+      :header-rows: 1
+
+      * - Partner's country
+        - Peppol e-address (EAS)
+        - Peppol Endpoint
+      * - Luxembourg
+        - 9938 - Luxemburg VAT number
+        - a valid Luxemburgish VAT number
+      * - Netherlands
+        - 0190 - Dutch Originator's Identification Number
+        - a valid OIN number
+      * - Belgium
+        - 9925 - Belgium VAT number
+        - a valid Belgian VAT number
+
+National electronic invoicing
+-----------------------------
+
+Depending on your company's country (e.g., :doc:`Italy <../../fiscal_localizations/italy>`,
+:doc:`Spain <../../fiscal_localizations/spain>`, :doc:`Mexico
+<../../fiscal_localizations/mexico>`, etc.), you may be required to issue e-invoicing documents in
+a specific format for all your invoices. In this case, you can define a default e-invoicing format
+for your sales journal.
+
+To do so, go to :menuselection:`Accounting --> Configuration --> Journals`, open your sales journal,
+go to the :guilabel:`Advanced Settings` tab, and enable the formats you need for this journal.
+
+.. _e-invoicing/generation:
+
+E-invoices generation
+=====================
+
+From a confirmed invoice, click :guilabel:`Send & Print` to open the send window. Check the
+e-invoicing option to generate and attach the e-invoice file.
+
+.. image:: electronic_invoicing/send-window.png
+   :alt: The Peppol option is checked and an e-invoicing XML file is attached to the email.

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

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

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

@@ -0,0 +1,46 @@
+=========
+Incoterms
+=========
+
+:abbr:`Incoterms (International Commercial Terms)` are standardized trade terms used in
+international transactions to define the rights and responsibilities of buyers and sellers. They
+establish the obligations related to the delivery of goods, the transfer of risks, and the
+distribution of costs between the parties involved. Incoterms specify important details, such as the
+point at which the risk and costs transfer from the seller to the buyer, the responsibility for
+transportation, insurance, customs clearance, and other relevant aspects of the transaction.
+
+.. note::
+   By default, all 11 Incoterms are available in Odoo:
+
+   - **EXW**: Ex works
+   - **FCA**: Free carrier
+   - **FAS**: Free alongside ship
+   - **FOB**: Free on board
+   - **CFR**: Cost and freight
+   - **CIF**: Cost, insurance and freight
+   - **CPT**: Carriage paid to
+   - **CIP**: Carriage and insurance paid to
+   - **DPU**: Delivered at place unloaded
+   - **DAP**: Delivered at place
+   - **DDP**: Delivered duty paid
+
+.. seealso::
+   :doc:`../reporting/intrastat`
+
+.. _incoterms/invoices:
+
+Define an Incoterm
+==================
+
+To define an Incoterm manually, create an invoice or bill, click the :guilabel:`Other Info` tab, and
+select the :guilabel:`Incoterm`.
+
+.. _incoterms/default:
+
+Default Incoterm configuration
+==============================
+
+You can set a default Incoterm rule to **automatically** populate the Incoterm field on all newly
+created invoices and bills. Under :menuselection:`Accounting/Invoicing --> Configuration -->
+Settings`, scroll down to the :guilabel:`Customer Invoices` section, and select an Incoterm in the
+:guilabel:`Default Incoterm` field.