[IMP] payment: render /payment/status entirely from the server

Previously, /payment/status would render a template on the server-side, and a JS widget would render subtemplates on the client-side and insert them in the server-side rendered template. However, mixing server-side and client-side templates causes issues because the context is not properly communicated between client and server. It also makes the code more complex. This change assumes that no new information returned by /payment/status is worth re-rendering part of the template. If the transaction moves from a pending ('draft', 'pending') state to a final state, the customer should be redirected to the final route that will display the updated information on the transaction. task-3340354
[IMP} barcode: update default nomenclature doc
2024-03-19 14:29:35 +01:00 · 2024-03-19 06:27:57 +00:00 · 2024-03-19 06:27:56 +00:00 · 2024-03-19 01:31:02 +00:00 · 2024-03-18 17:31:17 +00:00 · 2024-03-16 18:34:35 +00:00
2931 changed files with 109449 additions and 49250 deletions
@@ -1,63 +1,122 @@
 [main]
 host = https://www.transifex.com

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

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

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

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

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

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

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

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

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

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

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

+[o:odoo:p:odoo-17-doc:r:websites]
+file_filter            = locale/<lang>/LC_MESSAGES/websites.po
+source_file            = locale/sources/websites.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = websites
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
@@ -86,12 +86,13 @@ static: $(HTML_BUILD_DIR)/_static/style.css

 # Called by runbot for the ci/documentation_guideline check.
 test:
-	@python tests/main.py $(SOURCE_DIR)/administration $(SOURCE_DIR)/applications $(SOURCE_DIR)/contributing $(SOURCE_DIR)/developer $(SOURCE_DIR)/services redirects
+	@python tests/main.py $(SOURCE_DIR)/administration $(SOURCE_DIR)/applications $(SOURCE_DIR)/contributing $(SOURCE_DIR)/developer redirects

 # Similar as `test`, but called only manually by content reviewers to trigger extra checks.
 review:
-	@read -p "Enter content path: " path; read -p "Enter max line length (default: 100): " line_length; \
+	@read -p "Enter relative content path: " path; read -p "Enter max line length (default: 100): " line_length; \
 	if [ -z "$$path" ]; then echo "Error: Path cannot be empty"; exit 1; fi; \
+	if echo $$path | grep -q 'content/'; then path=`echo $$path | sed 's|content/||'`; fi; \
 	if [ -z "$$line_length" ]; then line_length=100; fi; \
 	export REVIEW=1; \
 	python tests/main.py --max-line-length=$$line_length $(SOURCE_DIR)/$$path
@@ -213,6 +213,8 @@ 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",
    'saas-16.2': "Odoo Online",
@@ -221,7 +223,6 @@ versions_names = {
    'saas-15.2': "Odoo Online",
    '15.0': "Odoo 15",
    '14.0': "Odoo 14",
-    '13.0': "Odoo 13",
 }

 # The language names that should be shown in the language switcher, if the config option `languages`
@@ -234,6 +235,8 @@ languages_names = {
    'it': 'IT',
    'nl': 'NL',
    'pt_BR': 'PT',
+    'ro': 'RO',
+    'sv': 'SV',
    'uk': 'UA',
    'zh_CN': 'ZH (CN)',
    'zh_TW': 'ZH (TW)'
@@ -444,7 +447,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)
+        context['language'] = languages_names.get(_current_lang, _current_lang.upper())
        context['language_code'] = _current_lang

        # If the list of languages is not set, assume that the project has no alternate language
@@ -478,8 +481,24 @@ def _generate_alternate_urls(app, pagename, templatename, context, doctree):
        _version = _version or app.config.version
        _lang = _lang or app.config.language or 'en'
        _canonical_page = f'{pagename}.html'
+
+        # legal translations have different URLs schemes as they are not managed on transifex
+        # e.g. FR translation of /terms/enterprise => /fr/terms/enterprise_fr
+        if pagename.startswith('legal/terms/'):
+            if _lang in legal_translations and not pagename.endswith(f"_{_lang}"):
+                # remove language code for current translation, set target one
+                _page = re.sub("_[a-z]{2}$", "", pagename)
+                if 'terms/i18n' not in _page:
+                    _page = _page.replace("/terms/", "/terms/i18n/")
+                _canonical_page = f'{_page}_{_lang}.html'
+            elif _lang == 'en' and pagename.endswith(tuple(f"_{l}" for l in legal_translations)):
+                # remove language code for current translation, link to original EN one
+                _page = re.sub("_[a-z]{2}$", "", pagename)
+                _canonical_page = f'{_page.replace("/i18n/", "/")}.html'
+
        if app.config.is_remote_build:
            _canonical_page = _canonical_page.replace('index.html', '')
+
        return f'{_root}' \
               f'{f"/{_version}" if app.config.versions else ""}' \
               f'{f"/{_lang}" if _lang != "en" else ""}' \
@@ -3,20 +3,62 @@
 :hide-page-toc:
 :show-toc:

-====================
-Install and Maintain
-====================
+===================
+Database management
+===================

 These guides provide instructions on how to install, maintain and upgrade Odoo databases.

 .. seealso::
-    :doc:`History of Versions <administration/maintain/supported_versions>`
+    :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).


 .. toctree::
    :titlesonly:

-    administration/install
-    administration/maintain
-    administration/upgrade
+    administration/hosting
+    administration/odoo_online
    administration/odoo_sh
+    administration/on_premise
+    administration/upgrade
+    administration/neutralized_database
+    administration/supported_versions
+    administration/odoo_accounts
@@ -1,4 +1,9 @@
-=======================
+=======
+Hosting
+=======
+
+.. _hosting/change-solution:
+
 Change hosting solution
 =======================

@@ -1,49 +0,0 @@
-: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
@@ -1,21 +0,0 @@
-======
-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.
@@ -1,18 +0,0 @@
-: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
@@ -1,366 +0,0 @@
-============
-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`
@@ -0,0 +1,35 @@
+====================
+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.**
@@ -0,0 +1,78 @@
+=================
+Odoo.com accounts
+=================
+
+This documentation is dedicated to edits made to an Odoo.com account. The following processes
+describe how to delete an Odoo.com account, and how to change the password on an Odoo.com account.
+
+Delete Odoo.com account
+=======================
+
+To delete an Odoo.com account, start by clicking the profile icon in the upper-right corner
+(represented by the username and icon) to reveal a drop-down menu. From the drop-down menu, select
+:guilabel:`My Odoo.com account`, which reveals the user portal.
+
+From the user portal, the delete option can be accessed by going to :menuselection:`My Account -->
+Edit Security Settings --> Delete Account`. It can also be accessed by going to
+`https://www.odoo.com/my/home <https://www.odoo.com/my/home>`_.
+
+.. danger::
+   Deleting an Odoo account is irreversible. Be careful performing this action, as the Odoo.com
+   account is **not** retrievable once deleted.
+
+Upon clicking the :guilabel:`Delete Account` button, a pop-up window appears, requesting
+confirmation for the account deletion.
+
+.. image:: odoo_account/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.
+
+Odoo.com account password change
+================================
+
+To change an Odoo.com account password, first login into the Odoo.com user account from the Odoo.com
+login page. After logging-in, go to the upper-right corner of the screen, and click the :guilabel:`▼
+(down arrow)` icon next to the profile icon. Then, select :guilabel:`My Account`, and a portal
+dashboard appears.
+
+To change the Odoo.com password, click on the :guilabel:`Edit Security Settings` link, below the
+:menuselection:`Account Security` section. Next, make the necessary changes by typing in the current
+:guilabel:`Password`, :guilabel:`New Password`, and verify the new password. Lastly, click on
+:guilabel:`Change Password` to complete the password change.
+
+.. note::
+   If a customer would like to change the login, contact Odoo support `here
+   <https://www.odoo.com/help>`_.
+
+.. note::
+   Passwords for Odoo.com users and portal users remain separate, even if the same email address is
+   used.
+
+Add two-factor authentication
+=============================
+
+To add two-factor authentication, login into the Odoo.com user account from the Odoo.com login page.
+After logging-in, go to the upper-right corner of the screen, and click the :guilabel:`▼ (down
+arrow)` icon next to the :guilabel:`profile icon`. Then, select :guilabel:`My Account`, and a portal
+dashboard appears.
+
+If the user would like to turn on two-factor authentication (2FA) for Odoo.com access, click on the
+:guilabel:`Edit Security Settings` link below the :menuselection:`Account Security` section.
+
+Click on :guilabel:`Enable two-factor authentication` to turn on :abbr:`2FA (two-factor
+authentication)`. Then, confirm the current password in the :guilabel:`Password` field. Next, click
+on :guilabel:`Confirm Password`. Following that, activate :abbr:`2FA (two-factor authentication)` in
+a :abbr:`2FA (two-factor authentication)` app (Google Authenticator, Authy, etc.), by scanning the
+:guilabel:`QR code` or entering a :guilabel:`Verification Code`.
+
+Finally, click on :guilabel:`Enable two-factor authentication` to complete the setup.
+
+.. note::
+   Under :guilabel:`My Account` Odoo.com users can also access the following:
+
+   - :guilabel:`My Partner dashboard`
+   - :guilabel:`My In-App Services`
+   - :guilabel:`My Apps Dashboard`
@@ -1,6 +1,21 @@
-===============================
-Odoo Online database management
-===============================
+===========
+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
+===================

 To manage a database, go to the `database manager <https://www.odoo.com/my/databases>`_ and sign in
 as the database administrator.
