[IMP] odoo_sh: FAQ more workers

taskid-3433600

closes odoo/documentation#7542

X-original-commit: 2d4a3cc883
Signed-off-by: Audrey Vandromme (auva) <auva@odoo.com>
Signed-off-by: Donatienne Pirlot (dopi) <dopi@odoo.com>

Makefile

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

conf.py

@@ -22,7 +22,7 @@ copyright = 'Odoo S.A.'
 # `version` is the version info for the project being documented, acts as replacement for |version|,
 # also used in various other places throughout the built documents.
 # `release` is the full version, including alpha/beta/rc tags. Acts as replacement for |release|.
-version = release = '17.0'
+version = release = 'master'
 
 # `current_branch` is the technical name of the current branch.
 # E.g., saas-15.4 -> saas-15.4; 12.0 -> 12.0, master -> master (*).
@@ -213,7 +213,6 @@ sphinx.transforms.i18n.docname_to_domain = (
 # is populated. If a version is passed to `versions` but is not listed here, it will not be shown.
 versions_names = {
     'master': "Master",
-    'saas-17.1': "Odoo Online",
     '17.0': "Odoo 17",
     'saas-16.4': "Odoo Online",
     'saas-16.3': "Odoo Online",
@@ -235,8 +234,6 @@ languages_names = {
     'it': 'IT',
     'nl': 'NL',
     'pt_BR': 'PT',
-    'ro': 'RO',
-    'sv': 'SV',
     'uk': 'UA',
     'zh_CN': 'ZH (CN)',
     'zh_TW': 'ZH (TW)'
@@ -447,7 +444,7 @@ def _generate_alternate_urls(app, pagename, templatename, context, doctree):
         """
         _current_lang = app.config.language or 'en'
         # Replace the context value by its upper-cased value ("FR" instead of "fr")
-        context['language'] = languages_names.get(_current_lang, _current_lang.upper())
+        context['language'] = languages_names.get(_current_lang)
         context['language_code'] = _current_lang
 
         # If the list of languages is not set, assume that the project has no alternate language

content/administration.rst

@@ -3,62 +3,20 @@
 :hide-page-toc:
 :show-toc:
 
-===================
-Database management
-===================
+====================
+Install and Maintain
+====================
 
 These guides provide instructions on how to install, maintain and upgrade Odoo databases.
 
 .. seealso::
-    :doc:`History of Versions <administration/supported_versions>`
-
-Installation
-============
-
-Depending on the intended use case, there are multiple ways to install Odoo - or not install it at
-all.
-
-- :doc:`Online <administration/odoo_online>` is the easiest way to use Odoo in production or to try it.
-
-- :doc:`Packaged installers <administration/on_premise/packages>` are suitable for testing Odoo and
-  developing modules. They can be used for long-term production with additional deployment and
-  maintenance work.
-
-- :doc:`Source install <administration/on_premise/source>` provides greater flexibility, as it
-  allows, for example, running multiple Odoo versions on the same system. It is adequate to develop
-  modules and can be used as a base for production deployment.
-
-- A `Docker <https://hub.docker.com/_/odoo/>`_ base image is available for development or
-  deployment.
-
-.. _install/editions:
-
-Editions
-========
-
-There are two different editions.
-
-**Odoo Community** is the free and open-source version of the software, licensed under the `GNU
-LGPLv3 <https://github.com/odoo/odoo/blob/master/LICENSE>`_. It is the core upon which Odoo
-Enterprise is built.
-
-**Odoo Enterprise** is the shared source version of the software, giving access to more
-functionalities, including functional support, upgrades, and hosting. `Pricing
-<https://www.odoo.com/pricing-plan>`_ starts from one app free.
-
-.. tip::
-   :doc:`Switch from Community to Enterprise <administration/on_premise/community_to_enterprise>` at
-   any time (except for the source install).
+    :doc:`History of Versions <administration/maintain/supported_versions>`
 
 
 .. toctree::
     :titlesonly:
 
-    administration/hosting
-    administration/odoo_online
-    administration/odoo_sh
-    administration/on_premise
+    administration/install
+    administration/maintain
     administration/upgrade
-    administration/neutralized_database
-    administration/supported_versions
-    administration/odoo_accounts
+    administration/odoo_sh

content/administration/install.rst

@@ -0,0 +1,50 @@
+:show-content:
+
+=======
+Install
+=======
+
+Depending on the intended use case, there are multiple ways to install Odoo - or not install it at
+all.
+
+- :doc:`Online <install/online>` is the easiest way to use Odoo in production or to try it.
+
+- :doc:`Packaged installers <install/packages>` are suitable for testing Odoo and developing
+  modules. They can be used for long-term production with additional deployment and maintenance
+  work.
+
+- :doc:`Source install <install/source>` provides greater flexibility, as it allows, for example,
+  running multiple Odoo versions on the same system. It is adequate to develop modules and can be
+  used as a base for production deployment.
+
+- A `Docker <https://hub.docker.com/_/odoo/>`_ base image is available for development or
+  deployment.
+
+.. _install/editions:
+
+Editions
+========
+
+There are two different editions.
+
+**Odoo Community** is the free and open-source version of the software, licensed under the `GNU
+LGPLv3 <https://github.com/odoo/odoo/blob/master/LICENSE>`_. It is the core upon which Odoo
+Enterprise is built.
+
+**Odoo Enterprise** is the shared source version of the software, giving access to more
+functionalities, including functional support, upgrades, and hosting. `Pricing
+<https://www.odoo.com/pricing-plan>`_ starts from one app free.
+
+.. tip::
+   :doc:`Switch from Community to Enterprise <maintain/enterprise>` at any time (except for the
+   source install).
+
+.. toctree::
+
+   install/online
+   install/packages
+   install/source
+   install/deploy
+   install/cdn
+   install/email_gateway
+   install/geo_ip

content/administration/install/cdn.rst

@@ -57,7 +57,7 @@ Configure the Odoo instance with the new zone
 In the Odoo :guilabel:`Website` app, go to the :menuselection:`Settings` and then activate the
 :guilabel:`Content Delivery Network (CDN)` setting and copy/paste the :guilabel:`Zone URL` value
 from the earlier step into the :guilabel:`CDN Base URL` field. This field is only visible and
-configurable when the :ref:`developer mode <developer-mode>` is activated.
+configurable when :doc:`Developer Mode <../../applications/general/developer_mode>` is activated.
 
 .. note::
    Ensure that there are two *forward slashes* (`//`) before the :guilabel:`CDN Base URL` and one

content/administration/install/deploy.rst

@@ -3,7 +3,7 @@ System configuration
 ====================
 
 This document describes basic steps to set up Odoo in production or on an
-internet-facing server. It follows :doc:`installation <../on_premise>`, and is
+internet-facing server. It follows :doc:`installation <../install>`, and is
 not generally necessary for a development systems that is not exposed on the
 internet.
 
@@ -334,9 +334,6 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $scheme;
       proxy_set_header X-Real-IP $remote_addr;
-
-      add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
-      proxy_cookie_flags session_id samesite=lax secure;  # requires nginx 1.19.8
     }
 
     # Redirect requests to odoo backend server
@@ -349,8 +346,10 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
       proxy_redirect off;
       proxy_pass http://odoo;
 
+      # Enable HSTS
       add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
-      proxy_cookie_flags session_id samesite=lax secure;  # requires nginx 1.19.8
+      # requires nginx 1.19.8
+      proxy_cookie_flags session_id samesite=lax secure;
     }
 
     # common gzip

content/administration/install/online.rst

@@ -0,0 +1,21 @@
+======
+Online
+======
+
+Online instances are accessed using any web browser and do not require a local installation.
+
+Demo
+----
+
+To quickly try out Odoo, shared `demo <https://demo.odoo.com>`_ instances are available. No
+registration is required, but each instance only lives for a few hours.
+
+Odoo Online
+-----------
+
+`Odoo Online <https://www.odoo.com/trial>`_ provides private instances which are fully managed and
+hosted by Odoo. It can be used for long-term production or to test Odoo thoroughly, including
+customizations that don't require code.
+
+.. note::
+   Odoo Online is incompatible with custom modules or the Odoo App Store.

content/administration/install/packages.rst

@@ -16,8 +16,8 @@ Official **Community** and **Enterprise** packages can be downloaded from the `O
 <https://www.odoo.com/page/download>`_.
 
 .. note::
-   It is required to be logged in as a paying on-premise customer or partner to download the
-   Enterprise packages.
+   It is required to be logged in as a paying customer or partner to download the Enterprise
+   packages.
 
 .. _install/packages/linux:
 

content/administration/install/source.rst

@@ -1,6 +1,6 @@
-==============
-Source install
-==============
+======
+Source
+======
 
 The source 'installation' is not about installing Odoo but running it directly from the source
 instead.
@@ -479,7 +479,7 @@ http://localhost:8069 in a web browser and log into the Odoo database with the b
 account: use `admin` as the email and, again, `admin` as the password.
 
 .. tip::
-   - From there, create and manage new :doc:`users <../../applications/general/users>`.
+   - From there, create and manage new :doc:`users <../../applications/general/users/manage_users>`.
    - The user account used to log into Odoo's web interface differs from the :option:`--db_user
      <odoo-bin -r>` CLI argument.
 

content/administration/maintain.rst

@@ -0,0 +1,18 @@
+:nosearch:
+
+========
+Maintain
+========
+
+.. toctree::
+
+    maintain/domain_names
+    maintain/azure_oauth
+    maintain/google_oauth
+    maintain/mailjet_api
+    maintain/update
+    maintain/enterprise
+    maintain/hosting_changes
+    maintain/odoo_online
+    maintain/on_premise
+    maintain/supported_versions

content/administration/maintain/azure_oauth.rst

@@ -12,7 +12,7 @@ personal email address or an address created by a custom domain.
    <https://learn.microsoft.com/azure/active-directory/develop/quickstart-register-app>`_
 
 .. seealso::
-   - :doc:`/applications/general/users/azure`
+   - :doc:`/applications/general/auth/azure`
    - :doc:`/applications/productivity/calendar/outlook`
 
 Setup in Microsoft Azure Portal
@@ -290,4 +290,4 @@ account`. Odoo will state: :guilabel:`Outlook Token Valid` Now :guilabel:`Test a
 account. The account should be ready to receive email to the Odoo database.
 
 .. seealso::
-   :doc:`email_servers`
+   :doc:`../../applications/general/email_communication/email_servers`

content/administration/maintain/domain_names.rst

@@ -0,0 +1,366 @@
+============
+Domain names
+============
+
+A **domain name** works as an address for your website. It makes the Internet much more accessible
+as it allows users to type a meaningful web address, such as ``www.odoo.com``, rather than its
+server's IP address with a series of numbers.
+
+You can use a custom domain name to access your Odoo database and websites:
+
+- By :ref:`registering a free domain name with Odoo <domain-name/odoo-register>` (for Odoo Online
+  databases)
+- By :ref:`configuring a custom domain that you already own <domain-name/existing>`.
+
+.. note::
+   Odoo Online and Odoo.sh databases, including their websites, use by default a subdomain of
+   ``odoo.com`` for both the URL and the emails (e.g., ``https://example.odoo.com``).
+
+.. important::
+   Odoo offers a :ref:`free custom domain name <domain-name/odoo-register>` to all Odoo Online
+   databases for one year. Visitors can then access your website with an address such as
+   ``www.example.com`` rather than the default ``example.odoo.com``.
+
+.. seealso::
+   - `Odoo Tutorials: Register a Free Domain Name
+     <https://www.odoo.com/slides/slide/register-a-free-domain-name-1663>`_
+   - `Odoo Quick Tips: Get a free domain name! <https://www.youtube.com/watch?v=eAfgeNOHLP4>`_
+
+.. _domain-name/about:
+
+About domain names
+==================
+
+Having a **good domain name** is as important to your branding as the name of your business or
+organization as it is the first thing your visitors will notice. We recommend you keep them *simple,
+short, easy to remember and spell*.
+
+A **subdomain** is a domain that is a part of another domain. It often refers to the additional part
+that comes before the main domain name. Traditionally, most websites use the ``www.`` subdomain,
+but any string of letters can be used as well. You can use subdomains to direct your visitors to
+other websites than your main website or to specific pages (e.g., ``experience.odoo.com`` points to
+a specific page.)
+
+All domain names are referenced in the **Domain Name System**, or **DNS**, which works as a giant
+directory for the Internet. There are many DNS servers, so any modification to the DNS can take up
+to 72 hours to propagate worldwide on all servers.
+
+.. _domain-name/indexing:
+
+Indexing of domain names by search engines
+------------------------------------------
+
+Search engines, such as Google and Bing, rely on web crawlers (:dfn:`robots that explore and analyze
+the web`) to index all websites and their related domain names. These crawlers discover new URLs
+thanks to links on known web pages. As a result, search engines should index domain names
+automatically after a while, as long as their URLs are mentioned elsewhere on the Internet.
+
+Improving the appearance and positioning of web pages on search engines is a practice named "Search
+Engine Optimization" (SEO).
+
+.. tip::
+   Adding relevant content, optimizing metadata, and building high-quality backlinks can all help
+   improve a website's search engine visibility.
+
+Some search engines provide tools for web admins, such as
+`Google Search Console <https://search.google.com/search-console>`_ and
+`Bing Webmaster Tools <https://www.bing.com/webmasters>`_, to help you analyze and improve your
+page ranking. To use these services, you must prove that you are the owner of your domain name. One
+way to verify the ownership of your domain name is by adding a DNS record. You can do this for
+:ref:`domain names registered with Odoo <domain-name/odoo-manage>` and for domain names managed by
+other providers.
+
+.. seealso::
+   - :doc:`/applications/websites/website/pages/seo`
+   - `Google Search Console Help - Verify your site ownership <https://support.google.com/webmasters/answer/9008080>`_
+   - `Bing Webmaster Tools - Add and Verify site <https://www.bing.com/webmasters/help/add-and-verify-site-12184f8b>`_
+
+.. _domain-name/odoo-register:
+
+Register a free domain name with Odoo
+=====================================
+
+You can register a domain name for your Odoo Online database directly from Odoo Website or your
+database manager.
+
+.. important::
+   - Your domain name is **free for one year** if you register it with Odoo!
+   - The domain name is registered with `Gandi <https://www.gandi.net/>`_, the domain name
+     registrar.
+   - You are the owner of the domain name and can use it for other purposes.
+   - Odoo manages payment and technical support for you.
+   - This offer doesn't include any mailbox. However, you can :ref:`configure your MX records
+     <domain-name/odoo-manage>` to use your own email server or solution such as Google Workspace.
+
+To do so, go to :menuselection:`Website --> Domain Name`. Alternatively, open your `database manager
+<https://www.odoo.com/my/databases>`_, click on the :guilabel:`settings` button next to your
+database, then on :guilabel:`Domain names`.
+
+.. image:: domain_names/register-menu.png
+   :align: center
+   :alt: Clicking on Domain Names from an Odoo website
+
+Search for the domain name of your choice to check its availability, then select the one you want to
+register for your website.
+
+.. image:: domain_names/register-search.png
+   :align: center
+   :alt: The search of the domain name example.com shows which associated domains are available.
+
+Next, fill in the form with your information to become the domain name owner.
+
+Your domain name is directly linked to your database, but you still have to :ref:`map your domain
+name with your website <domain-name/website-map>`.
+
+.. note::
+   - Free domain names are also available for free Odoo Online databases (if you installed one app
+     only, for example). In this case, Odoo reviews your request and your website to avoid abuse.
+     This process can take several days due to the success of the offer.
+   - This is not available for Odoo.sh databases yet.
+
+.. _domain-name/odoo-manage:
+
+Manage your domain name registered with Odoo
+--------------------------------------------
+
+To manage the DNS records of your domain name registered with Odoo or to visualize the contacts
+associated with it, open your `database manager <https://www.odoo.com/my/databases>`_, click on the
+:guilabel:`settings` button next to your database, on :guilabel:`Domain names`, and then on
+:guilabel:`Contacts` or :guilabel:`DNS`.
+
+.. image:: domain_names/manage.png
+   :align: center
+   :alt: Management of the domain names linked to an Odoo database
+
+.. note::
+   Please `submit a support ticket <https://www.odoo.com/help>`_ if you need further assistance to
+   manage your domain name.
+
+.. _domain-name/existing:
+
+Configure your existing domain name
+===================================
+
+If you already own a domain name, you can use it to point to your website.
+
+To avoid any issue with the :ref:`SSL certificate validation <domain-name/ssl>`, we highly recommend
+that you proceed with the following actions in this order:
+
+#. :ref:`Add a CNAME record <domain-name/cname>` on your domain name's DNS zone.
+#. :ref:`Map your domain name with your Odoo database <domain-name/db-map>`.
+#. :ref:`Map your domain name with your Odoo website <domain-name/website-map>`.
+
+.. _domain-name/cname:
+
+Add a CNAME record
+------------------
+
+A **CNAME record** is a type of DNS record that points to the domain of another website rather than
+directly to an IP address.
+
+You need a CNAME record that points to your Odoo database. The requirements are detailed in your
+database manager.
+
+.. tabs::
+
+   .. group-tab:: Odoo Online
+
+      The target address is the current address of your database, as defined at its creation (e.g.,
+      ``example.odoo.com``)
+
+   .. group-tab:: Odoo.sh
+
+      Your project's main address is defined in :menuselection:`Settings --> Project Name`.
+
+      If you want to target a specific branch (production, staging or development), go to
+      :menuselection:`Branches --> select your branch --> Settings --> Custom domains`, and click on
+      :guilabel:`How to set up my domain?`. A message indicates which address your CNAME record
+      should target.
+
+#. Open your domain name's manager dashboard.
+#. Open the **DNS zone** management page for the domain name you want to configure.
+#. Create a **CNAME record** pointing to the address of your database.
+
+While Odoo suggests creating a CNAME record for your ``www.`` subdomain (``www.example.com``), you
+can of course use any domain name of your choice, with any subdomain (e.g.,
+``anything.example.com``).
+
+.. example::
+   You own the domain name ``example.com``, and you have an Odoo Online database at the address
+   ``example.odoo.com``. You want to access your Odoo database primarily with the domain
+   ``www.example.com`` but also with the :ref:`naked domain <domain-name/naked-domain>`
+   ``example.com``.
+
+   To do so, you create a CNAME record for the ``www`` subdomain, with ``example.odoo.com`` as the
+   target. The DNS zone manager generates the following rule and adds it to your DNS zone: ``www IN
+   CNAME example.odoo.com.``
+
+   You also create a redirection from ``example.com`` to ``wwww.example.com``.
+
+   Your new DNS records are propagated to all DNS servers.
+
+.. note::
+   Here are some specific guidelines to create a CNAME record:
+
+   - `GoDaddy <https://www.godaddy.com/help/add-a-cname-record-19236>`_
+   - `Namecheap <https://www.namecheap.com/support/knowledgebase/article.aspx/9646/2237/how-to-create-a-cname-record-for-your-domain>`_
+   - `OVH <https://docs.ovh.com/us/en/domains/web_hosting_how_to_edit_my_dns_zone/#add-a-new-dns-record>`_
+   - `CloudFlare <https://support.cloudflare.com/hc/en-us/articles/360019093151>`_
+   - `Google Domains <https://support.google.com/domains/answer/3290350?hl=en>`_
+
+.. _domain-name/naked-domain:
+
+Naked domain
+~~~~~~~~~~~~
+
+A **naked domain** is a domain name that doesn't have any subdomain at the beginning of the address
+(e.g., ``odoo.com`` instead of ``www.odoo.com``).
+
+You may want your naked domain to redirect to your website as some visitors may not type the full
+domain name to access your website.
+
+#. Open your domain name's manager dashboard.
+#. Create a **redirection** from the naked domain (``example.com``) to your main domain name
+   (``www.example.com``).
+
+.. note::
+   Depending on your domain name registrar, this redirection may be already pre-configured.
+
+.. _domain-name/db-map:
+
+Map your domain name with your Odoo database
+--------------------------------------------
+
+.. tabs::
+
+   .. group-tab:: Odoo Online
+
+      Open your `database manager <https://www.odoo.com/my/databases>`_, click on the
+      :guilabel:`settings` button next to your database, on :guilabel:`Domain names`, and then on
+      :guilabel:`Use my own domain` at the bottom of the right column.
+
+      Type the domain name you want to add to this database, then click on :guilabel:`Verify` to
+      check if the CNAME record is correctly configured. Once done, click on :guilabel:`I confirm,
+      it's done`.
+
+      .. image:: domain_names/online-map.png
+         :align: center
+         :alt: Verification of the CNAME records of a domain name before mapping it with a database
+
+   .. group-tab:: Odoo.sh
+
+      Go to :menuselection:`Branches --> select your branch --> Settings --> Custom domains`, type
+      the domain name you want to add to this database, then click on :guilabel:`Add domain`.
+
+      .. image:: domain_names/odoo-sh-map.png
+         :align: center
+         :alt: Mapping a domain name with an Odoo.sh branch
+
+      .. seealso::
+         - :ref:`Odoo.sh branches: settings tab <odoosh-gettingstarted-branches-tabs-settings>`
+
+.. warning::
+   Make sure to :ref:`add a CNAME record <domain-name/cname>` to your domain name's DNS **before**
+   mapping your domain name with your Odoo database.
+
+   Failing to do so may impede the validation of the :ref:`SSL certificate <domain-name/ssl>` and
+   would result in a *certificate name mismatch* error. This is often displayed by web browsers as a
+   warning such as *"Your connection is not private"*.
+
+   If this is the case and you have added the domain name to your database's settings less than five
+   days ago, wait 24 hours as the validation may still happen. Otherwise, please `submit a support
+   ticket <https://www.odoo.com/help>`_ including screenshots of your CNAME records.
+
+.. _domain-name/ssl:
+
+SSL encryption (HTTPS protocol)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**SSL encryption** is an encryption-based Internet security protocol. It allows your visitors to
+navigate your website through a secure connection, which appears as an ``https://`` protocol at the
+beginning of your web address, rather than a non-secure ``http://`` protocol.
+
+Odoo generates a separate SSL certificate for each domain :ref:`mapped in the database manager
+<domain-name/db-map>`, using integration with `Let's Encrypt Certificate Authority and ACME protocol
+<https://letsencrypt.org/how-it-works/>`_.
+
+.. note::
+   - The certificate generation may take up to 24h.
+   - Several attempts to validate your certificate are made during the five days following the
+     moment you add your domain name in your database's settings.
+   - If you already use another service, you can keep using it or simply change for Odoo.
+
+.. _domain-name/web-base-url:
+
+Web base URL of a database
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. note::
+   If you have Odoo Website, you can disregard this part and directly :ref:`map your domain name
+   with your website <domain-name/website-map>`.
+
+The **web base URL** of a database, or **root URL** affects your main website address and all the
+links sent to your customers (e.g., quotations, portal links, etc.).
+
+To configure it, access your Odoo database with your custom address, then log in as an administrator
+of your database (any user in the *Settings* group) from the login screen.
+
+.. warning::
+   Connecting to your database with the original Odoo subdomain address (e.g., ``example.odoo.com``
+   also updates the web base URL of your database. See below to prevent these automatic updates.
+
+Alternatively, you can do it manually. To do so, activate the :ref:`developer mode
+<developer-mode>`, then go to :menuselection:`Settings --> Technical --> System Parameters`.
+
+Find the key called ``web.base.url`` (or create it if it does not exist) and enter the full address
+of your website as value, such as ``https://www.example.com``.
+
+.. note::
+   The URL must include the protocol ``https://`` (or ``http://``) and must not end with a slash
+   (``/``).
+
+To prevent the automatic update of the web base URL when an administrator logs in the database, you
+can create the following System Parameter:
+
+- key: ``web.base.url.freeze``
+- value: ``True``
+
+.. _domain-name/website-map:
+
+Map your domain name with your website
+======================================
+
+Mapping your domain name to your website isn't the same as mapping it with your database:
+
+- It defines your domain name as the main one for your website, helping search engines to index your
+  website properly.
+- It defines your domain name as the base URL for your database, including the portal links sent by
+  email to your customers.
+- If you have multiple websites, it maps your domain name with the appropriate website.
+
+Go to :menuselection:`Website --> Configuration --> Settings --> Website Info`. If you have multiple
+websites, select the one you want to configure.
+
+In the :guilabel:`Domain` field, fill in the web address of your website (e.g.,
+``https://www.example.com``) and click on :guilabel:`Save`.
+
+.. image:: domain_names/website-settings.png
+   :align: center
+   :alt: Configuring https://www.example.com as the Domain of the website
+
+.. warning::
+   Mapping your domain name with your Odoo website prevents Google from indexing both your custom
+   domain name ``www.example.com`` and your original odoo database address ``example.odoo.com``.
+
+   If both addresses are already indexed, it may take some time before Google removes the indexation
+   of the second address. You may also try using the `Google Search Console
+   <https://search.google.com/search-console>`_ to fix this.
+
+.. note::
+   If you have multiple websites and companies on your database, make sure that you select the
+   right :guilabel:`Company` in the website settings, next to the :guilabel:`Domain` settings. Doing
+   so indicates Odoo which URL to use as the :ref:`base URL <domain-name/web-base-url>` according to
+   the company in use.
+
+.. seealso::
+  - :doc:`/applications/general/email_communication/email_servers`

content/administration/maintain/enterprise.rst

@@ -11,8 +11,8 @@ In any case the basic guidelines are:
 
 * Backup your community database
 
-  .. image:: community_to_enterprise/db_manager.png
-     :class: img-fluid
+  .. image:: enterprise/db_manager.png
+    :class: img-fluid
 
 * Shutdown your server
 
@@ -22,8 +22,8 @@ In any case the basic guidelines are:
 
 * Enter your Odoo Enterprise Subscription code
 
-.. image:: community_to_enterprise/enterprise_code.png
-   :class: img-fluid
+.. image:: enterprise/enterprise_code.png
+  :class: img-fluid
 
 On Linux, using an installer
 ============================
@@ -61,7 +61,7 @@ have your own favourite. You may need to adapt sections to your usual workflow.
 
 * Shutdown your server
 * Backup your community database
-* Update the ``--addons-path`` parameter of your launch command (see :doc:`../on_premise/source`)
+* Update the ``--addons-path`` parameter of your launch command (see :doc:`../install/source`)
 * Install the web_enterprise module by using
 
   .. code-block:: console
@@ -82,7 +82,7 @@ On Windows
 * Uninstall Odoo Community (using the Uninstall executable in the installation folder) -
   PostgreSQL will remain installed
 
-  .. image:: community_to_enterprise/windows_uninstall.png
+  .. image:: enterprise/windows_uninstall.png
     :class: img-fluid
 
 * Launch the Odoo Enterprise Installer and follow the steps normally. When choosing
@@ -90,8 +90,8 @@ On Windows
   (this folder still contains the PostgreSQL installation).
   Uncheck ``Start Odoo`` at the end of the installation
 
-  .. image:: community_to_enterprise/windows_setup.png
-     :class: img-fluid
+  .. image:: enterprise/windows_setup.png
+   :class: img-fluid
 
 * Using a command window, update your Odoo Database using this command (from the Odoo
   installation path, in the server subfolder)

content/administration/maintain/google_oauth.rst

@@ -12,7 +12,7 @@ email address or an address created by a custom domain.
    <https://support.google.com/cloud/answer/6158849>`_ on setting up OAuth.
 
 .. seealso::
-   - :doc:`/applications/general/users/google`
+   - :doc:`/applications/general/auth/google`
    - :doc:`/applications/productivity/calendar/google`
 
 Setup in Google

content/administration/maintain/hosting_changes.rst

@@ -1,9 +1,4 @@
-=======
-Hosting
-=======
-
-.. _hosting/change-solution:
-
+=======================
 Change hosting solution
 =======================
 
@@ -20,7 +15,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 of the database <on-premise/duplicate>`.
+#. Create a :ref:`duplicate <duplicate_premise>` of the database.
 #. 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:

content/administration/maintain/mailjet_api.rst

@@ -210,8 +210,9 @@ Connection`.
 
    For more information see :ref:`Using a default email address <email_communication/default>`.
 
-   The :guilabel:`System Parameters` can be accessed by activating the :ref:`developer mode
-   <developer-mode>`.
+   The :guilabel:`System Parameters` can be accessed by activating
+   :doc:`../../applications/general/developer_mode` in the :menuselection:`Settings --> Technical
+   --> Parameters --> System Parameters` menu.
 
 Once the setup is complete, the Odoo database is ready to use the Mailjet email server for mass
 mailing or transactional emails!

content/administration/maintain/odoo_online.rst

@@ -1,21 +1,6 @@
-===========
-Odoo Online
-===========
-
-`Odoo Online <https://www.odoo.com/trial>`_ provides private databases which are fully managed and
-hosted by Odoo. It can be used for long-term production or to test Odoo thoroughly, including
-customizations that don't require code.
-
-.. note::
-   Odoo Online is incompatible with custom modules or the Odoo App Store.
-
-Odoo Online databases are accessed using any web browser and do not require a local installation.
-
-To quickly try out Odoo, shared `demo <https://demo.odoo.com>`_ instances are available. No
-registration is required, but each instance only lives for a few hours.
-
-Database management
-===================
+===============================
+Odoo Online database management
+===============================
 
 To manage a database, go to the `database manager <https://www.odoo.com/my/databases>`_ and sign in
 as the database administrator.
@@ -84,11 +69,10 @@ Download a ZIP file containing a backup of the database.
 Domain names
 ============
 
-Use a custom :doc:`domain name </applications/websites/website/configuration/domain_names>` to
-access the database via another URL.
+Use a custom :doc:`domain name <domain_names>` to access the database via another URL.
 
 .. tip::
-   You can :ref:`register a domain name for free <domain-name/register>`.
+   You can :ref:`register a domain name for free <domain-name/odoo-register>`.
 
 .. _odoo_online/tags:
 
@@ -145,5 +129,5 @@ users, click :guilabel:`Add more users`.
 To remove users, select them and click :guilabel:`Remove`.
 
 .. seealso::
-   - :doc:`/applications/general/users`
-   - :doc:`odoo_accounts`
+   - :doc:`/applications/general/users/manage_users`
+   - :doc:`/applications/general/users/odoo_account`

content/administration/maintain/on_premise.rst

@@ -0,0 +1,168 @@
+==============================
+On-premise database management
+==============================
+
+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).
+
+Registration Error Message
+--------------------------
+
+If you are unable to register your database, you will likely encounter this
+message:
+
+.. image:: on_premise/error_message_sub_code.png
+   :align: center
+   :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
+       :align: center
+
+    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
+       :align: center
+
+* 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
+       :align: center
+
+    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
+   :align: center
+   :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
+   :align: center
+   :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:
+
+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).
+
+.. image:: on_premise/db_manager.gif
+   :align: center
+
+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.
+
+.. note::
+   From July 2016 onward, Odoo 9 now automatically change the uuid of a duplicated database; a
+   manual operation is no longer required.
+
+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/db_uuid.png
+   :align: center

content/administration/maintain/supported_versions.rst

@@ -13,7 +13,7 @@ Odoo provides support and bug fixing **for the 3 last major versions** of Odoo.
    <odoo_online>` hosting every two months. Odoo Online users can then benefit from the latest
    features of Odoo.
 
-   - Admins of Odoo Online databases are invited to :doc:`upgrade <upgrade>` them regularly.
+   - Admins of Odoo Online databases are invited to :doc:`upgrade <../upgrade>` them regularly.
    - Online versions are *not* released for Odoo.sh and On-Premise installations.
    - Online versions are listed below as *SaaS*.
 
@@ -31,18 +31,12 @@ This matrix shows the support status of every version.
      - On-Premise
      - Release date
      - End of support
-   * - Odoo saas~17.1
-     - |green|
-     - N/A
-     - N/A
-     - January 2024
-     -
    * - **Odoo 17.0**
      - |green|
      - |green|
      - |green|
      - November 2023
-     - October 2026 (planned)
+     - November 2026 (planned)
    * - Odoo saas~16.4
      - |green|
      - N/A

content/administration/maintain/update.rst

@@ -46,7 +46,7 @@ Updating Odoo is accomplished by simply reinstalling the latest version of your
 Edition on top of your current installation. This will preserve your data without any alteration,
 as long as you do not uninstall PostgreSQL (the database engine that comes with Odoo).
 
-The main reference for updating is logically our :doc:`installation guide <../on_premise>`,
+The main reference for updating is logically our :doc:`installation guide <../install>`,
 which explains the common installation methods.
 
 Updating is also most appropriately accomplished by the person who deployed Odoo initially,

content/administration/neutralized_database.rst

@@ -1,35 +0,0 @@
-====================
-Neutralized database
-====================
-
-A neutralized database is a non-production database on which several parameters are deactivated.
-This enables one to carry out tests without the risk of launching specific automated processes that
-could impact production data (e.g., sending emails to customers). Live access is removed and
-turned into a testing environment.
-
-.. note::
-   **Any testing database created is a neutralized database:**
-
-   - testing backup databases
-   - duplicate databases
-   - for Odoo.sh: staging and development databases
-
-.. important::
-   A database can also be neutralized when upgrading, as it is vital to do some tests before
-   switching to a new version.
-
-Deactivated features
-====================
-
-Here is a non-exhaustive list of the deactivated parameters:
-
-- all planned actions (e.g., automatic invoicing of subscriptions, mass mailing, etc.)
-- outgoing emails
-- bank synchronization
-- payment providers
-- delivery methods
-- :abbr:`IAP (In-App Purchase)` tokens
-
-.. note::
-   **A red banner at the top of the screen is displayed on the neutralized database so that it can
-   be seen immediately.**

content/administration/odoo_sh/advanced/frequent_technical_questions.rst

@@ -29,3 +29,24 @@ 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.
+
+How do I know if I need more workers ?
+--------------------------------------
+
+Workers are abstract units of resources allocated to your database. The more workers you have the more it can be accessed concurrently.
+
+As a general rule of thumb, you should allocate about **1 worker per 25 users and 1 worker for every 5000 daily visitors**. However, this can vary considerably based on database usage, website characteristics, and code customizations.
+
+Speed is only impacted if you have too much concurrency.
+
+If things are getting slow, here are a couple of indications to tell if it's due to a high concurrency.
+
+- When things gets slow, **everything is slowed down**, not just specific operations.
+- **The slowness comes and goes**, typically it's better outside of business hours. (There can be other reasons for this as well.)
+- :ref:`Open your monitoring <odoosh-gettingstarted-branches-tabs-monitoring>`, there is a graph indicating the number of **"concurrent requests (max)"**. This graphs is often high or shows a flat upper bound during a prolonged period of time.
+- Some requests get a **"429 Too Many Requests"** response code.
+
+If you have these symptoms it's advisable to try increasing your workers.
+
+.. warning::
+    Sometimes this high concurrency is temporary or illegitimate, it's possible your website is being crawled or that you have misconfigured third party applications excessively sollicitating your database. To identify this, have a look at the IP adresses in your odoo logs to see if some are flooding.

content/administration/odoo_sh/getting_started/branches.rst

@@ -208,6 +208,8 @@ You can also open terminals, Python consoles and even Odoo Shell consoles.
 You can open multiple tabs and drag-and-drop them to arrange the layout as you wish,
 for instance side by side.
 
+.. _odoosh-gettingstarted-branches-tabs-monitoring:
+
 Monitoring
 ----------
 

content/administration/odoo_sh/getting_started/create.rst

@@ -91,7 +91,7 @@ Import your database
 ====================
 
 You can import your database in your Odoo.sh project as long as it is in a :doc:`supported version
-</administration/supported_versions>` of Odoo.
+</administration/maintain/supported_versions>` of Odoo.
 
 Push your modules in production
 -------------------------------
@@ -202,4 +202,4 @@ therefore removed, as you can only have one database linked per subscription.
 
 If you plan to make it your production, unlink your former database from the subscription, and
 register the newly imported database. Read the :doc:`database registration documentation
-<../../on_premise>` for instructions.
+<../../maintain/on_premise>` for instructions.

content/administration/odoo_sh/getting_started/first_module.rst

@@ -85,7 +85,7 @@ From the Odoo.sh editor, in a terminal:
 
   $ odoo-bin scaffold my_module ~/src/user/
 
-Or, from your computer, if you have an :doc:`installation of Odoo <../../on_premise/source>`:
+Or, from your computer, if you have an :doc:`installation of Odoo <../../install/source>`:
 
 .. code-block:: bash
 

content/administration/on_premise.rst

@@ -1,123 +0,0 @@
-:show-content:
-
-==========
-On-premise
-==========
-
-Register a database
-===================
-
-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.
-
-.. tip::
-   The expiration date is also displayed at the bottom of the Settings page.
-
-.. _on-premise/duplicate:
-
-Duplicate a database
-====================
-
-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.
-
-Common error messages and solutions
-===================================
-
-Registration error
-------------------
-
-In case of a registration error, the following message should be displayed.
-
-.. image:: on_premise/error-message-sub-code.png
-   :alt: Database registration error message
-
-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:
-
-  - `services.odoo.com` on port `443` (or `80`)
-  - for older deployments, `services.openerp.com` on port `443` (or `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.
-
-.. important::
-   If you are on a monthly subscription plan, the database will automatically update to reflect the
-   added user(s). If you are on a yearly or multi-year plan, an expiration banner will appear in the
-   database. You can create the upsell quotation by clicking the banner to update the subscription
-   or `send a support ticket <https://www.odoo.com/help>`_ to resolve the issue.
-
-Once your database has the correct number of users, the expiration message disappears automatically
-after a few days, when the next verification occurs.
-
-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::
-
-   on_premise/packages
-   on_premise/source
-   on_premise/update
-   on_premise/deploy
-   on_premise/email_gateway
-   on_premise/geo_ip
-   on_premise/community_to_enterprise

content/administration/upgrade.rst

@@ -5,8 +5,8 @@ Upgrade
 .. _administration/upgrade:
 
 An upgrade is the process of moving your database from an older version to a newer :doc:`supported
-version <supported_versions>` (e.g., Odoo 14.0 to Odoo 16.0). Frequently upgrading is essential as
-each version comes with new and improved features, bug fixes, and security patches.
+version <maintain/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.
 
 .. _upgrade_faq/rolling_release:
 
@@ -33,9 +33,9 @@ each version comes with new and improved features, bug fixes, and security patch
 An upgrade does not cover:
 
   - Downgrading to a previous version of Odoo
-  - :doc:`Switching editions <on_premise/community_to_enterprise>` (e.g., from Community to
-    Enterprise)
-  - :ref:`Changing hosting type <hosting/change-solution>` (e.g., from on-premise to Odoo Online)
+  - :doc:`Switching editions <maintain/enterprise>` (e.g., from Community to Enterprise)
+  - :doc:`Changing hosting type </administration/maintain/hosting_changes>` (e.g., from on-premise
+    to Odoo Online)
   - Migrating from another ERP to Odoo
 
 .. warning::
@@ -404,4 +404,4 @@ The following upgrade-related services are **not** included:
 
 .. seealso::
    - :doc:`Odoo.sh documentation <odoo_sh>`
-   - :doc:`Supported Odoo versions <supported_versions>`
+   - :doc:`Supported Odoo versions <maintain/supported_versions>`

content/applications.rst

@@ -14,7 +14,6 @@ Discover our user guides and configuration tutorials per application.
 .. toctree::
     :maxdepth: 2
 
-    applications/essentials
     applications/finance
     applications/sales
     applications/websites
@@ -23,5 +22,4 @@ Discover our user guides and configuration tutorials per application.
     applications/marketing
     applications/services
     applications/productivity
-    applications/studio
     applications/general

content/applications/essentials.rst

@@ -1,11 +0,0 @@
-===============
-Odoo essentials
-===============
-
-.. toctree::
-
-   essentials/activities
-   essentials/reporting
-   essentials/search
-   essentials/export_import_data
-   essentials/in_app_purchase

content/applications/essentials/in_app_purchase.rst

@@ -1,192 +0,0 @@
-=====================
-In-app purchase (IAP)
-=====================
-
-.. |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::
-   Users with an Enterprise version of Odoo Online get free credits to test IAP features.
-
-.. _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 provided 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.
-
-For more information on every service currently available, 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:`📱 (phone) 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:
-
-   #. 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.
-   #. Hover the mouse over the :guilabel:`Phone` or :guilabel:`Mobile` field, and a :guilabel:`📱
-      (phone) SMS` icon appears to the right.
-   #. Click the :guilabel:`📱 (phone) SMS` icon, and a :guilabel:`Send SMS Text Message` pop-up
-      window appears.
-   #. Type a message in the :guilabel:`Message` field of the :guilabel:`Send SMS Text Message`
-      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 </applications/sales/crm/acquire_leads/lead_mining>`
-   - :doc:`Enrich your contacts base with Partner Autocomplete
-     </applications/sales/crm/optimize/partner_autocomplete>`
-   - :doc:`SMS essentials </applications/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
-   </applications/marketing/sms_marketing/pricing/pricing_and_faq>` documentation.
-
-.. _iap/buying_credits:
-
-Buy credits
------------
-
-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 --> Search IAP --> View My Services`.
-
-Doing so reveals an :guilabel:`IAP Account` 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:
-
-#. Go to the :menuselection:`Settings application`.
-#. Type `IAP` in the search bar.
-#. Click :guilabel:`View My Services`.
-
-   .. image:: in_app_purchase/view-services.png
-      :align: center
-      :alt: The Settings app showing the Odoo IAP heading and View My Services button.
-
-#. Doing so reveals an :guilabel:`IAP Account` 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.
-#. On the :guilabel:`Account Information` page, click the :guilabel:`Buy Credit` button.
-
-   .. image:: in_app_purchase/account-info.png
-      :align: center
-      :alt: The Account Information page for an IAP service showing the 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.
-
-   .. 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.
-
-#. Once the transaction is complete, the credits are available for use in the database.
-
-.. _in_app_purchase/low-credits:
-
-Low-credit notification
-~~~~~~~~~~~~~~~~~~~~~~~
-
-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:
-
-#. Go to the :menuselection:`Settings application`.
-#. Type `IAP` in the search bar.
-#. Click :guilabel:`View My Services`.
-#. 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 :guilabel:`Account Information`
-   page.
-#. On the :guilabel:`Account Information` page, tick the :guilabel:`Warn Me` box. Doing so reveals
-   two fields on the form: :guilabel:`Threshold` and :guilabel:`Warning Email`.
-
-   .. image:: in_app_purchase/low-credits.png
-      :align: center
-      :alt: Odoo will send an email alert when credits for this service fall below the threshold.
-
-#. In the :guilabel:`Threshold` field, enter an amount of credits Odoo should use as the minimum
-   threshold for this service.
-#. In the :guilabel:`Warning Email` field, enter the email address that should receive the
-   notification.
-
-Odoo sends a low-credit alert to the :guilabel:`Warning Email` when the balance of credits falls
-below the amount listed as the :guilabel:`Threshold`.

content/applications/finance.rst

@@ -8,5 +8,8 @@ Finance
 
     finance/accounting
     finance/expenses
+    finance/documents
+    finance/sign
+    finance/spreadsheet
     finance/payment_providers
     finance/fiscal_localizations

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

@@ -53,7 +53,7 @@ Resulting entry
    The resulting entry section on the top right displays the selected bank transaction matched with
    the counterpart entries and includes any remaining debits or credits. In this section, you can
    validate the reconciliation or mark it as :guilabel:`To Check`. Any :ref:`reconciliation model
-   buttons <reconciliation/button>` are also available in the resulting entry section.
+   buttons <reconciliation_models_button>` are also available in the resulting entry section.
 
 Reconcile transactions
 ======================
@@ -62,13 +62,13 @@ Transactions can be matched automatically with the use of :doc:`reconciliation m
 <reconciliation_models>`, or they can be matched with :ref:`existing entries
 <reconciliation/existing-entries>`, :ref:`batch payments <reconciliation/batch-payments>`,
 :ref:`manual operations <reconciliation/manual-operations>`, and :ref:`reconciliation model buttons
-<reconciliation/button>`.
+<reconciliation_models_button>`.
 
 #. Select a transaction among unmatched bank transactions.
 #. Define the counterpart. There are several options for defining a counterpart, including
    :ref:`matching existing entries <reconciliation/existing-entries>`, :ref:`manual operations
    <reconciliation/manual-operations>`, :ref:`batch payments <reconciliation/batch-payments>`, and
-   :ref:`reconciliation model buttons <reconciliation/button>`.
+   :ref:`reconciliation model buttons <reconciliation_models_button>`.
 #. If the resulting entry is not fully balanced, balance it by adding another existing counterpart
    entry or writing it off with a :ref:`manual operation <reconciliation/manual-operations>`.
 #. Click the :guilabel:`Validate` button to confirm the reconciliation and move to the next
@@ -90,8 +90,8 @@ Match existing entries
 ----------------------
 
 This tab contains matching entries Odoo automatically pre-selects according to the reconciliation
-models. The entry order is based on :doc:`reconciliation models <reconciliation_models>`, with
-suggested entries appearing first.
+models. The entry order is based on :ref:`reconciliation models <reconciliation_models_suggestion>`,
+with suggested entries appearing first.
 
 .. tip::
    The search bar within the :guilabel:`Match Existing Entries` tab allows you to search for
@@ -130,11 +130,10 @@ of the relevant optional fields.
    .. image:: reconciliation/fully-paid.png
       :alt: Click on fully paid to manually set an invoice as entirely paid.
 
-.. _reconciliation/button:
 
 Reconciliation model buttons
 ----------------------------
 
-Use a :doc:`reconciliation model <reconciliation_models>` button for manual operations that are
-frequently used. These custom buttons allow you to quickly reconcile bank transactions manually and
-can also be used in combination with existing entries.
+Use a :ref:`reconciliation model button <reconciliation_models_button>` for manual operations that
+are frequently used. These custom buttons allow you to quickly reconcile bank transactions manually
+and can also be used in combination with existing entries.

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

@@ -1,123 +1,129 @@
 =====================
-Reconciliation models
+Reconciliation Models
 =====================
 
-Reconciliation models are used to automate the :doc:`bank reconciliation <reconciliation>` process,
-which is especially handy when dealing with recurring entries like bank fees. Reconciliation models
-can also be helpful in handling :doc:`cash discounts <../customer_invoices/cash_discounts>`.
+Once the bank statements are correctly imported, it is essential to *reconcile* the records properly
+and ensure all *Journal Entries* are balanced and in agreement. To ease and speed up the
+reconciliation process, you can configure **Reconciliation Models**, which are particularly useful
+with recurrent entries such as bank fees.
 
-Each model is created based on a :ref:`model type <models/type>` and :guilabel:`bank transaction
-conditions`.
+.. todo:: Add a link to the Reconciliation process in the paragraph above, once the doc will have
+   been updated.
 
-.. seealso::
-   - :doc:`bank_synchronization`
-   - `Odoo Tutorials: Reconciliation models <https://www.odoo.com/slides/slide/reconciliation-models-1841?fullscreen=1>`_
+.. note::
+   Reconciliation Models are also useful to handle *Cash Discounts*. Please refer to
+   :doc:`this documentation <../customer_invoices/cash_discounts>` for more
+   information.
 
-.. _models/type:
+.. _reconciliation_models_types:
 
-Reconciliation model types
-==========================
+Types of Reconciliation Models
+==============================
 
-The reconciliation models are available by going to :menuselection:`Accounting --> Configuration
---> Banks: Reconciliation Models`. For each reconciliation model, a :guilabel:`Type` must be set.
-Three types of models exist:
+There are three types of Reconciliation Models:
 
-- :guilabel:`Button to generate counterpart entry`: a button is created in the resulting entry
-  section of the bank reconciliation view. If clicked, this button generates a counterpart entry to
-  reconcile with the active transaction based on the rules set in the model. The rules specified in
-  the model determine the counterpart entry's account(s), amount(s), label(s), and analytic
-  distribution;
-- :guilabel:`Rule to suggest counterpart entry`: used for recurring transactions to match the
-  transaction to a new entry based on conditions that must match the information on the transaction;
-- :guilabel:`Rule to match invoices/bills`: used for recurring transactions to match the transaction
-  to existing invoices, bills, or payments based on conditions that must match the information on
-  the transaction.
+#. :ref:`Write-off Button <reconciliation_models_button>`
+#. :ref:`Suggestion of counterpart values <reconciliation_models_suggestion>`
+#. :ref:`Match existing invoices/bills <reconciliation_models_match>`
 
-Default reconciliation models
-=============================
+.. _reconciliation_models_button:
 
-In Odoo, different models are available by default depending on the company's fiscal localization.
-These can be updated if needed. Users can also create their own reconciliation models by clicking
-:guilabel:`New`.
+Manually create a write-off on clicked button
+---------------------------------------------
+
+When you are reconciling an entry with an *Open Balance*, you can use the buttons available under
+the *Manual Operations* tab to pre-fill all the values automatically, before validating the
+reconciliation. Each button is a different Reconciliation Model.
+
+.. image:: reconciliation_models/reconciliation_models_button.png
+   :align: center
+   :alt: Example of a Reconciliation Model with a write-off button in Odoo Accounting
+
+.. _reconciliation_models_suggestion:
+
+Suggest counterpart values
+--------------------------
+
+This type of Reconciliation Model suggests immediately counterpart values that only need to be
+validated. This automation is based on a set of rules defined in the reconciliation model.
+
+.. image:: reconciliation_models/reconciliation_models_suggestion.png
+   :align: center
+   :alt: Example of a Reconciliation Model that suggests counterpart values in Odoo Accounting
+
+.. _reconciliation_models_match:
+
+Match existing invoices/bills
+-----------------------------
+
+This type of Reconciliation Model automatically selects the right Customer Invoice or Vendor Bill
+that matches the payment. All that is left to do is to validate the entry. This automation is based
+on a set of rules defined in the reconciliation model.
+
+.. image:: reconciliation_models/reconciliation_models_match.png
+   :align: center
+   :alt: Example of a Reconciliation Model that matches existing invoices and bills automatically
+         in Odoo Accounting
+
+Configuration
+=============
+
+To manage or create new **Reconciliation Models**, go to :menuselection:`Accounting -->
+Reconciliation --> Reconciliation Models`. Alternatively, you can also open this menu from the
+Accounting Overview, by going to your Bank Journal card, clicking on the three little dots, and then
+on *Reconciliation Models*.
+
+.. image:: reconciliation_models/reconciliation_models_overview.png
+   :align: center
+   :alt: Open the Reconciliation Model menu from the overview dashboard in Odoo Accounting
 
 .. important::
-   If a record matches with several reconciliation models, the first one in the *sequence* of models
-   is applied. You can rearrange the order by dragging and dropping the handle next to the name.
+   The first entry, named *Invoices Matching Rule*, is the one responsible for the current matching
+   of invoices and bills. Therefore, it is advised to leave it at the top of the list and not to
+   delete it.
 
-   .. image:: reconciliation_models/list-view.png
-      :alt: Rearrange the sequence of models in the list view.
+Open the model you want to modify, or click on *Create* to create a new one, then fill out the form.
 
-Invoices/Bills perfect match
-----------------------------
+Type
+----
 
-This model should be at the top of the *sequence* of models, as it enables Odoo to suggest matching
-existing invoices or bills with a bank transaction based on set conditions.
-
-.. image:: reconciliation_models/invoices-bills-perfect-match.png
-   :alt: Set rules to trigger the reconciliation.
-
-Odoo automatically reconciles the payment when the :guilabel:`Auto-validate` option is selected, and
-the model conditions are perfectly met. In this case, it expects to find on the bank statement's
-line the invoice/payment's reference (as :guilabel:`Label` is selected) and the partner's name
-(as :guilabel:`Partner is set` is selected) to suggest the correct counterpart entry and reconcile
-the payment automatically.
-
-Invoices/Bills partial match if underpaid
------------------------------------------
-
-This model suggests a customer invoice or vendor bill that partially matches the payment when the
-amount received is slightly lower than the invoice amount, for example in the case of
-**cash discounts**. The difference is reconciled with the account indicated in the
-:guilabel:`counterpart entries` tab.
-
-The reconciliation model :guilabel:`Type` is :guilabel:`Rule to match invoices/bills`, and the
-:guilabel:`Payment tolerance` should be set.
-
-.. image:: reconciliation_models/partial-match.png
-   :alt: Set rules to trigger the reconciliation.
+See :ref:`above <reconciliation_models_types>` for an explanation about the different types of
+Reconciliation Models.
 
 .. note::
-   The :guilabel:`Payment tolerance` is only applicable to lower payments. It is disregarded when an
-   overpayment is received.
+   If the *Documents* application is installed on your database, an additional **Activity type**
+   field appears when *To check* is ticked. Selecting the value *Reconciliation request* implies
+   that, whenever you use this model, a *Request Document* window pops up to request a document from
+   a user.
+
+Conditions on Bank Statement Line
+---------------------------------
+
+Define here all the conditions that are required for a Reconciliation Model to be applied.
+
+.. important::
+   If a record matches with several Reconciliation Models, the first one in the *sequence* of models
+   will be applied. The sequence is simply the order of the models in the *list view*. They can be
+   rearranged by dragging-and-dropping the handle next to the name.
+
+.. image:: reconciliation_models/reconciliation_models_conditions.png
+   :align: center
+   :alt: Conditions for the Reconciliation Model to be applied in Odoo Accounting
+
+Counterpart Values
+------------------
+
+This section comprises the values that are applied by the Reconciliation Model.
+
+If the value to reconcile needs to be written-off in two separate accounts, click on *Add a second
+line*.
+
+.. image:: reconciliation_models/reconciliation_models_counterparts.png
+   :align: center
+   :alt: Counterparts values of a Reconciliation Model in Odoo Accounting
 
 .. seealso::
-   :doc:`../customer_invoices/cash_discounts`
 
-Line with bank fees
--------------------
-
-This model suggests a counterpart entry according to the rules set in the model. In this case, the
-reconciliation model :guilabel:`Type` is :guilabel:`Rule to suggest counterpart entry`, and the
-:guilabel:`Label` can be used for example, to identify the information referring to the
-:guilabel:`Bank fees` in the label of the transaction.
-
-.. image:: reconciliation_models/bank-fees.png
-   :alt: Set rules to trigger the reconciliation.
-
-.. note::
-   `Regular expressions <https://regexone.com/>`_, often abbreviated as **Regex**, can be used in
-   Odoo in various ways to search, validate, and manipulate data within the system. Regex can be
-   powerful but also complex, so it's essential to use it judiciously and with a good understanding
-   of the patterns you're working with.
-
-   To use regular expressions in your reconciliation models, set the :guilabel:`Transaction Type`
-   to :guilabel:`Match Regex` and add your expression. Odoo automatically retrieves the
-   transactions that match your Regex expression and the conditions specified in your model.
-
-   .. image:: reconciliation_models/regex.png
-      :alt: Using Regex in Odoo
-
-Partner mapping
-===============
-
-Partner mapping allows you to establish rules for automatically matching transactions to the correct
-partner account, saving time and reducing the risk of errors that can occur during manual
-reconciliation. For example, you can create a partner mapping rule for incoming payments with
-specific reference numbers or keywords in the transaction description. When an incoming payment
-meets these criteria, Odoo automatically maps it to the corresponding customer's account.
-
-To create a partner mapping rule, go to the :guilabel:`Partner Mapping` tab and enter the
-:guilabel:`Find Text in Label`, :guilabel:`Find Text in Notes`, and :guilabel:`Partner`.
-
-.. image:: reconciliation_models/partner-mapping.png
-   :alt: defining partner mapping
+   - :doc:`reconciliation`
+   - :doc:`bank_synchronization`
+   - :doc:`../customer_invoices/cash_discounts`