[IMP] contributing: documentation macOS make install

As per usual, leave off developer.pot and contributing.pot since we
don't translate them (not useful, can't really contribute to/dev in
Odoo without knowing English)

closes odoo/documentation#12119

Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>

.tx/config

@@ -11,6 +11,11 @@ file_filter = locale/<lang>/LC_MESSAGES/applications.po
 source_file = locale/sources/applications.pot
 source_lang = en
 
+[o:odoo:p:odoo-16-doc:r:essentials]
+file_filter = locale/<lang>/LC_MESSAGES/essentials.po
+source_file = locale/sources/essentials.pot
+source_lang = en
+
 [o:odoo:p:odoo-16-doc:r:finance]
 file_filter = locale/<lang>/LC_MESSAGES/finance.po
 source_file = locale/sources/finance.pot
@@ -63,6 +68,11 @@ file_filter = locale/<lang>/LC_MESSAGES/settings.po
 source_file = locale/sources/settings.pot
 source_lang = en
 
+[o:odoo:p:odoo-16-doc:r:studio]
+file_filter = locale/<lang>/LC_MESSAGES/studio.po
+source_file = locale/sources/studio.pot
+source_lang = en
+
 [o:odoo:p:odoo-16-doc:r:websites]
 file_filter = locale/<lang>/LC_MESSAGES/websites.po
 source_file = locale/sources/websites.pot

Makefile

@@ -18,6 +18,7 @@ CONFIG_DIR     = .
 SPHINXOPTS     = -D project_root=$(ROOT) -D canonical_version=$(CANONICAL_VERSION) \
                  -D versions=$(VERSIONS) -D languages=$(LANGUAGES) -D language=$(CURRENT_LANG) \
                  -D is_remote_build=$(IS_REMOTE_BUILD) \
+                 -T \
                  -A google_analytics_key=$(GOOGLE_ANALYTICS_KEY) \
                  -A plausible_script=$(PLAUSIBLE_SCRIPT) \
                  -A plausible_domain=$(PLAUSIBLE_DOMAIN) \

README.md