@@ -30,8 +45,8 @@ Upgrade
 Trigger a database upgrade.

 .. seealso::
-   For more information about the upgrade process, check out the :doc:`Odoo Online upgrade
-   documentation <../upgrade/odoo_online>`.
+   For more information about the upgrade process, check out the :ref:`Odoo Online upgrade
+   documentation <upgrade/request-test-database>`.

 .. _odoo_online/duplicate:

@@ -69,10 +84,11 @@ Download a ZIP file containing a backup of the database.
 Domain names
 ============

-Use a custom :doc:`domain name <domain_names>` to access the database via another URL.
+Use a custom :doc:`domain name </applications/websites/website/configuration/domain_names>` to
+access the database via another URL.

 .. tip::
-   You can :ref:`register a domain name for free <domain-name/odoo-register>`.
+   You can :ref:`register a domain name for free <domain-name/register>`.

 .. _odoo_online/tags:

@@ -129,6 +145,5 @@ users, click :guilabel:`Add more users`.
 To remove users, select them and click :guilabel:`Remove`.

 .. seealso::
-   - :doc:`../../applications/general/users/manage_users`
-   - :doc:`../../applications/general/users/delete_account`
-
+   - :doc:`/applications/general/users`
+   - :doc:`odoo_accounts`
@@ -295,7 +295,7 @@ Upgrade
 Available for production and staging branches for valid projects.

 .. seealso::
-    :doc:`Upgrade - Odoo.sh <../../upgrade/odoo_sh>`
+    :doc:`Upgrade documentation <../../upgrade>`

 .. _odoosh-gettingstarted-branches-tabs-settings:

@@ -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/maintain/supported_versions>` of Odoo.
+</administration/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
-<../../maintain/on_premise>` for instructions.
+<../../on_premise>` for instructions.
@@ -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 <../../install/source>`:
+Or, from your computer, if you have an :doc:`installation of Odoo <../../on_premise/source>`:

 .. code-block:: bash

@@ -1,6 +1,8 @@
-==============================
-On-premise database management
-==============================
+:show-content:
+
+==========
+On-premise
+==========

 Register a database
 ===================
@@ -19,7 +21,6 @@ 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

@@ -42,13 +43,11 @@ Solutions
    <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?

@@ -61,7 +60,6 @@ Solutions
    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>`.
@@ -89,7 +87,6 @@ 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


@@ -117,7 +114,6 @@ 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.
@@ -147,7 +143,6 @@ 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
@@ -165,4 +160,13 @@ use the unix command ``uuidgen`` to generate a new uuid. You can then simply rep
 other record by clicking on it and using the edit button.

 .. image:: on_premise/db_uuid.png
-   :align: center
+
+.. 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
@@ -11,8 +11,8 @@ In any case the basic guidelines are:

 * Backup your community database

-  .. image:: enterprise/db_manager.png
-    :class: img-fluid
+  .. image:: community_to_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:: enterprise/enterprise_code.png
-  :class: img-fluid
+.. image:: community_to_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:`../install/source`)
+* Update the ``--addons-path`` parameter of your launch command (see :doc:`../on_premise/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:: enterprise/windows_uninstall.png
+  .. image:: community_to_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:: enterprise/windows_setup.png
-   :class: img-fluid
+  .. image:: community_to_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)
@@ -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 <../install>`, and is
+internet-facing server. It follows :doc:`installation <../on_premise>`, and is
 not generally necessary for a development systems that is not exposed on the
 internet.

@@ -330,26 +330,27 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
      proxy_pass http://odoochat;
      proxy_set_header Upgrade $http_upgrade;
      proxy_set_header Connection $connection_upgrade;
-      proxy_set_header X-Forwarded-Host $host;
+      proxy_set_header X-Forwarded-Host $http_host;
      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
    location / {
      # Add Headers for odoo proxy mode
-      proxy_set_header X-Forwarded-Host $host;
+      proxy_set_header X-Forwarded-Host $http_host;
      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;
      proxy_redirect off;
      proxy_pass http://odoo;

-      # Enable HSTS
      add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
-      # requires nginx 1.19.8
-      proxy_cookie_flags session_id samesite=lax secure;
+      proxy_cookie_flags session_id samesite=lax secure;  # requires nginx 1.19.8
    }

    # common gzip
@@ -439,51 +440,71 @@ Odoo static files are located in each module's :file:`static/` folder, so static
 by intercepting all requests to :samp:`/{MODULE}/static/{FILE}`, and looking up the right module
 (and file) in the various addons paths.

-.. example::
-   Say Odoo has been installed via the **debian packages** for Community and Enterprise and the
-   :option:`--addons-path <odoo-bin --addons-path>` is ``'/usr/lib/python3/dist-packages/odoo/addons'``.
+It is recommended to set the ``Content-Security-Policy: default-src 'none'`` header on all images
+delivered by the web server. It is not strictly necessary as users cannot modify/inject content
+inside of modules' :file:`static/` folder and existing images are final (they do not fetch new
+resources by themselves). However, it is good practice.

-   Using the above NGINX (https) configuration, the following location block should be added to
-   serve static files via NGINX.
+Using the above NGINX (https) configuration, the following ``map`` and ``location`` blocks should be
+added to serve static files via NGINX.

-   .. code-block:: nginx
+.. code-block:: nginx

-       location @odoo {
-           # copy-paste the content of the / location block
-       }
+    map $sent_http_content_type $content_type_csp {
+        default "";
+        ~image/ "default-src 'none'";
+    }

-       # Serve static files right away
-       location ~ ^/[^/]+/static/.+$ {
-           root /usr/lib/python3/dist-packages/odoo/addons;
-           try_files $uri @odoo;
-           expires 24h;
-       }
+    server {
+        # the rest of the configuration
+
+        location @odoo {
+            # copy-paste the content of the / location block
+        }
+
+        # Serve static files right away
+        location ~ ^/[^/]+/static/.+$ {
+            # root and try_files both depend on your addons paths
+            root ...;
+            try_files ... @odoo;
+            expires 24h;
+            add_header Content-Security-Policy $content_type_csp;
+        }
+    }
+
+The actual ``root`` and ``try_files`` directives are dependant on your installation, specifically on
+your :option:`--addons-path <odoo-bin --addons-path>`.

 .. example::
-   Say Odoo has been installed via the **source**. The two git repositories for Community and
-   Enterprise have been cloned in :file:`/opt/odoo/community` and :file:`/opt/odoo/enterprise`
-   respectively and the :option:`--addons-path <odoo-bin --addons-path>` is
-   ``'/opt/odoo/community/odoo/addons,/opt/odoo/community/addons,/opt/odoo/enterprise'``.

-   Using the above NGINX (https) configuration, the following location block should be added to
-   serve static files via NGINX.
+   .. tabs::

-   .. code-block:: nginx
+      .. group-tab:: Debian package

-       location @odoo {
-           # copy-paste the content of the / location block
-       }
+         Say Odoo has been installed via the **debian packages** for Community and Enterprise, and
+         that the :option:`--addons-path <odoo-bin --addons-path>` is
+         ``'/usr/lib/python3/dist-packages/odoo/addons'``.

-       # Serve static files right away
-       location ~ ^/[^/]+/static/.+$ {
-           root /opt/odoo;
-           try_files /community/odoo/addons$uri /community/addons$uri /enterprise$uri @odoo;
-           expires 24h;
-       }
+         The ``root`` and ``try_files`` should be:

-.. warning::
-   The actual NGINX configuration you need is highly dependent on your own installation. The two
-   above snippets only highlight two possible configurations and may not be used as-is.
+         .. code-block:: nginx
+
+            root /usr/lib/python3/dist-packages/odoo/addons;
+            try_files $uri @odoo;
+
+      .. group-tab:: Git sources
+
+         Say Odoo has been installed via the **sources**, that both the Community and Enterprise git
+         repositories were cloned in :file:`/opt/odoo/community` and :file:`/opt/odoo/enterprise`
+         respectively, and that the :option:`--addons-path <odoo-bin --addons-path>` is
+         ``'/opt/odoo/community/odoo/addons,/opt/odoo/community/addons,/opt/odoo/enterprise'``.
+
+         The ``root`` and ``try_files`` should be:
+
+         .. code-block:: nginx
+
+            root /opt/odoo;
+            try_files /community/odoo/addons$uri /community/addons$uri /enterprise$uri @odoo;

 Serving attachments
 -------------------
@@ -1,6 +1,9 @@
-==========================================
-Geo IP Installation (On-Premises Database)
-==========================================
+======
+Geo IP
+======
+
+.. note::
+   This documentation only applies to On-premise databases.

 Installation
 ============
@@ -32,8 +35,8 @@ Installation
   .. seealso::
      - :doc:`CLI documentation </developer/reference/cli>`.

-Test GeoIP Geolocation In Odoo Website
-======================================
+Test GeoIP geolocation in your Odoo website
+===========================================

 Edit a web page to include some geo-ip information such as the country name of the current
 request IP address. To do so:
@@ -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 customer or partner to download the Enterprise
-   packages.
+   It is required to be logged in as a paying on-premise customer or partner to download the
+   Enterprise packages.

 .. _install/packages/linux:

@@ -54,10 +54,10 @@ Odoo needs a `PostgreSQL <https://www.postgresql.org/>`_ server to run properly.
         $ sudo systemctl start postgresql

 .. warning::
-   `wkhtmltopdf` is not installed through **pip** and must be installed manually in `version 0.12.5
-   <https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.5>`_ for it to support headers and
-   footers. Check out the `wkhtmltopdf wiki <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_ for
-   more details on the various versions.
+   `wkhtmltopdf` is not installed through **pip** and must be installed manually in `version 0.12.6
+   <https://github.com/wkhtmltopdf/packaging/releases/tag/0.12.6.1-3>`_ for it to support headers
+   and footers. Check out the `wkhtmltopdf wiki <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_
+   for more details on the various versions.

 Repository
 ----------
@@ -1,6 +1,6 @@
-======
-Source
-======
+==============
+Source install
+==============

 The source 'installation' is not about installing Odoo but running it directly from the source
 instead.
@@ -229,7 +229,7 @@ PostgreSQL user.

      .. code-block:: console

-         $ sudo -u postgres createuser -s $USER
+         $ sudo -u postgres createuser -d -R -S $USER
         $ createdb $USER

      .. note::
@@ -254,7 +254,7 @@ PostgreSQL user.

      .. code-block:: console

-         $ sudo -u postgres createuser -s $USER
+         $ sudo -u postgres createuser -d -R -S $USER
         $ createdb $USER

      .. note::
@@ -413,10 +413,10 @@ Dependencies
               $ sudo npm install -g rtlcss

 .. warning::
-   `wkhtmltopdf` is not installed through **pip** and must be installed manually in `version 0.12.5
-   <https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.5>`_ for it to support headers and
-   footers. Check out the `wkhtmltopdf wiki <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_ for
-   more details on the various versions.
+   `wkhtmltopdf` is not installed through **pip** and must be installed manually in `version 0.12.6
+   <https://github.com/wkhtmltopdf/packaging/releases/tag/0.12.6.1-3>`_ for it to support headers
+   and footers. Check out the `wkhtmltopdf wiki <https://github.com/odoo/odoo/wiki/Wkhtmltopdf>`_
+   for more details on the various versions.

 .. _install/source/running_odoo:

@@ -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/manage_users>`.
+   - From there, create and manage new :doc:`users <../../applications/general/users>`.
   - The user account used to log into Odoo's web interface differs from the :option:`--db_user
     <odoo-bin -r>` CLI argument.

@@ -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 <../install>`,
+The main reference for updating is logically our :doc:`installation guide <../on_premise>`,
 which explains the common installation methods.

 Updating is also most appropriately accomplished by the person who deployed Odoo initially,
@@ -1,3 +1,4 @@
+:hide-page-toc:

 .. _supported_versions:

@@ -12,13 +13,10 @@ 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*.

-What's the support status of my Odoo?
-=====================================
-
 This matrix shows the support status of every version.

 **Major releases are in bold type.**
@@ -33,6 +31,18 @@ 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)
   * - Odoo saas~16.4
     - |green|
     - N/A
@@ -62,7 +72,7 @@ This matrix shows the support status of every version.
     - |green|
     - |green|
     - October 2022
-     - October 2025 (planned)
+     - November 2025 (planned)
   * - Odoo saas~15.2
     - |red|
     - N/A
@@ -80,21 +90,27 @@ This matrix shows the support status of every version.
     - |green|
     - |green|
     - October 2021
-     - October 2024 (planned)
+     - November 2024 (planned)
   * - **Odoo 14.0**
-     - |green|
-     - |green|
-     - |green|
+     - |red|
+     - |red|
+     - |red|
     - October 2020
-     - November 2023 (planned)
+     - November 2023
   * - **Odoo 13.0**
     - |red|
     - |red|
     - |red|
     - October 2019
     - October 2022
+   * - Older versions
+     - |red|
+     - |red|
+     - |red|
+     - Before 2019
+     - Before 2022

-.. note::
+.. admonition:: Legend

    |green| Supported version

@@ -102,7 +118,9 @@ This matrix shows the support status of every version.

    N/A Never released for this platform

-    🏁 Future version, not released yet
+.. important::
+   Even though we don't support older versions, you can always `upgrade from any version
+   <https://upgrade.odoo.com/>`_.

 .. |green| raw:: html

@@ -111,14 +129,3 @@ This matrix shows the support status of every version.
 .. |red| raw:: html

   <span class="text-danger" style="font-size: 32px; line-height: 0.5">●</span>
-
-I run an older version of Odoo/OpenERP/TinyERP
-==============================================
-
-Odoo 12.0, 11.0, 10.0, 9.0, and 8.0 are not supported anymore, on any platform.
-
-OpenERP 7.0, 6.1, 6.0 and 5.0 are not supported anymore, on any platform.
-
-TinyERP 4.0, 3.0, 2.0 and 1.0 are not supported anymore, on any platform.
-
-Even though we don't support older versions, you can always `upgrade from any version <https://upgrade.odoo.com/>`_.
@@ -1,226 +1,372 @@
-:show-content:
-
-.. |assistance-contact| replace::
-   If you need Odoo assistance on this matter, please get in touch with your Odoo Account Manager or
-   our `Sales department`_.
-.. _Sales department: mailto:sales@odoo.com
-
 =======
 Upgrade
 =======

-.. toctree::
-   :titlesonly:
+.. _administration/upgrade:

-   upgrade/odoo_online
-   upgrade/odoo_sh
-   upgrade/on_premise
-   upgrade/faq
+An upgrade is the process of moving your database from an older version to a newer :doc:`supported
+version <supported_versions>` (e.g., Odoo 14.0 to Odoo 16.0). Frequently upgrading is essential as
+each version comes with new and improved features, bug fixes, and security patches.

-An upgrade is switching to a newer version of Odoo (e.g., Odoo 14.0 to Odoo 15.0).
+.. _upgrade_faq/rolling_release:
+
+.. 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.
+
+   .. 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.
+
+   It is **not** recommended to click :guilabel:`Upgrade Now` without testing first, as it
+   immediately triggers the live production database upgrade.
+
+   If the Rolling Release process detects an issue with the upgrade, it will be deactivated until
+   the issue is resolved.

 An upgrade does not cover:

-* Changing :ref:`editions <upgrade-faq/editions-change>` (i.e., Community to Enterprise edition)
-* Switching :ref:`hosting type <upgrade-faq/hosting-types-switch>` (i.e., On-Premise to Odoo Online
-  or Odoo.sh)
-* Migration from another ERP to Odoo
+  - 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)
+  - Migrating from another ERP to Odoo

-.. note:: |assistance-contact|
+.. warning::
+   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
+   modules </developer/howtos/upgrade_custom_db>`.

-.. seealso::
-   - :ref:`upgrade/sla`

-.. _upgrade/process-workflow:
+Upgrading in a nutshell
+-----------------------

-Process workflow
-================
+#. Request an upgraded test database (see :ref:`obtaining an upgraded test database
+   <upgrade/request-test-database>`).

-The upgrade process in a nutshell:
+#. 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`).

-#. You create a test upgrade request.
-#. Odoo processes the request automatically by running the database through an upgrade script, which
-   takes between 20 and 120 minutes.
-#. Odoo delivers a test database.
-#. You test your database for possible discrepancies (see :ref:`upgrade/test-guidance`).
-#. If there are any discrepancies, you report them to the Upgrade support team via the help portal
-   (see :ref:`upgrade/test-assistance`).
-#. We fix the issues and send you a new test database.
-#. Once you have completed the testing and are happy with the result, you decide on a date and time
-   when you stop users from accessing Odoo, freeze all data entries, and create an upgrade request
-   for the production upgrade.
-#. Odoo delivers the production database through the automated process.
-#. You restore it in your Production environment a few short hours later and continue working on the
-   newly upgraded database (this is done automatically on Odoo Online).
+#. Thoroughly test the upgraded database (see :ref:`testing the new version of the database
+   <upgrade/test_your_db>`).

-.. seealso::
-   - :doc:`Upgrade process for Odoo Online <upgrade/odoo_online>`
-   - :doc:`Upgrade process for Odoo.sh <upgrade/odoo_sh>`
-   - :doc:`Upgrade process for On-Premise <upgrade/on_premise>`
+#. Report any issue encountered during the testing to Odoo via the `support page
+   <https://odoo.com/help?stage=migration>`__.

-.. _upgrade/testing-phase:
+#. 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.

-Testing
-=======
+#. 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>`).

-This phase allows you to review an upgraded version of your database without affecting your
-production database in any way. We suggest that you run the test upgrade process at least once, but
-you can do it as many times as you need (one at a time).
+#. Report any issue encountered during the upgrade to Odoo via the `support page
+   <https://odoo.com/help?stage=post_upgrade>`__.

-Once you receive your upgraded test database, check that all data, processes, and functionality are
-still correct and working as expected.
+.. _upgrade/request-test-database:

-If you do find discrepancies, :ref:`report your issues <upgrade/test-assistance>` and :ref:`request
-a new test database <upgrade/test-db-request>` when the reported issues are fixed in the upgrade
-script.
-
-If you do not find any discrepancies, you can move on to the upgrade of your production database.
-
-.. important::
-   A test database is only intended for testing and remains completely unrelated to your present or
-   future production database. Any data you add, or changes you make, will not be reflected in your
-   upgraded production database.
-
-.. note::
-   Test databases are neutered and features are disabled to prevent them from having an impact on
-   the production database:
-
-   #. The serial number of the database is modified (to prevent it from sending information as if it
-      was the production database).
-   #. The :ref:`base URL of the database <domain-name/web-base-url>` is reset to
-      ``http://localhost:8069`` and the email domain to ``localhost``.
-   #. Scheduled actions are disabled (the calendar synchronization, the bank statement
-      synchronization, the planned automated actions, the fetching of incoming mail servers, etc.).
-   #. Outgoing mail servers are disabled by archiving the existing ones and adding a
-      fake/non-working one.
-   #. Payment providers and delivery carriers are reset to test environment.
-   #. Accounting localization Electronic Data Interchange (EDI) services are disabled.
-   #. A system parameter is set to tell the database has been neutered.
-
-.. _upgrade/test-db-request:
-
-Request a test database
-=======================
-
-Follow the instructions available per hosting type on the `website form
-<https://upgrade.odoo.com>`_ and select *Testing* purpose.
-
-.. image:: upgrade/test-purpose.png
-   :align: center
-   :alt: Selection of the "Testing" purpose in the upgrade form on Odoo
-
-.. _upgrade/test-guidance:
-
-Test guidance
-=============
-
-Every business and organization has its own operational needs and has to test its specific Odoo
-database individually. We recommend you look at `the test scenario
-<https://docs.google.com/document/d/1ypNs7JKPOsjNbKpdiKFH7Al6g6whZ9jr7f7duAQ5E1w/>`_ for further
-information.
-
-.. todo:: change link "test scenario" once the related doc is published
-
-.. _upgrade/test-assistance:
-
-Assistance
----------
-
-If you encounter an issue in the **test database**, please get in touch with Odoo Upgrade Support
-via the `Odoo Support page <https://www.odoo.com/help>`_.
-
-Under the *Ticket Description* section, select *An issue related to my upgrade* ticket type.
-
-   .. image:: upgrade/test-assistance.png
-      :align: center
-      :alt: Selection of "An issue related to my upgrade" as Ticket Type in the support form on Odoo
-
-   .. warning::
-      If you choose another *Ticket Description* type, the request will be redirected to another
-      team. This will slow down the processing and response time.
-
-Please provide as much detail as you can (i.e., videos and screenshots to illustrate your issue).
-This will avoid clarifying questions and speed up the resolution process significantly.
-
-.. note::
-   * The purpose of the test phase is not to correct existing data or configurations in your
-     database.
-   * |assistance-contact|
-
-.. _upgrade/steps-production:
-
-The production launch
-=====================
-
-The production upgrade request is when you decide to upgrade your current database with all your
-production data (invoices, VAT returns, inventories, current orders) to a new version of your
-choice.
-
-After your :ref:`tests <upgrade/testing-phase>` are completed to your satisfaction, submit the
-request to upgrade your production database via our `website form <https://upgrade.odoo.com>`_.
-Select *Production* purpose.
-
-.. important::
-   Going into production without first testing may lead to:
-
-   - business interruptions (e.g., no longer having the possibility to validate an action)
-   - poor customer experiences (e.g., an eCommerce website that does not work correctly)
-
-.. _upgrade/production-assistance:
-
-Assistance
----------
-
-If you encounter issues or problems in the **production database**, please get in touch with **Odoo
-Support**:
-
-#. Connect to our `Odoo Support page <https://www.odoo.com/help>`_.
-#. Under the *Ticket Description* section, select the appropriate type related to your issue but
-   **do not select** the option *An issue related to my upgrade*.
-
-   .. note::
-      After upgrading to production, the support will be provided by the Support team instead of the
-      Upgrade team.
-
-#. Please provide as much detail as you can (i.e., videos and screenshots to illustrate your issue).
-   This will avoid clarifying questions and speed up the resolution process significantly.
-
-   .. warning::
-      If you choose *An issue related to my upgrade* as ticket type, the request will be redirected
-      to another team than the support one and will slow down the processing and response time.
-
-.. _upgrade/assistance:
-
-Help
-====
-
-.. _upgrade/contact:
-
-Contact our upgrade service support
+Obtaining an upgraded test database
 -----------------------------------

-Should you have any more questions about the upgrade, do not hesitate to send a message to `Odoo
-Upgrade Team <mailto:upgrade@odoo.com>`_. We will be happy to answer it as soon as possible.
+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>`_.

-.. _upgrade/supported-versions:
+.. note::
+   The Upgrade platform follows the same `Privacy Policy <https://www.odoo.com/privacy>`_ as the
+   other Odoo.com services. Visit the `General Data Protection Regulation page
+   <https://www.odoo.com/gdpr>`_ to learn more about how Odoo handles your data and privacy.

-Supported versions
------------------
+.. tabs::

-Please note that Odoo provides support and bug fixing only for the three last major versions of
-Odoo.
+   .. group-tab:: Odoo Online