@@ -9,6 +9,7 @@
 - Python dependencies listed in the file `requirements.txt`.
 - Make
 - A local copy of the [odoo/odoo repository](https://github.com/odoo/odoo) (optional)
+- A local copy of the [odoo/upgrade-util repository](https://github.com/odoo/upgrade-util) (optional)
 
 ### Instructions
 
@@ -18,8 +19,9 @@
 3. See [this guide](https://www.odoo.com/documentation/latest/contributing/documentation.html)
    for more detailed instructions.
 
-Optional: place your local copy of the `odoo/odoo` repository in the parent directory or in the root
-directory of the documentation to build the latter with the documented Python docstrings.
+Optional: place your local copy of the `odoo/odoo` and `odoo/upgrade-util` repositories in
+the parent directory or in the root directory of the documentation to build the latter
+with the documented Python docstrings.
 
 ## Contribute to the documentation
 

conf.py

@@ -133,6 +133,24 @@ else:
         )
         odoo_dir_in_path = True
 
+if odoo_dir_in_path:
+    upgrade_util_dir = next(filter(Path.exists, [Path('upgrade-util'), Path('../upgrade-util')]), None)
+    if not upgrade_util_dir:
+        _logger.warning(
+            "Could not find Upgrade Utils sources directory in `upgrade_util`.\n"
+            "The developer documentation will be built but autodoc directives will be skipped.\n"
+            "In order to fully build the 'Developer' documentation, clone the repository with "
+            "`git clone https://github.com/odoo/upgrade-util` or create a symbolic link."
+        )
+        odoo_dir_in_path = False
+    else:
+        _logger.info(
+            "Found Upgrade Util sources in %(directory)s",
+            {'directory': upgrade_util_dir.resolve()},
+        )
+        from odoo import upgrade
+        upgrade.__path__.append(str((upgrade_util_dir / 'src').resolve()))
+
 # Mapping between odoo models related to master data and the declaration of the
 # data. This is used to point users to available xml_ids when giving values for
 # a field with the autodoc_field extension.
@@ -213,16 +231,13 @@ sphinx.transforms.i18n.docname_to_domain = (
 # is populated. If a version is passed to `versions` but is not listed here, it will not be shown.
 versions_names = {
     'master': "Master",
-    'saas-17.1': "Odoo Online",
+    'saas-18.1': "Odoo Online",
+    '18.0': "Odoo 18",
+    'saas-17.4': "Odoo Online",
+    'saas-17.2': "Odoo Online",
     '17.0': "Odoo 17",
-    'saas-16.4': "Odoo Online",
-    'saas-16.3': "Odoo Online",
-    'saas-16.2': "Odoo Online",
-    'saas-16.1': "Odoo Online",
     '16.0': "Odoo 16",
-    'saas-15.2': "Odoo Online",
     '15.0': "Odoo 15",
-    '14.0': "Odoo 14",
 }
 
 # The language names that should be shown in the language switcher, if the config option `languages`
@@ -231,8 +246,10 @@ languages_names = {
     'de': 'DE',
     'en': 'EN',
     'es': 'ES',
+    'es_419': 'ES (LATAM)',
     'fr': 'FR',
     'it': 'IT',
+    'ko': 'KR',
     'nl': 'NL',
     'pt_BR': 'PT',
     'ro': 'RO',
@@ -248,6 +265,9 @@ redirects_dir = 'redirects/'
 sphinx_tabs_disable_tab_closing = True
 sphinx_tabs_disable_css_loading = True
 
+# Autodoc ordering
+autodoc_member_order = 'bysource'
+
 #=== Options for HTML output ===#
 
 html_theme = 'odoo_theme'

content/administration.rst

@@ -61,4 +61,5 @@ functionalities, including functional support, upgrades, and hosting. `Pricing
     administration/upgrade
     administration/neutralized_database
     administration/supported_versions
+    administration/mobile
     administration/odoo_accounts

content/administration/hosting.rst

@@ -20,7 +20,7 @@ To Odoo Online
    - Odoo Online is *not* compatible with **non-standard apps**.
    - The database's current version must be :doc:`supported <supported_versions>`.
 
-#. Create a :ref:`duplicate <duplicate_premise>` of the database.
+#. Create a :ref:`duplicate of the database <on-premise/duplicate>`.
 #. In this duplicate, uninstall all **non-standard apps**.
 #. Use the database manager to grab a *dump with filestore*.
 #. `Submit a support ticket <https://www.odoo.com/help>`_ including the following:
@@ -46,10 +46,10 @@ Transferring an Odoo Online database
 ====================================
 
 .. important::
-   Odoo Online's :ref:`intermediary versions <supported_versions>` cannot be hosted on-premise as
-   that type of hosting does not support those versions. Therefore, if the database to transfer
-   is running an intermediary version, it must be upgraded first to the next :ref:`major version
-   <supported_versions>`, waiting for its release if necessary.
+   Odoo Online's :ref:`intermediary versions <supported_versions>` are not supported by Odoo.sh or
+   on-premise. Therefore, if the database to transfer is running an intermediary version, it must be
+   upgraded first to the next :ref:`major version <supported_versions>`, waiting for its release if
+   necessary.
 
    .. example::
       Transferring an online database running on Odoo 16.3 would require first upgrading it to Odoo
@@ -59,6 +59,11 @@ Transferring an Odoo Online database
       Click the gear icon (:guilabel:`⚙`) next to the database name on the `Odoo Online database
       manager <https://www.odoo.com/my/databases/>`_ to display its version number.
 
+   .. warning::
+      If there is an active Odoo subscription linked to the database being migrated, reach out to
+      the Customer Service Manager or `submit a support ticket <https://www.odoo.com/help>`_  to
+      complete the subscription transfer.
+
 To on-premise
 -------------
 

content/administration/mobile.rst

@@ -0,0 +1,67 @@
+================
+Odoo mobile apps
+================
+
+Two kind of Odoo mobile app exist: the progressive web app (PWA) and store apps. Using the PWA is
+recommended.
+
+Progressive web app (PWA)
+=========================
+
+PWAs are web-based applications designed to function across different devices and platforms,
+leveraging web browsers to deliver user experiences similar to native apps.
+
+The Odoo PWA features include:
+
+- Quick access by adding the PWA to a device's home screen
+- Seamless and borderless navigation experience
+- Push notifications
+- SSO authentication
+
+To install the Odoo PWA, launch a browser supporting PWAs, and sign in to an Odoo database. The
+instructions to install a PWA depend on the platform and browser used.
+
+.. tabs::
+
+   .. tab:: Android
+
+      **Chrome**: open Chrome's menu (:guilabel:`⋮`), select :guilabel:`Install app`, and tap
+      :guilabel:`Install`.
+
+      **Firefox**: open Firefox's menu (:guilabel:`⋮`), select :guilabel:`Install`, and either touch
+      and hold the Odoo icon or tap :guilabel:`Add automatically`.
+
+      The PWA can also be installed with **Samsung Internet**, **Edge**, and **Opera**.
+
+   .. tab:: iOS
+
+      **Safari**: open the **Share** menu by tapping the square with an arrow pointing upwards icon,
+      select :guilabel:`Add to Home Screen`, edit the PWA details if desired, and tap
+      :guilabel:`Add`.
+
+      On iOS 16.4 and above, the PWA can also be installed with **Chrome**, **Firefox**, and
+      **Edge**.
+
+   .. tab:: Desktop
+
+      **Chrome** and **Edge**: click the installation icon at the right of the address bar and click
+      :guilabel:`Install`.
+
+.. seealso::
+   - `Google Chrome Help: Use progressive web apps
+     <https://support.google.com/chrome/answer/9658361>`_
+   - `MDN Web Docs: Installing and uninstalling web apps
+     <https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps/Guides/Installing>`_
+   - `Microsoft Support: Install, manage, or uninstall apps in Microsoft Edge <https://support.microsoft.com/en-us/topic/install-manage-or-uninstall-apps-in-microsoft-edge-0c156575-a94a-45e4-a54f-3a84846f6113>`_
+
+Store apps
+==========
+
+The Odoo mobile apps are available for download on the `Google Play Store
+<https://play.google.com/store/apps/details?id=com.odoo.mobile>`_ and `Apple App Store
+<https://apps.apple.com/app/odoo/id1272543640>`_.
+
+.. important::
+   The iOS app cannot be updated and will be deprecated at some point in the future.
+
+While the store apps support multi-accounts, they are not compatible with SS0 authentication.

content/administration/neutralized_database.rst

@@ -21,7 +21,7 @@ turned into a testing environment.
 Deactivated features
 ====================
 
-Here is a non-exhaustive list of the deactivated parameters:
+Here is a non-exhaustive list of the deactivated features:
 
 - all planned actions (e.g., automatic invoicing of subscriptions, mass mailing, etc.)
 - outgoing emails
@@ -29,6 +29,7 @@ Here is a non-exhaustive list of the deactivated parameters:
 - payment providers
 - delivery methods
 - :abbr:`IAP (In-App Purchase)` tokens
+- website visibility (prevent search engines from indexing your site)
 
 .. note::
    **A red banner at the top of the screen is displayed on the neutralized database so that it can

content/administration/odoo_accounts.rst

@@ -23,13 +23,15 @@ Edit Security Settings --> Delete Account`. It can also be accessed by going to
 Upon clicking the :guilabel:`Delete Account` button, a pop-up window appears, requesting
 confirmation for the account deletion.
 
-.. image:: odoo_account/delete-account.png
+.. image:: odoo_accounts/delete-account.png
    :align: center
    :alt: Clicking on the Delete Account button will populate a window verifying the change.
 
 To confirm the deletion, enter the :guilabel:`Password` and the :guilabel:`Login` for the account
 being deleted. Then, click the :guilabel:`Delete Account` button to confirm the deletion.
 
+.. _odoocom/change_password:
+
 Odoo.com account password change
 ================================
 

content/administration/odoo_online.rst

@@ -46,7 +46,7 @@ Trigger a database upgrade.
 
 .. seealso::
    For more information about the upgrade process, check out the :ref:`Odoo Online upgrade
-   documentation <upgrade/request-test-database>`.
+   documentation <upgrade-request-test>`.
 
 .. _odoo_online/duplicate:
 
@@ -60,6 +60,8 @@ daily operations.
    - 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.
+   - A maximum of five duplicates can be made per database. Under extraordinary circumstances,
+     contact `support <https://www.odoo.com/help>`_ to raise the limit.
 
 .. _odoo_online/rename:
 

content/administration/odoo_sh/advanced/frequent_technical_questions.rst

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

content/administration/odoo_sh/getting_started/settings.rst

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

content/administration/on_premise.rst

@@ -7,159 +7,104 @@ On-premise
 Register a database
 ===================
 
-To register your database, you just need to enter your Subscription Code in the
-banner in the App Switcher. Make sure you do not add extra spaces before or after
-your subscription code. If the registration is successful, it will turn green and
-will provide you with the Expiration Date of your freshly-registered database. You
-can check this Expiration Date in the About menu (Odoo 9) or in the Settings Dashboard
-(Odoo 10).
+To register your database, enter your subscription code in the banner in the app dashboard. If the
+registration is successful, the banner will turn green and display the database expiration date.
 
-Registration Error Message
---------------------------
+.. tip::
+   The expiration date is also displayed at the bottom of the Settings page.
 
-If you are unable to register your database, you will likely encounter this
-message:
-
-.. image:: on_premise/error_message_sub_code.png
-   :alt: Something went wrong while registering your database, you can try again or contact Odoo
-         Help
-
-Solutions
-~~~~~~~~~
-
-* Do you have a valid Enterprise subscription?
-
-  * Check if your subscription details get the tag "In Progress" on
-    your `Odoo Account
-    <https://accounts.odoo.com/my/subscription>`__ or with your Account Manager
-
-* Have you already linked a database with your subscription reference?
-
-  * You can link only one database per subscription.
-    (Need a test or a development database? `Find a partner
-    <https://www.odoo.com/partners>`__)
-
-  * You can unlink the old database yourself on your `Odoo Contract
-    <https://accounts.odoo.com/my/subscription>`__ with the button "Unlink database"
-
-    .. image:: on_premise/unlink_single_db.png
-
-    A confirmation message will appear; make sure this is the correct database as
-    it will be deactivated shortly:
-
-    .. image:: on_premise/unlink_confirm_enterprise_edition.png
-
-* Do you have the updated version of Odoo 9?
-
-  * From July 2016 onward, Odoo 9 now automatically change the uuid of a
-    duplicated database; a manual operation is no longer required.
-
-  * If it's not the case, you may have multiple databases sharing the same
-    UUID. Please check on your `Odoo Contract
-    <https://accounts.odoo.com/my/subscription>`__, a short message will appear
-    specifying which database is problematic:
-
-    .. image:: on_premise/unlink_db_name_collision.png
-
-    In this case, you need to change the UUID on your test databases to solve this
-    issue. You will find more information about this in :ref:`this section <duplicate_premise>`.
-
-    For your information, we identify database with UUID. Therefore, each database
-    should have a distinct UUID to ensure that registration and invoicing proceed
-    effortlessly for your and for us.
-
-* Check your network and firewall settings
-
-  * The Update notification must be able to reach Odoo's subscription
-    validation servers. In other words, make sure that the Odoo server is able
-    to open outgoing connections towards:
-
-      * services.odoo.com on port 443 (or 80)
-      * services.openerp.com on port 443 (or 80) for older deployments
-
-  * Once you activated your database, you must keep these ports open, as the
-    Update notification runs once a week.
-
-Error message due to too many users
------------------------------------
-
-If you have more users in your local database than provisionned in your
-Odoo Enterprise subscription, you may encounter this message:
-
-.. image:: on_premise/add_more_users.png
-   :alt: This database will expire in X days, you have more users than your subscription allows
-
-
-When the message appears you have 30 days before the expiration.
-The countdown is updated everyday.
-
-Solutions
-~~~~~~~~~
-
-- **Add more users** on your subscription: follow the link and Validate
-  the upsell quotation and pay for the extra users.
-- **Deactivate users** as explained in this `documentation <documentation.html#deactivating-users>`_
-  and **Reject** the upsell quotation.
-
-Once your database has the correct number of users, the expiration message
-will disappear automatically after a few days, when the next verification occurs.
-We understand that it can be a bit frightening to see the countdown,
-so you can :ref:`force an Update Notification <force_ping>`  to make the message disappear
-right away.
-
-Database expired error message
-------------------------------
-
-If your database reaches its expiration date before your renew your subscription,
-you will encounter this message:
-
-.. image:: on_premise/database_expired.png
-   :alt: This database has expired.
-
-This **blocking** message appears after a non-blocking message that lasts 30 days.
-If you fail to take action before the end of the countdown, the database is expired.
-
-Solutions
-~~~~~~~~~
-
-* Renew your subscription: follow the link and renew your subscription - note that
-    if you wish to pay by Wire Transfer, your subscription will effectively be renewed
-    only when the payment arrives, which can take a few days. Credit card payments are
-    processed immediately.
-* Contact our `Support <https://www.odoo.com/help>`__
-
-None of those solutions worked for you? Please contact our
-`Support <https://www.odoo.com/help>`__
-
-.. _force_ping:
-
-.. _duplicate_premise:
+.. _on-premise/duplicate:
 
 Duplicate a database
 ====================
 
-You can duplicate your database by accessing the database manager on your
-server (<odoo-server>/web/database/manager). In this page, you can easily
-duplicate your database (among other things).
+Duplicate a database by accessing the database manager on your server
+(`<odoo-server>/web/database/manager`). Typically, you want to duplicate your production database
+into a neutralized testing database. It can be done by checking the neutralize box when prompted,
+which executes all :file:`neutralize.sql` scripts for every installed module.
 
-.. image:: on_premise/db_manager.gif
+Common error messages and solutions
+===================================
 
-When you duplicate a local database, it is **strongly** advised to change
-the duplicated database's uuid (Unniversally Unique Identifier), since this
-uuid is how your database identifies itself with our servers. Having two
-databases with the same uuid could result in invoicing problems or registration
-problems down the line.
+Registration error
+------------------
 
-.. note::
-   From July 2016 onward, Odoo 9 now automatically change the uuid of a duplicated database; a
-   manual operation is no longer required.
+In case of a registration error, the following message should be displayed.
 
-The database uuid is currently accessible from the menu :menuselection:`Settings --> Technical -->
-System Parameters`, we advise you to use a `uuid generator <https://www.uuidtools.com>`_ or to
-use the unix command ``uuidgen`` to generate a new uuid. You can then simply replace it like any
-other record by clicking on it and using the edit button.
+.. image:: on_premise/error-message-sub-code.png
+   :alt: Database registration error message
 
-.. image:: on_premise/db_uuid.png
+To resolve the issue:
+
+- Check the **validity of your Odoo Enterprise subscription** by verifying if your subscription
+  details have the tag :guilabel:`In Progress` on your `Odoo Account
+  <https://accounts.odoo.com/my/subscription>`_ or contact your Account Manager.
+
+- Ensure that **no other database is linked** to the subscription code, as only one database can be
+  linked per subscription.
+
+  .. tip::
+     If a test or a development database is needed, you can :ref:`duplicate a database
+     <on-premise/duplicate>`.
+
+- Verify that **no databases share the same UUID** (Universally Unique Identifier) by opening your
+  `Odoo Contract <https://accounts.odoo.com/my/subscription>`_. If two or more databases share the
+  same UUID, their name will be displayed.
+
+  .. image:: on_premise/unlink-db-name-collision.png
+     :alt: Database UUID error message
+
+  If that is the case, manually change the database(s) UUID or `send a support ticket
+  <https://www.odoo.com/help>`_.
+
+- As the update notification must be able to reach Odoo's subscription validation servers, ensure
+  your **network and firewall settings** allow the Odoo server to open outgoing connections
+  towards:
+
+  - Odoo 18.0 and above: `services.odoo.com` on port `80`
+  - Odoo 17.0 and below: `services.openerp.com` on port `80`
+
+  These ports must be kept open even after registering a database, as the update notification runs
+  once a week.
+
+Too many users error
+--------------------
+
+If you have more users in a local database than provisioned in your Odoo Enterprise subscription,
+the following message should be displayed.
+
+.. image:: on_premise/add-more-users.png
+   :alt: Too many users on a database error message
+
+When the message appears, you have 30 days to act before the database expires. The countdown is
+updated every day.
+
+To resolve the issue, either:
+
+- **Add more users** to your subscription by clicking the :guilabel:`Upgrade your subscription` link
+  displayed in the message to validate the upsell quotation and pay for the extra users.
+- :ref:`Deactivate users <users/deactivate>` and **reject** the upsell quotation.
+
+Once your database has the correct number of users, the expiration message disappears automatically
+after a few days, when the next verification occurs.
+
+Database expired error
+----------------------
+
+If your database expires before you renew your subscription, the following message should be
+displayed.
+
+.. image:: on_premise/database-expired.png
+   :alt: Database expired error message
+
+This message appears if you fail to act before the end of the 30-day countdown.
+
+To resolve the issue, either:
+
+- Click the :guilabel:`Renew your subscription` link displayed in the message and complete the
+  process. If you pay by wire transfer, your subscription will be renewed when the payment arrives
+  which can take a few days. Credit card payments are processed immediately.
+- `Send a support ticket <https://www.odoo.com/help>`_.
 
 .. toctree::
 

content/administration/on_premise/deploy.rst

@@ -740,7 +740,143 @@ It should be stored securely, and should be generated randomly e.g.
 
     $ python3 -c 'import base64, os; print(base64.b64encode(os.urandom(24)))'
 
-which will generate a 32 characters pseudorandom printable string.
+which generates a 32-character pseudorandom printable string.
+
+Reset the master password
+-------------------------
+
+There may be instances where the master password is misplaced, or compromised, and needs to be
+reset. The following process is for system administrators of an Odoo on-premise database detailing
+how to manually reset and re-encrypt the master password.
+
+.. seealso::
+   For more information about changing an Odoo.com account password, see this documentation:
+   :ref:`odoocom/change_password`.
+
+When creating a new on-premise database, a random master password is generated. Odoo recommends
+using this password to secure the database. This password is implemented by default, so there is a
+secure master password for any Odoo on-premise deployment.
+
+.. warning::
+   When creating an Odoo on-premise database the installation is accessible to anyone on the
+   internet, until this password is set to secure the database.
+
+The master password is specified in the Odoo configuration file (`odoo.conf` or `odoorc` (hidden
+file)). The Odoo master password is needed to modify, create, or delete a database through the
+graphical user interface (GUI).
+
+Locate configuration file
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+First, open the Odoo configuration file (`odoo.conf` or `odoorc` (hidden file)).
+
+.. tabs::
+
+   .. tab:: Windows
+
+      The configuration file is located at: `c:\\ProgramFiles\\Odoo{VERSION}\\server\\odoo.conf`
+
+   .. tab:: Linux
+
+      Depending on how Odoo is installed on the Linux machine, the configuration file is located in
+      one of two different places:
+
+      - Package installation: `/etc/odoo.conf`
+      - Source installation: `~/.odoorc`
+
+Change old password
+~~~~~~~~~~~~~~~~~~~
+
+Once the appropriate file has been opened, proceed to modify the old password in the configuration
+file to a temporary password.
+
+.. tabs::
+
+   .. group-tab:: Graphical user interface
+
+      After locating the configuration file, open it using a (:abbr:`GUI (graphical user
+      interface)`). This can be achieved by simply double clicking on the file. Then, the device
+      should have a default :abbr:`GUI (graphical user interface)` to open the file with.
+
+      Next, modify the master password line `admin_passwd = $pbkdf2-sha…` to `admin_passwd =
+      newpassword1234`, for example. This password can be anything, as long as it is saved
+      temporarily. Make sure to modify all characters after the `=`.
+
+      .. example::
+         The line appears like this:
+         `admin_passwd =
+         $pbkdf2-sh39dji295.59mptrfW.9z6HkA$w9j9AMVmKAP17OosCqDxDv2hjsvzlLpF8Rra8I7p/b573hji540mk/.3ek0lg%kvkol6k983mkf/40fjki79m`
+
+         The modified line appears like this: `admin_passwd = newpassword1234`
+
+   .. group-tab:: Command-line interface
+
+      Modify the master password line using the following Unix command detailed below.
+
+      Connect to the Odoo server's terminal via Secure Shell (SSH) protocol, and edit the
+      configuration file. To modify the configuration file, enter the following command:
+      :command:`sudo nano /etc/odoo.conf`
+
+      After opening the configuration file, modify the master password line `admin_passwd =
+      $pbkdf2-sha…` to `admin_passwd = newpassword1234`. This password can be anything, as long as
+      it is saved temporarily. Make sure to modify all characters after the `=`.
+
+      .. example::
+         The line appears like this:
+         `admin_passwd =
+         $pbkdf2-sh39dji295.59mptrfW.9z6HkA$w9j9AMVmKAP17OosCqDxDv2hjsvzlLpF8Rra8I7p/b573hji540mk/.3ek0lg%kvkol6k983mkf/40fjki79m`
+
+         The modified line appears like this: `admin_passwd = newpassword1234`
+
+.. important::
+   It is essential that the password is changed to something else, rather than triggering a new
+   password reset by adding a semicolon `;` at the beginning of the line. This ensures the database
+   is secure throughout the entire password reset process.
+
+Restart Odoo server
+~~~~~~~~~~~~~~~~~~~
+
+After setting the temporary password, a restart of the Odoo server is **required**.
+
+.. tabs::
+
+   .. group-tab:: Graphical user interface
+
+      To restart the Odoo server, first, type `services` into the Windows :guilabel:`Search` bar.
+      Then, select the :guilabel:`Services` application, and scroll down to the :guilabel:`Odoo`
+      service.
+
+      Next, right click on :guilabel:`Odoo`, and select :guilabel:`Start` or :guilabel:`Restart`.
+      This action manually restarts the Odoo server.
+
+   .. group-tab:: Command-line interface
+
+      Restart the Odoo server by typing the command: :command:`sudo service odoo15 restart`
+
+      .. note::
+         Change the number after `odoo` to fit the specific version the server is running on.
+
+Use web interface to re-encrypt password
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+First, navigate to `/web/database/manager` or `http://server_ip:port/web/database/manager` in a
+browser.
+
+.. note::
+   Replace `server_ip` with the IP address of the database. Replace `port` with the numbered port
+   the database is accessible from.
+
+Next, click :guilabel:`Set Master Password`, and type in the previously-selected temporary password
+into the :guilabel:`Master Password` field. Following this step, type in a :guilabel:`New Master
+Password`. The :guilabel:`New Master Password` is hashed (or encrypted), once the
+:guilabel:`Continue` button is clicked.
+
+At this point, the password has been successfully reset, and a hashed version of the new password
+now appears in the configuration file.
+
+.. seealso::
+   For more information on Odoo database security, see this documentation:
+   :ref:`db_manager_security`.
 
 Supported Browsers
 ==================

content/administration/on_premise/source.rst

@@ -273,18 +273,23 @@ Dependencies
 
          .. tab:: Debian/Ubuntu
 
-            For Debian-based systems, the packages are listed in the `debian/control
-            <{GITHUB_PATH}/debian/control>`_ file of the Odoo sources.
-
             On Debian/Ubuntu, the following commands should install the required packages:
 
             .. code-block:: console
 
-               $ cd /CommunityPath
-               $ sed -n -e '/^Depends:/,/^Pre/ s/ python3-\(.*\),/python3-\1/p' debian/control | sudo xargs apt-get install -y
+               $ cd odoo #CommunityPath
+               $ sudo ./setup/debinstall.sh
+
+            The `setup/debinstall.sh` script will parse the `debian/control
+            <{GITHUB_PATH}/debian/control>`_ file and install the found packages.
 
          .. tab:: Install with pip
 
+            .. warning::
+
+               Using pip may lead to security issues and broken dependencies; only do this if you
+               know what you are doing.
+
             As some of the Python packages need a compilation step, they require system libraries to
             be installed.
 

content/administration/supported_versions.rst

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

content/administration/upgrade.rst

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

content/applications/essentials.rst

@@ -7,5 +7,6 @@ Odoo essentials
    essentials/activities
    essentials/reporting
    essentials/search
+   essentials/contacts
    essentials/export_import_data
    essentials/in_app_purchase

content/applications/essentials/contacts.rst

@@ -0,0 +1,238 @@
+========
+Contacts
+========
+
+The *Contacts* application comes installed on all Odoo databases. Contacts are created for customers
+the company does business with through Odoo. A contact is a repository of vital business
+information, facilitating communication and business transactions.
+
+Contact form
+============
+
+To create a new contact, navigate to the :menuselection:`Contacts app`, and click
+:guilabel:`Create`. A new form appears where various contact information can be added.
+
+Contact type
+------------
+
+Odoo allows for both :guilabel:`Individual` and :guilabel:`Company` contacts. Select either
+:guilabel:`Individual` or :guilabel:`Company`, depending on the type of contact that is being added.
+
+Name
+----
+
+First, fill in the name of the :guilabel:`Individual` or :guilabel:`Company`. This is how the name
+appears throughout the database. This field is **mandatory**.
+
+.. tip::
+   :guilabel:`Individual` contacts can have a :guilabel:`Company` contact linked to it. After
+   selecting :guilabel:`Individual`, a new :guilabel:`Company Name...` field appears below the
+   first name field.
+
+Address
+-------
+
+Next, enter the :guilabel:`Address` of the :guilabel:`Company` or :guilabel:`Individual`.
+
+.. tip::
+   If the :guilabel:`Individual` option is chosen, then the *type of address* can be chosen from a
+   drop-down menu. Options for this drop-down menu include: :guilabel:`Contact`, :guilabel:`Invoice
+   Address`, :guilabel:`Delivery Address`, :guilabel:`Other Address`, and :guilabel:`Private
+   Address`.
+
+Additional fields
+-----------------
+
+Additional details are included on the initial form. The following fields are available:
+
+- :guilabel:`VAT`: Value Added Tax number.
+- :guilabel:`Citizen Identification`: citizen or government identification number (only available
+  on :guilabel:`Individual`).
+- :guilabel:`Job Position`: list the job position of the :guilabel:`Individual` (only available on
+  :guilabel:`Individual`).
+- :guilabel:`Phone`: list phone number (with country code). Make a call, send an SMS, or WhatsApp
+  message by hovering over the field on the saved form, and clicking the desired option.
+- :guilabel:`Mobile`: list mobile phone number (with country code). Make a call, send an SMS, or
+  WhatsApp message by hovering over the field on the saved form, and clicking on the desired option.
+- :guilabel:`Email`: enter the email address with the domain.
+- :guilabel:`Website`: enter the full website address, starting with `http` or `https`.
+- :guilabel:`Title`: select :guilabel:`Doctor`, :guilabel:`Madam`, :guilabel:`Miss`,
+  :guilabel:`Mister`, :guilabel:`Professor`, or create a new one directly from this field.
+- :guilabel:`Tags`: enter preconfigured tags by typing them in the field, or clicking the drop-down
+  menu, and selecting one. To create a new one, type the new tag in the field, and click
+  :guilabel:`Create` from the resulting drop-down menu.
+
+Contacts & Addresses tab
+------------------------
+
+At the bottom of the contact form are several tabs. On the :guilabel:`Contacts & Addresses` tab,
+contacts can be added that are associated with a :guilabel:`Company` and related addresses. For
+example, a specific contact person for the company can be listed here.
+
+Multiple addresses can be added on both :guilabel:`Individual` and :guilabel:`Company` contacts. To
+do so, click :guilabel:`Add` in the :guilabel:`Contacts & Addresses` tab. Doing so reveals a
+:guilabel:`Create Contact` pop-up form, in which additional addresses can be configured.
+
+.. image:: contacts/contact-form-add-address.png
+   :align: center
+   :alt: Add a contact/address to the contact form.
+
+On the :guilabel:`Create Contact` pop-up form, start by clicking the default :guilabel:`Other
+Address` field at the top to reveal a drop-down menu of address-related options.
+
+Select any of the following options:
+
+- :guilabel:`Contact`: adds another contact to the existing contact form.
+- :guilabel:`Invoice Address`: adds a specific invoice address to the existing contact form.
+- :guilabel:`Delivery Address`: adds a specific delivery address to the existing contact form.
+- :guilabel:`Other Address`: adds an alternate address to the existing contact form.
+- :guilabel:`Private Address`: adds a private address to the existing contact form.
+
+.. image:: contacts/create-contact-window.png
+   :align: center
+   :alt: Create a new contact/address on a contact form.
+
+Once an option is selected, enter the corresponding contact information that should be used for the
+specified address type.
+
+Add the :guilabel:`Contact Name`, :guilabel:`Address`, :guilabel:`Email`, along with the
+:guilabel:`Phone` and/or :guilabel:`Mobile` numbers below.
+
+Set the :guilabel:`Job Position`, which appears if the :guilabel:`Contact` address type has been
+selected. This is similar to the :guilabel:`Individual` contact.
+
+To add a note, click on the text field next to :guilabel:`Notes`, and write anything that is
+applicable to the customer or contact.
+
+Then, click :guilabel:`Save & Close` to save the address, and close the :guilabel:`Create Contact`
+window. Or, click :guilabel:`Save & New` to save the address, and immediately input another one.
+
+Sales & Purchase tab
+--------------------
+
+Next, is the :guilabel:`Sales & Purchases` tab, which only appears when the *Sales*, *Purchase*,
+**or** *Point of Sale* applications are installed.
+
+The :guilabel:`Fiscal Position` can be set on the :guilabel:`Sales & Purchases` tab. Select a
+:guilabel:`Fiscal Position` from the drop-down menu.
+
+Sales section
+~~~~~~~~~~~~~
+
+Under the :guilabel:`Sales` heading, a specific :guilabel:`Salesperson` can be assigned to a
+contact. To do that, click the :guilabel:`Salesperson` drop-down field, and select one. Create a new
+:guilabel:`Salesperson` by typing the user's name, and making the appropriate selection.
+
+Certain :guilabel:`Payment Terms`, or a certain :guilabel:`Pricelist`, can also be set, if needed.
+Click the drop-down menu next to :guilabel:`Payment Terms`, and change it to one of the preselected
+:guilabel:`Payment Terms`, or :guilabel:`Create` a new one. Select the :guilabel:`Pricelist`
+drop-down menu to choose the appropriate :guilabel:`Pricelist`.
+
+Click into the :guilabel:`Delivery Method` field to select an option from the drop-down menu.
+
+Point Of Sale section
+~~~~~~~~~~~~~~~~~~~~~
+
+Under the :guilabel:`Point Of Sale` heading, enter a :guilabel:`Barcode` that can be used to
+identify the contact. Use the :guilabel:`Loyalty Points` field to track points the user won as part
+of a *Loyalty Program*.
+
+Purchase section
+~~~~~~~~~~~~~~~~
+
+Specify :guilabel:`Payment Terms`, :guilabel:`1099 Box` information, and a preferred
+:guilabel:`Payment Method` here. A :guilabel:`Receipt Reminder` can be set here, as well.
+
+Misc section
+~~~~~~~~~~~~
+
+Under the :guilabel:`Misc.` heading, use :guilabel:`Reference` field to add any additional
+information for this contact. If this contact should only be accessible for one company in a
+multi-company database, select it from the :guilabel:`Company` field drop-down list. Use the
+:guilabel:`Website` drop-down menu to restrict the publishing of this contact to one website (if
+working on a database with multiple websites). Select one or more :guilabel:`Website Tags` to assist
+in filtering published customers on the `/customers` website page. Select an :guilabel:`Industry`
+for this contact from the drop-down menu. Use the :guilabel:`SLA Policies` field to assign a
+*Helpdesk* SLA policy to this contact.
+
+Accounting tab
+--------------
+
+The :guilabel:`Accounting` tab appears when the *Accounting* application is installed. Here, a user
+can add any related :guilabel:`Bank Accounts`, or set default :guilabel:`Accounting entries`.
+
+Under the :guilabel:`Miscellaneous` heading, use the :guilabel:`LEI` field to enter a Legal Entity
+Identifier, if necessary.
+
+Internal Notes tab
+------------------
+
+Following the :guilabel:`Accounting` tab is the :guilabel:`Internal Notes` tab, where notes can be
+left on this contact form, just like on the contact form noted above.
+
+Partner Assignment tab
+----------------------
+
+Next is the :guilabel:`Partner Assignment` tab, which by default, includes a :guilabel:`Geolocation`
+section, and other partner options, including :guilabel:`Partner Activation` and :guilabel:`Partner
+Review` configurations. These are **only** present when the *Enterprise Resellers* module is
+installed.
+
+Membership tab
+--------------
+
+Finally, there is the :guilabel:`Membership` tab, which can help users manage any memberships that
+are being offered to this specific contact. It should be noted that this tab only appears when the
+*Members* applications is installed.
+
+Smart buttons
+=============
+
+At the top of the contact form, there are some additional options available, known as *smart
+buttons*.
+
+Here, Odoo displays a variety of records, related to this contact, that were created on other apps.
+Odoo integrates information from every single app, so there are many smart buttons.
+
+.. example::
+   For example, there is an :guilabel:`Opportunities` smart button, where all the opportunities
+   related to this customer from the *CRM* app are accessible.
+
+.. tip::
+   If the corresponding applications are installed, their related smart buttons appear
+   automatically on a contact form.
+
+A user can see any :guilabel:`Meetings`, :guilabel:`Sales`, :guilabel:`POS Orders`,
+:guilabel:`Subscriptions`, project :guilabel:`Tasks`, and the :guilabel:`More` smart button reveals
+additional options, via a drop-down menu. A user can even quickly access :guilabel:`Purchases`,
+:guilabel:`Helpdesk` tasks, :guilabel:`On-time Rate` for deliveries, :guilabel:`Invoiced`
+information, :guilabel:`Vendor Bills`, and the :guilabel:`Partner Ledger` connected to this contact.
+
+Deliveries, documents, loyalty cards, and direct debits are *also* linked to smart buttons, like
+this, should there be any outstanding/on-file for this contact.
+
+If the contact is a partner, the user can visit their partner page on the Odoo-built website by
+clicking the :guilabel:`Go to Website` smart button.
+
+Archive contacts
+----------------
+
+If a user decides they no longer want to have this contact active, the record can be archived. To do
+that, go to the :icon:`fa-cog` :guilabel:`Action` menu at the top of the contact form, and click
+:guilabel:`Archive`.
+
+Then, click :guilabel:`OK` from the resulting :guilabel:`Confirmation` pop-up window.
+
+With this contact successfully archived, as indicated by a banner at the top, they do not show up
+in the main contacts page, but they can still be searched for with the :guilabel:`Archived` filter.
+
+.. tip::
+   A contact can be *unarchived*, if the user decides to work with them again. To do that, just
+   click the :icon:`fa-cog` :guilabel:`Action` menu again at the top of the archived contact form,
+   and click :guilabel:`Unarchive`. Upon doing so, the :guilabel:`Archived` banner is removed, and
+   the contact is restored.
+
+.. seealso::
+   - :doc:`Add different addresses in CRM <../sales/sales/send_quotations/different_addresses>`
+   - `Odoo's eLearning Contacts tutorial
+     <https://www.odoo.com/slides/slide/contacts-2527?fullscreen=1>`_

content/applications/essentials/export_import_data.rst

@@ -2,166 +2,245 @@
 Export and import data
 ======================
 
+In Odoo, it is sometimes necessary to export or import data for running reports, or for data
+modification. This document covers the export and import of data into and out of Odoo.
+
+.. important::
+   Sometimes, users run into a 'time out' error, or a record does not process, due to its size. This
+   can occur with large exports, or in cases where the import file is too large. To circumvent this
+   limitation surrounding the size of the records, process exports or imports in smaller batches.
+
 .. _export-data:
 
 Export data from Odoo
 =====================
 
-When working with a database, it sometimes is necessary to export your data in a distinct file.
-Doing so can help to do reporting over your activities (even if Odoo offers a precise and easy
-reporting tool with each available application).
+When working with a database, it is sometimes necessary to export data in a distinct file. Doing so
+can aid in reporting on activities, although, Odoo provides a precise and easy reporting tool with
+each available application.
 
-With Odoo, you can export the values from any field in any record. To do so,
-activate the list view on the items that need to be exported, click on *Action*, and, then,
-on *Export*.
+With Odoo, the values can be exported from any field in any record. To do so, activate the list view
+(:guilabel:`☰ (three horizontal lines)` icon), on the items that need to be exported, and then
+select the records that should be exported. To select a record, tick the checkbox next to the
+corresponding record. Finally, click on :guilabel:`⚙️ Action`, and then :guilabel:`Export`.
 
 .. image:: export_import_data/list-view-export.png
    :align: center
-   :alt: view of the different things to enable/click to export data
+   :alt: View of the different things to enable/click to export data.
 
-Pretty simple, this action still comes with some specificities. In fact,
-when clicking on *Export*, a pop-up window appears with several
-options for the data to export:
+When clicking on :guilabel:`Export`, an :guilabel:`Export Data` pop-over window appears, with
+several options for the data to export:
 
 .. image:: export_import_data/export-data-overview.png
    :align: center
-   :alt: overview of all the options to take into account when exporting data in Odoo
+   :alt: Overview of options to consider when exporting data in Odoo..
 
-#. With the *I want to update data* option ticked, the system only
-   shows the fields which can be imported. This is very helpful in
-   case you want to update existing records. Basically, this works
-   like a filter. Leaving the box unticked gives way more field
-   options because it shows all the fields, not just the ones which
-   can be imported.
-#. When exporting, you can choose between two formats: .csv and .xls.
-   With .csv, items are separated with a comma, while .xls holds information about all the
-   worksheets in a file, including both content and formatting.
-#. Those are the items you may want to export. Use the arrows to display
-   more sub-field options. Of course, you can use the search bar to
-   find specific fields more easily. To use the search option more
-   efficiently, display all the fields by clicking on all the
-   arrows!
-#. The + button is there to add fields to the "to export" list.
-#. The "handles" next to the selected fields allow you to move the fields up and down to
-   change the order in which they must be displayed in the exported
-   file.
-#. The trashcan is there if you need to remove fields.
-#. For recurring reports, it might be interesting to save export presets.
-   Select all the needed ones and click on the template bar.
-   There, click on *New template* and give a name to yours. The
-   next time you need to export the same list, simply select the
-   related template.
+#. With the :guilabel:`I want to update data (import-compatable export)` option ticked, the system
+   only shows the fields that can be imported. This is helpful in the case where the existing
+   records need to be updated. This works like a filter. Leaving the box unticked, gives many more
+   field options because it shows all the fields, not just the ones that can be imported.
+#. When exporting, there is the option to export in two formats: `.csv` and `.xls`. With `.csv`,
+   items are separated by a comma, while `.xls` holds information about all the worksheets in a
+   file, including both content and formatting.
+#. These are the items that can be exported. Use the :guilabel:`> (right arrow)` icon to display
+   more sub-field options. Use the :guilabel:`Search` bar to find specific fields. To use the
+   :guilabel:`Search` option more efficiently, click on all the :guilabel:`> (right arrows)` to
+   display all fields.
+#. The :guilabel:`+ (plus sign)` icon button is present to add fields to the :guilabel:`Fields to
+   export` list.
+#. The :guilabel:`↕️ (up-down arrow)` to the left of the selected fields can be used to move the
+   fields up and down, to change the order in which they are displayed in the exported file.
+   Drag-and-drop using the :guilabel:`↕️ (up-down arrow)` icon.
+#. The :guilabel:`🗑️ (trash can)` icon is used to remove fields. Click on the :guilabel:`🗑️ (trash
+   can)` icon to remove the field.
+#. For recurring reports, it is helpful to save export presets. Select all the needed fields, and
+   click on the template drop-down menu. Once there, click on :guilabel:`New template`, and give a
+   unique name to the export just created. The next time the same list needs to be exported, select
+   the related template that was previously saved from the drop-down menu.
 
 .. tip::
-   It’s good to keep the field’s external identifier in mind. For example,
-   *Related Company* is equal to *parent_id*. Doing so helps export
-   only what you would like to import next.
+   It is helpful to know the field's external identifier. For example, :guilabel:`Related Company`
+   in the export user interface is equal to *parent_id* (external identifier). This is helpful
+   because then, the only data exported is what should be modified and re-imported.
 
 .. _import-data:
 
 Import data into Odoo
 =====================
 
-How to start
-------------
+Importing data into Odoo is extremely helpful during implementation, or in times where data needs to
+be updated in bulk. The following documentation covers how to import data into an Odoo database.
 
-You can import data on any Odoo's business object using either Excel
-(.xlsx) or CSV (.csv) formats:
-contacts, products, bank statements, journal entries and even orders!
+.. warning::
+   Imports are permanent and **cannot** be undone. However, it is possible to use filters (`created
+   on` or `last modified`) to identify records changed or created by the import.
 
-Open the view of the object you want to populate and click on :menuselection:`Favorites --> Import
-records`.
+.. tip::
+   Activating :ref:`developer mode <developer-mode>` changes the visible import settings in the left
+   menu. Doing so reveals an :menuselection:`Advanced` menu. Included in this advanced menu are two
+   options: :guilabel:`Track history during import` and :guilabel:`Allow matching with subfields`.
 
-.. image:: export_import_data/import_button.png
+   .. image:: export_import_data/advanced-import.png
+      :align: center
+      :alt: Advanced import options when developer mode is activated.
+
+   If the model uses openchatter, the :guilabel:`Track history during import` option sets up
+   subscriptions and sends notifications during the import, but leads to a slower import.
+
+   Should the :guilabel:`Allow matching with subfields` option be selected, then all subfields
+   within a field are used to match under the :guilabel:`Odoo Field` while importing.
+
+Get started
+-----------
+
+Data can be imported on any Odoo business object using either Excel (`.xlsx`) or :abbr:`CSV
+(Comma-separated Values)` (`.csv`) formats. This includes: contacts, products, bank statements,
+journal entries, and orders.
+
+Open the view of the object to which the data should be imported/populated, and click on
+:menuselection:`⭐ Favorites --> Import records`.
+
+.. image:: export_import_data/import-button.png
    :align: center
+   :alt:  Favorites menu revealed with the import records option highlighted.
 
-There you are provided with templates you can easily populate
-with your own data. Such templates can be imported in one click;
-The data mapping is already done.
+After clicking :guilabel:`Import records`, Odoo reveals a separate page with templates that can be
+downloaded and populated with the company's own data. Such templates can be imported in one click,
+since the data mapping is already done. To download a template click :guilabel:`Import Template for
+Customers` at the center of the page.
 
-How to adapt the template
--------------------------
+.. important::
+   When importing a :abbr:`CSV (Comma-separated Values)` file, Odoo provides :guilabel:`Formatting`
+   options. These options do **not** appear when importing the proprietary Excel file type (`.xls`,
+   `.xlsx`).
 
-* Add, remove and sort columns to fit at best your data structure.
-* We advise to not remove the **ID** one (see why in the next section).
-* Set a unique ID to every single record by dragging down the ID sequencing.
+   .. image:: export_import_data/formatting.png
+      :align: center
+      :alt: Formatting options presented when a CVS file is imported in Odoo.
+
+Make necessary adjustments to the *Formatting* options, and ensure all columns in the
+:guilabel:`Odoo field` and :guilabel:`File Column` are free of errors. Finally, click
+:guilabel:`Import` to import the data.
+
+Adapt a template
+----------------
+
+Import templates are provided in the import tool of the most common data to import (contacts,
+products, bank statements, etc.). Open them with any spreadsheet software (*Microsoft Office*,
+*OpenOffice*, *Google Drive*, etc.).
+
+Once the template is downloaded, proceed to follow these steps:
+
+- Add, remove, and sort columns to best fit the data structure.
+- It is strongly advised to **not** remove the :guilabel:`External ID` (ID) column (see why in the
+  next section).
+- Set a unique ID to every record by dragging down the ID sequencing in the :guilabel:`External ID`
+  (ID) column.
 
 .. image:: export_import_data/dragdown.gif
    :align: center
+   :alt: An animation of the mouse dragging down the ID column, so each record has a unique ID.
 
-* When you add a new column, Odoo might not be able to map it automatically if its
-  label doesn't fit any field in Odoo. Don't worry! You can map
-  new columns manually when you test the import. Search the list for the
-  corresponding field.
+.. note::
+   When a new column is added, Odoo may not be able to map it automatically, if its label does not
+   fit any field within Odoo. However, new columns can be mapped manually when the import is tested.
+   Search the drop-down menu for the corresponding field.
 
-    .. image:: export_import_data/field_list.png
-       :align: center
+   .. image:: export_import_data/field_list.png
+      :align: center
+      :alt: Drop-down menu expanded in the initial import screen on Odoo.
 
-  Then, use this field's label in your file in order to make it work
-  straight on the very next time.
+   Then, use this field's label in the import file to ensure future imports are successful.
 
-How to import from another application
---------------------------------------
+.. tip::
+   Another useful way to find out the proper column names to import is to export a sample file
+   using the fields that should be imported. This way, if there is not a sample import template,
+   the names are accurate.
 
-In order to re-create relationships between different records,
-you should use the unique identifier from the original application
-and map it to the **ID** (External ID) column in Odoo.
-When you import another record that links to the first one,
-use **XXX/ID** (XXX/External ID) to the original unique identifier.
-You can also find this record using its name but you will be stuck
-if at least 2 records have the same name.
+Import from another application
+-------------------------------
 
-The **ID** will also be used to update the original import
-if you need to re-import modified data later,
-it's thus good practice to specify it whenever possible.
+The :guilabel:`External ID` (ID) is a unique identifier for the line item. Feel free to use one
+from previous software to facilitate the transition to Odoo.
 
+Setting an ID is not mandatory when importing, but it helps in many cases:
 
-I cannot find the field I want to map my column to
---------------------------------------------------
+- Update imports: import the same file several times without creating duplicates.
+- :ref:`Import relation fields <export_import_data/relation-fields>`.
 
-Odoo tries to find with some heuristic, based on the first ten lines of
-the files, the type of field for each column inside your file.
-For example if you have a column only containing numbers,
-only the fields that are of type *Integer* will be displayed for you
-to choose from.
-While this behavior might be good and easy for most cases,
-it is also possible that it goes wrong or that you want to
-map your column to a field that is not proposed by default.
+To recreate relationships between different records, the unique identifier from the original
+application should be used to map it to the :guilabel:`External ID` (ID) column in Odoo.
 
-If that happens, you just have to check the
-** Show fields of relation fields (advanced)** option,
-you will then be able to choose from the complete list of fields for each column.
+When another record is imported that links to the first one, use **XXX/ID** (XXX/External ID) for
+the original unique identifier. This record can also be found using its name.
+
+.. warning::
+   It should be noted that there will be a conflict if two or more records have the same name.
+
+The :guilabel:`External ID` (ID) can also be used to update the original import, if modified data
+needs to be re-imported later, therefore, it is a good practice to specify it whenever possible.
+
+Field missing to map column
+---------------------------
+
+Odoo heuristically tries to find the type of field for each column inside the imported file, based
+on the first ten lines of the files.
+
+For example, if there is a column only containing numbers, only the fields with the *integer* type
+are presented as options.
+
+While this behavior might be beneficial in most cases, it is also possible that it could fail, or
+the column may be mapped to a field that is not proposed by default.
+
+If this happens, check the :guilabel:`Show fields of relation fields (advanced) option`, then a
+complete list of fields becomes available for each column.
 
 .. image:: export_import_data/field_list.png
    :align: center
+   :alt: Searching for the field to match the tax column.
 
-Where can I change the date import format?
-------------------------------------------
-
-Odoo can automatically detect if a column is a date, and it will try to guess the date format from a
-set of most commonly used date formats. While this process can work for many date formats, some date
-formats will not be recognized. This can cause confusion due to day-month inversions; it is
-difficult to guess which part of a date format is the day and which part is the month in a date such
-as '01-03-2016'.
-
-To view which date format Odoo has found from your file you can check the **Date Format** that is
-shown when clicking on **Options** under the file selector. If this format is incorrect you can
-change it to your liking using the *ISO 8601* to define the format.
+Change data import format
+-------------------------
 
 .. note::
-   If you are importing an excel (.xls, .xlsx) file, you can use date cells to store dates as the
-   display of dates in excel is different from the way it is stored. That way you will be sure that
-   the date format is correct in Odoo whatever your locale date format is.
+   Odoo can automatically detect if a column is a date, and tries to guess the date format from a
+   set of most commonly used date formats. While this process can work for many date formats, some
+   date formats are not recognizable. This can cause confusion, due to day-month inversions; it is
+   difficult to guess which part of a date format is the day, and which part is the month, in a
+   date, such as `01-03-2016`.
 
-Can I import numbers with currency sign (e.g.: $32.00)?
--------------------------------------------------------
+When importing a :abbr:`CSV (Comma-separated Values)` file, Odoo provides :guilabel:`Formatting`
+options.
 
-Yes, we fully support numbers with parenthesis to represent negative sign as well as numbers with
-currency sign attached to them. Odoo also automatically detect which thousand/decimal separator you
-use (you can change those under **options**). If you use a currency symbol that is not known to
-Odoo, it might not be recognized as a number though and it will crash.
+To view which date format Odoo has found from the file, check the :guilabel:`Date Format` that is
+shown when clicking on options under the file selector. If this format is incorrect, change it to
+the preferred format using *ISO 8601* to define the format.
 
-Examples of supported numbers (using thirty-two thousands as an example):
+.. important::
+   *ISO 8601* is an international standard, covering the worldwide exchange, along with the
+   communication of date and time-related data. For example, the date format should be `YYYY-MM-DD`.
+   So, in the case of July 24th 1981, it should be written as `1981-07-24`.
+
+.. tip::
+   When importing Excel files (`.xls`, `.xlsx`), consider using *date cells* to store dates. This
+   maintains locale date formats for display, regardless of how the date is formatted in Odoo. When
+   importing a :abbr:`CSV (Comma-separated Values)` file, use Odoo's :guilabel:`Formatting` section
+   to select the date format columns to import.
+
+Import numbers with currency signs
+----------------------------------
+
+Odoo fully supports numbers with parenthesis to represent negative signs, as well as numbers with
+currency signs attached to them. Odoo also automatically detects which thousand/decimal separator is
+used. If a currency symbol unknown to Odoo is used, it might not be recognized as a number, and the
+import crashes.
+
+.. note::
+   When importing a :abbr:`CSV (Comma-separated Values)` file, the :guilabel:`Formatting` menu
+   appears on the left-hand column. Under these options, the :guilabel:`Thousands Separator` can be
+   changed.
+
+Examples of supported numbers (using 'thirty-two thousand' as the figure):
 
 - 32.000,00
 - 32000,00
@@ -176,156 +255,191 @@ Example that will not work:
 - ABC 32.000,00
 - $ (32.000,00)
 
-What can I do when the Import preview table isn't displayed correctly?
-----------------------------------------------------------------------
+.. important::
+   A :guilabel:`() (parenthesis)` around the number indicates that the number is a negative value.
+   The currency symbol **must** be placed within the parenthesis for Odoo to recognize it as a
+   negative currency value.
 
-By default the Import preview is set on commas as field separators and quotation marks as text
-delimiters. If your csv file does not have these settings, you can modify the File Format Options
-(displayed under the Browse CSV file bar after you select your file).
+Import preview table not displayed correctly
+--------------------------------------------
 
-Note that if your CSV file has a tabulation as separator, Odoo will not detect the separations. You
-will need to change the file format options in your spreadsheet application. See the following
-question.
+By default, the import preview is set on commas as field separators, and quotation marks as text
+delimiters. If the :abbr:`CSV (Comma-separated Values)` file does not have these settings, modify
+the :guilabel:`Formatting` options (displayed under the :guilabel:`Import` :abbr:`CSV
+(Comma-separated Values)` file bar after selecting the :abbr:`CSV (Comma-separated Values)` file).
 
-How can I change the CSV file format options when saving in my spreadsheet application?
----------------------------------------------------------------------------------------
+.. important::
+   If the :abbr:`CSV (Comma-separated Values)` file has a tabulation as a separator, Odoo does
+   **not** detect the separations. The file format options need to be modified in the spreadsheet
+   application. See the following :ref:`Change CSV file format <export_import_data/change-csv>`
+   section.
 
-If you edit and save CSV files in spreadsheet applications, your computer's regional settings will
-be applied for the separator and delimiter. We suggest you use OpenOffice or LibreOffice Calc as
-they will allow you to modify all three options (in :menuselection:`'Save As' dialog box --> Check the
-box 'Edit filter settings' --> Save`).
+.. _export_import_data/change-csv:
 
-Microsoft Excel will allow you to modify only the encoding when saving (in :menuselection:`'Save As'
-dialog box --> click 'Tools' dropdown list --> Encoding tab`).
+Change CSV file format in spreadsheet application
+-------------------------------------------------
 
-What's the difference between Database ID and External ID?
-----------------------------------------------------------
+When editing and saving :abbr:`CSV (Comma-separated Values)` files in spreadsheet applications, the
+computer's regional settings are applied for the separator and delimiter. Odoo suggests using
+*OpenOffice* or *LibreOffice*, as both applications allow modifications of all three options (from
+*LibreOffice* application, go to :menuselection:`'Save As' dialog box --> Check the box 'Edit filter
+settings' --> Save`).
+
+Microsoft Excel can modify the encoding when saving (:menuselection:`'Save As' dialog box -->
+'Tools' drop-down menu --> Encoding tab`).
+
+Difference between Database ID and External ID
+----------------------------------------------
 
 Some fields define a relationship with another object. For example, the country of a contact is a
-link to a record of the 'Country' object. When you want to import such fields, Odoo will have to
-recreate links between the different records. To help you import such fields, Odoo provides three
-mechanisms. You must use one and only one mechanism per field you want to import.
+link to a record of the 'Country' object. When such fields are imported, Odoo has to recreate links
+between the different records. To help import such fields, Odoo provides three mechanisms.
 
-For example, to reference the country of a contact, Odoo proposes you 3 different fields to import:
+.. important::
+   **Only one** mechanism should be used per field that is imported.
 
-- Country: the name or code of the country
-- Country/Database ID: the unique Odoo ID for a record, defined by the ID postgresql column
-- Country/External ID: the ID of this record referenced in another application (or the .XML file
-  that imported it)
+For example, to reference the country of a contact, Odoo proposes three different fields to import:
 
-For the country Belgium, you can use one of these 3 ways to import:
+- :guilabel:`Country`: the name or code of the country
+- :guilabel:`Country/Database ID`: the unique Odoo ID for a record, defined by the ID PostgreSQL
+  column
+- :guilabel:`Country/External ID`: the ID of this record referenced in another application (or the
+  `.XML` file that imported it)
 
-- Country: Belgium
-- Country/Database ID: 21
-- Country/External ID: base.be
+For the country of Belgium, for example, use one of these three ways to import:
 
-According to your need, you should use one of these 3 ways to reference records in relations. Here
-is when you should use one or the other, according to your need:
+- :guilabel:`Country`: `Belgium`
+- :guilabel:`Country/Database ID`: `21`
+- :guilabel:`Country/External ID`: `base.be`
 
-- Use Country: This is the easiest way when your data come from CSV files that have been created
-  manually.
-- Use Country/Database ID: You should rarely use this notation. It's mostly used by developers as
-  it's main advantage is to never have conflicts (you may have several records with the same name,
+According to the company's need, use one of these three ways to reference records in relations. Here
+is an example when one or the other should be used, according to the need:
+
+- Use :guilabel:`Country`: this is the easiest way when data comes from :abbr:`CSV (Comma-separated
+  Values)` files that have been created manually.
+- Use :guilabel:`Country/Database ID`: this should rarely be used. It is mostly used by developers
+  as the main advantage is to never have conflicts (there may be several records with the same name,
   but they always have a unique Database ID)
-- Use Country/External ID: Use External ID when you import data from a third party application.
+- Use :guilabel:`Country/External ID`: use *External ID* when importing data from a third-party
+  application.
 
-When you use External IDs, you can import CSV files with the "External ID" column to define the
-External ID of each record you import. Then, you will be able to make a reference to that record
-with columns like "Field/External ID". The following two CSV files give you an example for Products
-and their Categories.
+When *External IDs* are used, import :abbr:`CSV (Comma-separated Values)` files with the
+:guilabel:`External ID` (ID) column defining the *External ID* of each record that is imported.
+Then, a reference can be made to that record with columns, like `Field/External ID`. The following
+two :abbr:`CSV (Comma-separated Values)` files provide an example for products and their categories.
 
-:download:`CSV file for categories
-<export_import_data/External_id_3rd_party_application_product_categories.csv>`.
+- :download:`CSV file for categories
+  <export_import_data/External_id_3rd_party_application_product_categories.csv>`
+- :download:`CSV file for Products
+  <export_import_data/External_id_3rd_party_application_products.csv>`
 
-:download:`CSV file for Products
-<export_import_data/External_id_3rd_party_application_products.csv>`.
+.. _export_import_data/relation-fields:
 
-What can I do if I have multiple matches for a field?
------------------------------------------------------
+Import relation fields
+----------------------
 
-If for example you have two product categories with the child name "Sellable" (ie. "Misc.
-Products/Sellable" & "Other Products/Sellable"), your validation is halted but you may still import
-your data. However, we recommend you do not import the data because they will all be linked to the
-first 'Sellable' category found in the Product Category list ("Misc. Products/Sellable"). We
-recommend you modify one of the duplicates' values or your product category hierarchy.
+An Odoo object is always related to many other objects (e.g. a product is linked to product
+categories, attributes, vendors, etc.). To import those relations, the records of the related object
+need to be imported first, from their own list menu.
 
-However if you do not wish to change your configuration of product categories, we recommend you use
-make use of the external ID for this field 'Category'.
+This can be achieved by using either the name of the related record, or its ID, depending on the
+circumstances. The ID is expected when two records have the same name. In such a case add `/ ID`
+at the end of the column title (e.g. for product attributes: `Product Attributes / Attribute / ID`).
 
-How can I import a many2many relationship field (e.g. a customer that has multiple tags)?
------------------------------------------------------------------------------------------
+Options for multiple matches on fields
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The tags should be separated by a comma without any spacing. For example, if you want your customer
-to be linked to both tags 'Manufacturer' and 'Retailer' then you will encode "Manufacturer,Retailer"
-in the same column of your CSV file.
+If, for example, there are two product categories with the child name `Sellable` (e.g. `Misc.
+Products/Sellable` & `Other Products/Sellable`), the validation is halted, but the data may still be
+imported. However, Odoo recommends that the data is not imported because it will all be linked to
+the first `Sellable` category found in the *Product Category* list (`Misc. Products/Sellable`).
+Odoo, instead, recommends modifying one of the duplicate's values, or the product category
+hierarchy.
 
-:download:`CSV file for Manufacturer, Retailer <export_import_data/m2m_customers_tags.csv>`
+However, if the company does not wish to change the configuration of product categories, Odoo
+recommends making use of the *External ID* for this field, 'Category'.
 
+Import many2many relationship fields
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-How can I import a one2many relationship (e.g. several Order Lines of a Sales Order)?
--------------------------------------------------------------------------------------
+The tags should be separated by a comma, without any spacing. For example, if a customer needs to be
+linked to both tags: `Manufacturer` and `Retailer` then 'Manufacturer,Retailer' needs to be encoded
+in the same column of the :abbr:`CSV (Comma-separated Values)` file.
 
-If you want to import sales order having several order lines; for each order line, you need to
-reserve a specific row in the CSV file. The first order line will be imported on the same row as the
-information relative to order. Any additional lines will need an additional row that does not have
-any information in the fields relative to the order. As an example, here is
-``purchase.order_functional_error_line_cant_adpat.CSV`` file of some quotations you can import,
-based on demo data.
+- :download:`CSV file for Manufacturer, Retailer <export_import_data/m2m_customers_tags.csv>`
 
-:download:`File for some Quotations <export_import_data/purchase.order_functional_error_line_cant_adpat.csv>`.
+Import one2many relationships
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The following CSV file shows how to import purchase orders with their respective purchase order
-lines:
+If a company wants to import a sales order with several order lines, a specific row **must** be
+reserved in the :abbr:`CSV (Comma-separated Values)` file for each order line. The first order line
+is imported on the same row as the information relative to order. Any additional lines need an
+additional row that does not have any information in the fields relative to the order.
 
-:download:`Purchase orders with their respective purchase order lines <export_import_data/o2m_purchase_order_lines.csv>`.
+As an example, here is a :abbr:`CSV (Comma-separated Values)` file of some quotations that can be
+imported, based on demo data:
 
-The following CSV file shows how to import customers and their respective contacts:
+- :download:`File for some Quotations
+  <export_import_data/purchase.order_functional_error_line_cant_adpat.csv>`
 
-:download:`Customers and their respective contacts <export_import_data/o2m_customers_contacts.csv>`.
+The following :abbr:`CSV (Comma-separated Values)` file shows how to import purchase orders with
+their respective purchase order lines:
 
-Can I import several times the same record?
--------------------------------------------
+- :download:`Purchase orders with their respective purchase order lines
+  <export_import_data/o2m_purchase_order_lines.csv>`
 
-If you import a file that contains one of the column "External ID" or "Database ID", records that
-have already been imported will be modified instead of being created. This is very useful as it
-allows you to import several times the same CSV file while having made some changes in between two
-imports. Odoo will take care of creating or modifying each record depending if it's new or not.
+The following :abbr:`CSV (Comma-separated Values)` file shows how to import customers and their
+respective contacts:
 
-This feature allows you to use the Import/Export tool of Odoo to modify a batch of records in your
-favorite spreadsheet application.
+- :download:`Customers and their respective contacts
+  <export_import_data/o2m_customers_contacts.csv>`
 
-What happens if I do not provide a value for a specific field?
+Import records several times
+----------------------------
+
+If an imported file contains one of the columns: :guilabel:`External ID` or :guilabel:`Database ID`,
+records that have already been imported are modified, instead of being created. This is extremely
+useful as it allows users to import the same :abbr:`CSV (Comma-separated Values)` file several
+times, while having made some changes in between two imports.
+
+Odoo takes care of creating or modifying each record, depending if it is new or not.
+
+This feature allows a company to use the *Import/Export tool* in Odoo to modify a batch of records
+in a spreadsheet application.
+
+Value not provided for a specific field
+---------------------------------------
+
+If all fields are not set in the CSV file, Odoo assigns the default value for every non-defined
+field. But, if fields are set with empty values in the :abbr:`CSV (Comma-separated Values)` file,
+Odoo sets the empty value in the field, instead of assigning the default value.
+
+Export/import different tables from an SQL application to Odoo
 --------------------------------------------------------------
 
-If you do not set all fields in your CSV file, Odoo will assign the default value for every non
-defined fields. But if you set fields with empty values in your CSV file, Odoo will set the EMPTY
-value in the field, instead of assigning the default value.
+If data needs to be imported from different tables, relations need to be recreated between records
+belonging to different tables. For instance, if companies and people are imported, the link between
+each person and the company they work for needs to be recreated.
 
-How to export/import different tables from an SQL application to Odoo?
-----------------------------------------------------------------------
+To manage relations between tables, use the `External ID` facilities of Odoo. The `External ID` of a
+record is the unique identifier of this record in another application. The `External ID` must be
+unique across all records of all objects. It is a good practice to prefix this `External ID` with
+the name of the application or table. (like, 'company_1', 'person_1' - instead of '1')
 
-If you need to import data from different tables, you will have to recreate relations between
-records belonging to different tables. (e.g. if you import companies and persons, you will have to
-recreate the link between each person and the company they work for).
+As an example, suppose there is an SQL database with two tables that are to be imported: companies
+and people. Each person belongs to one company, so the link between a person and the company they
+work for must be recreated.
 
-To manage relations between tables, you can use the "External ID" facilities of Odoo. The "External
-ID" of a record is the unique identifier of this record in another application. This "External ID"
-must be unique across all the records of all objects, so it's a good practice to prefix this
-"External ID" with the name of the application or table. (like 'company_1', 'person_1' instead of
-'1')
+Test this example, with a :download:`sample of a PostgreSQL database
+<export_import_data/database_import_test.sql>`.
 
-As an example, suppose you have a SQL database with two tables you want to import: companies and
-persons. Each person belong to one company, so you will have to recreate the link between a person
-and the company he work for. (If you want to test this example, here is a :download:`dump of such a
-PostgreSQL database <export_import_data/database_import_test.sql>`)
-
-We will first export all companies and their "External ID". In PSQL, write the following command:
+First, export all companies and their *External ID*. In PSQL, write the following command:
 
 .. code-block:: sh
 
    > copy (select 'company_'||id as "External ID",company_name as "Name",'True' as "Is a Company" from companies) TO '/tmp/company.csv' with CSV HEADER;
 
-This SQL command will create the following CSV file:
+This SQL command creates the following :abbr:`CSV (Comma-separated Values)` file:
 
 .. code-block:: text
 
@@ -334,13 +448,14 @@ This SQL command will create the following CSV file:
    company_2,Organi,True
    company_3,Boum,True
 
-To create the CSV file for persons, linked to companies, we will use the following SQL command in PSQL:
+To create the :abbr:`CSV (Comma-separated Values)` file for people linked to companies, use the
+following SQL command in PSQL:
 
 .. code-block:: sh
 
     > copy (select 'person_'||id as "External ID",person_name as "Name",'False' as "Is a Company",'company_'||company_id as "Related Company/External ID" from persons) TO '/tmp/person.csv' with CSV
 
-It will produce the following CSV file:
+It produces the following :abbr:`CSV (Comma-separated Values)` file:
 
 .. code-block:: text
 
@@ -350,62 +465,13 @@ It will produce the following CSV file:
    person_3,Eric,False,company_2
    person_4,Ramsy,False,company_3
 
-As you can see in this file, Fabien and Laurence are working for the Bigees company (company_1) and
-Eric is working for the Organi company. The relation between persons and companies is done using the
-External ID of the companies. We had to prefix the "External ID" by the name of the table to avoid a
-conflict of ID between persons and companies (person_1 and company_1 who shared the same ID 1 in the
-original database).
+In this file, Fabien and Laurence are working for the Bigees company (`company_1`), and Eric is
+working for the Organi company. The relation between people and companies is done using the
+*External ID* of the companies. The *External ID* is prefixed by the name of the table to avoid a
+conflict of ID between people and companies (`person_1` and `company_1`, who shared the same ID 1 in
+the original database).
 
 The two files produced are ready to be imported in Odoo without any modifications. After having
-imported these two CSV files, you will have 4 contacts and 3 companies. (the firsts two contacts are
-linked to the first company). You must first import the companies and then the persons.
-
-How to adapt an import template
-===============================
-
-Import templates are provided in the import tool of the most common data to
-import (contacts, products, bank statements, etc.).
-You can open them with any spreadsheets software (Microsoft Office,
-OpenOffice, Google Drive, etc.).
-
-How to customize the file
-=========================
-
-* Remove columns you don't need. We advise to not remove the *ID* one (see
-  why here below).
-* Set a unique ID to every single record by dragging down the ID sequencing.
-
-  .. image:: export_import_data/dragdown.gif
-     :align: center
-
-* When you add a new column, Odoo might not be able to map it automatically if its
-  label doesn't fit any field of the system.
-  If so, find the corresponding field using the search.
-
-    .. image:: export_import_data/field_list.png
-       :align: center
-
-  Then, use the label you found in your import template in order to make it work
-  straight away the very next time you try to import.
-
-Why an “ID” column
-==================
-
-The **ID** (External ID) is an unique identifier for the line item.
-Feel free to use the one of your previous software to ease the transition to Odoo.
-
-Setting an ID is not mandatory when importing but it helps in many cases:
-
-* Update imports: you can import the same file several times without creating duplicates;
-* Import relation fields (see here below).
-
-How to import relation fields
-=============================
-
-An Odoo object is always related to many other objects (e.g. a product is linked
-to product categories, attributes, vendors, etc.). To import those relations you need to
-import the records of the related object first from their own list menu.
-
-You can do it using either the name of the related record or its ID. The ID is expected when
-two records have the same name. In such a case add " / ID" at the end of the column title
-(e.g. for product attributes: Product Attributes / Attribute / ID).
+imported these two :abbr:`CSV (Comma-separated Values)` files, there are four contacts and three
+companies (the first two contacts are linked to the first company). Keep in mind to first import
+the companies, and then the people.

content/applications/essentials/in_app_purchase.rst

@@ -1,59 +1,191 @@
-=====================
-In-App Purchase (IAP)
-=====================
+======================
+In-app purchases (IAP)
+======================
 
-In-App Purchases (IAP) gives access to additional services through Odoo. For instance, it allows you
-to send SMS Text Messages or to send Invoices by post directly from your database.
+.. |IAP| replace:: :abbr:`IAP (In-app purchases)`
+
+In-app purchases (IAP) are optional services that enhance Odoo databases. Each service provides its
+own specific features and functionality. A full list of services is available on the `Odoo IAP
+Catalog <https://iap.odoo.com/iap/all-in-app-services>`_.
+
+.. image:: in_app_purchase/iap.png
+   :align: center
+   :alt: The IAP catalog with various services available on IAP.Odoo.com.
+
+.. example::
+   The :guilabel:`SMS` service sends text messages to contacts directly from the database, and the
+   :guilabel:`Documents Digitization` service digitizes scanned or PDF vendor bills, expenses, and
+   resumes with optical character recognition (OCR) and artificial intelligence (AI).
+
+|IAP| services do **not** need to be configured or set up before use. Odoo users can simply click on
+the service in the app to activate it. However, each service requires its own prepaid credits, and
+when they run out, users **must** :ref:`buy more <iap/buying_credits>` in order to keep using it.
+
+.. note::
+   Enterprise Odoo users with a valid subscription get free credits to test IAP features before
+   deciding to purchase more credits for the database. This includes demo/training databases,
+   educational databases, and one-app-free databases.
+
+.. _in_app_purchase/portal:
+
+IAP services
+============
+
+|IAP| services are provided by Odoo, as well as third-parties, and have a wide range of uses.
+
+The following |IAP| services are offered by Odoo:
+
+- :guilabel:`Documents Digitization`: digitizes scanned or PDF vendor bills, expenses, and resumes
+  with OCR and AI.
+- :guilabel:`Partner Autocomplete`: automatically populates contact records with corporate data.
+- :guilabel:`SMS`: sends SMS text messages to contacts directly from the database.
+- :guilabel:`Lead Generation`: generates leads based on a set of criteria, and converts web visitors
+  into quality leads and opportunities.
+- :guilabel:`Snailmail`: sends customer invoices and follow-up reports by post, worldwide.
+- :guilabel:`Signer identification with itsme®️`: ask document signatories in Odoo *Sign* to provide
+  their identity using the *itsme®* identity platform, which is available in Belgium and the
+  Netherlands.
+
+For more information on every service currently available (offered from developers other than Odoo),
+visit the `Odoo IAP Catalog <https://iap.odoo.com/iap/all-in-app-services>`_.
+
+Use IAP services
+----------------
+
+|IAP| services are automatically integrated with Odoo, and do **not** require users to configure any
+settings. To use a service, simply interact with it wherever it appears in the database.
+
+.. example::
+   The following flow focuses on the *SMS* |IAP| service being used from a contact's record.
+
+   This can be done by clicking the :guilabel:`📱 SMS` icon within the database.
+
+   .. image:: in_app_purchase/sms-icon.png
+      :align: center
+      :alt: The SMS icon on a typical contact information form located within an Odoo database.
+
+   One way to utilize the *SMS* |IAP| service with Odoo is showcased in the following steps:
+
+   First, navigate to the :menuselection:`Contacts application`, and click on a contact with a
+   mobile phone number entered in either the :guilabel:`Phone` or :guilabel:`Mobile` field of the
+   contact form.
+
+   Next, find the :guilabel:`📱 SMS` icon that appears to the right of the :guilabel:`Phone` or
+   :guilabel:`Mobile` fields. Click the :guilabel:`📱 SMS` icon, and a :guilabel:`Send SMS Text
+   Message` pop-up window appears.
+
+   Type a message in the :guilabel:`Message` field of the pop-up window. Then, click the
+   :guilabel:`Send SMS` button. Odoo then sends the message, via SMS, to the contact, and logs what
+   was sent in the *chatter* of the contact's form.
+
+   Upon sending the SMS message, the prepaid credits for the *SMS* |IAP| service are automatically
+   deducted from the existing credits. If there are not enough credits to send the message, Odoo
+   prompts the user to purchase more.
+
+.. seealso::
+   For more information on how to use various |IAP| services, and for more in-depth instructions
+   related to SMS functionality in Odoo, review the documentation below:
+
+   - :doc:`Lead mining <../sales/crm/acquire_leads/lead_mining>`
+   - :doc:`Enrich your contacts base with Partner Autocomplete
+     <../sales/crm/optimize/partner_autocomplete>`
+   - :doc:`SMS essentials <../marketing/sms_marketing/essentials/sms_essentials>`
+
+.. _in_app_purchase/credits:
+
+IAP credits
+===========
+
+Every time an |IAP| service is used, the prepaid credits for that service are spent. Odoo prompts
+the purchase of more credits when there are not enough credits left to continue using a service.
+Email alerts can also be set up for when :ref:`credits are low <in_app_purchase/low-credits>`.
+
+Credits are purchased in *Packs* from the `Odoo IAP Catalog
+<https://iap.odoo.com/iap/all-in-app-services>`_, and pricing is specific to each service.
+
+.. example::
+   The `SMS service <https://iap.odoo.com/iap/in-app-services/1>`_ has four packs available, in
+   denominations of:
+
+   - :guilabel:`Starter Pack`: 10 credits
+   - :guilabel:`Standard Pack`: 100 credits
+   - :guilabel:`Advanced Pack`: 500 credits
+   - :guilabel:`Expert Pack`: 1,000 credits
+
+   .. image:: in_app_purchase/packs.png
+      :align: center
+      :alt: Four different packs of credits for the SMS IAP service.
+
+   The number of credits consumed depends on the length of the SMS and the country of destination.
+
+   For more information, refer to the :doc:`SMS Pricing and FAQ
+   <../marketing/sms_marketing/pricing/pricing_and_faq>` documentation.
 
 .. _iap/buying_credits:
 
-Buying Credits
-==============
+Buy credits
+-----------
 
-Each IAP Service relies on prepaid credits to work and has its own pricing. To consult your current
-balance or to recharge your account, go to :menuselection:`Settings --> Odoo IAP --> View my
+If there are not enough credits to perform a task, the database automatically prompts the purchase
+of more credits.
+
+Users can check the current balance of credits for each service, and manually purchase more credits,
+by navigating to the :menuselection:`Settings app --> Contacts section`, and beneath the
+:guilabel:`Odoo IAP` setting, click :guilabel:`View My Services`.
+
+Doing so reveals a :guilabel:`My Services` page, listing the various |IAP| services in the database.
+From here, click an |IAP| service to open its :guilabel:`Account Information` page, where additional
+credits can be purchased.
+
+Manually buy credits
+~~~~~~~~~~~~~~~~~~~~
+
+To manually buy credits in Odoo, follow these steps:
+
+First, go to the :menuselection:`Settings application` and type `IAP` in the :guilabel:`Search...`
+bar. Alternatively users can scroll down to the :guilabel:`Contacts` section. Under the
+:guilabel:`Contacts` section, where it says :guilabel:`Odoo IAP`, click :guilabel:`View My
 Services`.
 
-.. image:: in_app_purchase/image1.png
+.. image:: in_app_purchase/view-services.png
    :align: center
+   :alt: The Settings app showing the Odoo IAP heading and View My Services button.
 
-.. tip::
-   If you are on Odoo Online and have the Enterprise version, you benefit from free credits to test our
-   IAP features.
+Doing so reveals an :guilabel:`IAP Account` page, listing the various |IAP| services in the
+database. From here, click an |IAP| service to open details about it; additional credits can be
+purchased from here.
 
-IAP accounts
-============
+On the following page, click the :guilabel:`Buy Credit` button. Doing so loads a :guilabel:`Buy
+Credits for (IAP Account)` page in a new tab. From here, click :guilabel:`Buy` on the desired pack
+of credits. Then, follow the prompts to enter payment details, and confirm the order.
 
-Credits to use IAP services are stored on IAP accounts, which are specific to each service.
-By default, IAP accounts are common to all companies, but can be restricted to specific
-ones. Activate the :ref:`developer mode <developer-mode>`, then go to :menuselection:`Technical
-Settings --> IAP Account`.
-
-.. image:: in_app_purchase/image2.png
+.. image:: in_app_purchase/buy-pack.png
    :align: center
+   :alt: The SMS service page on IAP.Odoo.com with four packs of credits available for purchase.
 
-.. tip::
-   An IAP account can be disabled by appending `+disabled` to its token.
-   Reverting this change will re-enable the account.
+Once the transaction is complete, the credits are available for use in the database.
 
-IAP Portal
-==========
+.. _in_app_purchase/low-credits:
 
-The IAP Portal is a platform regrouping your IAP Services. It is accessible from
-:menuselection:`Settings app --> Odoo IAP --> View my Services`. From there, you can view your current
-balance, recharge your credits and set a reminder when your balance falls below a threshold.
+Low-credit notification
+~~~~~~~~~~~~~~~~~~~~~~~
 
-.. image:: in_app_purchase/image3.png
-   :align: center
+It is possible to be notified when credits are low, in order to avoid running out of credits, while
+using an |IAP| service. To do that, follow this process:
 
-Get notified when credits are low
-=================================
+Go to the :menuselection:`Settings application`, and type `IAP` in the :guilabel:`Search...` bar.
+Under the :guilabel:`Contacts` section, where it says :guilabel:`Odoo IAP`, click :guilabel:`View My
+Services`.
 
-To be notified when it’s time to recharge your credits, you can go to your IAP Portal through
-:menuselection:`Settings app --> Odoo IAP --> View my Services`, unfold a service and check the
-Receive threshold warning option. Then, you can provide a minimum amount of credits and email
-addresses. Now, every time that the limit is reached, an automatic reminder will be sent by
-email!
+The available |IAP| accounts appear in a list view on the :guilabel:`IAP Account` page. From here,
+click on the desired |IAP| account to view that service's details.
 
-.. image:: in_app_purchase/image4.png
-   :align: center
+On the details page, tick the :guilabel:`Receive threshold warning` checkbox. Doing so reveals two
+fields on the form: :guilabel:`Warning Threshold` and :guilabel:`Contact Email`.
+
+In the :guilabel:`Warning Threshold` field, enter an amount of credits Odoo should use as the
+minimum threshold for this service. In the :guilabel:`Contact Email` field, enter the email address
+that receives the notification.
+
+Odoo sends a low-credit alert to the :guilabel:`Contact Email` when the balance of credits falls
+below the amount listed as the :guilabel:`Warning Threshold`.

content/applications/finance/accounting.rst

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

content/applications/finance/accounting/bank.rst

@@ -36,6 +36,8 @@ follow the instructions.
 .. seealso::
    :doc:`bank/bank_synchronization`
 
+.. _bank_accounts/create:
+
 Create a bank account
 ---------------------
 
@@ -191,4 +193,3 @@ Payments` tab. To display the outstanding accounts column, click on the toggle b
    bank/reconciliation
    bank/reconciliation_models
    bank/foreign_currency
-   bank/cash_register

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

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

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

@@ -36,8 +36,8 @@ your customer’s address is set correctly, including the country, before sendin
      <developer-mode>`, go to :menuselection:`General Settings --> Technical --> Reporting
      section: Paper Format`.
    - A square of **15mm by 15mm** on the bottom left corner has to stay clear.
-   - The postage area has to stay clear (click :download:`here <snailmail/snailmail-template.pdf>`
-     to get more info about the area).
+   - The postage area has to stay clear (:download:`download the snailmail PDF template
+     <snailmail/snailmail-template.pdf>` for more details).
    - Pingen (Odoo Snailmail service provider) scans the area to process the address, so if something
      gets written outside the area, it is not counted as part of the address.
 
@@ -51,7 +51,5 @@ To buy stamps, go to :menuselection:`Accounting --> Configuration --> Settings -
 invoices: Snailmail`, click on :guilabel:`Buy credits`, or go to :menuselection:`Settings --> In-App
 Purchases: Odoo IAP`, and click on :guilabel:`View my Services`.
 
-.. tip::
-   - If you are on Odoo Online and have the Enterprise version, you benefit from free trial credits
-     to test the feature.
-   - Click `here <https://iap.odoo.com/privacy#header_4>`_ to know about our *Privacy Policy*.
+.. seealso::
+   `Odoo's IAP Privacy Policy <https://iap.odoo.com/privacy#header_4>`_

content/applications/finance/accounting/get_started.rst

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

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

@@ -24,12 +24,14 @@ to reflect the change in inventory valuation. However, Odoo does **not** automat
 valuation <inventory/avg_price/leaving_inventory>`.
 
 .. note::
-   This document addresses a specific use case for theoretical purposes. Navigate :ref:`here
-   <inventory/management/inventory_valuation_config>` for instructions on how to set up and use
-   |AVCO| in Odoo.
+   This document addresses a specific use case for theoretical purposes. For instructions on how to
+   set up and use |AVCO|, refer to the :doc:`inventory valuation configuration
+   <../../../inventory_and_mrp/inventory/product_management/inventory_valuation/inventory_valuation_config>`
+   doc.
 
 .. seealso::
-   - :ref:`Using inventory valuation <inventory/reporting/using_inventory_val>`
+   - :doc:`Using inventory valuation
+     <../../../inventory_and_mrp/inventory/product_management/inventory_valuation/using_inventory_valuation>`
    - :ref:`Other inventory valuation methods <inventory/inventory_valuation_config/costing_methods>`
 
 Configuration
@@ -41,7 +43,8 @@ product category page, set :guilabel:`Costing Method` to `Average Cost (AVCO)` a
 :guilabel:`Inventory Valuation` to `Automated`.
 
 .. seealso::
-   :ref:`Inventory valuation configuration <inventory/management/inventory_valuation_config>`
+   :doc:`Inventory valuation configuration
+   <../../../inventory_and_mrp/inventory/product_management/inventory_valuation/inventory_valuation_config>`
 
 Using average cost valuation
 ============================

content/applications/finance/accounting/payments.rst

@@ -7,18 +7,20 @@ Payments
 In Odoo, payments can either be automatically linked to an invoice or bill or be stand-alone records
 for use at a later date:
 
-- If a payment is **linked to an invoice or bill**, it reduces/settles the amount due of the
-  invoice. You can have multiple payments related to the same invoice.
+- If a payment is **linked to an invoice or bill**, it reduces/settles the amount due on the
+  invoice. Multiple payments on the same invoice are possible.
 
 - If a payment is **not linked to an invoice or bill**, the customer has an outstanding credit with
-  your company, or your company has an outstanding debit with a vendor. You can use those
-  outstanding amounts to reduce/settle unpaid invoices/bills.
+  the company, or the company has an outstanding debit with a vendor. Those outstanding amounts
+  reduce/settle unpaid invoices/bills.
 
 .. seealso::
    - :doc:`Internal transfers <payments/internal_transfers>`
    - :doc:`bank/reconciliation`
    - `Odoo Tutorials: Bank Configuration
-     <https://www.odoo.com/slides/slide/bank-configuration-1880>`_
+     <https://www.odoo.com/slides/slide/bank-configuration-6832>`_
+
+.. _accounting/payments/from-invoice-bill:
 
 Registering payment from an invoice or bill
 ===========================================
@@ -27,11 +29,12 @@ When clicking :guilabel:`Register payment` in a customer invoice or vendor bill,
 journal entry and changes the amount due according to the payment amount. The counterpart is
 reflected in an :ref:`outstanding <bank/outstanding-accounts>` **receipts** or **payments** account.
 At this point, the customer invoice or vendor bill is marked as :guilabel:`In payment`. Then, when
-the outstanding account is reconciled with a bank statement line, the invoice or vendor bill changes
-to the :guilabel:`Paid` status.
+the outstanding account is reconciled with a bank transaction line, the invoice or vendor bill
+changes to the :guilabel:`Paid` status.
 
-The information icon near the payment line displays more information about the payment. You can
-access additional information, such as the related journal, by clicking :guilabel:`View`.
+The :icon:`fa-info-circle` information icon next to the payment line displays more
+information about the payment. To access additional information, such as the related journal, click
+:guilabel:`View`.
 
 .. image:: payments/information-icon.png
    :alt: See detailed information of a payment.
@@ -39,65 +42,89 @@ access additional information, such as the related journal, by clicking :guilabe
 .. note::
    - The customer invoice or vendor bill must be in the :guilabel:`Posted` status to register the
      payment.
-   - If you unreconcile a payment, it still appears in your books but is no longer linked to the
+   - If a payment is unreconciled, it still appears in the books but is no longer linked to the
      invoice.
-   - If you (un)reconcile a payment in a different currency, a journal entry is automatically
+   - If a payment is (un)reconciled in a different currency, a journal entry is automatically
      created to post the currency exchange gains/losses (reversal) amount.
-   - If you (un)reconcile a payment and an invoice having cash basis taxes, a journal entry is
-     automatically created to post the cash basis tax (reversal) amount.
+   - If a payment is (un)reconciled and an invoice with cash-basis taxes, a journal entry is
+     automatically created to post the cash-basis tax (reversal) amount.
 
 .. tip::
-   - If your main bank account is set as an :ref:`outstanding account
-     <bank/outstanding-accounts>`, and the payment is registered in Odoo (not through a related
-     bank statement), invoices and bills are directly registered as :guilabel:`Paid`.
+   If the main bank account is set as an :ref:`outstanding account
+   <bank/outstanding-accounts>`, and the payment is registered in Odoo (not through a related
+   bank transaction), invoices and bills are directly registered as :guilabel:`Paid`.
+
+.. _accounting/payments/not-tied:
 
 Registering payments not tied to an invoice or bill
 ===================================================
 
-When a new payment is registered via :menuselection:`Customers / Vendors --> Payments` menu, it is
-not directly linked to an invoice or bill. Instead, the account receivable or the account payable is
+When a new payment is registered via :menuselection:`Customers / Vendors --> Payments`, it is not
+directly linked to an invoice or bill. Instead, the account receivable or the account payable is
 matched with the **outstanding account** until it is manually matched with its related invoice or
 bill.
 
+.. _accounting/payments/matching-invoices-bills:
+
 Matching invoices and bills with payments
 -----------------------------------------
 
-A blue banner appears when you validate a new invoice/bill and an **outstanding payment** exists for
-this specific customer or vendor. It can easily be matched from the invoice or bill by clicking
-:guilabel:`ADD` under :guilabel:`Outstanding Credits` or :guilabel:`Outstanding Debits`.
+A blue banner appears when validating a new invoice/bill and an **outstanding payment** exists for
+this specific customer or vendor. To match it with the invoice or bill, click :guilabel:`ADD`
+under :guilabel:`Outstanding Credits` or :guilabel:`Outstanding Debits`.
 
 .. image:: payments/add-option.png
    :alt: Shows the ADD option to reconcile an invoice or a bill with a payment.
 
 The invoice or bill is now marked as :guilabel:`In payment` until it is reconciled with its
-corresponding bank statement.
+corresponding bank transaction.
 
-.. _payments/batch-payments:
+.. _accounting/payments/group-payments:
 
-Batch payment
--------------
+Group payments
+--------------
 
-Batch payments allow you to group different payments to ease :doc:`reconciliation
-<bank/reconciliation>`. They are also useful when you deposit :doc:`checks <payments/checks>` to the
-bank or for :doc:`SEPA payments <payments/pay_sepa>`. To do so, go to :menuselection:`Accounting -->
-Customers --> Batch Payments` or :menuselection:`Accounting --> Vendors --> Batch Payments`. In the
-list view of payments, you can select and group several payments in a batch by clicking
-:menuselection:`Action --> Create Batch Payment`.
+Group payments allow combining outgoing and incoming payments from the same contact into a single
+payment to simplify the process and improve payment usability. To register a group payment:
+
+#. Go to :menuselection:`Accounting --> Customers --> Invoices/Credit Notes` or
+   :menuselection:`Accounting --> Vendors --> Bills/Refunds`.
+#. Select the relevant invoices/credit notes or bills/refunds linked to a specific contact.
+#. Click the :icon:`fa-cog` (:guilabel:`Action menu`) icon and select :guilabel:`Register Payment`.
+#. In the :guilabel:`Register Payment` window, select the :guilabel:`Journal`, the
+   :guilabel:`Payment Method`, and the :guilabel:`Payment Date`.
+#. Enable the :guilabel:`Group Payments` option and click :guilabel:`Create payment`.
+
+The invoices or bills are now marked as :guilabel:`In payment` until they are reconciled with the
+corresponding bank transactions. The credit notes or refunds are marked as :guilabel:`Paid`.
+
+.. _accounting/payments/batch-payments:
+
+Batch payments
+--------------
+
+Batch payments allow grouping payments from multiple contacts to ease
+:doc:`reconciliation <bank/reconciliation>`. They are also useful when depositing :doc:`checks
+<payments/checks>` to the bank or for :doc:`SEPA payments <payments/pay_sepa>`. To do so, go to
+:menuselection:`Accounting --> Customers --> Batch Payments` or :menuselection:`Accounting -->
+Vendors --> Batch Payments`. In the list view of payments, to group several payments in a
+batch, select them and click :menuselection:`Action --> Create Batch Payment`.
 
 .. seealso::
   - :doc:`payments/batch`
   - :doc:`payments/batch_sdd`
 
-.. _payments/matching:
+.. _accounting/payments/matching:
 
 Payments matching
 -----------------
 
 The :guilabel:`Payments matching` tool opens all unreconciled customer invoices or vendor bills and
-allows you to process them individually, matching all payments and invoices in one place. You can
-reach this tool from the :menuselection:`Accounting Dashboard --> Customer Invoices / Vendor Bills`,
-click the drop-down menu button (:guilabel:`⋮`), and select :guilabel:`Payments Matching`, or go to
-:menuselection:`Accounting --> Accounting --> Reconciliation`.
+allows them to be processed individually, matching all payments and invoices in one place. Go to the
+:guilabel:`Accounting Dashboard`, click the :icon:`fa-ellipsis-v` (:guilabel:`dropdown menu`)
+button from the :guilabel:`Customer Invoices` or :guilabel:`Vendor Bills` journals, and select
+:guilabel:`Payments Matching`, or go to :menuselection:`Accounting --> Accounting -->
+Reconciliation`.
 
 .. image:: payments/payments-journal.png
    :alt: Payments matching menu in the drop-down menu.
@@ -105,39 +132,49 @@ click the drop-down menu button (:guilabel:`⋮`), and select :guilabel:`Payment
 .. note::
    During the :doc:`reconciliation <bank/reconciliation>`, if the sum of the debits and credits does
    not match, there is a remaining balance. This either needs to be reconciled at a later date or
-   needs to be written off directly.
+   written off directly.
+
+.. _accounting/payments/batch-payments-matching:
 
 Batch payments matching
 -----------------------
 
-You can use the batch reconciliation feature to reconcile several outstanding payments or invoices
+Use the batch reconciliation feature to reconcile several outstanding payments or invoices
 simultaneously for a specific customer or vendor. Go to :menuselection:`Accounting --> Reporting -->
-Aged Receivable / Aged Payable`. You can see all transactions that have not been reconciled yet for
-that partner, and when you select a customer or vendor, the :guilabel:`Reconcile` option is
+Aged Receivable / Aged Payable`. All transactions that have not yet been reconciled for that
+contact are visible, and when a customer or vendor is selected, the :guilabel:`Reconcile` option is
 displayed.
 
 .. image:: payments/reconcile-option.png
    :alt: See the reconcile option.
 
+.. _accounting/payments/partial-payment:
+
 Registering a partial payment
 =============================
 
-To register a **partial payment**, click :guilabel:`Register payment` from the related invoice or
-bill, and enter the amount received or paid. Upon entering the amount, a prompt appears to decide
-whether to :guilabel:`Keep open` the invoice or bill, or :guilabel:`Mark as fully paid`. Select
-:guilabel:`Keep open` and click :guilabel:`Create payment`. The invoice or bill is now marked as
-:guilabel:`Partial`. Select :guilabel:`Mark as fully paid` if you wish to settle the invoice or bill
-with a difference in the amount.
+To register a partial payment, click on :guilabel:`Register Payment` from the related invoice or
+bill. In the case of a partial payment (when the :guilabel:`Amount` paid is less than the total
+remaining amount on the invoice or the bill), the :guilabel:`Payment Difference` field displays the
+outstanding balance. There are two options:
 
-.. image:: payments/payment-difference.png
-   :alt: Partial payment of an invoice or bill.
+- :guilabel:`Keep open`: Keep the invoice or the bill open and mark it with a :guilabel:`Partial`
+  banner;
+- :guilabel:`Mark as fully paid`: Select an account in the :guilabel:`Post Difference In` field and
+  change the :guilabel:`Label` if needed. A journal entry will be created to balance the accounts
+  payable or receivable with the selected account.
 
-Reconciling payments with bank statements
-=========================================
+.. image:: payments/partial-payment.png
+   :alt: register a partial payment
+
+.. _accounting/payments/reconciling-payments:
+
+Reconciling payments with bank transactions
+===========================================
 
 Once a payment has been registered, the status of the invoice or bill is :guilabel:`In payment`. The
-next step is :doc:`reconciling <bank/reconciliation>` it with the related bank statement line to
-have the transaction finalized and the invoice or bill marked as :guilabel:`Paid`.
+next step is :doc:`reconciling <bank/reconciliation>` it with the related bank transaction line to
+finalize the payment workflow and mark the invoice or bill as :guilabel:`Paid`.
 
 .. toctree::
    :titlesonly:

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

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

content/applications/finance/accounting/reporting.rst

@@ -4,30 +4,31 @@
 Reporting
 =========
 
-Main reports available
-======================
-
 Odoo includes **generic** and **dynamic** reports available for all countries, regardless of the
 :doc:`localization package <../../finance/fiscal_localizations>` installed:
 
--  **Balance Sheet**
--  **Profit and Loss**
--  **Executive Summary**
--  **General Ledger**
--  **Aged Payable**
--  **Aged Receivable**
--  **Cash Flow Statement**
--  **Tax Report**
+-  :ref:`reporting/balance-sheet`
+-  :ref:`reporting/profit-and-loss`
+-  :ref:`reporting/executive-summary`
+-  :ref:`reporting/general-ledger`
+-  :ref:`reporting/aged-receivable`
+-  :ref:`reporting/aged-payable`
+-  :ref:`reporting/cash-flow-statement`
+-  :ref:`reporting/tax-report`
 
-Reports can be **annotated, printed, and drilled down** to see details (payments, invoices,
-journal items, etc.) by clicking the **down** arrow. Reports can also be exported to **PDF** or
-**XLSX** format by clicking :guilabel:`PDF` or :guilabel:`XLSX` at the top of the page.
+To expand the lines of a report and view its details, click the :icon:`fa-caret-right`
+(:guilabel:`right arrow`) on the left. Then click the :icon:`fa-caret-down` (:guilabel:`down arrow`)
+to the right of the account, journal entry, payment, invoice, etc. to :guilabel:`Annotate` and view
+the details.
 
 .. image:: reporting/reporting-annotate.png
    :alt: Annotate reports.
 
-You can compare values across periods by using the :guilabel:`Comparison` menu and selecting the
-periods you want to compare.
+To export reports in PDF or XLSX format, click :guilabel:`PDF` or :guilabel:`XLSX` at the top of the
+page.
+
+To compare values across periods, click the :guilabel:`Comparison` menu and select the periods you
+want to compare.
 
 .. image:: reporting/reporting-comparison.png
    :alt: Comparison menu to compare time periods.
@@ -35,119 +36,97 @@ periods you want to compare.
 .. _reporting/balance-sheet:
 
 Balance Sheet
--------------
+=============
 
-The **Balance Sheet** shows a snapshot of your organization's assets, liabilities, and equity at a
-particular date.
-
-.. image:: reporting/reporting-balance-sheet.png
-   :alt: Balance sheet report of Odoo.
+The :guilabel:`Balance Sheet` shows a snapshot of your organization's assets, liabilities, and
+equity at a particular date.
 
 .. _reporting/profit-and-loss:
 
 Profit and Loss
----------------
+===============
 
-The **Profit and Loss** report (or **Income Statement**) shows your company's net income by
+The :guilabel:`Profit and Loss` report (or **Income Statement**) shows your company's net income by
 deducting expenses from revenue for the reporting period.
 
-.. image:: reporting/reporting-profit-and-loss.png
-   :alt: Profit and Loss report of Odoo
-
 .. _reporting/executive-summary:
 
 Executive Summary
------------------
+=================
 
-The **Executive Summary** allows a quick look at all the important figures to run your company.
+The :guilabel:`Executive Summary` provides an overview of all the important figures for overseeing
+your company's performance.
 
-In basic terms, this is what each item in the following section reports:
+It includes the following items:
 
-- **Performance:**
-    - **Gross profit margin:**
-        The contribution of all sales made by your business **minus** any direct costs needed to
+- :guilabel:`Performance`:
+    - :guilabel:`Gross profit margin`:
+        The contribution of all sales your business makes **minus** any direct costs needed to
         make those sales (labor, materials, etc.).
-    - **Net profit margin:**
+    - :guilabel:`Net profit margin`:
         The contribution of all sales made by your business **minus** any direct costs needed to
         make those sales *and* fixed overheads your company has (electricity, rent, taxes
         to be paid as a result of those sales, etc.).
-    - **Return on investment (per annum):**
-        The ratio of net profit made to the amount of assets the company used to make those profits.
-- **Position:**
-    - **Average debtors days:**
+    - :guilabel:`Return on investment (per annum)`:
+        The ratio of the net profit to the amount of assets the company used to make those profits.
+- :guilabel:`Position`:
+    - :guilabel:`Average debtors days`:
         The average number of days it takes your customers to (fully) pay you across all your
         customer invoices.
-    - **Average creditors days:**
+    - :guilabel:`Average creditors days`:
         The average number of days it takes you to (fully) pay your suppliers across all your bills.
-    - **Short-term cash forecast:**
+    - :guilabel:`Short-term cash forecast`:
         How much cash is expected in or out of your business in the next month, i.e., the balance of
         your **Sales account** for the month **minus** the balance of your **Purchases account** for
         the month.
-    - **Current assets to liabilities:**
-        Also referred to as **current ratio**, this is the ratio of current assets (:dfn:`assets
+    - :guilabel:`Current assets to liabilities`:
+        Also referred to as the **current ratio**, this is the ratio of current assets (:dfn:`assets
         that could be turned into cash within a year`) to the current liabilities (:dfn:`liabilities
         that will be due in the next year`). It is typically used to measure a company's ability to
         service its debt.
 
-.. image:: reporting/reporting-executive-summary.png
-   :alt: Executive summary report in Odoo.
-
 .. _reporting/general-ledger:
 
 General Ledger
---------------
+==============
 
-The **General Ledger Report** shows all transactions from all accounts for a chosen date range. The
-initial summary report shows each account's totals; from here, you can view a detailed transaction
-report or any exceptions. This report helps check every transaction that occurred during a specific
-period.
-
-.. image:: reporting/reporting-general-ledger.png
-   :alt: General Ledger report in Odoo.
-
-.. _reporting/aged-payable:
-
-Aged Payable
-------------
-
-Run the **Aged Payable Details** report to display information on individual bills, credit notes,
-and overpayments you owe and how long these have gone unpaid.
-
-.. image:: reporting/reporting-aged-payable.png
-   :alt: Aged Payable report in Odoo.
+The :guilabel:`General Ledger` report shows all transactions from all accounts for a selected date
+range. The initial summary report shows the totals for each account. To expand an account and view
+its details, click the :icon:`fa-caret-right` (:guilabel:`right arrow`) on the left.
+This report is useful for reviewing each transaction that occurred during a specific period.
 
 .. _reporting/aged-receivable:
 
 Aged Receivable
----------------
+===============
 
-The **Aged Receivables** report shows the sales invoices awaiting payment during a selected month
-and several months prior.
+The :guilabel:`Aged Receivable` report shows the sales invoices awaiting payment during a selected
+month and several months prior.
 
-.. image:: reporting/reporting-aged-receivable.png
-   :alt: Aged Receivable report in Odoo.
+.. _reporting/aged-payable:
+
+Aged Payable
+============
+
+The :guilabel:`Aged Payable` report displays information on individual bills, credit notes, and
+overpayments you owe and how long these have gone unpaid.
 
 .. _reporting/cash-flow-statement:
 
 Cash Flow Statement
--------------------
+===================
 
-The **Cash Flow Statement** shows how changes in balance sheet accounts and income affect cash and
-cash equivalents and breaks the analysis down to operating, investing, and financing activities.
-
-.. image:: reporting/reporting-cash-flow-statement.png
-   :alt: Cash Flow Statement report in Odoo.
+The :guilabel:`Cash Flow Statement` shows how changes in balance sheet accounts and income affect
+cash and cash equivalents and breaks the analysis down to operating, investing, and financing
+activities.
 
 .. _reporting/tax-report:
 
 Tax Report
-----------
+==========
 
-This report allows you to see the **net** and **tax amounts** for all the taxes grouped by type
-(sale/purchase).
-
-.. image:: reporting/reporting-tax-report.png
-   :alt: Tax report in Odoo.
+The :guilabel:`Tax Report` shows the :guilabel:`NET` and :guilabel:`TAX` amounts for all the
+taxes grouped by type (:guilabel:`Sales`/:guilabel:`Purchases`).
 
 .. toctree::
    :titlesonly:

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

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

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

@@ -7,7 +7,7 @@ inalterable**, meaning that once an entry has been posted, it can no longer be c
 
 To do so, Odoo can use the **SHA-256 algorithm** to create a unique fingerprint for each posted
 entry. This fingerprint is called a hash. The hash is generated by taking an entry's essential data
-(the values of the `date`, `journal_id`, `company_id`, `debit`, `credit`, `account_id`, and
+(the values of the `name`, `date`, `journal_id`, `company_id`, `debit`, `credit`, `account_id`, and
 `partner_id` fields), concatenating it, and inputting it to the SHA-256 hash function, which then
 outputs a fixed size (256-bit) string of characters. The hash function is deterministic (:dfn:`the
 same input always creates the same output`): any minor modification to the original data would

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

@@ -101,14 +101,13 @@ Tax Report
 ----------
 
 Once all the transactions involving taxes have been posted for the period you want to report, open
-your :guilabel:`Tax Report` by going to :menuselection:`Accounting --> Reporting -->
-Audit Reports: Tax Report`. Make sure to select the right period you want to declare by using the
-date filter, this way you can have an overview of your tax report. From this view, you can easily
-access different formats of your tax report, such as `PDF` and XLSX. These include all the values to
-report to the tax authorities, along with the amount you have to pay or be refunded.
+the :guilabel:`Tax Report` by going to :menuselection:`Accounting --> Reporting --> Tax Report`.
+Select the period you want to declare using the date filter to have an overview of the tax report.
+From the report, click :guilabel:`PDF` or :guilabel:`XLSX` to download the desired format of the tax
+report, or click :guilabel:`Save` to save the report to the Documents app. The report includes all
+the values to report to the tax authorities, along with the amount to be paid or refunded.
 
 .. image:: tax_returns/tax_return_report.png
-   :align: center
    :alt: download the PDF with your Tax Report in Odoo Accounting
 
 .. note::

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

@@ -60,10 +60,10 @@ Then, to close the fiscal year:
     <reporting/aged-receivable>` and :ref:`aged payables <reporting/aged-payable>` reports.
   - Audit all accounts, being sure to fully understand all transactions and their nature, making
     sure to include loans and fixed assets.
-  - Optionally, run :ref:`payments matching <payments/matching>` to validate any open vendor bills
-    and customer invoices with their payments. While this step is optional, it could assist the
-    year-end closing process if all outstanding payments and invoices are reconciled, potentially
-    finding errors or mistakes in the system.
+  - Optionally, run :ref:`payments matching <accounting/payments/matching>` to validate any open
+    vendor bills and customer invoices with their payments. While this step is optional, it could
+    assist the year-end closing process if all outstanding payments and invoices are reconciled,
+    potentially finding errors or mistakes in the system.
 
 Next, the accountant likely verifies balance sheet items and book entries for:
 
@@ -101,8 +101,9 @@ correctly reporting a balance of zero. If that is the case, set an :guilabel:`Al
 to the last day of the fiscal year by going to :menuselection:`Accounting --> Accounting --> Lock
 Dates`.
 
-.. warning::
-   Setting an :guilabel:`All Users Lock Date` is **irreversible** and cannot be removed.
+.. tip::
+   Install the :guilabel:`Irreversible Lock Date` (`account_lock`) module to make the :guilabel:`All
+   Users Lock Date` *irreversible* once set.
 
 .. note::
    A specific year-end closing entry is **optional** in order to close out the **profit and loss

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

@@ -1,74 +1,408 @@
+:show-content:
+
 ==================
-Avatax integration
+AvaTax integration
 ==================
 
-Avatax is a tax calculation provider that can be integrated in Odoo.
+Avalara's *AvaTax* is a cloud-based tax software. Integrating *AvaTax* with Odoo provides real-time
+and region-specific tax calculations when users sell, purchase, and invoice items in Odoo. *AvaTax*
+tax calculation is supported with every United Nations charted country, including inter-border
+transactions.
+
+.. important::
+   *AvaTax* is only available for integration with databases/companies that have locations in the
+   United States and Canada. This means the fiscal position/country of a database can only be set to
+   the United States or Canada. For more information, reference this documentation:
+   :ref:`avatax/fiscal_country`.
+
+*AvaTax* accounts for location-based tax rates for each state, county, and city. It improves
+remittance accuracy by paying close attention to laws, rules, jurisdiction boundaries, and special
+circumstances (like, tax holidays, and product exemptions). Companies who integrate with *AvaTax*
+can maintain control of tax-calculations in-house with this simple :abbr:`API (application
+programming interface)` integration.
+
+.. important::
+   Some limitations exist in Odoo while using *AvaTax* for tax calculation:
+
+   - *AvaTax* is **not** supported in Odoo's *Point of Sale* app, because a dynamic tax calculation
+     model is excessive for transactions within a single delivery address, such as stores or
+     restaurants.
+   - *AvaTax* and Odoo use the company address and **not** the warehouse address.
+   - Exercise tax is **not** supported. This includes tobacco/vape taxes, fuel taxes, and other
+     specific industries.
+
+.. seealso::
+   Avalara's support documents: `About AvaTax
+   <https://community.avalara.com/support/s/document-item?language=en_US&bundleId=dqa1657870670369_dqa1657870670369&topicId=About_AvaTax.html&_LANG=enus>`_
+
+Set up on AvaTax
+================
+
+To use *AvaTax*, an account with Avalara is required for the setup. If one has not been set up yet,
+connect with Avalara to purchase a license: `Avalara: Let's Talk
+<https://www.avalara.com/us/en/get-started.html>`_.
+
+.. tip::
+   Upon account setup, take note of the *AvaTax* :guilabel:`Account ID`. This will be needed in the
+   :ref:`Odoo setup <avatax/credentials>`. In Odoo, this number is the :guilabel:`API ID`.
+
+Then, `create a basic company profile
+<https://community.avalara.com/support/s/document-item?bundleId=dqa1657870670369_dqa1657870670369&topicId=Create_a_Basic_company_profile.html&_LANG=enus>`_.
+
+Create basic company profile
+----------------------------
+
+Collect essential business details for the next step: locations where tax is collected,
+products/services sold (and their sales locations), and customer tax exemptions, if applicable.
+Follow the Avalara documentation for creating a basic company profile:
+
+#. `Add company information
+   <https://community.avalara.com/support/s/document-item?bundleId=dqa1657870670369_dqa1657870670369&topicId=Add_your_company_information.html&_LANG=enus>`_.
+#. `Tell us where the company collects and pays tax
+   <https://community.avalara.com/support/s/document-item?bundleId=dqa1657870670369_dqa1657870670369&topicId=Tell_us_where_you_collect_and_pay_tax.html&_LANG=enus>`_.
+#. `Verify jurisdictions and activate the company
+   <https://community.avalara.com/support/s/document-item?bundleId=dqa1657870670369_dqa1657870670369&topicId=Verify_your_jurisdictions_and_activate_your_company.html&_LANG=enus>`_.
+#. `Add other company locations for location-based filing
+   <https://community.avalara.com/support/s/document-item?bundleId=dqa1657870670369_dqa1657870670369&topicId=Add_other_company_locations_for_location-based_filing.html&_LANG=enus>`_.
+#. `Add a marketplace to the company profile
+   <https://community.avalara.com/support/s/document-item?bundleId=dqa1657870670369_dqa1657870670369&topicId=Add_marketplace_transactions_to_your_company_profile.html&_LANG=enus>`_.
+
+.. _avatax/create_avalara_credentials:
+
+Connect to AvaTax
+-----------------
+
+After creating the basic company profile in Avalara, connect to *AvaTax*. This step links Odoo and
+*AvaTax* bidirectionally.
+
+Navigate to either Avalara's `sandbox <https://sandbox.admin.avalara.com/>`_ or `production
+<https://admin.avalara.com/>`_ environment. This will depend on which type of Avalara account the
+company would like to integrate.
+
+.. seealso::
+   `Sandbox vs production environments in Avalara
+   <https://knowledge.avalara.com/bundle/fzc1692293626742/page/sandbox-vs-production.html>`_.
+
+Log in to create the :guilabel:`License Key`. Go to :menuselection:`Settings --> License and API
+Keys`. Click :guilabel:`Generate License Key`.
+
+.. note::
+   A warning appears stating: `If your business app is connected to Avalara solutions, the
+   connection will be broken until you update the app with the new license key. This action cannot
+   be undone.`
+
+   Generating a new license key breaks the connection with existing business apps using the *AvaTax*
+   integration. Make sure to update these apps with the new license key.
+
+If this will be the first :abbr:`API (application programming interface)` integration being made
+with *AvaTax* and Odoo, then click :guilabel:`Generate license key`.
+
+If this is an additional license key, ensure the previous connection can be broken. There is
+**only** one license key associated with each of the Avalara sandbox and production accounts.
+
+.. important::
+   Copy this key to a safe place. It is **strongly encouraged** to backup the license key for future
+   reference. This key cannot be retrieved after leaving this screen.
+
+Odoo configuration
+==================
+
+Before using *AvaTax*, there are some additional configurations in Odoo to ensure tax calculations
+are made accurately.
+
+Verify that the Odoo database contains necessary data. The country initially set up in the database
+determines the fiscal position, and aids *AvaTax* in calculating accurate tax rates.
+
+.. _avatax/fiscal_country:
+
+Fiscal country
+--------------
+
+To set the :guilabel:`Fiscal Country`, navigate to :menuselection:`Accounting app --> Configuration
+--> Settings`.
+
+.. seealso::
+   :doc:`../../fiscal_localizations`
+
+Under the :guilabel:`Taxes` section, set the :guilabel:`Fiscal Country` feature to :guilabel:`United
+States` or :guilabel:`Canada`. Then, click :guilabel:`Save`.
+
+Company settings
+----------------
+
+All companies operating under the Odoo database should have a full and complete address listed in
+the settings. Navigate to the :menuselection:`Settings app`, and under the :guilabel:`Companies`
+section, ensure there is only one company operating the Odoo database. Click :guilabel:`Update Info`
+to open a separate page to update company details.
+
+If there are multiple companies operating in the database, click :guilabel:`Manage Companies` to
+load a list of companies to select from. Update company information by clicking into the specific
+company.
+
+Database administrators should ensure that the :guilabel:`Street...`, :guilabel:`Street2...`,
+:guilabel:`City`, :guilabel:`State`, :guilabel:`ZIP`, and :guilabel:`Country` are all updated for
+the companies.
+
+This ensures accurate tax calculations and smooth end-of-year accounting operations.
+
+.. seealso::
+   - :doc:`../../../general/companies`
+   - :doc:`../get_started`
+
+Module installation
+-------------------
+
+Next, ensure that the Odoo *AvaTax* module is installed. To do so, navigate to the
+:menuselection:`Apps application`. In the :guilabel:`Search...` bar, type in `avatax`, and press
+:kbd:`Enter`. The following results populate:
+
+.. list-table::
+   :header-rows: 1
+   :widths: 25 25 50
+
+   * - Name
+     - Technical name
+     - Description
+   * - :guilabel:`Avatax`
+     - `account_avatax`
+     - Default *AvaTax* module. This module adds the base *AvaTax* features for tax calculation.
+   * - :guilabel:`Avatax for SO`
+     - `account_avatax_sale`
+     - Includes the information needed for tax calculation on sales orders in Odoo.
+   * - :guilabel:`Avatax for Subscriptions`
+     - `account_avatax_sale_subscription`
+     - This module includes the features required for tax calculation on subscriptions in Odoo.
+   * - :guilabel:`Account Avatax - Ecommerce`
+     - `website_sale_account_avatax`
+     - Includes tax calculation features for the checkout process on Odoo eCommerce.
+   * - :guilabel:`Account AvaTax - Ecommerce - Delivery`
+     - `website_sale_delivery_avatax`
+     - Includes tax calculation features for the delivery process on Odoo eCommerce.
+
+Click the :guilabel:`Install` button on the module labeled :guilabel:`Avatax`: `account_avatax`.
+Doing so installs the following modules:
+
+- :guilabel:`Avatax`: `account_avatax`
+- :guilabel:`Avatax for SO`: `account_avatax_sale`
+- :guilabel:`Account Avatax - Ecommerce`: `website_sale_account_avatax`
+
+Should *AvaTax* be needed for Odoo *Subscriptions*, or for delivery tax in Odoo *eCommerce*, then
+install those modules individually by clicking on :guilabel:`Install`.
 
 .. _avatax/credentials:
 
-Credential configuration
-========================
+Odoo AvaTax settings
+--------------------
 
-To integrate Avatax with Odoo, go to :menuselection:`Accounting --> Configuration --> Settings -->
-Taxes` and add your Avatax credentials in the :guilabel:`Avatax` section.
-
-.. tip::
-   If you do not yet have credentials, click on :guilabel:`How to Get Credentials`.
+To integrate the *AvaTax* :abbr:`API (application programming interface)` with Odoo, go to
+:menuselection:`Accounting app --> Configuration --> Settings` section. The :guilabel:`AvaTax`
+fields in the :guilabel:`Taxes` section is where the *AvaTax* configurations are made and the
+credentials are entered in.
 
 .. image:: avatax/avatax-configuration-settings.png
    :align: center
-   :alt: Configure Avatax settings
+   :alt: Configure AvaTax settings
 
-.. _avatax/tax-mapping:
+Prerequisites
+~~~~~~~~~~~~~
+
+First, select the :guilabel:`Environment` in which the company wishes to use *AvaTax* in. It can
+either be :guilabel:`Sandbox` or :guilabel:`Production`.
+
+.. seealso::
+   For help determining which *AvaTax* environment to use (either :guilabel:`Production` or
+   :guilabel:`Sandbox`), visit: `Sandbox vs Production environments
+   <https://knowledge.avalara.com/bundle/fzc1692293626742/page/sandbox-vs-production.html>`_.
+
+Credentials
+~~~~~~~~~~~
+
+Now, the credentials can be entered in. The *AvaTax* :guilabel:`Account ID` should be entered in the
+:guilabel:`API ID` field, and the :guilabel:`License Key` should be entered in the :guilabel:`API
+Key` field.
+
+.. important::
+   The :guilabel:`Account ID` can be found by logging into the *AvaTax* portal (`sandbox
+   <https://sandbox.admin.avalara.com/>`_ or `production <https://admin.avalara.com/>`_). In the
+   upper-right corner, click on the initials of the user and :guilabel:`Account`. The
+   :guilabel:`Account ID` is listed first.
+
+   To access the :guilabel:`License Key` see this documentation:
+   :ref:`avatax/create_avalara_credentials`.
+
+For the :guilabel:`Company Code` field, enter the Avalara company code for the company being
+configured. Avalara interprets this as `DEFAULT`, if it is not set. The :guilabel:`Company Code` can
+be accessed in the Avalara management portal.
+
+First, log into the *AvaTax* portal (`sandbox <https://sandbox.admin.avalara.com/>`_ or `production
+<https://admin.avalara.com/>`_). Then, navigate to :menuselection:`Settings --> Manage Companies`.
+The :guilabel:`Company Code` value is located in the row of the :guilabel:`Company` in the
+:guilabel:`Company Code` column.
+
+.. image:: avatax/company-code.png
+   :align: center
+   :alt: AvaTax company code highlighted on the company details page.
+
+Transaction options
+~~~~~~~~~~~~~~~~~~~
+
+There are two transactional settings in the Odoo *AvaTax* settings that can be configured:
+:guilabel:`Use UPC` and :guilabel:`Commit Transactions`.
+
+If the checkbox next to :guilabel:`Use UPC` is ticked, the transactions will use Universal Product
+Codes (UPC), instead of custom defined codes in Avalara. Consult a certified public accountant (CPA)
+for specific guidance.
+
+Should the :guilabel:`Commit Transactions` checkbox be ticked, then, the transactions in the Odoo
+database will be committed for reporting in *AvaTax*.
+
+Address validation
+~~~~~~~~~~~~~~~~~~
+
+The *Address Validation* feature ensures that the most up-to-date address by postal standards is set
+on a contact in Odoo. This is important to provide accurate tax calculations for customers.
+
+.. important::
+   The :guilabel:`Address Validation` feature only works with partners/customers in North America.
+
+Additionally, tick the checkbox next to the :guilabel:`Address validation` field.
+
+.. important::
+   For accurate tax calculations, it is best practice to enter a complete address for the contacts
+   saved in the database. However, *AvaTax* can still function by implementing a best effort attempt
+   using only the :guilabel:`Country`, :guilabel:`State`, and :guilabel:`Zip code`. These are the
+   three minimum required fields.
+
+:guilabel:`Save` the settings to implement the configuration.
+
+.. tip::
+   Manually :guilabel:`Validate` the address by navigating to the :menuselection:`Contacts app`, and
+   selecting a contact. Now that the *AvaTax* module has been configured on the database, a
+   :guilabel:`Validate` button appears directly below the :guilabel:`Address`.
+
+   Click :guilabel:`Validate`, and a pop-up window appears with a :guilabel:`Validated Address` and
+   :guilabel:`Original Address` listed. If the :guilabel:`Validated Address` is the correct mailing
+   address for tax purposes, click :guilabel:`Save Validated`.
+
+   .. image:: avatax/validate-address.png
+      :align: center
+      :alt: Validate address pop-up window in Odoo with "Save Validated" button and "Validated
+            Address" highlighted.
+
+.. warning::
+   All previously-entered addresses for contacts in the Odoo database will need to be validated
+   using the manually validate process outlined above. Addresses are not automatically validated if
+   they were entered previously. This only occurs upon tax calculation.
+
+Test connection
+~~~~~~~~~~~~~~~
+
+After entering all the above information into the *AvaTax* setup on Odoo, click :guilabel:`Test
+connection`. This ensures the :guilabel:`API ID` and :guilabel:`API KEY` are correct, and a
+connection is made between Odoo and the *AvaTax* application programming interface (API).
+
+Sync parameters
+~~~~~~~~~~~~~~~
+
+Upon finishing the configuration and settings of the *AvaTax* section, click the :guilabel:`Sync
+Parameters` button. This action synchronizes the exemption codes from *AvaTax*.
+
+.. _avatax/fiscal_positions:
+
+Fiscal position
+---------------
+
+Next, navigate to :menuselection:`Accounting app --> Configuration --> Accounting: Fiscal
+Positions`. A :guilabel:`Fiscal Position` is listed named, :guilabel:`Automatic Tax Mapping
+(AvaTax)`. Click it to open *AvaTax's* fiscal position configuration page.
+
+Here, ensure that the :guilabel:`Use AvaTax API` checkbox is ticked.
+
+Optionally, tick the checkbox next to the field labeled: :guilabel:`Detect Automatically`. Should
+this option be ticked, then, Odoo will automatically apply this :guilabel:`Fiscal Position` for
+transactions in Odoo.
+
+Enabling :guilabel:`Detect Automatically` also makes specific parameters, such as :guilabel:`VAT
+required`, :guilabel:`Foreign Tax ID`, :guilabel:`Country Group`, :guilabel:`Country`,
+:guilabel:`Federal States`, or :guilabel:`Zip Range` appear. Filling these parameters filters the
+:guilabel:`Fiscal Position` usage. Leaving them blank ensures all calculations are made using this
+:guilabel:`Fiscal Position`.
+
+.. warning::
+   Should the :guilabel:`Detect Automatically` checkbox not be ticked, each customer will need to
+   have the :guilabel:`Fiscal Position` set on their :guilabel:`Sales and Purchase` tab of the
+   contact record. To do so, navigate to :menuselection:`Sales app --> Order --> Customers`, or
+   :menuselection:`Contacts app --> Contacts`. Then, select a customer or contact to set the fiscal
+   position on.
+
+   Navigate to the :guilabel:`Sales and Purchase` tab, and down to the section labeled,
+   :guilabel:`Fiscal Position`. Set the :guilabel:`Fiscal Position` field to the fiscal position
+   for the customer.
+
+.. seealso::
+   :doc:`fiscal_positions`
+
+AvaTax accounts
+~~~~~~~~~~~~~~~
+
+Upon selecting the checkbox option for :guilabel:`Use AvaTax API` a new :guilabel:`AvaTax` tab
+appears. Click into this tab to reveal two different settings.
+
+The first setting is the :guilabel:`AvaTax Invoice Account`, while the second is, :guilabel:`AvaTax
+Refund Account`. Ensure both accounts are set for smooth end-of-year record keeping. Consult a
+certified public accountant (CPA) for specific guidance on setting both accounts.
+
+Click :guilabel:`Save` to implement the changes.
 
 Tax mapping
-===========
+-----------
 
-The Avatax integration is available on Sale Orders and Invoices with the included Avatax fiscal
+The *AvaTax* integration is available on sale orders and invoices with the included *AvaTax* fiscal
 position.
 
+Product category mapping
+~~~~~~~~~~~~~~~~~~~~~~~~
+
 Before using the integration, specify an :guilabel:`Avatax Category` on the product categories.
+Navigate to :menuselection:`Inventory app --> Configuration --> Product Categories`. Select the
+product category to add the :guilabel:`AvaTax Category` to. In the :guilabel:`AvaTax Category`
+field, select a category from the drop-down menu, or :guilabel:`Search More...` to open the complete
+list of options.
 
 .. image:: avatax/avatax-category.png
    :align: center
-   :alt: Specify Avatax Category on products
+   :alt: Specify AvaTax Category on products.
 
-Avatax Categories may be overridden or set on individual products as well.
+Product mapping
+~~~~~~~~~~~~~~~
+
+*AvaTax* Categories may be set on individual products, as well. To set the :guilabel:`Avatax
+Category` navigate to :menuselection:`Inventory app --> Products --> Products`. Select the product
+to add the :guilabel:`Avatax Category` to. Under the :guilabel:`General Information` tab, on the
+far-right, is a selector field labeled: :guilabel:`Avatax Category`. Finally, click the drop-down
+menu, and select a category, or :guilabel:`Search More...` to find one that is not listed.
+
+.. note::
+   If both the product, and its category, have an :guilabel:`AvaTax Category` set, the product's
+   :guilabel:`AvaTax Category` takes precedence.
 
 .. image:: avatax/override-avatax-product-category.png
    :align: center
-   :alt: Override product categories as needed
+   :alt: Override product categories as needed.
 
-.. _avatax/address-mapping:
-
-Address validation
-==================
-
-Manually validate customer addresses by clicking the :guilabel:`Validate address` link in the
-customer form view.
-
-.. image:: avatax/validate-customer-address.png
-   :align: center
-   :alt: Validate customer addresses
-
-If preferred, choose to keep the newly validated address or the original address in the wizard that
-pops up.
-
-.. image:: avatax/choose-customer-address.png
-   :align: center
-   :alt: Address validation wizard
-
-.. _avatax/tax-calculation:
-
-Tax calculation
-===============
-
-Automatically calculate taxes on Odoo quotations and invoices with Avatax by confirming the
-documents. Alternatively, calculate the taxes manually by clicking the :guilabel:`Compute taxes
-using Avatax` button while these documents are in draft mode.
-
-Use the :guilabel:`Avalara Code` field that's available on customers, quotations, and invoices to
-cross-reference data in Odoo and Avatax.
+.. important::
+   Mapping an :guilabel:`AvaTax Category` on either the *Product* or *Product Category* should be
+   completed for every *Product* or *Product Category*, depending the route that is chosen.
 
 .. seealso::
    - :doc:`fiscal_positions`
+   - :doc:`avatax/avatax_use`
+   - :doc:`avatax/avalara_portal`
+   - `US Tax Compliance: Avatax elearning video
+     <https://www.odoo.com/slides/slide/us-tax-compliance-avatax-2858?fullscreen=1>`_
+
+.. toctree::
+   :titlesonly:
+
+   avatax/avatax_use
+   avatax/avalara_portal

content/applications/finance/accounting/taxes/avatax/avalara_portal.rst

@@ -0,0 +1,259 @@
+
+.. _avatax/portal:
+
+=======================
+Avalara (Avatax) portal
+=======================
+
+Avalara's (*AvaTax*) management console offers account management options including: viewing/editing
+the transactions sent from Odoo to *AvaTax*, details on how the taxes are calculated, tax reporting,
+tax exemption management, and tax return resources.
+
+.. tip::
+   Avalara is the software developer of the tax software, *AvaTax*.
+
+To access the console, first, navigate to either Avalara's `sandbox
+<https://sandbox.admin.avalara.com/>`_ or `production <https://admin.avalara.com/>`_ environment.
+This will depend on which type of account was set in the :doc:`integration <../avatax>`. Log in to
+the management console.
+
+.. image:: avalara_portal/avalara-portal.png
+   :align: center
+   :alt: Avalara dashboard after logging into management portal.
+
+.. seealso::
+   For more information see Avalara's documentation: `Activate your Communications Customer Portal
+   account
+   <https://community.avalara.com/support/s/document-item?language=en_US&bundleId=qvv1656594440497&topicId=Activate_your_Communications_Customer_Portal_account.html&_LANG=enus>`_.
+
+.. _avalara/portal-transactions:
+
+Transactions
+============
+
+To access transactions, click in the :guilabel:`Transactions` link on the main dashboard upon
+logging into the :ref:`avatax/portal`. To manually access the *Transactions* page, while logged into
+the Avalara console, navigate to :menuselection:`Transactions --> Transactions`.
+
+.. image:: avalara_portal/avalara-transactions.png
+   :align: center
+   :alt: Avalara portal with the transactions shortcut highlighted.
+
+Edit transaction
+----------------
+
+Click into a transaction to reveal more details about the transaction. These details include
+sections on :guilabel:`Invoice detail`, :guilabel:`Additional info`, and :guilabel:`Customer info`.
+Click :icon:`fa-pencil` :guilabel:`Edit document details` to make changes to the transaction.
+
+A :guilabel:`Discount` can be added to adjust the invoice. This is especially useful in cases where
+the transaction has already synced with Avalara / *AvaTax*, and changes need to be made afterward.
+
+.. _avalara/portal-filter:
+
+Filter
+------
+
+Filter transactions on the :guilabel:`Transactions` page, by setting the :guilabel:`From` and
+:guilabel:`To` fields, and configuring other fields to filter by, including:
+
+- :guilabel:`Document Status`: any of the following options, :guilabel:`All`, :guilabel:`Voided`,
+  :guilabel:`Committed`, :guilabel:`Uncommitted`, or :guilabel:`Locked`.
+- :guilabel:`Document Code`: any of the following options, :guilabel:`Exactly match`,
+  :guilabel:`Starts with`, or :guilabel:`Contains`.
+- :guilabel:`Customer/Vendor Code`: the customer/vendor code in Odoo (e.g. `Contact18`).
+- :guilabel:`Country`: the country this tax was calculated in; this is a text field.
+- :guilabel:`Region`: the region of the country, which varies based on the :guilabel:`Country`
+  selection.
+
+Click :icon:`fa-plus` :guilabel:`Filters` to access the following filter conditions:
+
+- :guilabel:`Document Type`: any of the following selections, :guilabel:`All`, :guilabel:`Sales
+  Invoice`, :guilabel:`Purchase Invoice`, :guilabel:`Return Invoice`, :guilabel:`Inventory Transfer
+  Inbound Invoice`, :guilabel:`Inventory Transfer Outbound Invoice`, or :guilabel:`Customs
+  Invoice`.
+- :guilabel:`Import ID`: represents the import ID of the document.
+
+Sort by
+-------
+
+On the :guilabel:`Transactions` page, transactions will be listed below, according to the set
+:ref:`avalara/portal-filter`, located in the top half of the page. The following columns are
+available by default, to sort by ascending or descending order:
+
+- :guilabel:`Doc Code`: either of the following options, :guilabel:`Exactly match`,
+  :guilabel:`Starts with`, or :guilabel:`Contains`.
+- :guilabel:`Doc Status`: either of the following options, :guilabel:`All`, :guilabel:`Voided`,
+  :guilabel:`Committed`, :guilabel:`Uncommitted`, or :guilabel:`Locked`.
+- :guilabel:`Cust/Vendor Code` : this is the customer/vendor code in Odoo (e.g. Contact18).
+- :guilabel:`Region`: this is the region of the country, this will vary based on the
+  :guilabel:`Country` selection.
+- :guilabel:`Amount`: the numeric amount of the total amount on the Odoo document.
+- :guilabel:`Tax`: the numeric amount of the tax applied to the total.
+
+.. image:: avalara_portal/transactions.png
+   :align: center
+   :alt: Transactions page on the Avalara portal with the filter and sort-by options highlighted.
+
+Customize columns
+~~~~~~~~~~~~~~~~~
+
+Additional columns can be added by clicking the :icon:`fa-cog` :guilabel:`Customize columns`. On the
+resulting popover window, click the drop-down menu for the :guilabel:`column` that should be
+changed.
+
+The following columns can be added for additional transactional information:
+
+- :guilabel:`AvaTax calculated`: the amount of tax calculated by *AvaTax*.
+- :guilabel:`Country`: the country this tax was calculated in; this is a text field.
+- :guilabel:`Cust/vendor code`: the customer/vendor code in Odoo (e.g. `Contact18`).
+- :guilabel:`Currency`: the standardized abbreviation for the currency the amount total is in.
+- :guilabel:`Doc date`: the document's date of creation.
+- :guilabel:`Doc status`: any of the following options, :guilabel:`All`, :guilabel:`Voided`,
+  :guilabel:`Committed`, :guilabel:`Uncommitted`, or :guilabel:`Locked`.
+- :guilabel:`Doc type`: any of the following selections, :guilabel:`All`, :guilabel:`Sales
+  Invoice`, :guilabel:`Purchase Invoice`, :guilabel:`Return Invoice`, :guilabel:`Inventory Transfer
+  Inbound Invoice`, :guilabel:`Inventory Transfer Outbound Invoice`, or :guilabel:`Customs
+  Invoice`.
+- :guilabel:`Import ID`: represents the import ID of the document.
+- :guilabel:`Last modified`: timestamp of the last time the document was modified.
+- :guilabel:`Location code`: the location code used to calculate the tax, based on the delivery
+  address.
+- :guilabel:`PO number`: the purchase order number.
+- :guilabel:`Reference code`: the Odoo reference code (e.g. NV/2024/00003)
+- :guilabel:`Region`: the region of the country,which varies based on the :guilabel:`Country`
+  selection.
+- :guilabel:`Salesperson code`: the numeric ID of the user assigned to the sales order in Odoo.
+- :guilabel:`Tax date`: the month/day/year of the tax calculation.
+- :guilabel:`Tax override type`: where an exemption would appear, should there be none, the field
+  populates with :guilabel:`None`.
+
+To add a new column click the :icon:`fa-plus` :guilabel:`Column`.
+
+.. seealso::
+   For more information on *AvaTax* transactions, refer to this Avalara documentation: `Transactions
+   <https://community.avalara.com/support/s/document-item?language=en_US&bundleId=qvv1656594440497&topicId=transactions.html&_LANG=enus>`_.
+
+Import-export
+-------------
+
+While on the :ref:`avalara/portal-transactions`, click :icon:`fa-download` :guilabel:`Import
+transactions` or :icon:`fa-upload` :guilabel:`Export transactions` to import or export transactions.
+
+Reports
+-------
+
+To access reporting, navigate to the :menuselection:`Reports` link in the top menu of the Avalara
+management console. Next, select from one of the available reporting tabs: :guilabel:`Transactions
+reports`, :guilabel:`Liability & tax return reports`, or :guilabel:`Exemption reports`.
+
+.. tip::
+   Additionally, there is a :guilabel:`Favorites` tab and :guilabel:`Downloads` tab. The
+   :guilabel:`Favorites` tab contains any favorited report configurations for the Avalara user. The
+   :guilabel:`Downloads` tab contains a list view where the user can download the high-volume
+   transaction reports created in the last 30 days.
+
+Make a selection for the :guilabel:`Report Category`, and the :guilabel:`Report Name`, under the
+:guilabel:`Select a report` section.
+
+Next, fill out the :guilabel:`Select report details` section. These options will vary based on the
+tab selected above.
+
+Depending on the report size, the following two options are available in the section labeled,
+:guilabel:`Select the approximate number of transactions for your report`: :guilabel:`Create and
+download the report instantly` (for small reports) and :guilabel:`Create and download the report in
+the background` (for larger reports). Select one or the other depending on the volume of
+transactions in this report.
+
+Finally, under the section labeled, :guilabel:`Report preview and export` make a selection of the
+file type to download. Either a :guilabel:`.PDF` or :guilabel:`.XLS` can be chosen. Alternatively,
+the file can be previewed by selecting the :guilabel:`Preview` option.
+
+After making all the configurations, click :guilabel:`Create report` to download the report. Click
+:icon:`fa-star-o` :guilabel:`Make this report a favorite` to save the report configuration to the
+user's favorites.
+
+After the report is created, click :icon:`fa-download` :guilabel:`Download` to download the file to
+the device.
+
+.. tip::
+   Select a pre-configured report from the :guilabel:`Frequently used reports` section of the
+   reporting dashboard.
+
+   Access this list by clicking on the :guilabel:`Reports` option in the top menu of the Avalara
+   management console, and scroll to the bottom of the page.
+
+.. seealso::
+   `See Avalara's documentation: Reports in AvaTax
+   <https://community.avalara.com/support/s/document-item?language=en_US&bundleId=rjq1671176624730&topicId=Reports_in_AvaTax.html&_LANG=enus>`_.
+
+Add more jurisdictions
+======================
+
+Additional jurisdictions (tax locations) can be added in the Avalara management console. Navigate to
+either Avalara's `sandbox <https://sandbox.admin.avalara.com/>`_ or `production
+<https://admin.avalara.com/>`_ environment. This will depend on which type of account was set in the
+:doc:`integration <../avatax>`.
+
+Next, navigate to :menuselection:`Settings --> Where you collect tax`. Choose between the three
+different tabs, depending on the business need. The first tab is :guilabel:`Sales and use tax`,
+where tax can be collected for the United States. Click the :icon:`fa-plus` :guilabel:`Add to where
+you collect sales and use tax` to add another location where the company collects sales and use tax.
+
+The second option, is the :guilabel:`VAT/GST` tab where the :icon:`fa-plus` :guilabel:`Add a country
+or territory where you collect VAT/GST` can be selected to add another country or territory where
+the company collects VAT/GST.
+
+Finally, on the far-right, is the :guilabel:`Customs duty` tab, where a country can be added where
+the company collects customs duty. Simply click on the :icon:`fa-plus` :guilabel:`Add a country
+where you calculate customs duty` icon below the tab.
+
+.. image:: avalara_portal/where-you-collect-tax.png
+   :align: center
+   :alt: AvaTax management console, on the Where you collect tax page, with the add button and
+         sales and use tax tab highlighted.
+
+.. seealso::
+   `See Avalara's documentation: Add local jurisdiction taxes
+   <https://community.avalara.com/support/s/document-item?language=en_US&bundleId=bla1700809896571_bla1700809896571&topicId=nbw1698727575499.html&_LANG=enus>`_.
+
+Tax exemption certificate
+=========================
+
+Tax exemption certificates for customers can be added into the Avalara management console, so that
+*AvaTax* is aware of which customers may be exempt from paying certain taxes. To add an *exception
+certificate* navigate to :menuselection:`Exemptions --> Customer certificates`. From there, click on
+the :icon:`fa-plus` :guilabel:`Add a certificate` to configure an exemption.
+
+.. warning::
+   An Avalara subscription to Exemption Certificate Management (ECM) is required in order to attach
+   certificate images, and to be ready for an audit. For more on subscribing to this add-on, visit
+   `Avalara
+   <https://community.avalara.com/support/s/document-item?language=en_US&bundleId=hff1682048150115_hff1682048150115&topicId=fol1682356576230.html&_LANG=enus>`_.
+
+End-of-year operations
+======================
+
+Avalara's services include tax return services, for when it is time to file taxes at the end of the
+year. To access Avalara's tax services log, into the `management portal
+<https://admin.avalara.com/>`_. Then, from the main dashboard, click :guilabel:`Returns`. Avalara
+will prompt the Avalara user to log in for security purposes, and redirect the user to the *Returns*
+portal.
+
+.. image:: avalara_portal/avalara-returns.png
+   :align: center
+   :alt: Avalara portal with the returns shortcut highlighted.
+
+Click :guilabel:`Get started` to begin the tax return process. For more information, refer to this
+Avalara documentation: `About Managed Returns
+<https://community.avalara.com/support/s/document-item?language=en_US&bundleId=hps1656397152776_hps1656397152776&topicId=Learn_about_Managed_Returns.html&_LANG=enus>`_.
+
+.. tip::
+   Alternatively, click on the :menuselection:`Returns` button in the top menu of the Avalara
+   management console.
+
+.. seealso::
+   - :doc:`../avatax`
+   - :doc:`avatax_use`
+   - `US Tax Compliance: Avatax elearning video
+     <https://www.odoo.com/slides/slide/us-tax-compliance-avatax-2858?fullscreen=1>`_

content/applications/finance/accounting/taxes/avatax/avatax_use.rst

@@ -0,0 +1,164 @@
+==========
+AvaTax use
+==========
+
+AvaTax is a tax calculation software that can be integrated with Odoo in the United States and
+Canada. Once the :doc:`integration setup <../avatax>` is complete, the calculated tax is simple and
+automatic.
+
+Tax calculation
+===============
+
+Automatically calculate taxes on Odoo quotations and invoices with AvaTax by confirming the
+documents during the sales flow. Alternatively, calculate the taxes manually by clicking the
+:guilabel:`Compute taxes using Avatax` button while these documents are in draft mode.
+
+.. tip::
+   Clicking the :guilabel:`Compute taxes using Avatax` button recalculates taxes if any product
+   lines are edited on the invoice.
+
+.. image:: avatax_use/calculate-avatax.png
+   :align: center
+   :alt: Sales quotation with the confirm and compute taxes using AvaTax buttons highlighted.
+
+The tax calculation is triggered during the following :ref:`automatic trigger
+<avatax/automatic-triggers>` and :ref:`manual trigger <avatax/manual-triggers>` circumstances.
+
+.. _avatax/automatic-triggers:
+
+Automatic triggers
+------------------
+
+- When the sales rep sends the quote by email with :guilabel:`Send by email` button (pop-up).
+- When the customer views the online quote on the portal.
+- When a quote is confirmed and becomes a sales order.
+- When the customer views the invoice on the portal.
+- When a draft invoice is validated.
+- When the customer views the subscription in the portal.
+- When a subscription generates an invoice.
+- When the customer gets to the last screen of the eCommerce checkout.
+
+.. _avatax/manual-triggers:
+
+Manual triggers
+---------------
+
+- :guilabel:`Compute taxes using Avatax` button at the bottom of the quote.
+- :guilabel:`Compute taxes using Avatax` button at the top of the invoice.
+
+.. tip::
+   Use the :guilabel:`Avalara Partner Code` field that is available on customer records, quotations,
+   and invoices to cross-reference data in Odoo and AvaTax. This field is located under the
+   :menuselection:`Other info` tab of the sales order or quotation in the :guilabel:`Sales` section.
+
+   On the customer record, navigate to *Contacts app* and select a contact. Then open the
+   :guilabel:`Sales & Purchase` tab and the :guilabel:`Avalara Partner Code` under the
+   :guilabel:`Sales` section.
+
+.. important::
+   The :guilabel:`Automatic Tax Mapping (AvaTax)` fiscal position is also applied on those Odoo
+   documents, like subscriptions.
+
+.. seealso::
+   - :doc:`../fiscal_positions`
+
+AvaTax synchronization
+======================
+
+Synchronization occurs with AvaTax, when the *invoice* is created in Odoo. This means the sales tax
+is recorded with Avalara (AvaTax software developer).
+
+To do so, navigate to :menuselection:`Sales app --> Orders --> Quotations`. Select a quotation from
+the list.
+
+After confirming a quotation and validating the delivery, click :guilabel:`Create Invoice`. Indicate
+whether it is a :guilabel:`Regular invoice`, :guilabel:`Down payment (percentage)`, or
+:guilabel:`Down payment (fixed amount)`.
+
+Then click :guilabel:`Create and view invoice`. The recorded taxes can be seen in the
+:guilabel:`Journal Items` tab of the invoice. There will be different taxes depending on the
+location of the :guilabel:`Delivery Address`.
+
+.. image:: avatax_use/journal-items.png
+   :align: center
+   :alt: Journal items highlighted on a invoice in Odoo.
+
+Finally, press the :guilabel:`Confirm` button to complete the invoice and synchronize with the
+AvaTax portal.
+
+.. warning::
+   An invoice cannot be :guilabel:`Reset to draft` because this causes de-synchronization with the
+   AvaTax Portal. Instead, click :guilabel:`Add credit note` and state: `Sync with AvaTax Portal`.
+   See this documentation: :doc:`../../../accounting/customer_invoices/credit_notes`.
+
+Fixed price discounts
+=====================
+
+Add a fixed price discount to a valuable customer by click :guilabel:`Add a line` on the customer's
+invoice. Add the product discount and set the :guilabel:`Price` to either a positive or negative
+value. To recalculate the taxes, click :guilabel:`Compute taxes using Avatax`.
+
+.. tip::
+   Tax calculation can even be done on negative subtotals and credit notes.
+
+Logging
+=======
+
+It is possible to log Avalara/*AvaTax* actions in Odoo for further analysis, or verification of
+functionality. Logging is accessible through the *AvaTax* settings.
+
+To start logging *AvaTax* actions, first, navigate to the :menuselection:`Accounting app -->
+Configuration --> Settings`.
+
+Then, in the :guilabel:`Taxes` section, under the :guilabel:`AvaTax` settings, click
+:guilabel:`Start logging for 30 minutes`.
+
+Upon starting the log process, Odoo will log all Avalara/*AvaTax* actions performed in the database.
+
+To view the logs, click on :guilabel:`Show logs` to the right of the :guilabel:`Start logging for 30
+minutes`. This reveals a detailed list of Avalara/*AvaTax* actions. This list is sortable by the
+following columns:
+
+- :guilabel:`Created on`: timestamp of the *AvaTax* calculation.
+- :guilabel:`Created by`: numeric value of the user in the database.
+- :guilabel:`Database name`: name of the database.
+- :guilabel:`Type`: two values can be chosen for this field, :guilabel:`Server` or
+  :guilabel:`Client`.
+- :guilabel:`Name`: Avalara service name. In this case, it will be *AvaTax*.
+- :guilabel:`Level`: by default, this will be `INFO`.
+- :guilabel:`Path`: indicates the path taken to make the calculation.
+- :guilabel:`Line`: indicates the line the calculation is made on.
+- :guilabel:`Function`: indicates the calculation taken on the line.
+
+.. image:: avatax_use/logging.png
+   :align: center
+   :alt: Avalara logging page with top row of list highlighted.
+
+Click into the log line to reveal another field, called :guilabel:`Message`.
+
+This field populates a raw transcription of the transaction, which involves the creation (or
+adjustment) of a sales invoice using the Avalara *AvaTax* API.
+
+The transaction includes details, such as addresses for shipping from and to, line items describing
+the products or services, tax codes, tax amounts, and other relevant information.
+
+The :guilabel:`Message` contains the calculated taxes for different jurisdictions and confirms the
+creation (or adjustment) of the transaction.
+
+.. tip::
+   Custom fields can be made using Odoo *Studio*. Click the :icon:`fa-ellipsis-v`
+   :guilabel:`(ellipsis)` menu to the far-right of the header row. Then click :icon:`fa-plus`
+   :guilabel:`Add custom field`. This action opens Odoo *Studio*.
+
+.. important::
+   Odoo *Studio* requires a *custom* pricing plan. Consult the database's customer success manager
+   for more information on switching plans. Or to see if Odoo *Studio* is included in the database's
+   current pricing plan. See this documentation: :doc:`../../../../studio`.
+
+.. seealso::
+   - :doc:`../avatax`
+   - :doc:`avalara_portal`
+   - `US Tax Compliance: Avatax elearning video
+     <https://www.odoo.com/slides/slide/us-tax-compliance-avatax-2858?fullscreen=1>`_
+   - :doc:`../fiscal_positions`
+