-This is a factor to take into consideration before upgrading. If you are on an older version, we
-suggest you to prefer the most recent version to benefit from longer support (before having to
-upgrade again).
+      Odoo Online databases can be manually upgraded via the `database manager
+      <https://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,
+      indicating that they can be upgraded.
+
+      .. image:: upgrade/databases-page.png
+         :alt: The database manager with an upgrade button next to the name of a database.
+
+      Click the **arrow in a circle** icon to start the upgrade process. In the popup, fill in:
+
+      - The **version** of Odoo you want to upgrade to, usually the latest version
+      - The **email** address that should receive the link to the upgraded database
+      - The :guilabel:`Purpose` of the upgrade, which is automatically set to :guilabel:`Test` for
+        your first upgrade request
+
+      .. image:: upgrade/upgrade-popup.png
+         :alt: The "Upgrade your database" popup.
+
+      The :guilabel:`Upgrade in progress` tag is displayed next to the database name until
+      completion. Once the process succeeds, an email containing a link to the upgraded test
+      database is sent to the address provided. The database can also be accessed from the database
+      manager by clicking the dropdown arrow before the database name.
+
+      .. image:: upgrade/access-upgraded-db.png
+         :alt: Clicking the menu arrow displays the upgraded test database.
+
+   .. group-tab:: Odoo.sh
+
+      Odoo.sh is integrated with the upgrade platform to simplify the upgrade process.
+
+      .. 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>`_.
+
+      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
+      operation** of the upgraded backup and an **update of all the custom modules** occur. This
+      allows you to test your custom modules on a pristine copy of the upgraded database. The log
+      file of the upgrade process can be found in your newly upgraded staging build by going to
+      :file:`~/logs/upgrade.log`.
+
+      .. important::
+         In databases where custom modules are installed, their source code must be up-to-date with
+         the target version of Odoo before the upgrade can be performed. If there are none, the
+         "update on commit" mode is skipped, the upgraded database is built as soon as it is
+         transferred from the upgrade platform, and the upgrade mode is exited.
+
+         Check out the :doc:`/developer/howtos/upgrade_custom_db` page for more information.
+
+   .. group-tab:: On-premise
+
+      The standard upgrade process can be initiated by entering the following command line on the
+      machine where the database is hosted:
+
+      .. code-block:: console
+
+         $ python <(curl -s https://upgrade.odoo.com/upgrade) test -d <your db name> -t <target version>
+
+      The following command can be used to display the general help and the main commands:
+
+      .. code-block:: console
+
+         $ 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/>`_.
+
+      .. important::
+         In databases where custom modules are installed, their source code must be up-to-date with
+         the target version of Odoo before the upgrade can be performed. Check out the
+         :doc:`/developer/howtos/upgrade_custom_db` page for more information.
+
+      .. note::
+         - For security reasons, only the person who submitted the upgrade request can download it.
+         - For storage reasons, the database's copy is submitted without a filestore to the upgrade
+           server. Therefore, the upgraded database does not contain the production filestore.
+         - Before restoring the upgraded database, its filestore must be merged with the production
+           filestore to be able to perform tests in the same conditions as it would be in the new
+           version.
+         - The upgraded database contains:
+
+           - A `dump.sql` file containing the upgraded database
+           - A `filestore` folder containing files extracted from in-database records into
+             attachments (if there are any) and new standard Odoo files from the targeted Odoo
+             version (e.g., new images, icons, payment provider's logos, etc.).
+             This is the folder that should be merged with the production filestore
+             in order to get the full upgraded filestore.
+
+.. 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:
+
+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.
+
+.. note::
+   Test databases are neutralized, and some features are disabled to prevent them from impacting the
+   production database:
+
+   #. Scheduled actions are disabled.
+   #. Outgoing mail servers are disabled by archiving the existing ones and adding a fake one.
+   #. Payment providers and delivery carriers are reset to the test environment.
+   #. Bank synchronization is disabled. Should you want to test the synchronization, contact your
+      bank synchronization provider to get sandbox credentials.
+
+Testing as many of your business flows as possible is strongly recommended to ensure they are
+working correctly and to get more familiar with the new version.
+
+.. admonition:: Basic test checklist
+
+   - Are there views that are deactivated in your test database but active in your production
+     database?
+   - Are your usual views still displayed correctly?
+   - Are your reports (invoice, sales order, etc.) correctly generated?
+   - Are your website pages working correctly?
+   - Are you able to create and modify records? (sales orders, invoices, purchases, users, contacts,
+     companies, etc.)
+   - Are there any issues with your mail templates?
+   - Are there any issues with saved translations?
+   - Are your search filters still present?
+   - Can you export your data?
+
+.. spoiler:: Example of end-to-end testing
+
+   - Checking a random product in your product catalog and comparing its test and production data to
+     verify everything is the same (product category, selling price, cost price, vendor, accounts,
+     routes, etc.).
+   - Buying this product (Purchase app).
+   - Confirming the reception of this product (Inventory app).
+   - Checking if the route to receive this product is the same in your production database
+     (Inventory app).
+   - Selling this product (Sales app) to a random customer.
+   - Opening your customer database (Contacts app), selecting a customer (or company), and checking
+     its data.
+   - Shipping this product (Inventory app).
+   - Checking if the route to ship this product is the same as in your production database
+     (Inventory app).
+   - Validating a customer invoice (Invoicing or Accounting app).
+   - Crediting the invoice (issuing a credit note) and checking if it behaves as in your production
+     database.
+   - Checking your reports' results (Accounting app).
+   - Randomly checking your taxes, currencies, bank accounts, and fiscal year (Accounting app).
+   - Making an online order (Website apps) from the product selection in your shop until the
+     checkout process and checking if everything behaves as in your production database.
+
+   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.
+
+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
+by a new version breaks a customization, it is the responsibility of the maintainer of your custom
+module to make it compatible with the new version of Odoo.
+
+.. tip::
+   Do not forget to test:
+
+   - Integrations with external software (EDI, APIs, etc.)
+   - Workflows between different apps (online sales with eCommerce, converting a lead all the way to
+     a sales order, delivery of products, etc.)
+   - Data exports
+   - Automated actions
+   - Server actions in the action menu on form views, as well as by selecting multiple records on
+     list views
+
+.. _upgrade/upgrade-prod:
+
+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>`__.
+
+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.**
+
+.. important::
+   - 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)
+
+The process of upgrading a production database is similar to upgrading a test database 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
+      :guilabel:`Production` instead of :guilabel:`Test`.
+
+      .. warning::
+         Once the upgrade is requested, the database will be unavailable until the upgrade is
+         finished. Once the process is completed, it is impossible to revert to the previous
+         version.
+
+   .. group-tab:: Odoo.sh
+
+      The process is similar to :ref:`obtaining an upgraded test database
+      <upgrade/request-test-database>` on the :guilabel:`Production` branch.
+
+      .. image:: upgrade/odoo-sh-prod.png
+         :alt: View from the upgrade tab
+
+      The process is **triggered as soon as a new commit is made** on the branch. This
+      allows the upgrade process to be synchronized with the deployment of the custom modules'
+      upgraded source code.
+      If there are no custom modules, the upgrade process is triggered immediately.
+
+      .. important::
+         The database is unavailable throughout the process. If anything goes wrong, the platform
+         automatically reverts the upgrade, as it would be for a regular update. In case of success,
+         a backup of the database before the upgrade is created.
+
+      The update of your custom modules must be successful to complete the entire upgrade process.
+      Make sure the status of your staging upgrade is :guilabel:`successful` before trying it in
+      production. More information on how to upgrade your custom modules can be found on
+      :doc:`/developer/howtos/upgrade_custom_db`.
+
+   .. group-tab:: On-premise
+
+      The command to upgrade a database to production is similar to the one of upgrading a test
+      database except for the argument `test`, which must be replaced by `production`:
+
+      .. code-block:: console
+
+         $ 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/>`_.
+      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.
+
+      .. important::
+         When requesting an upgraded database for production purposes, the copy is submitted without
+         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.

-.. seealso::
-   :doc:`maintain/supported_versions`

 .. _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.
@@ -230,7 +376,7 @@ Information about the upgrade services included in the Enterprise Licence is ava
 upgrade services you can expect.

 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:
@@ -245,7 +391,7 @@ Upgrade services are limited to the technical conversion and adaptation of a dat
 modules and data) to make it compatible with the version targeted by the upgrade.

 Upgrade services not covered by the SLA
---------------------------------------
+=======================================

 The following upgrade-related services are **not** included:

@@ -256,9 +402,6 @@ The following upgrade-related services are **not** included:
  <studio/automated-actions/action>`; and
 - **training** on using the upgraded version's features and workflows.

-.. note:: |assistance-contact|
-
 .. seealso::
-   - :doc:`Upgrade FAQ <upgrade/faq>`
   - :doc:`Odoo.sh documentation <odoo_sh>`
-   - :doc:`Supported Odoo versions <maintain/supported_versions>`
+   - :doc:`Supported Odoo versions <supported_versions>`
@@ -1,228 +0,0 @@
-.. |assistance-contact| replace::
-   If you need Odoo assistance on this matter, please get in touch with your Odoo Account Manager or
-   our `Sales department`_.
-.. _Sales department: mailto:sales@odoo.com
-
-===
-FAQ
-===
-
-.. _upgrade-faq/why:
-
-Why upgrade
-===========
-
-* You benefit from the latest features of the :ref:`new major version
-  <upgrade-faq/release-notes>` released by Odoo.
-* If you are in an :ref:`unsupported version <upgrade/supported-versions>`, you get a new version
-  with support.
-
-.. _upgrade-faq/when:
-
-When to upgrade
-===============
-
-Whenever you want. You can make your upgrade request as soon as a new version is released or when
-your version turns unsupported, and you still wish to enjoy support.
-
-.. _upgrade-faq/availability:
-
-Availability of the new version
-===============================
-
-As soon as Odoo announces the release of a new major version, you can create a test upgrade request
-to try the latest version. Please note that at this point, the upgrade scripts will only have been
-tested with demo data. Please report any issue you might encounter while testing via the `Odoo
-Support page <https://www.odoo.com/help>`_ and make sure to be happy with your test version before
-requesting the upgrade of your database in production.
-
-.. _upgrade-faq/duration:
-
-Duration of the upgrade
-=======================
-
-It is impossible to give time estimates for every upgrade request.
-
-In general, the "smaller" the database, the quickest the upgrade request is completed. A single-user
-database that uses only CRM will be processed faster than a multi-company, multi-user database that
-uses Accounting, Sales, Purchase, and Manufacturing.
-
-You can expect the time it takes for the platform to upgrade the test database to be similar to the
-production upgrade.
-
-.. _upgrade-faq/project:
-
-Duration of the upgrade project
-------------------------------
-
-It depends on the user involvement (the time spent on testing, reporting problems, etc.) and the
-issues encountered that might need to be addressed by our technical team.
-
-So, in a nutshell, what can impact your upgrade lead time?
-
-* Source & targeted versions
-* Installed apps
-* Volume of data
-* Amount of customization (models, fields, methods, workflows, reports, website, etc.)
-* Installation of new apps or configuration changes after the start of the test phase
-* User commitment
-
-.. _upgrade-faq/custom-modules:
-
-Upgrade of the custom modules
-=============================
-
-As stated in our :doc:`/legal/terms/enterprise`, section :ref:`charges_standard`, this optional
-service is subject to additional fees.
-
-Depending on your situation, the custom code could be upgraded by our services, by one of our
-partners, or you can do it yourself.
-
-.. note:: |assistance-contact|
-
-.. _upgrade-faq/upgrade-or-migration:
-
-Upgrade or Migration
-====================
-
-An upgrade is switching to a newer version of Odoo, while a migration reflects the change of
-:ref:`editions <upgrade-faq/editions-change>` or change of :ref:`hosting type
-<upgrade-faq/hosting-types-switch>`.
-
-.. note:: |assistance-contact|
-
-.. _upgrade-faq/editions-change:
-
-Editions change (from Community to Enterprise)
-==============================================
-
-The upgrade always returns an Enterprise edition of Odoo, whether the database you sent was a
-community or enterprise edition. It is required to have an enterprise subscription to upgrade.
-
- .. note::
-    If you need assistance on this matter,  please contact us via the `Odoo Support page
-    <https://www.odoo.com/help>`_.
-
-.. seealso::
-   - `Editions <https://www.odoo.com/page/editions>`_
-
-.. _upgrade-faq/hosting-types-switch:
-
-Switching the hosting types (On-premise vs. Odoo Online vs. Odoo.sh)
-====================================================================
-
-An upgrade does not cover a change of `Hosting types <https://www.odoo.com/page/hosting-types>`_.
-
-Open the following link to get :doc:`more information about how to change your hosting type
-<../maintain/hosting_changes>`.
-
-.. note:: |assistance-contact|
-
-.. _upgrade-faq/upgrade-report:
-
-The Upgrade Report
-==================
-
-When an upgrade request completes successfully (test or production), you receive an email
-notification about it that includes an 'Upgrade Report'. This report is also sent to you via the
-Discuss app. It contains valuable information regarding changes that occurred during the upgrade.
-While it serves as a guide to possible issues to look out for, it is not an exhaustive list. It
-remains imperative that you test the upgraded database thoroughly and report any discrepancies you
-might find, before you decide to upgrade your production database.
-
-.. _upgrade-faq/custom-views:
-
-Custom views
-============
-
-During the upgrade, some custom views might get disabled for technical reasons. Therefore they might
-have to be fixed after the upgrade. The :ref:`Upgrade Report <upgrade-faq/upgrade-report>` that is
-generated after the upgrade is available in the Discuss app, and lists all the custom views that
-might be impacted by this.
-
-.. _upgrade-faq/release-notes:
-
-Release Notes by version
-========================
-
-Open our `Release Note <https://www.odoo.com/page/release-notes>`_ page to get a summary of the new
-features and improvements made in each version.
-
-How long is my test available for
-=================================
-
-An Odoo Online test database is available for one month by default. We can extend this trial period
-upon request. For Odoo.sh or on-premise, there is no restriction.
-
-How many tests to perform before upgrading to production?
-=========================================================
-
-As many as needed. When you are comfortable with the database, run a last test upgrade 48 hours
-before requesting your production upgrade and test your workflows one last time.
-
-How to/Where to report upgrade issues?
-======================================
-
-If you encounter issues during the upgrade process, please contact the Odoo Support through the
-`Odoo Support page <https://www.odoo.com/help>`_.
-
- To report an issue discovered during the testing phase, please select **An issue related to my
-  upgrade (test phase)**.
- To report an issue discovered post-upgrade, please select **An issue related to my upgrade
-  (production)**.
-
-Upgrading to production
-=======================
-
-Once you have completed testing and are happy with the result, you decide on a date and time when
-you stop users from accessing Odoo, freeze all data entries, and create an upgrade request for the
-production upgrade.
-
-How is my data handled in the Upgrade Platform?
-===============================================
-
-The Odoo Upgrade platform uses the same Privacy Policy as the rest of Odoo.com services.
-
-Your data is hosted on servers that follow our security guidelines, namely:
-
- SSL - All web connections to client instances are protected with 256-bit SSL encryption
-  (HTTPS with a 2048-bit modulus SSL certificate), and running behind Grade A SSL stacks. All our
-  certificate chains are using SHA-2 already.
- Safe System - Our servers are running recent Linux distribution with up-to-date security patches,
-  with firewall and intrusion countermeasures (not disclosed for obvious reasons).
-
-Servers are located at the same locations as our Cloud providers with the following services:
-
- Restricted perimeter, physically accessed by authorized data center employees only
- Physical access control with security badges or biometrical security
- Security cameras monitoring the data center locations 24/7
- Security personnel on-site 24/7
-
-The uploaded and migrated databases uploaded to the Upgrade platform are kept for up to 3 months and
-are permanently deleted following that period.
-
-You can learn more about privacy and data handling at Odoo by visiting our `General Data Protection
-Regulation page <https://www.odoo.com/gdpr>`_.
-
-Rolling Release (applicable to Odoo Online databases)
-=====================================================
-
-This feature allows customers to upgrade their database directly from a message prompt sent to the
-database administrator as soon as the new version is released. Odoo first tests the upgrade to the
-next version. The rolling release upgrade option is displayed if the automated tests are successful.
-The message offers two options:
-
-#. To 'Upgrade Now', which immediately triggers the upgrade of your live production database.
-
-#. To take you to your `database manager <https://www.odoo.com/my/databases/>`_ where you can
-   `request an upgraded test database <https://upgrade.odoo.com/#online/>`_ and check the upgraded
-   test database for any discrepancies.
-
-When you choose to proceed with the production upgrade directly, make sure all users have saved
-their work and are logged out. The upgrade takes approximately 15 minutes. During this time your
-database is unreachable. If you notice any problem after the upgrade, please report it via the `Odoo
-Support page <https://www.odoo.com/help>`_.
-
-.. note::
-   If you are using the Website or Studio app, we recommend you always do a test upgrade before
-   upgrading your production instance.
@@ -1,92 +0,0 @@
-===========
-Odoo Online
-===========
-
-Odoo databases can be manually upgraded directly from the main Odoo website. To upgrade an Odoo
-database, navigate to the `database manager <https://www.odoo.com/my/databases>`_ page and sign in.
-
-The database manager page displays all of the Odoo databases associated with the user's account. Any
-databases that are not already on the most recent version of Odoo display an **arrow in a circle**
-icon next to the database name, indicating that the database can be upgraded.
-
-.. image:: odoo_online/databases-page.png
-   :align: center
-   :alt: The database manager page with an upgrade button next to the name of a database.
-
-.. important::
-   - If the database's version is **lower** than the latest major release: the database must be
-     upgraded within two months. After these two months, an automatic upgrade is initiated.
-   - If the database's version is **equal** to or **higher** than the latest major release:
-     you can disregard the invitation to upgrade, as the database probably would not benefit from
-     new features every two months.
-
-If a database is *not* on the latest online version, its administrator should receive an invitation
-to upgrade on the database's dashboard, displayed as an **arrow in a circle**.
-
-.. image:: odoo_online/database-notification.png
-   :alt: Invitation to upgrade on the database dashboard.
-
-.. note::
-   Versions that are not supported anymore become deprecated and must be updated to avoid
-   security issues. It is recommended to initiate the upgrade yourself and not wait for the
-   automatic upgrade, as the former method allows you to request a test upgrade of the database to
-   check for any discrepancies.
-
-Test database
-=============
-
-Click on the **arrow in a circle** icon to start the upgrade process. On the :guilabel:`Upgrade your
-database` pop-up, select the version of Odoo that the platform will be upgraded to. In the
-:guilabel:`Email to notify` field, enter an email address that will receive email notifications
-about the database upgrade.
-
-There is also a :guilabel:`Purpose` section on the pop-up that is used to specify the reason for the
-upgrade. However, at this stage of the process, the only selectable option is :guilabel:`Test`, as
-Odoo requires users to create a test copy of the upgraded database before converting the actual
-database.
-
-.. image:: odoo_online/upgrade-pop-up.png
-   :align: center
-   :alt: The "Upgrade your database" pop-up.
-
-After filling out the form, click the :guilabel:`Upgrade` button. The pop-up disappears and the
-database being upgraded shows a red :guilabel:`Upgrade in progress` tag next to its name. An email
-confirming that the upgrade is in progress is also sent to the email address specified on the
-pop-up.
-
-.. image:: odoo_online/upgrade-in-progress.png
-   :align: center
-   :alt: The "Upgrade in progress" tag next to the database name.
-
-Once the upgrade is complete, a new test database appears on the `database manager
-<https://www.odoo.com/my/databases>`_ page. To access the test database, click the drop-down arrow
-(:guilabel:`⯆`) to the left of the main database's name. Doing so makes the test version appear
-below it. Finally, click the green :guilabel:`Connect` button on the right side of the test
-version's row to go to the database.
-
-.. image:: odoo_online/test-database.png
-   :align: center
-   :alt: A test database on the database manager page.
-
-Except for being on the newer version of Odoo, the test database is an exact copy of the one being
-upgraded. It is important to do extensive testing in this database to ensure that the upgrade has
-not altered or corrupted any data, and that all workflows still proceed as expected.
-
-Production database
-===================
-
-After confirming the integrity of the new version, return to the `database manager
-<https://www.odoo.com/my/databases>`_ page. Once again, click on the **arrow in a circle** icon next
-to the database being upgraded. The :guilabel:`Upgrade your database` pop-up appears as before,
-except that there is now a :guilabel:`Production` option under the :guilabel:`Purpose` section.
-
-Select the :guilabel:`Production` option and then click :guilabel:`Upgrade` to begin the upgrade
-process. As before, a notification email is sent to the email address provided and a red
-:guilabel:`Upgrade in progress` tag appears next to the name of the database.
-
-The production database is then taken offline and will be upgraded automatically. The time it takes
-to upgrade the production database should be similar to the time that was necessary to upgrade the
-test database. Make sure to inform database users of the scheduled downtime.
-
-After the upgrade is finished, the :guilabel:`Upgrade in progress` tag disappears and the database
-is upgraded to the version specified.
@@ -1,132 +0,0 @@
-=======
-Odoo.sh
-=======
-
-.. _upgrade/odoo_sh/overview:
-
-Overview
-========
-
-Odoo.sh is integrated with the upgrade platform to make the upgrade process easier.
-
-.. note::
-   The :guilabel:`Upgrade` tab is available in the branches view. It is only available for valid
-   projects with a valid production build.
-
-.. image:: odoo_sh/odoo-sh-menu.png
-   :align: center
-   :alt: Click on the upgrade menu
-
-The suggested upgrade steps on Odoo.sh are:
-
-#. On a :guilabel:`Development` branch, upgrade your custom modules to keep them compatible with the
-   new version and thoroughly **test them**.
-#. Switch that branch to the :guilabel:`Staging` branch, **upgrade** the last daily production
-   backup and **test it**. Write upgrade scripts if necessary.
-#. Trigger the production upgrade from your :guilabel:`Production` branch and sit tight.
-
-.. seealso::
-   - :doc:`../../administration/upgrade`
-   - :doc:`Upgrade FAQ <../upgrade/faq>`
-   - :doc:`Introduction to Odoo.sh <../odoo_sh/overview/introduction>`
-
-.. _upgrade/odoo_sh/custom-modules:
-
-Upgrade your custom modules
-===========================
-
-The first step is to upgrade your custom modules to keep them compatible with the new version. Fork
-your :guilabel:`Production` branch in the :guilabel:`Development` stage, then go to the settings of
-your :guilabel:`Development` branch and select the Odoo version you target. If needed, modify your
-code to be compatible with the new version. Make sure to **test** your features are still working
-correctly.
-
-.. note::
-   Depending on your contract, the upgrade of your custom modules can be done by yourself, by your
-   Partner or by Odoo (if you hold a subscription including maintenance of customizations).
-
-.. _upgrade/odoo_sh/testing-phase:
-
-Upgrade your database on a staging branch
-=========================================
-
-Take the upgraded development branch and drag & drop it to :guilabel:`Staging`.
-
-Go to the :guilabel:`Upgrade` tab and select the :guilabel:`target version`. Then, click on
-:guilabel:`Test Upgrade`.
-
-.. image:: odoo_sh/odoo-sh-staging.png
-   :align: center
-   :alt: Odoo.sh project and tabs
-
-The **latest production daily automatic backup** is sent to the
-`upgrade platform <https://www.upgrade.odoo.com>`_ to start the upgrade test process.
-
-.. note::
-   You can follow the upgrade process by going to the :guilabel:`Upgrade` menu of your
-   :guilabel:`Production` branch.
-
-When the upgraded backup is ready on the `upgrade platform <https://www.upgrade.odoo.com>`_, it is
-automatically downloaded back to your project.
-
-The branch is now in a **special mode**: each time a **commit is pushed** on the branch, a
-**restore operation** of the upgraded backup occurs, and an **update of all the custom modules**
-happens. This allows you to quickly iterate on your custom modules upgrade scripts. The log file of
-the upgrade process can be found at :file:`~/logs/upgrade.log` in your newly upgraded staging build.
-
-.. note::
-   - The **special upgrade mode** is automatically closed after 30 days.
-   - It may happen that custom modules are no longer needed after an upgrade. Custom modules in the
-     upgraded database are set to be updated. If the modules are missing in the code, the update
-     fails, thus failing the whole process. An empty module with a manifest and possibly some custom
-     upgrade script are necessary to clean up the database. The complete removal of the module has
-     to be handled afterwards.
-
-Functionally test your upgraded database
-========================================
-
-Now that the test upgraded database is available on your staging branch, **thoroughly test it** and
-make sure everything runs as it's supposed to. Once you are satisfied with the result, you are ready
-to upgrade your production database.
-
-Production upgrade
-==================
-
-Once you are happy with your testing, you can start the process on the :guilabel:`Production`
-branch.
-
-On your :guilabel:`Production` branch, go to the :guilabel:`Upgrade` tab, select the
-:guilabel:`targeted version` and click on the :guilabel:`start Upgrade` button.
-
-.. image:: odoo_sh/odoo-sh-prod.png
-   :align: center
-   :alt: View from the upgrade tab
-
-The actual process is **triggered as soon as you push a new commit** in your branch. Make sure you
-are pushing code that is compatible with the new version. For example by merging the code from your
-upgraded staging branch.
-
-.. note::
-   You can see the progress of the upgrade by going to the :guilabel:`Upgrade` tab of the main
-   branch.
-
-.. image:: odoo_sh/odoo-sh-progress.png
-   :align: center
-   :alt: View showing the progress of the upgrade
-
-.. important::
-   Your database is unavailable throughout the process.
-
-.. note::
-   If anything goes wrong, the platform automatically reverts the upgrade, the same as it would be
-   for a regular update. In case of success, a backup is always made.
-
-The update of your custom modules must be successful to complete the entire upgrade process. Make
-sure the status of your staging upgrade is :guilabel:`successful` before trying it in production.
-
-.. note::
-   It may happen that custom modules are no longer needed after an upgrade. Custom modules in the
-   upgraded database are set to be updated. If the modules are missing in the code, the update
-   fails, thus failing the whole process. An empty module with a manifest and possibly some custom
-   upgrade script are necessary to clean up the database. The complete removal of the module has to
-   be handled afterwards.
@@ -1,76 +0,0 @@
-==========
-On-Premise
-==========
-
-Test upgrade request
-====================
-
-There are two ways to create your upgrade request.
-
-Upgrade request via command line
--------------------------------
-
-For technically-advanced users and partners, the upgrade process can be initiated via the following
-command line on the server where the database is hosted:
-
-:command:`python <(curl -s https://upgrade.odoo.com/upgrade) test -d <your db name> -t
-<target version>`
-
-The above command creates the database dump, sends it to the upgrade platform, and initiates the
-automated upgrade process. During the upgrade, you can follow the live logs on your screen.
-Once the upgrade process is completed successfully, the upgraded database is restored onto the
-server (as a duplicate test database).
-
-Upgrade request via the Odoo Upgrade Portal
-------------------------------------------
-
-#. Download a recent copy of your database and select the option :guilabel:`pg_dump custom format
-   (without filestore)`.
-#. Upload this dump file at https://upgrade.odoo.com and select *Testing* as the aim.
-   Odoo performs the automated upgrade process. Once it is completed, you receive an email with a
-   link to download the upgrade database dump file.
-#. Import the upgraded database into your on-premise environment and manually test all processes and
-   workflows.
-
-.. note::
-   - For security reasons, only the person who submitted the upgrade request is able to download it.
-   - Any problem found during testing should be reported via the `helpdesk
-     <https://odoo.com/help>`_.
-   - For storage reasons, the copy of your database is submitted without a filestore to the upgrade
-     server. Therefore, the upgraded database does not contain the production filestore.
-   - Before restoring the upgraded database, its filestore must be merged with the production
-     filestore to be able to perform tests in the same conditions as it would be in the new version.
-   - The upgraded database contains:
-
-      - A `dump.sql` file containing the upgraded database.
-      - A `filestore` folder containing files that were extracted from in-database records into
-        attachments (if there are any) and new standard Odoo files from the targeted Odoo version
-        (like new images, icons, payment provider's logos, etc.). This is the folder that should be
-        merged with the production filestore in order to get the full upgraded filestore.
-
-Upgrade your production database
-================================
-
-Once you have completed the testing successfully, you can proceed to upgrade your live database in
-production. Download your upgraded database from the link in the email and import it onto your live
-environment.
-
-.. important::
-   - Same as in the test phase, when requesting an upgrade for production purposes, the copy of your
-     database is submitted without a filestore.
-   - Therefore, the upgraded database filestore must be merged with the production filestore before
-     deploying the new version.
-
-Custom modules (if applicable)
-==============================
-
-The upgrade of a database that contains custom modules is a two-step process.
-
-#. The standard upgrade is done when your upgrade request is completed.
-#. Your custom modules also need to be upgraded to keep them compatible with the new version.
-
-Depending on your contract, the upgrade of your custom modules can be done
-
-#. by yourself.
-#. by your Partner.
-#. by Odoo (if you hold a subscription to 'Maintenance of Customizations').
@@ -14,6 +14,7 @@ Discover our user guides and configuration tutorials per application.
 .. toctree::
    :maxdepth: 2

+    applications/essentials
    applications/finance
    applications/sales
    applications/websites
@@ -22,4 +23,5 @@ Discover our user guides and configuration tutorials per application.
    applications/marketing
    applications/services
    applications/productivity
+    applications/studio
    applications/general
@@ -0,0 +1,11 @@
+===============
+Odoo essentials
+===============
+
+.. toctree::
+
+   essentials/activities
+   essentials/reporting
+   essentials/search
+   essentials/export_import_data
+   essentials/in_app_purchase
@@ -0,0 +1,239 @@
+==========
+Activities
+==========
+
+*Activities* are follow-up tasks tied to a record in an Odoo database. Activities can be scheduled
+on any page of the database that contains a chatter thread, kanban view, list view, or activities
+view of an application.
+
+Schedule activities
+===================
+
+One way that activities are created is by clicking the :guilabel:`Schedule Activity` button, located
+at the top of the *chatter* on any record. On the pop-up window that appears, select an
+:guilabel:`Activity Type` from the drop-down menu.
+
+.. tip::
+   Individual applications have a list of *Activity Types* dedicated to that application. For
+   example, to view and edit the activities available for the *CRM* application, go to
+   :menuselection:`CRM app --> Configuration --> Activity Types`.
+
+Enter a title for the activity in the :guilabel:`Summary` field, located in the :guilabel:`Schedule
+Activity` pop-up window.
+
+To assign the activity to a different user, select a name from the :guilabel:`Assigned to` drop-down
+menu. Otherwise, the user creating the activity is automatically assigned.
+
+Lastly, feel free to add any additional information in the optional :guilabel:`Log a note...` field.
+
+.. note::
+   The :guilabel:`Due Date` field on the :guilabel:`Schedule Activity` pop-up window auto-populates
+   based on the configuration settings for the selected :guilabel:`Activity Type`. However, this
+   date can be changed by selecting a day on the calendar in the :guilabel:`Due Date` field.
+
+Lastly, click one of the following buttons:
+
+- :guilabel:`Schedule`: adds the activity to the chatter under :guilabel:`Planned activities`.
+- :guilabel:`Mark as Done`: adds the details of the activity to the chatter under :guilabel:`Today`.
+  The activity is not scheduled, it is automatically marked as completed.
+- :guilabel:`Done \& Schedule Next`: adds the task under :guilabel:`Today` marked as done, and
+  opens a new activity window.
+- :guilabel:`Discard`: discards any changes made on the pop-up window.
+
+.. image:: activities/schedule-pop-up.png
+   :alt: View of CRM leads and the option to schedule an activity.
+
+.. note::
+   Depending on the activity type, the :guilabel:`Schedule` button may be replaced by a
+   :guilabel:`Save` button, or an :guilabel:`Open Calendar` button.
+
+Scheduled activities are added to the chatter for the record under :guilabel:`Planned activities`.
+
+.. image:: activities/chatter-activities.png
+   :alt: View of CRM leads and the option to schedule an activity.
+
+Activities can also be scheduled from the kanban, list, or activities view of an application.
+
+.. tabs::
+
+   .. tab:: Kanban view
+
+      Select a record on which to schedule an activity. Click on the :guilabel:`🕘 (clock)` icon,
+      then :guilabel:`Schedule An Activity`, and proceed to fill out the pop-up form.
+
+      .. image:: activities/schedule-kanban-activity.png
+               :alt: Kanban view of the CRM pipeline and the option to schedule an activity.
+
+   .. tab:: List view
+
+      Select a record on which to schedule an activity. Click on the :guilabel:`🕘 (clock)` icon,
+      then :guilabel:`Schedule An Activity`. If the record already has an activity scheduled, the
+      clock icon may be replaced by a :guilabel:`📞 (phone)` or an :guilabel:`✉️ (envelope)` icon.
+
+      .. image:: activities/schedule-list-activity.png
+               :alt: List view of the CRM pipeline and the option to schedule an activity.
+
+   .. tab:: Activity view
+
+      To open the activity view for an application, select the :guilabel:`🕘 (clock)` icon from the
+      menu bar anywhere in the database. Select any application from the drop-down menu, and click
+      the :guilabel:`🕘 (clock)` icon for the desired app.
+
+      .. image:: activities/schedule-activity-view-menu.png
+               :alt: Activity menu drop down with focus on where to open activity view for CRM.
+
+      Select a record on which to schedule an activity. Move across the row to find the desired
+      activity type, then click the :guilabel:`＋ (plus sign)`.
+
+      .. image:: activities/schedule-activity-view.png
+               :alt: Activity view of the CRM pipeline and the option to schedule an activity.
+
+.. note::
+   Activity colors, and their relation to an activity's due date, is consistent throughout Odoo,
+   regardless of the activity type, or the view.
+
+   - Activities that appear in **green** indicate a due date sometime in the future.
+   - **Yellow** indicates that the activity's due date is today.
+   - **Red** indicates that the activity is overdue and the due date has passed.
+
+   For example, if an activity is created for a phone call, and the due date passes, the activity
+   appears with a red phone in list view, and a red clock on the kanban view.
+
+View scheduled activities
+=========================
+
+To view scheduled activities, open either the :menuselection:`Sales app` or :menuselection:`CRM app`
+and click the :guilabel:`🕘 (clock)` icon, located to the far-right side of the other view options.
+
+Doing so opens the activities menu, showcasing all the scheduled activities for the user, by
+default. To show all activities for every user, remove the :guilabel:`My Pipeline` filter from the
+:guilabel:`Search...` bar.
+
+To view a consolidated list of activities separated by the application where they were created, and
+by deadline, click the :guilabel:`🕘 (clock)` icon on the header menu to see the activities for that
+specific application in a drop-down menu.
+
+The possibility to :guilabel:`Add new note` and :guilabel:`Request a Document` appear at the bottom
+of this drop-down menu, when the :guilabel:`🕘 (clock)` icon on the header menu is clicked.
+
+.. image:: activities/activities-menu.png
+   :alt: View of CRM leads page emphasizing the activities menu.
+
+Configure activity types
+========================
+
+To configure the types of activities in the database, go to :menuselection:`Settings app --> Discuss
+--> Activities --> Activity Types`.
+
+.. image:: activities/settings-activities-types.png
+   :alt: View of the settings page emphasizing the menu activity types.
+
+Doing so reveals the :guilabel:`Activity Types` page, where the existing activity types are found.
+
+To edit an existing activity type, select it from the list, then click :guilabel:`Edit`. To create a
+new activity type, click :guilabel:`Create`.
+
+At the top of a blank activity type form, start by choosing a :guilabel:`Name` for the new activity
+type.
+
+.. image:: activities/new-activity-type.png
+   :alt: New activity type form.
+
+Activity settings
+-----------------
+
+Action
+~~~~~~
+
+The *Action* field specifies the intent of the activity. Some actions trigger specific behaviors
+after an activity is scheduled.
+
+- If :guilabel:`Upload Document` is selected, a link to upload a document is added directly to the
+  planned activity in the chatter.
+- If either :guilabel:`Phonecall` or :guilabel:`Meeting` are selected, users have the option to open
+  their calendar to schedule a time for this activity.
+- If :guilabel:`Request Signature` is selected, a link is added to the planned activity in the
+  chatter that opens a signature request pop-up window.
+
+.. note::
+   The actions available to select on an activity type vary, depending on the applications currently
+   installed in the database.
+
+Default user
+~~~~~~~~~~~~
+
+To automatically assign this activity to a specific user when this activity type is scheduled,
+choose a name from the :guilabel:`Default User` drop-down menu. If this field is left blank, the
+activity is assigned to the user who creates the activity.
+
+Default summary
+~~~~~~~~~~~~~~~
+
+To include notes whenever this activity type is created, enter them into the :guilabel:`Default
+Summary` field.
+
+.. note::
+   The information in the :guilabel:`Default User` and :guilabel:`Default Summary` fields are
+   included when an activity is created. However, they can be altered before the activity is
+   scheduled or saved.
+
+Next activity
+-------------
+
+To automatically suggest, or trigger, a new activity after an activity has been marked complete, the
+:guilabel:`Chaining Type` must be set.
+
+Suggest next activity
+~~~~~~~~~~~~~~~~~~~~~
+
+In the :guilabel:`Chaining Type` field, select :guilabel:`Suggest Next Activity`. Upon doing so, the
+field underneath changes to: :guilabel:`Suggest`. Click the :guilabel:`Suggest` field drop-down menu
+to select any activities to recommend as follow-up tasks to this activity type.
+
+In the :guilabel:`Schedule` field, choose a default deadline for these activities. To do so,
+configure a desired number of :guilabel:`Days`, :guilabel:`Weeks`, or :guilabel:`Months`. Then,
+decide if it should occur :guilabel:`after completion date` or :guilabel:`after previous activity
+deadline`.
+
+This :guilabel:`Schedule` field information can be altered before the activity is scheduled.
+
+When all configurations are complete, click :guilabel:`Save`.
+
+.. image:: activities/schedule-recommended-activity.png
+   :alt: Schedule activity popup with emphasis on recommended activities.
+
+.. note::
+   If an activity has the :guilabel:`Chaining Type` set to :guilabel:`Suggest Next Activity`, and
+   has activities listed in the :guilabel:`Suggest` field, users are presented with recommendations
+   for activities as next steps.
+
+Trigger next activity
+~~~~~~~~~~~~~~~~~~~~~
+
+Setting the :guilabel:`Chaining Type` to :guilabel:`Trigger Next Activity` immediately launches the
+next activity once the previous one is completed.
+
+If :guilabel:`Trigger Next Activity` is selected in the :guilabel:`Chaining Type` field, the field
+beneath changes to: :guilabel:`Trigger`. From the :guilabel:`Trigger` field drop-down menu, select
+the activity that should be launched once this activity is completed.
+
+In the :guilabel:`Schedule` field, choose a default deadline for these activities. To do so,
+configure a desired number of :guilabel:`Days`, :guilabel:`Weeks`, or :guilabel:`Months`. Then,
+decide if it should occur :guilabel:`after completion date` or :guilabel:`after previous activity
+deadline`.
+
+This :guilabel:`Schedule` field information can be altered before the activity is scheduled.
+
+When all configurations are complete, click :guilabel:`Save`.
+
+.. image:: activities/triggered-activities.png
+   :alt: Schedule new activity popup with emphasis on Done and launch next button.
+
+.. note::
+   When an activity has the :guilabel:`Chaining Type` set to :guilabel:`Trigger Next Activity`,
+   marking the activity as `Done` immediately launches the next activity listed in the
+   :guilabel:`Trigger` field.
+
+.. seealso::
+   - :doc:`/applications/productivity/discuss`
+   - :doc:`/applications/productivity/discuss/team_communication`
@@ -0,0 +1,192 @@
+=====================
+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`.
--- a/Show More
+++ b/Show More