[IMP] odoo_sh: FAQ more workers

[IMP] elearning: set prerequisite courses
taskid-3433600 closes odoo/documentation#7542 X-original-commit: 2d4a3cc883 Signed-off-by: Audrey Vandromme (auva) <auva@odoo.com> Signed-off-by: Donatienne Pirlot (dopi) <dopi@odoo.com>
2024-01-25 18:50:31 +01:00 · 2024-01-25 14:56:28 +00:00 · 2024-01-25 13:11:23 +00:00 · 2024-01-25 05:49:20 +00:00 · 2024-01-24 10:52:51 +00:00 · 2024-01-24 09:20:37 +00:00
3389 changed files with 342132 additions and 897879 deletions
@@ -1,83 +1,122 @@
 [main]
 host = https://www.transifex.com

-[o:odoo:p:odoo-15-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-15-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-15-doc:r:essentials]
-file_filter = locale/<lang>/LC_MESSAGES/essentials.po
-source_file = locale/sources/essentials.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-15-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: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-15-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: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-15-doc:r:hr]
-file_filter = locale/<lang>/LC_MESSAGES/hr.po
-source_file = locale/sources/hr.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-15-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: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-15-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: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-15-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: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-15-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: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-15-doc:r:sales]
-file_filter = locale/<lang>/LC_MESSAGES/sales.po
-source_file = locale/sources/sales.pot
-source_lang = en
-
-[o:odoo:p:odoo-15-doc:r:services]
-file_filter = locale/<lang>/LC_MESSAGES/services.po
-source_file = locale/sources/services.pot
-source_lang = en
-
-[o:odoo:p:odoo-15-doc:r:theme]
-file_filter = locale/<lang>/LC_MESSAGES/sphinx.po
-source_file = locale/sources/sphinx.pot
-source_lang = en
-
-[o:odoo:p:odoo-15-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-15-doc:r:studio]
-file_filter = locale/<lang>/LC_MESSAGES/studio.po
-source_file = locale/sources/studio.pot
-source_lang = en
-
-[o:odoo:p:odoo-15-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
@@ -26,7 +26,7 @@ SOURCE_DIR     = content

 HTML_BUILD_DIR = $(BUILD_DIR)/html
 ifdef VERSIONS
-  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/15.0
+  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/master
 endif
 ifneq ($(CURRENT_LANG),en)
  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/$(CURRENT_LANG)
@@ -22,7 +22,7 @@ copyright = 'Odoo S.A.'
 # `version` is the version info for the project being documented, acts as replacement for |version|,
 # also used in various other places throughout the built documents.
 # `release` is the full version, including alpha/beta/rc tags. Acts as replacement for |release|.
-version = release = '15.0'
+version = release = 'master'

 # `current_branch` is the technical name of the current branch.
 # E.g., saas-15.4 -> saas-15.4; 12.0 -> 12.0, master -> master (*).
@@ -82,6 +82,7 @@ source_read_replace_vals = {
    'CURRENT_MAJOR_VERSION': current_major_version,
    'GITHUB_PATH': f'https://github.com/odoo/odoo/blob/{version}',
    'GITHUB_ENT_PATH': f'https://github.com/odoo/enterprise/blob/{version}',
+    'OWL_PATH': f'https://github.com/odoo/owl/blob/master',
 }

 # Add extensions directory to PYTHONPATH
@@ -114,8 +115,8 @@ else:
    import odoo.addons
    odoo.addons.__path__.append(str(odoo_dir) + '/addons')
    from odoo import release as odoo_release  # Don't collide with Sphinx's 'release' config option
-    odoo_version = odoo_release.version.replace('~', '-') \
-        if 'alpha' not in odoo_release.version else 'master'
+    odoo_version = '.'.join(str(s) for s in odoo_release.version_info[:2]).replace('~', '-')  # Change saas~XX.Y to saas-XX.Y
+    odoo_version = 'master' if 'alpha' in odoo_release.version else odoo_version
    if release != odoo_version:
        _logger.warning(
            "Found Odoo sources in %(directory)s but with version '%(odoo_version)s' incompatible "
@@ -192,6 +193,7 @@ extensions.append('sphinx.ext.graphviz' if shutil.which('dot') else 'graphviz_pl
 todo_include_todos = False

 intersphinx_mapping = {
+    'pillow': ('https://pillow.readthedocs.io/en/stable/', None),
    'python': ('https://docs.python.org/3/', None),
    'werkzeug': ('https://werkzeug.palletsprojects.com/en/2.3.x/', None),
 }
@@ -211,7 +213,6 @@ sphinx.transforms.i18n.docname_to_domain = (
 # is populated. If a version is passed to `versions` but is not listed here, it will not be shown.
 versions_names = {
    'master': "Master",
-    'saas-17.1': "Odoo Online",
    '17.0': "Odoo 17",
    'saas-16.4': "Odoo Online",
    'saas-16.3': "Odoo Online",
@@ -231,13 +232,11 @@ languages_names = {
    'es': 'ES',
    'fr': 'FR',
    'it': 'IT',
-    'ko': 'KO',
    'nl': 'NL',
    'pt_BR': 'PT',
-    'ro': 'RO',
-    'sv': 'SV',
    'uk': 'UA',
-    'zh_CN': 'ZH',
+    'zh_CN': 'ZH (CN)',
+    'zh_TW': 'ZH (TW)'
 }

 # The directory in which files holding redirect rules used by the 'redirects' extension are listed.
@@ -445,7 +444,7 @@ def _generate_alternate_urls(app, pagename, templatename, context, doctree):
        """
        _current_lang = app.config.language or 'en'
        # Replace the context value by its upper-cased value ("FR" instead of "fr")
-        context['language'] = languages_names.get(_current_lang, _current_lang.upper())
+        context['language'] = languages_names.get(_current_lang)
        context['language_code'] = _current_lang

        # If the list of languages is not set, assume that the project has no alternate language
@@ -3,61 +3,20 @@
 :hide-page-toc:
 :show-toc:

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

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

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


 .. toctree::
    :titlesonly:

-    administration/hosting
-    administration/odoo_online
-    administration/odoo_sh
-    administration/on_premise
+    administration/install
+    administration/maintain
    administration/upgrade
-    administration/supported_versions
-    administration/odoo_accounts
+    administration/odoo_sh
@@ -1,121 +0,0 @@
-=======
-Hosting
-=======
-
-.. _hosting/change-solution:
-
-Change hosting solution
-=======================
-
-The instructions to change the hosting type of a database depend on the current solution used and to
-which solution the database should be moved.
-
-Transferring an on-premise database
-===================================
-
-To Odoo Online
--------------
-
-.. important::
-   - Odoo Online is *not* compatible with **non-standard apps**.
-   - The database's current version must be :doc:`supported <supported_versions>`.
-
-#. Create a :ref:`duplicate of the database <on-premise/duplicate>`.
-#. In this duplicate, uninstall all **non-standard apps**.
-#. Use the database manager to grab a *dump with filestore*.
-#. `Submit a support ticket <https://www.odoo.com/help>`_ including the following:
-
-   - your **subscription number**,
-   - the **URL** you want to use for the database (e.g., `company.odoo.com`), and
-   - the **dump** as an attachment or as a link to the file (required for 60 MB+ files).
-
-#. Odoo then makes sure the database is compatible before putting it online. In case of technical
-   issues during the process, Odoo might contact you.
-
-.. note::
-   If you have time constraints, `submit a support ticket <https://www.odoo.com/help>`_ as soon as
-   possible to schedule the transfer.
-
-To Odoo.sh
----------
-
-Follow the instructions found in :ref:`the Import your database section
-<odoo_sh_import_your_database>` of the Odoo.sh *Create your project* documentation.
-
-Transferring an Odoo Online database
-====================================
-
-.. important::
-   Odoo Online's :ref:`intermediary versions <supported_versions>` cannot be hosted on-premise as
-   that type of hosting does not support those versions. Therefore, if the database to transfer
-   is running an intermediary version, it must be upgraded first to the next :ref:`major version
-   <supported_versions>`, waiting for its release if necessary.
-
-   .. example::
-      Transferring an online database running on Odoo 16.3 would require first upgrading it to Odoo
-      17.0.
-
-   .. tip::
-      Click the gear icon (:guilabel:`⚙`) next to the database name on the `Odoo Online database
-      manager <https://www.odoo.com/my/databases/>`_ to display its version number.
-
-   .. warning::
-      If there is an active Odoo subscription linked to the database being migrated, reach out to
-      the Customer Service Manager or `submit a support ticket <https://www.odoo.com/help>`_  to
-      complete the subscription transfer.
-
-To on-premise
-------------
-
-#. Sign in to `the Odoo Online database manager <https://www.odoo.com/my/databases/>`_ and click the
-   gear icon (:guilabel:`⚙`) next to the database name to :guilabel:`Download` a backup. If the
-   download fails due to the file being too large, `contact Odoo support
-   <https://www.odoo.com/help>`_.
-#. Restore the database from the database manager on your local server using the backup.
-
-To Odoo.sh
----------
-
-#. Sign in to `the Odoo Online database manager <https://www.odoo.com/my/databases/>`_ and click the
-   gear icon (:guilabel:`⚙`) next to the database name to :guilabel:`Download` a backup. If the
-   download fails due to the file being too large, `contact Odoo support
-   <https://www.odoo.com/help>`_.
-#. Follow the instructions found in :ref:`the Import your database section
-   <odoo_sh_import_your_database>` of the Odoo.sh *Create your project* documentation.
-
-Transferring an Odoo.sh database
-================================
-
-To Odoo Online
--------------
-
-.. important::
-   Odoo Online is *not* compatible with **non-standard apps**.
-
-#. Uninstall all **non-standard apps** in a staging build before doing it in the production build.
-#. `Create a support ticket <https://www.odoo.com/help>`_ including the following:
-
-   - your **subscription number**,
-   - the **URL** you want to use for the database (e.g., `company.odoo.com`),
-   - which **branch** should be migrated,
-   - in which **region** you want the database to be hosted (Americas, Europe, or Asia),
-   - which user(s) will be the **administrator(s)**, and
-   - **when** (and in which timezone) you want the database to be up and running.
-
-#. Odoo then makes sure the database is compatible before putting it online. In case of technical
-   issues during the process, Odoo might contact you.
-
-.. note::
-   - If you have time constraints, `submit a support ticket <https://www.odoo.com/help>`_ as soon as
-     possible to schedule the transfer.
-   - Select the **region** closest to most of your users to reduce latency.
-   - Future **administrator(s)** must have an Odoo.com account.
-   - The **date and time** you want the database to be up and running are helpful to organize the
-     switch from the Odoo.sh server to the Odoo Online servers.
-   - Databases are **not reachable** during their migration.
-
-To on-premise
-------------
-
-#. Download a :ref:`backup of your Odoo.sh production database <odoo_sh_branches_backups>`.
-#. Restore the database from the database manager on your local server using the backup.
@@ -0,0 +1,50 @@
+:show-content:
+
+=======
+Install
+=======
+
+Depending on the intended use case, there are multiple ways to install Odoo - or not install it at
+all.
+
+- :doc:`Online <install/online>` is the easiest way to use Odoo in production or to try it.
+
+- :doc:`Packaged installers <install/packages>` are suitable for testing Odoo and developing
+  modules. They can be used for long-term production with additional deployment and maintenance
+  work.
+
+- :doc:`Source install <install/source>` provides greater flexibility, as it allows, for example,
+  running multiple Odoo versions on the same system. It is adequate to develop modules and can be
+  used as a base for production deployment.
+
+- A `Docker <https://hub.docker.com/_/odoo/>`_ base image is available for development or
+  deployment.
+
+.. _install/editions:
+
+Editions
+========
+
+There are two different editions.
+
+**Odoo Community** is the free and open-source version of the software, licensed under the `GNU
+LGPLv3 <https://github.com/odoo/odoo/blob/master/LICENSE>`_. It is the core upon which Odoo
+Enterprise is built.
+
+**Odoo Enterprise** is the shared source version of the software, giving access to more
+functionalities, including functional support, upgrades, and hosting. `Pricing
+<https://www.odoo.com/pricing-plan>`_ starts from one app free.
+
+.. tip::
+   :doc:`Switch from Community to Enterprise <maintain/enterprise>` at any time (except for the
+   source install).
+
+.. toctree::
+
+   install/online
+   install/packages
+   install/source
+   install/deploy
+   install/cdn
+   install/email_gateway
+   install/geo_ip
@@ -57,7 +57,7 @@ Configure the Odoo instance with the new zone
 In the Odoo :guilabel:`Website` app, go to the :menuselection:`Settings` and then activate the
 :guilabel:`Content Delivery Network (CDN)` setting and copy/paste the :guilabel:`Zone URL` value
 from the earlier step into the :guilabel:`CDN Base URL` field. This field is only visible and
-configurable when the :ref:`developer mode <developer-mode>` is activated.
+configurable when :doc:`Developer Mode <../../applications/general/developer_mode>` is activated.

 .. note::
   Ensure that there are two *forward slashes* (`//`) before the :guilabel:`CDN Base URL` and one
@@ -3,7 +3,7 @@ System configuration
 ====================

 This document describes basic steps to set up Odoo in production or on an
-internet-facing server. It follows :doc:`installation <../on_premise>`, and is
+internet-facing server. It follows :doc:`installation <../install>`, and is
 not generally necessary for a development systems that is not exposed on the
 internet.

@@ -97,7 +97,7 @@ Configuration sample
 * Allow tcp connection on localhost
 * Allow tcp connection from 192.168.1.x network

-in ``/etc/postgresql/9.5/main/pg_hba.conf`` set:
+in ``/etc/postgresql/<YOUR POSTGRESQL VERSION>/main/pg_hba.conf`` set:

 .. code-block:: text

@@ -105,7 +105,7 @@ in ``/etc/postgresql/9.5/main/pg_hba.conf`` set:
  host    all             all             127.0.0.1/32            md5
  host    all             all             192.168.1.0/24          md5

-in ``/etc/postgresql/9.5/main/postgresql.conf`` set:
+in ``/etc/postgresql/<YOUR POSTGRESQL VERSION>/main/postgresql.conf`` set:

 .. code-block:: text

@@ -172,7 +172,7 @@ in Odoo the db_sslmode control the ssl security of the connection
 with value chosen out of 'disable', 'allow', 'prefer', 'require', 'verify-ca'
 or 'verify-full'

-`PostgreSQL Doc <https://www.postgresql.org/docs/current/static/libpq-ssl.html>`_
+`PostgreSQL Doc <https://www.postgresql.org/docs/12/static/libpq-ssl.html>`_

 .. _builtin_server:

@@ -184,8 +184,8 @@ multi-processing.

 The **multi-threaded** server is a simpler server primarily used for development, demonstrations,
 and its compatibility with various operating systems (including Windows). A new thread is spawned
-for every new HTTP request, even for long-running requests such as long polling. Extra daemonic
-cron threads are spawned too. Due to a Python limitation (GIL), it doesn't make the best use of the
+for every new HTTP request, even for long-lived connections such as websocket. Extra daemonic cron
+threads are spawned too. Due to a Python limitation (GIL), it doesn't make the best use of the
 hardware.

 The multi-threaded server is the default server, also for docker containers. It is selected by
@@ -224,10 +224,10 @@ Needed RAM = #worker * ( (light_worker_ratio * light_worker_ram_estimation) + (h
 LiveChat
 --------

-In multi-processing, a dedicated LiveChat worker is automatically started and listens on the
-:option:`--longpolling-port <odoo-bin --longpolling-port>`. By default, the HTTP requests will keep
+In multi-processing, a dedicated LiveChat worker is automatically started and listens on
+the :option:`--gevent-port <odoo-bin --gevent-port>`. By default, the HTTP requests will keep
 accessing the normal HTTP workers instead of the LiveChat one. You must deploy a proxy in front of
-Odoo and redirect incoming requests whose path starts with ``/longpolling`` to the LiveChat worker.
+Odoo and redirect incoming requests whose path starts with ``/websocket/`` to the LiveChat worker.
 You must also start Odoo in :option:`--proxy-mode <odoo-bin --proxy-mode>` so it uses the real
 client headers (such as hostname, scheme, and IP) instead of the proxy ones.

@@ -294,6 +294,10 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
  upstream odoochat {
    server 127.0.0.1:8072;
  }
+  map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ''      close;
+  }

  # http -> https
  server {
@@ -309,12 +313,6 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
    proxy_connect_timeout 720s;
    proxy_send_timeout 720s;

-    # Add Headers for odoo proxy mode
-    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;
-
    # SSL parameters
    ssl_certificate /etc/ssl/nginx/server.crt;
    ssl_certificate_key /etc/ssl/nginx/server.key;
@@ -327,15 +325,31 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
    access_log /var/log/nginx/odoo.access.log;
    error_log /var/log/nginx/odoo.error.log;

-    # Redirect longpoll requests to odoo longpolling port
-    location /longpolling {
+    # Redirect websocket requests to odoo gevent port
+    location /websocket {
      proxy_pass http://odoochat;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection $connection_upgrade;
+      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;
    }

    # Redirect requests to odoo backend server
    location / {
+      # Add Headers for odoo proxy mode
+      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;
    }

    # common gzip
@@ -343,6 +357,31 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
    gzip on;
  }

+HTTPS Hardening
+---------------
+
+Add the `Strict-Transport-Security` header to all requests, in order to prevent
+browsers from ever sending a plain HTTP request to this domain. You will need
+to maintain a working HTTPS service with a valid certificate on this domain at
+all times, otherwise your users will see security alerts or be entirely unable
+to access it.
+
+Force HTTPS connections during a year for every visitor in NGINX with the line:
+
+.. code-block:: nginx
+
+  add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
+
+Additional configuration can be defined for the `session_id` cookie. The `Secure`
+flag can be added to ensure it is never transmitted over HTTP and `SameSite=Lax`
+to prevent authenticated `CSRF`_.
+
+.. code-block:: nginx
+
+  # requires nginx 1.19.8
+  proxy_cookie_flags session_id samesite=lax secure;
+
+
 Odoo as a WSGI Application
 ==========================

@@ -373,31 +412,133 @@ LiveChat
 --------

 Using a gevent-compatible WSGI server is required for the correct operation of the live chat
-feature. That server should be able to handle many simultaneous long-lived HTTP requests but
-doesn't need a lot of processing power. All requests whose path starts with ``/longpolling`` should
-be directed to that server. A regular (thread/process-based) WSGI server should be used for all
-other requests.
+feature. That server should be able to handle many simultaneous long-lived connections but doesn't
+need a lot of processing power. All requests whose path starts with ``/websocket/`` should be
+directed to that server. A regular (thread/process-based) WSGI server should be used for all other
+requests.

 The Odoo cron server can also be used to serve the live chat requests. Just drop
 the :option:`--no-http <odoo-bin --no-http>` cli option from the cron server and make sure requests
-whose path starts with ``/longpolling`` are directed to this server, either on
+whose path starts with ``/websocket/`` are directed to this server, either on
 the :option:`--http-port <odoo-bin --http-port>` (multi-threading server) or on
-the :option:`--longpolling-port <odoo-bin --longpolling-port>` (multi-processing server).
+the :option:`--gevent-port <odoo-bin --gevent-port>` (multi-processing server).

-Serving Static Files
-====================
+.. _deploy/streaming:

-For development convenience, Odoo directly serves all static files in its
-modules. This may not be ideal when it comes to performances, and static
-files should generally be served by a static HTTP server.
+Serving static files and attachments
+====================================

-Odoo static files live in each module's ``static/`` folder, so static files
-can be served by intercepting all requests to :samp:`/{MODULE}/static/{FILE}`,
-and looking up the right module (and file) in the various addons paths.
+For development convenience, Odoo directly serves all static files and attachments in its modules.
+This may not be ideal when it comes to performances, and static files should generally be served by
+a static HTTP server.
+
+Serving static files
+--------------------
+
+Odoo static files are located in each module's :file:`static/` folder, so static files can be served
+by intercepting all requests to :samp:`/{MODULE}/static/{FILE}`, and looking up the right module
+(and file) in the various addons paths.
+
+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 ``map`` and ``location`` blocks should be
+added to serve static files via NGINX.
+
+.. code-block:: nginx
+
+    map $sent_http_content_type $content_type_csp {
+        default "";
+        ~image/ "default-src 'none'";
+    }
+
+    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::
+
+   .. tabs::
+
+      .. group-tab:: Debian package
+
+         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'``.
+
+         The ``root`` and ``try_files`` should be:
+
+         .. 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
+-------------------
+
+Attachments are files stored in the filestore which access is regulated by Odoo. They cannot be
+directly accessed via a static web server as accessing them requires multiple lookups in the
+database to determine where the files are stored and whether the current user can access them or
+not.
+
+Nevertheless, once the file has been located and the access rights verified by Odoo, it is a good
+idea to serve the file using the static web server instead of Odoo. For Odoo to delegate serving
+files to the static web server, the `X-Sendfile <https://tn123.org/mod_xsendfile/>`_ (apache) or
+`X-Accel <https://www.nginx.com/resources/wiki/start/topics/examples/x-accel/>`_ (nginx) extensions
+must be enabled and configured on the static web server. Once it is set up, start Odoo with the
+:option:`--x-sendfile <odoo-bin --x-sendfile>` CLI flag (this unique flag is used for both
+X-Sendfile and X-Accel).
+
+
+.. note::
+   - The X-Sendfile extension for apache (and compatible web servers) does not require any
+     supplementary configuration.
+   - The X-Accel extension for NGINX **does** require the following additionnal configuration:
+
+     .. code-block:: nginx
+
+         location /web/filestore {
+             internal;
+             alias /path/to/odoo/data-dir/filestore;
+         }
+
+     In case you don't know what is the path to your filestore, start Odoo with the
+     :option:`--x-sendfile <odoo-bin --x-sendfile>` option and navigate to the ``/web/filestore`` URL
+     directly via Odoo (don't navigate to the URL via NGINX). This logs a warnings, the message
+     contains the configuration you need.

-.. todo:: test whether it would be interesting to serve filestored attachments
-          via this, and how (e.g. possibility of mapping ir.attachment id to
-          filestore hash in the database?)

 .. _security:

@@ -636,6 +777,7 @@ Here are the supported browsers:
    environment than over the internet.

 .. _regular expression: https://docs.python.org/3/library/re.html
+.. _CSRF: https://en.wikipedia.org/wiki/Cross-site_request_forgery
 .. _ARP spoofing: https://en.wikipedia.org/wiki/ARP_spoofing
 .. _Nginx termination example:
    https://nginx.com/resources/admin-guide/nginx-ssl-termination/
@@ -644,8 +786,8 @@ Here are the supported browsers:
 .. _socat: http://www.dest-unreach.org/socat/
 .. _PostgreSQL connection settings:
 .. _listen to network interfaces:
-    https://www.postgresql.org/docs/9.6/static/runtime-config-connection.html
+    https://www.postgresql.org/docs/12/static/runtime-config-connection.html
 .. _use an SSH tunnel:
-    https://www.postgresql.org/docs/9.6/static/ssh-tunnels.html
+    https://www.postgresql.org/docs/12/static/ssh-tunnels.html
 .. _WSGI: https://wsgi.readthedocs.org/
 .. _POSBox: https://www.odoo.com/page/point-of-sale-hardware#part_2
@@ -0,0 +1,63 @@
+======
+Geo IP
+======
+
+.. note::
+   This documentation only applies to On-premise databases.
+
+Installation
+============
+
+#. Download both the GeoLite2 City and Country
+   `databases <https://dev.maxmind.com/geoip/geoip2/geolite2/>`_. You should end up with two files
+   called :file:`GeoLite2-City.mmdb` and :file:`GeoLite2-Country.mmdb`.
+
+#. Move the files to the folder :file:`/usr/share/GeoIP/`.
+
+   .. code-block:: bash
+
+       mv ~/Downloads/GeoLite2-City.mmdb /usr/share/GeoIP/
+       mv ~/Downloads/GeoLite2-Country.mmdb /usr/share/GeoIP/
+
+#. Restart the server
+
+.. note::
+   If you don't want to locate the geoip database in :file:`/usr/share/GeoIP/`, use the
+   :option:`--geoip-city-db <odoo-bin --geoip-city-db>` and
+   :option:`--geoip-country-db <odoo-bin --geoip-country-db>` options of the Odoo command line
+   interface. These options take the absolute path to the GeoIP database file and use it as the
+   GeoIP database. For example:
+
+   .. code-block:: bash
+
+      ./odoo-bin --geoip-city-db= ~/Downloads/GeoLite2-City.mmdb
+
+   .. seealso::
+      - :doc:`CLI documentation </developer/reference/cli>`.
+
+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:
+
+#. Go to your website. Open the web page that you want to test ``GeoIP``.
+#. Choose :menuselection:`Customize --> HTML/CSS/JS Editor`.
+#. Add the following piece of XML in the page :
+
+   .. code-block:: xml
+
+       <h1 class="text-center" t-esc="request.geoip.country.name or 'geoip failure'"/>
+
+#. Save and refresh the page.
+
+Geo-ip is working if you read your country name displayed in bold in the middle of the page.
+
+In case you read "**geoip failure**" instead then the geolocalization failed. The common causes are:
+
+#. The browsing IP address is the localhost (``127.0.0.1``) or a local area network one. If you
+   don't know, you can access your website using mobile data.
+#. You are using a reverse-proxy (apache, nginx) in front of Odoo but didn't start Odoo with the
+   proxy-mode enabled. See :option:`proxy mode <odoo-bin --proxy-mode>`.
+#. The GeoIP database is corrupt, missing or unaccessible. In such case a warning was logged in the
+   server logs.
@@ -0,0 +1,21 @@
+======
+Online
+======
+
+Online instances are accessed using any web browser and do not require a local installation.
+
+Demo
+----
+
+To quickly try out Odoo, shared `demo <https://demo.odoo.com>`_ instances are available. No
+registration is required, but each instance only lives for a few hours.
+
+Odoo Online
+-----------
+
+`Odoo Online <https://www.odoo.com/trial>`_ provides private instances which are fully managed and
+hosted by Odoo. It can be used for long-term production or to test Odoo thoroughly, including
+customizations that don't require code.
+
+.. note::
+   Odoo Online is incompatible with custom modules or the Odoo App Store.
@@ -16,8 +16,8 @@ Official **Community** and **Enterprise** packages can be downloaded from the `O
 <https://www.odoo.com/page/download>`_.

 .. note::
-   It is required to be logged in as a paying on-premise customer or partner to download the
-   Enterprise packages.
+   It is required to be logged in as a paying customer or partner to download the Enterprise
+   packages.

 .. _install/packages/linux:

@@ -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 install
-==============
+======
+Source
+======

 The source 'installation' is not about installing Odoo but running it directly from the source
 instead.
@@ -118,7 +118,11 @@ Prepare
 Python
 ~~~~~~

-Odoo requires **Python 3.7** or later to run.
+Odoo requires **Python 3.10** or later to run.
+
+.. versionchanged:: 17
+    Minimum requirement updated from Python 3.7 to Python 3.10.
+

 .. tabs::

@@ -225,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::
@@ -250,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::
@@ -409,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:

@@ -475,7 +479,7 @@ http://localhost:8069 in a web browser and log into the Odoo database with the b
 account: use `admin` as the email and, again, `admin` as the password.

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

@@ -0,0 +1,18 @@
+:nosearch:
+
+========
+Maintain
+========
+
+.. toctree::
+
+    maintain/domain_names
+    maintain/azure_oauth
+    maintain/google_oauth
+    maintain/mailjet_api
+    maintain/update
+    maintain/enterprise
+    maintain/hosting_changes
+    maintain/odoo_online
+    maintain/on_premise
+    maintain/supported_versions
@@ -12,7 +12,7 @@ personal email address or an address created by a custom domain.
   <https://learn.microsoft.com/azure/active-directory/develop/quickstart-register-app>`_

 .. seealso::
-   - :doc:`/applications/general/users/azure`
+   - :doc:`/applications/general/auth/azure`
   - :doc:`/applications/productivity/calendar/outlook`

 Setup in Microsoft Azure Portal
@@ -290,4 +290,4 @@ account`. Odoo will state: :guilabel:`Outlook Token Valid` Now :guilabel:`Test a
 account. The account should be ready to receive email to the Odoo database.

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

 .. seealso::
-   - :doc:`/applications/general/users/google`
+   - :doc:`/applications/general/auth/google`
   - :doc:`/applications/productivity/calendar/google`

 Setup in Google
@@ -0,0 +1,111 @@
+=======================
+Change hosting solution
+=======================
+
+The instructions to change the hosting type of a database depend on the current solution used and to
+which solution the database should be moved.
+
+Transferring an on-premise database
+===================================
+
+To Odoo Online
+--------------
+
+.. important::
+   - Odoo Online is *not* compatible with **non-standard apps**.
+   - The database's current version must be :doc:`supported <supported_versions>`.
+
+#. Create a :ref:`duplicate <duplicate_premise>` of the database.
+#. In this duplicate, uninstall all **non-standard apps**.
+#. Use the database manager to grab a *dump with filestore*.
+#. `Submit a support ticket <https://www.odoo.com/help>`_ including the following:
+
+   - your **subscription number**,
+   - the **URL** you want to use for the database (e.g., `company.odoo.com`), and
+   - the **dump** as an attachment or as a link to the file (required for 60 MB+ files).
+
+#. Odoo then makes sure the database is compatible before putting it online. In case of technical
+   issues during the process, Odoo might contact you.
+
+.. note::
+   If you have time constraints, `submit a support ticket <https://www.odoo.com/help>`_ as soon as
+   possible to schedule the transfer.
+
+To Odoo.sh
+----------
+
+Follow the instructions found in :ref:`the Import your database section
+<odoo_sh_import_your_database>` of the Odoo.sh *Create your project* documentation.
+
+Transferring an Odoo Online database
+====================================
+
+.. important::
+   Odoo Online's :ref:`intermediary versions <supported_versions>` cannot be hosted on-premise as
+   that type of hosting does not support those versions. Therefore, if the database to transfer
+   is running an intermediary version, it must be upgraded first to the next :ref:`major version
+   <supported_versions>`, waiting for its release if necessary.
+
+   .. example::
+      Transferring an online database running on Odoo 16.3 would require first upgrading it to Odoo
+      17.0.
+
+   .. tip::
+      Click the gear icon (:guilabel:`⚙`) next to the database name on the `Odoo Online database
+      manager <https://www.odoo.com/my/databases/>`_ to display its version number.
+
+To on-premise
+-------------
+
+#. Sign in to `the Odoo Online database manager <https://www.odoo.com/my/databases/>`_ and click the
+   gear icon (:guilabel:`⚙`) next to the database name to :guilabel:`Download` a backup. If the
+   download fails due to the file being too large, `contact Odoo support
+   <https://www.odoo.com/help>`_.
+#. Restore the database from the database manager on your local server using the backup.
+
+To Odoo.sh
+----------
+
+#. Sign in to `the Odoo Online database manager <https://www.odoo.com/my/databases/>`_ and click the
+   gear icon (:guilabel:`⚙`) next to the database name to :guilabel:`Download` a backup. If the
+   download fails due to the file being too large, `contact Odoo support
+   <https://www.odoo.com/help>`_.
+#. Follow the instructions found in :ref:`the Import your database section
+   <odoo_sh_import_your_database>` of the Odoo.sh *Create your project* documentation.
+
+Transferring an Odoo.sh database
+================================
+
+To Odoo Online
+--------------
+
+.. important::
+   Odoo Online is *not* compatible with **non-standard apps**.
+
+#. Uninstall all **non-standard apps** in a staging build before doing it in the production build.
+#. `Create a support ticket <https://www.odoo.com/help>`_ including the following:
+
+   - your **subscription number**,
+   - the **URL** you want to use for the database (e.g., `company.odoo.com`),
+   - which **branch** should be migrated,
+   - in which **region** you want the database to be hosted (Americas, Europe, or Asia),
+   - which user(s) will be the **administrator(s)**, and
+   - **when** (and in which timezone) you want the database to be up and running.
+
+#. Odoo then makes sure the database is compatible before putting it online. In case of technical
+   issues during the process, Odoo might contact you.
+
+.. note::
+   - If you have time constraints, `submit a support ticket <https://www.odoo.com/help>`_ as soon as
+     possible to schedule the transfer.
+   - Select the **region** closest to most of your users to reduce latency.
+   - Future **administrator(s)** must have an Odoo.com account.
+   - The **date and time** you want the database to be up and running are helpful to organize the
+     switch from the Odoo.sh server to the Odoo Online servers.
+   - Databases are **not reachable** during their migration.
+
+To on-premise
+-------------
+
+#. Download a :ref:`backup of your Odoo.sh production database <odoo_sh_branches_backups>`.
+#. Restore the database from the database manager on your local server using the backup.
@@ -210,8 +210,9 @@ Connection`.

   For more information see :ref:`Using a default email address <email_communication/default>`.

-   The :guilabel:`System Parameters` can be accessed by activating the :ref:`developer mode
-   <developer-mode>`.
+   The :guilabel:`System Parameters` can be accessed by activating
+   :doc:`../../applications/general/developer_mode` in the :menuselection:`Settings --> Technical
+   --> Parameters --> System Parameters` menu.

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

 To manage a database, go to the `database manager <https://www.odoo.com/my/databases>`_ and sign in
 as the database administrator.
@@ -84,11 +69,10 @@ Download a ZIP file containing a backup of the database.
 Domain names
 ============

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

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

 .. _odoo_online/tags:

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

 .. seealso::
-   - :doc:`/applications/general/users`
-   - :doc:`odoo_accounts`
+   - :doc:`/applications/general/users/manage_users`
+   - :doc:`/applications/general/users/odoo_account`
@@ -0,0 +1,168 @@
+==============================
+On-premise database management
+==============================
+
+Register a database
+===================
+
+To register your database, you just need to enter your Subscription Code in the
+banner in the App Switcher. Make sure you do not add extra spaces before or after
+your subscription code. If the registration is successful, it will turn green and
+will provide you with the Expiration Date of your freshly-registered database. You
+can check this Expiration Date in the About menu (Odoo 9) or in the Settings Dashboard
+(Odoo 10).
+
+Registration Error Message
+--------------------------
+
+If you are unable to register your database, you will likely encounter this
+message:
+
+.. image:: on_premise/error_message_sub_code.png
+   :align: center
+   :alt: Something went wrong while registering your database, you can try again or contact Odoo
+         Help
+
+Solutions
+~~~~~~~~~
+
+* Do you have a valid Enterprise subscription?
+
+  * Check if your subscription details get the tag "In Progress" on
+    your `Odoo Account
+    <https://accounts.odoo.com/my/subscription>`__ or with your Account Manager
+
+* Have you already linked a database with your subscription reference?
+
+  * You can link only one database per subscription.
+    (Need a test or a development database? `Find a partner
+    <https://www.odoo.com/partners>`__)
+
+  * You can unlink the old database yourself on your `Odoo Contract
+    <https://accounts.odoo.com/my/subscription>`__ with the button "Unlink database"
+
+    .. image:: on_premise/unlink_single_db.png
+       :align: center
+
+    A confirmation message will appear; make sure this is the correct database as
+    it will be deactivated shortly:
+
+    .. image:: on_premise/unlink_confirm_enterprise_edition.png
+       :align: center
+
+* Do you have the updated version of Odoo 9?
+
+  * From July 2016 onward, Odoo 9 now automatically change the uuid of a
+    duplicated database; a manual operation is no longer required.
+
+  * If it's not the case, you may have multiple databases sharing the same
+    UUID. Please check on your `Odoo Contract
+    <https://accounts.odoo.com/my/subscription>`__, a short message will appear
+    specifying which database is problematic:
+
+    .. image:: on_premise/unlink_db_name_collision.png
+       :align: center
+
+    In this case, you need to change the UUID on your test databases to solve this
+    issue. You will find more information about this in :ref:`this section <duplicate_premise>`.
+
+    For your information, we identify database with UUID. Therefore, each database
+    should have a distinct UUID to ensure that registration and invoicing proceed
+    effortlessly for your and for us.
+
+* Check your network and firewall settings
+
+  * The Update notification must be able to reach Odoo's subscription
+    validation servers. In other words, make sure that the Odoo server is able
+    to open outgoing connections towards:
+
+      * services.odoo.com on port 443 (or 80)
+      * services.openerp.com on port 443 (or 80) for older deployments
+
+  * Once you activated your database, you must keep these ports open, as the
+    Update notification runs once a week.
+
+Error message due to too many users
+-----------------------------------
+
+If you have more users in your local database than provisionned in your
+Odoo Enterprise subscription, you may encounter this message:
+
+.. image:: on_premise/add_more_users.png
+   :align: center
+   :alt: This database will expire in X days, you have more users than your subscription allows
+
+
+When the message appears you have 30 days before the expiration.
+The countdown is updated everyday.
+
+Solutions
+~~~~~~~~~
+
+- **Add more users** on your subscription: follow the link and Validate
+  the upsell quotation and pay for the extra users.
+- **Deactivate users** as explained in this `documentation <documentation.html#deactivating-users>`_
+  and **Reject** the upsell quotation.
+
+Once your database has the correct number of users, the expiration message
+will disappear automatically after a few days, when the next verification occurs.
+We understand that it can be a bit frightening to see the countdown,
+so you can :ref:`force an Update Notification <force_ping>`  to make the message disappear
+right away.
+
+Database expired error message
+------------------------------
+
+If your database reaches its expiration date before your renew your subscription,
+you will encounter this message:
+
+.. image:: on_premise/database_expired.png
+   :align: center
+   :alt: This database has expired.
+
+This **blocking** message appears after a non-blocking message that lasts 30 days.
+If you fail to take action before the end of the countdown, the database is expired.
+
+Solutions
+~~~~~~~~~
+
+* Renew your subscription: follow the link and renew your subscription - note that
+    if you wish to pay by Wire Transfer, your subscription will effectively be renewed
+    only when the payment arrives, which can take a few days. Credit card payments are
+    processed immediately.
+* Contact our `Support <https://www.odoo.com/help>`__
+
+None of those solutions worked for you? Please contact our
+`Support <https://www.odoo.com/help>`__
+
+.. _force_ping:
+
+.. _duplicate_premise:
+
+Duplicate a database
+====================
+
+You can duplicate your database by accessing the database manager on your
+server (<odoo-server>/web/database/manager). In this page, you can easily
+duplicate your database (among other things).
+
+.. image:: on_premise/db_manager.gif
+   :align: center
+
+When you duplicate a local database, it is **strongly** advised to change
+the duplicated database's uuid (Unniversally Unique Identifier), since this
+uuid is how your database identifies itself with our servers. Having two
+databases with the same uuid could result in invoicing problems or registration
+problems down the line.
+
+.. note::
+   From July 2016 onward, Odoo 9 now automatically change the uuid of a duplicated database; a
+   manual operation is no longer required.
+
+The database uuid is currently accessible from the menu :menuselection:`Settings --> Technical -->
+System Parameters`, we advise you to use a `uuid generator <https://www.uuidtools.com>`_ or to
+use the unix command ``uuidgen`` to generate a new uuid. You can then simply replace it like any
+other record by clicking on it and using the edit button.
+
+.. image:: on_premise/db_uuid.png
+   :align: center
@@ -13,7 +13,7 @@ Odoo provides support and bug fixing **for the 3 last major versions** of Odoo.
   <odoo_online>` hosting every two months. Odoo Online users can then benefit from the latest
   features of Odoo.

-   - Admins of Odoo Online databases are invited to :doc:`upgrade <upgrade>` them regularly.
+   - Admins of Odoo Online databases are invited to :doc:`upgrade <../upgrade>` them regularly.
   - Online versions are *not* released for Odoo.sh and On-Premise installations.
   - Online versions are listed below as *SaaS*.

@@ -31,18 +31,12 @@ This matrix shows the support status of every version.
     - On-Premise
     - Release date
     - End of support
-   * - Odoo saas~17.1
-     - |green|
-     - N/A
-     - N/A
-     - January 2024
-     -
   * - **Odoo 17.0**
     - |green|
     - |green|
     - |green|
     - November 2023
-     - October 2026 (planned)
+     - November 2026 (planned)
   * - Odoo saas~16.4
     - |green|
     - N/A
@@ -0,0 +1,152 @@
+
+.. _setup/update:
+
+==============
+Bugfix updates
+==============
+
+Introduction
+============
+
+In order to benefit from the latest improvements, security fixes, bug corrections and
+performance boosts, you may need to update your Odoo installation from time to time.
+
+This guide only applies when are using Odoo on your own hosting infrastructure.
+If you are using one of the Odoo Cloud solutions, updates are automatically performed for you.
+
+The terminology surrounding software updates is often confusing, so here are some preliminary
+definitions:
+
+Updating (an Odoo installation)
+  Refers to the process of obtaining the latest revision of the source code for
+  your current Odoo Edition. For example, updating your Odoo Enterprise 13.0 to the
+  latest revision.
+  This does not directly cause any change to the contents of your Odoo database, and
+  can be undone by reinstalling the previous revision of the source code.
+
+Upgrading (an Odoo database)
+  Refers to a complex data processing operation where the structure and contents of your
+  database is permanently altered to make it compatible with a new release of Odoo.
+  This operation is irreversible and typically accomplished via Odoo's
+  `database upgrade service <https://upgrade.odoo.com>`_, when you decide to
+  switch to a newer release of Odoo.
+  Historically, this process has also been known as a "migration" because it involves moving data
+  around inside the database, even though the database may end up at the same physical location
+  after the upgrade.
+
+This page describes the typical steps needed to *update* an Odoo installation to the latest
+version. If you'd like more information about upgrading a database, please visit the
+`Odoo Upgrade page <https://upgrade.odoo.com>`_ instead.
+
+
+In a nutshell
+=============
+
+Updating Odoo is accomplished by simply reinstalling the latest version of your Odoo
+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>`,
+which explains the common installation methods.
+
+Updating is also most appropriately accomplished by the person who deployed Odoo initially,
+because the procedure is very similar.
+
+.. note:: We always recommend to download a complete new up-to-date Odoo version, rather than
+          manually applying patches, such as the security patches that come with Security
+          Advisories.
+          The patches are mainly provided for installations that are heavily customized, or for
+          technical personnel who prefer to apply minimal changes temporarily while testing a
+          complete update.
+
+
+Step 1: Download an updated Odoo version
+========================================
+
+The central download page is https://www.odoo.com/page/download. If you see a "Buy" link for the
+Odoo Enterprise download, make sure you are logged into Odoo.com with the same login that is
+linked to your Odoo Enterprise subscription.
+
+Alternatively, you can use the unique download link that was included with your Odoo Enterprise
+purchase confirmation email.
+
+.. note:: Downloading an updated version is not necessary if you installed via Github (see below)
+
+
+Step 2: Make a backup of your database
+======================================
+
+The update procedure is quite safe and should not alter you data. However it's always best to take
+a full database backup before performing any change on your installation, and to store it somewhere
+safe, on a different computer.
+
+If you have not disabled the database manager screen (see :ref:`here <security>` why you should), you
+can use it (link at bottom of your database selection screen) to download a backup of your
+database(s). If you disabled it, use the same procedure than for your usual backups.
+
+
+Step 3: Install the updated version
+===================================
+
+Choose the method that matches your current installation:
+
+
+Packaged Installers
+-------------------
+
+If you installed Odoo with an installation package downloaded on our website (the recommended method),
+updating is very simple.
+All you have to do is download the installation package corresponding to your system (see step #1)
+and install it on your server. They are updated daily and include the latest security fixes.
+Usually, you can simply double-click the package to install it on top of the current installation.
+After installing the package, be sure to restart the Odoo service or reboot your server,
+and you're all set.
+
+Source Install (Tarball)
+------------------------
+
+If you have originally installed Odoo with the "tarball" version (source code archive), you have
+to replace the installation directory with a newer version. First download the latest tarball
+from Odoo.com. They are updated daily and include the latest security fixes (see step #1)
+After downloading the package, extract it to a temporary location on your server.
+
+You will get a folder labeled with the version of the source code, for example "odoo-13.0+e.20190719",
+that contains a folder "odoo.egg-info" and the actual source code folder named "odoo" (for Odoo 10
+and later) or "openerp" for older versions.
+You can ignore the odoo.egg-info folder. Locate the folder where your current installation is deployed,
+and replace it with the newer "odoo" or "openerp" folder that was in the archive you just extracted.
+
+Be sure to match the folder layout, for example the new "addons" folder included in the source code
+should end up exactly at the same path it was before. Next, watch out for any specific configuration
+files that you may have manually copied or modified in the old folder, and copy them over to the
+new folder.
+Finally, restart the Odoo service or reboot the machine, and you are all set.
+
+Source Install (Github)
+-----------------------
+
+If you have originally installed Odoo with a full Github clone of the official repositories, the
+update procedure requires you to pull the latest source code via git.
+Change into the directory for each repository (the main Odoo repository, and the Enterprise
+repository), and run the following commands::
+
+     git fetch
+     git rebase --autostash
+
+The last command may encounter source code conflicts if you had edited the Odoo source code locally.
+The error message will give you the list of files with conflicts, and you will need to resolve
+the conflicts manually, by editing them and deciding which part of the code to keep.
+
+Alternatively, if you prefer to simply discard the conflicting changes and restore the official
+version, you can use the following command::
+
+     git reset --hard
+
+Finally, restart the Odoo service or reboot the machine, and you should be done.
+
+
+Docker
+------
+
+Please refer to our `Docker image documentation <https://hub.docker.com/_/odoo/>`_ for
+specific update instructions.
@@ -1,78 +0,0 @@
-=================
-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`
@@ -29,3 +29,24 @@ We advise that:
 - Your scheduled actions should be
  `idempotent <https://stackoverflow.com/a/1077421/3332416>`_: they must not
  cause side-effects if they are started more often than expected.
+
+How do I know if I need more workers ?
+--------------------------------------
+
+Workers are abstract units of resources allocated to your database. The more workers you have the more it can be accessed concurrently.
+
+As a general rule of thumb, you should allocate about **1 worker per 25 users and 1 worker for every 5000 daily visitors**. However, this can vary considerably based on database usage, website characteristics, and code customizations.
+
+Speed is only impacted if you have too much concurrency.
+
+If things are getting slow, here are a couple of indications to tell if it's due to a high concurrency.
+
+- When things gets slow, **everything is slowed down**, not just specific operations.
+- **The slowness comes and goes**, typically it's better outside of business hours. (There can be other reasons for this as well.)
+- :ref:`Open your monitoring <odoosh-gettingstarted-branches-tabs-monitoring>`, there is a graph indicating the number of **"concurrent requests (max)"**. This graphs is often high or shows a flat upper bound during a prolonged period of time.
+- Some requests get a **"429 Too Many Requests"** response code.
+
+If you have these symptoms it's advisable to try increasing your workers.
+
+.. warning::
+    Sometimes this high concurrency is temporary or illegitimate, it's possible your website is being crawled or that you have misconfigured third party applications excessively sollicitating your database. To identify this, have a look at the IP adresses in your odoo logs to see if some are flooding.
@@ -72,7 +72,7 @@ The neutralization includes:
 * Disabling outgoing emails by intercepting them with a mailcatcher. An
  :ref:`interface to view <odoosh-gettingstarted-branches-tabs-mails>` the emails sent by your
  database is provided. That way, you do not have to worry about sending test emails to your contacts.
-* Setting payment acquirers and shipping providers in test mode.
+* Setting payment providers and shipping providers in test mode.
 * Disabling IAP services

 The latest database will be kept alive indefinitely, older ones from the same branch may get garbage collected
@@ -208,6 +208,8 @@ You can also open terminals, Python consoles and even Odoo Shell consoles.
 You can open multiple tabs and drag-and-drop them to arrange the layout as you wish,
 for instance side by side.

+.. _odoosh-gettingstarted-branches-tabs-monitoring:
+
 Monitoring
 ----------

@@ -91,7 +91,7 @@ Import your database
 ====================

 You can import your database in your Odoo.sh project as long as it is in a :doc:`supported version
-</administration/supported_versions>` of Odoo.
+</administration/maintain/supported_versions>` of Odoo.

 Push your modules in production
 -------------------------------
@@ -202,4 +202,4 @@ therefore removed, as you can only have one database linked per subscription.

 If you plan to make it your production, unlink your former database from the subscription, and
 register the newly imported database. Read the :doc:`database registration documentation
-<../../on_premise>` for instructions.
+<../../maintain/on_premise>` for instructions.
@@ -85,7 +85,7 @@ From the Odoo.sh editor, in a terminal:

  $ odoo-bin scaffold my_module ~/src/user/

-Or, from your computer, if you have an :doc:`installation of Odoo <../../on_premise/source>`:
+Or, from your computer, if you have an :doc:`installation of Odoo <../../install/source>`:

 .. code-block:: bash

@@ -138,7 +138,7 @@ Uncomment the content of the files:
  the manifest of your module, including for instance its title, description and data files to load.
  You just need to uncomment the access control list data file:

-  .. code-block:: xml
+  .. code-block:: python

    # 'security/ir.model.access.csv',

@@ -1,123 +0,0 @@
-:show-content:
-
-==========
-On-premise
-==========
-
-Register a database
-===================
-
-To register your database, enter your subscription code in the banner in the app dashboard. If the
-registration is successful, the banner will turn green and display the database expiration date.
-
-.. tip::
-   The expiration date is also displayed at the bottom of the Settings page.
-
-.. _on-premise/duplicate:
-
-Duplicate a database
-====================
-
-Duplicate a database by accessing the database manager on your server
-(`<odoo-server>/web/database/manager`). Typically, you want to duplicate your production database
-into a neutralized testing database. It can be done by checking the neutralize box when prompted,
-which executes all :file:`neutralize.sql` scripts for every installed module.
-
-Common error messages and solutions
-===================================
-
-Registration error
------------------
-
-In case of a registration error, the following message should be displayed.
-
-.. image:: on_premise/error-message-sub-code.png
-   :alt: Database registration error message
-
-To resolve the issue:
-
- Check the **validity of your Odoo Enterprise subscription** by verifying if your subscription
-  details have the tag :guilabel:`In Progress` on your `Odoo Account
-  <https://accounts.odoo.com/my/subscription>`_ or contact your Account Manager.
-
- Ensure that **no other database is linked** to the subscription code, as only one database can be
-  linked per subscription.
-
-  .. tip::
-     If a test or a development database is needed, you can :ref:`duplicate a database
-     <on-premise/duplicate>`.
-
- Verify that **no databases share the same UUID** (Universally Unique Identifier) by opening your
-  `Odoo Contract <https://accounts.odoo.com/my/subscription>`_. If two or more databases share the
-  same UUID, their name will be displayed.
-
-  .. image:: on_premise/unlink-db-name-collision.png
-     :alt: Database UUID error message
-
-  If that is the case, manually change the database(s) UUID or `send a support ticket
-  <https://www.odoo.com/help>`_.
-
- As the update notification must be able to reach Odoo's subscription validation servers, ensure
-  your **network and firewall settings** allow the Odoo server to open outgoing connections
-  towards:
-
-  - `services.odoo.com` on port `443` (or `80`)
-  - for older deployments, `services.openerp.com` on port `443` (or `80`)
-
-  These ports must be kept open even after registering a database, as the update notification runs
-  once a week.
-
-Too many users error
--------------------
-
-If you have more users in a local database than provisioned in your Odoo Enterprise subscription,
-the following message should be displayed.
-
-.. image:: on_premise/add-more-users.png
-   :alt: Too many users on a database error message
-
-When the message appears, you have 30 days to act before the database expires. The countdown is
-updated every day.
-
-To resolve the issue, either:
-
- **Add more users** to your subscription by clicking the :guilabel:`Upgrade your subscription` link
-  displayed in the message to validate the upsell quotation and pay for the extra users.
- :ref:`Deactivate users <users/deactivate>` and **reject** the upsell quotation.
-
-.. important::
-   If you are on a monthly subscription plan, the database will automatically update to reflect the
-   added user(s). If you are on a yearly or multi-year plan, an expiration banner will appear in the
-   database. You can create the upsell quotation by clicking the banner to update the subscription
-   or `send a support ticket <https://www.odoo.com/help>`_ to resolve the issue.
-
-Once your database has the correct number of users, the expiration message disappears automatically
-after a few days, when the next verification occurs.
-
-Database expired error
----------------------
-
-If your database expires before you renew your subscription, the following message should be
-displayed.
-
-.. image:: on_premise/database-expired.png
-   :alt: Database expired error message
-
-This message appears if you fail to act before the end of the 30-day countdown.
-
-To resolve the issue, either:
-
- Click the :guilabel:`Renew your subscription` link displayed in the message and complete the
-  process. If you pay by wire transfer, your subscription will be renewed when the payment arrives
-  which can take a few days. Credit card payments are processed immediately.
- `Send a support ticket <https://www.odoo.com/help>`_.
-
-.. toctree::
-
-   on_premise/packages
-   on_premise/source
-   on_premise/update
-   on_premise/deploy
-   on_premise/email_gateway
-   on_premise/geo_ip
-   on_premise/community_to_enterprise
@@ -1,106 +0,0 @@
-
-.. _setup/enterprise:
-
-===================================
-Switch from Community to Enterprise
-===================================
-
-Depending on your current installation, there are multiple ways to upgrade
-your community version.
-In any case the basic guidelines are:
-
-* Backup your community database
-
-  .. image:: community_to_enterprise/db_manager.png
-     :class: img-fluid
-
-* Shutdown your server
-
-* Install the web_enterprise module
-
-* Restart your server
-
-* Enter your Odoo Enterprise Subscription code
-
-.. image:: community_to_enterprise/enterprise_code.png
-   :class: img-fluid
-
-On Linux, using an installer
-============================
-
-* Backup your community database
-
-* Stop the odoo service
-
-  .. code-block:: console
-
-    $ sudo service odoo stop
-
-* Install the enterprise .deb (it should install over the community package)
-
-  .. code-block:: console
-
-    $ sudo dpkg -i <path_to_enterprise_deb>
-
-* Update your database to the enterprise packages using
-
-  .. code-block:: console
-
-    $ python3 /usr/bin/odoo-bin -d <database_name> -i web_enterprise --stop-after-init
-
-* You should be able to connect to your Odoo Enterprise instance using your usual mean of identification.
-  You can then link your database with your Odoo Enterprise Subscription by entering the code you received
-  by e-mail in the form input
-
-
-On Linux, using the source code
-===============================
-
-There are many ways to launch your server when using sources, and you probably
-have your own favourite. You may need to adapt sections to your usual workflow.
-
-* Shutdown your server
-* Backup your community database
-* Update the ``--addons-path`` parameter of your launch command (see :doc:`../on_premise/source`)
-* Install the web_enterprise module by using
-
-  .. code-block:: console
-
-    $ -d <database_name> -i web_enterprise --stop-after-init
-
-  Depending on the size of your database, this may take some time.
-
-* Restart your server with the updated addons path of point 3.
-  You should be able to connect to your instance. You can then link your database with your
-  Odoo Enterprise Subscription by entering the code you received by e-mail in the form input
-
-On Windows
-==========
-
-* Backup your community database
-
-* Uninstall Odoo Community (using the Uninstall executable in the installation folder) -
-  PostgreSQL will remain installed
-
-  .. image:: community_to_enterprise/windows_uninstall.png
-    :class: img-fluid
-
-* Launch the Odoo Enterprise Installer and follow the steps normally. When choosing
-  the installation path, you can set the folder of the Community installation
-  (this folder still contains the PostgreSQL installation).
-  Uncheck ``Start Odoo`` at the end of the installation
-
-  .. image:: community_to_enterprise/windows_setup.png
-     :class: img-fluid
-
-* Using a command window, update your Odoo Database using this command (from the Odoo
-  installation path, in the server subfolder)
-
-  .. code-block:: console
-
-    $ ..\python\python.exe odoo-bin -d <database_name> -i web_enterprise --stop-after-init
-
-* No need to manually launch the server, the service is running.
-  You should be able to connect to your Odoo Enterprise instance using your usual
-  mean of identification. You can then link your database with your Odoo Enterprise
-  Subscription by entering the code you received by e-mail in the form input
@@ -1,70 +0,0 @@
-======
-Geo IP
-======
-
-.. note::
-   This documentation only applies to On-premise databases.
-
-Installation
-============
-
-.. warning::
-   Please note that the installation depends on your computer's operating system and distribution.
-   We will assume that a Linux operating system is being used.
-
-#. Install `geoip2 <https://pypi.org/project/geoip2/>`__ Python library
-    .. code-block:: bash
-
-      pip install geoip2
-
-#. Download the `GeoLite2 City database <https://dev.maxmind.com/geoip/geoip2/geolite2/>`_. You
-   should end up with a file called ``GeoLite2-City.mmdb``
-#. Move the file to the folder ``/usr/share/GeoIP/``
-    .. code-block:: bash
-
-        mv ~/Downloads/GeoLite2-City.mmdb /usr/share/GeoIP/
-
-#. Restart the server
-
-.. note::
-   If you can't/don't want to locate the geoip database in ``/usr/share/GeoIP/``, you can use the
-   ``--geoip-db`` option of the Odoo command line interface. This option takes the absolute path to
-   the GeoIP database file and uses it as the GeoIP database. For example:
-
-   .. code-block:: bash
-
-      ./odoo-bin --geoip-db= ~/Downloads/GeoLite2-City.mmdb
-
-   .. seealso::
-      - :doc:`CLI documentation </developer/reference/cli>`.
-
-.. warning::
-   ``GeoIP`` Python library can also be used. However this version is discontinued since January
-   1.    See `GeoLite Legacy databases are now discontinued
-   <https://support.maxmind.com/geolite-legacy-discontinuation-notice/>`_
-
-How to test GeoIP geolocation in your Odoo website
-==================================================
-
-1. Go to your website. Open the web page that you want to test ``GeoIP``.
-2. Choose :menuselection:`Customize --> HTML/CSS/JS Editor`.
-3. Add the following piece of XML in the page :
-
-.. code-block:: xml
-
-    <h1 class="text-center" t-esc="request.session.get('geoip')"/>
-
-You should end up with a dictionary indicating the location of the IP address.
-
-.. image:: geo_ip/on-premise_geo-ip-installation01.png
-    :align: center
-
-.. note::
-   If the curly braces are empty ``{}``, it can be for any of the following reasons :
-
-   - The browsing IP address is the localhost (``127.0.0.1``) or a local area network one
-     (``192.168.*.*``)
-   - If a reversed proxy is used, make sure to configure it correctly. See :option:`proxy mode
-     <odoo-bin --proxy-mode>`
-   - ``geoip2`` is not installed or the GeoIP database file wasn't found
-   - The GeoIP database was unable to resolve the given IP address
@@ -1,152 +0,0 @@
-
-.. _setup/update:
-
-==============
-Bugfix updates
-==============
-
-Introduction
-============
-
-In order to benefit from the latest improvements, security fixes, bug corrections and
-performance boosts, you may need to update your Odoo installation from time to time.
-
-This guide only applies when are using Odoo on your own hosting infrastructure.
-If you are using one of the Odoo Cloud solutions, updates are automatically performed for you.
-
-The terminology surrounding software updates is often confusing, so here are some preliminary
-definitions:
-
-Updating (an Odoo installation)
-  Refers to the process of obtaining the latest revision of the source code for
-  your current Odoo Edition. For example, updating your Odoo Enterprise 13.0 to the
-  latest revision.
-  This does not directly cause any change to the contents of your Odoo database, and
-  can be undone by reinstalling the previous revision of the source code.
-
-Upgrading (an Odoo database)
-  Refers to a complex data processing operation where the structure and contents of your
-  database is permanently altered to make it compatible with a new release of Odoo.
-  This operation is irreversible and typically accomplished via Odoo's
-  `database upgrade service <https://upgrade.odoo.com>`_, when you decide to
-  switch to a newer release of Odoo.
-  Historically, this process has also been known as a "migration" because it involves moving data
-  around inside the database, even though the database may end up at the same physical location
-  after the upgrade.
-
-This page describes the typical steps needed to *update* an Odoo installation to the latest
-version. If you'd like more information about upgrading a database, please visit the
-`Odoo Upgrade page <https://upgrade.odoo.com>`_ instead.
-
-
-In a nutshell
-=============
-
-Updating Odoo is accomplished by simply reinstalling the latest version of your Odoo
-Edition on top of your current installation. This will preserve your data without any alteration,
-as long as you do not uninstall PostgreSQL (the database engine that comes with Odoo).
-
-The main reference for updating is logically our :doc:`installation guide <../on_premise>`,
-which explains the common installation methods.
-
-Updating is also most appropriately accomplished by the person who deployed Odoo initially,
-because the procedure is very similar.
-
-.. note:: We always recommend to download a complete new up-to-date Odoo version, rather than
-          manually applying patches, such as the security patches that come with Security
-          Advisories.
-          The patches are mainly provided for installations that are heavily customized, or for
-          technical personnel who prefer to apply minimal changes temporarily while testing a
-          complete update.
-
-
-Step 1: Download an updated Odoo version
-========================================
-
-The central download page is https://www.odoo.com/page/download. If you see a "Buy" link for the
-Odoo Enterprise download, make sure you are logged into Odoo.com with the same login that is
-linked to your Odoo Enterprise subscription.
-
-Alternatively, you can use the unique download link that was included with your Odoo Enterprise
-purchase confirmation email.
-
-.. note:: Downloading an updated version is not necessary if you installed via Github (see below)
-
-
-Step 2: Make a backup of your database
-======================================
-
-The update procedure is quite safe and should not alter you data. However it's always best to take
-a full database backup before performing any change on your installation, and to store it somewhere
-safe, on a different computer.
-
-If you have not disabled the database manager screen (see :ref:`here <security>` why you should), you
-can use it (link at bottom of your database selection screen) to download a backup of your
-database(s). If you disabled it, use the same procedure than for your usual backups.
-
-
-Step 3: Install the updated version
-===================================
-
-Choose the method that matches your current installation:
-
-
-Packaged Installers
-------------------
-
-If you installed Odoo with an installation package downloaded on our website (the recommended method),
-updating is very simple.
-All you have to do is download the installation package corresponding to your system (see step #1)
-and install it on your server. They are updated daily and include the latest security fixes.
-Usually, you can simply double-click the package to install it on top of the current installation.
-After installing the package, be sure to restart the Odoo service or reboot your server,
-and you're all set.
-
-Source Install (Tarball)
------------------------
-
-If you have originally installed Odoo with the "tarball" version (source code archive), you have
-to replace the installation directory with a newer version. First download the latest tarball
-from Odoo.com. They are updated daily and include the latest security fixes (see step #1)
-After downloading the package, extract it to a temporary location on your server.
-
-You will get a folder labelled with the version of the source code, for example "odoo-13.0+e.20190719",
-that contains a folder "odoo.egg-info" and the actual source code folder named "odoo" (for Odoo 10
-and later) or "openerp" for older versions.
-You can ignore the odoo.egg-info folder. Locate the folder where your current installation is deployed,
-and replace it with the newer "odoo" or "openerp" folder that was in the archive you just extracted.
-
-Be sure to match the folder layout, for example the new "addons" folder included in the source code
-should end up exactly at the same path it was before. Next, watch out for any specific configuration
-files that you may have manually copied or modified in the old folder, and copy them over to the
-new folder.
-Finally, restart the Odoo service or reboot the machine, and you are all set.
-
-Source Install (Github)
-----------------------
-
-If you have originally installed Odoo with a full Github clone of the official repositories, the
-update procedure requires you to pull the latest source code via git.
-Change into the directory for each repository (the main Odoo repository, and the Enterprise
-repository), and run the following commands::
-
-     git fetch
-     git rebase --autostash
-
-The last command may encounter source code conflicts if you had edited the Odoo source code locally.
-The error message will give you the list of files with conflicts, and you will need to resolve
-the conflicts manually, by editing them and deciding which part of the code to keep.
-
-Alternatively, if you prefer to simply discard the conflicting changes and restore the official
-version, you can use the following command::
-
-     git reset --hard
-
-Finally, restart the Odoo service or reboot the machine, and you should be done.
-
-
-Docker
------
-
-Please refer to our `Docker image documentation <https://hub.docker.com/_/odoo/>`_ for
-specific update instructions.
@@ -2,9 +2,11 @@
 Upgrade
 =======

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

 .. _upgrade_faq/rolling_release:

@@ -31,16 +33,17 @@ each version comes with new and improved features, bug fixes, and security patch
 An upgrade does not cover:

  - Downgrading to a previous version of Odoo
-  - :doc:`Switching editions <on_premise/community_to_enterprise>` (e.g., from Community to
-    Enterprise)
-  - :ref:`Changing hosting type <hosting/change-solution>` (e.g., from on-premise to Odoo Online)
+  - :doc:`Switching editions <maintain/enterprise>` (e.g., from Community to Enterprise)
+  - :doc:`Changing hosting type </administration/maintain/hosting_changes>` (e.g., from on-premise
+    to Odoo Online)
  - Migrating from another ERP to Odoo

 .. warning::
-   If your database contains a **custom module**, you must first upgrade its source code to be
-   compatible with the new version of Odoo **before upgrading**.
-.. TODOUPG : once the page for developers is published, uncomment and link
-.. :doc:`first upgrade its source code </developer/reference/upgrade>`
+   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>`.


 Upgrading in a nutshell
@@ -49,15 +52,15 @@ Upgrading in a nutshell
 #. Request an upgraded test database (see :ref:`obtaining an upgraded test database
   <upgrade/request-test-database>`).

+#. If applicable, upgrade the source code of your custom module to be compatible with the new
+   version of Odoo (see :doc:`/developer/howtos/upgrade_custom_db`).
+
 #. Thoroughly test the upgraded database (see :ref:`testing the new version of the database
   <upgrade/test_your_db>`).

 #. Report any issue encountered during the testing to Odoo via the `support page
   <https://odoo.com/help?stage=migration>`__.

-#. (If applicable) : upgrade the source code of your custom module to be compatible with the new
-   version of Odoo.
-
 #. 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.

@@ -67,9 +70,6 @@ Upgrading in a nutshell
 #. Report any issue encountered during the upgrade to Odoo via the `support page
   <https://odoo.com/help?stage=post_upgrade>`__.

-.. TODOUPG: Once the page for developers is published, put this at 4)
-.. (see :ref:`upgrading customizations <upgrade/upgrading_customizations>`).
-
 .. _upgrade/request-test-database:

 Obtaining an upgraded test database
@@ -134,18 +134,13 @@ project <https://odoo.sh/project>`_.
      file of the upgrade process can be found in your newly upgraded staging build by going to
      :file:`~/logs/upgrade.log`.

-      .. note::
-         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.
+      .. 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.

-         .. TODOUPG : once the page for developers is published, uncomment
-         .. Check out the :doc:`upgrade for developers'
-         .. documentation </developer/reference/upgrade>` for more information. In
-         .. addition, if a module is not needed after an upgrade, :ref:`you can
-         .. remove customizations <upgrade/remove_customizations>`.
+         Check out the :doc:`/developer/howtos/upgrade_custom_db` page for more information.

   .. group-tab:: On-premise

@@ -165,6 +160,11 @@ project <https://odoo.sh/project>`_.
      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
@@ -289,8 +289,8 @@ 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.
+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:
@@ -335,9 +335,8 @@ exceptions.

      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.
-   .. TODOUPG : once the page for developers is published, uncomment
-   .. More information on how to upgrade your custom modules can be found in the :ref:`upgrading customizations documentation <upgrade/upgrading_customizations>`.
+      production. More information on how to upgrade your custom modules can be found on
+      :doc:`/developer/howtos/upgrade_custom_db`.

   .. group-tab:: On-premise

@@ -405,4 +404,4 @@ The following upgrade-related services are **not** included:

 .. seealso::
   - :doc:`Odoo.sh documentation <odoo_sh>`
-   - :doc:`Supported Odoo versions <supported_versions>`
+   - :doc:`Supported Odoo versions <maintain/supported_versions>`
@@ -14,7 +14,6 @@ Discover our user guides and configuration tutorials per application.
 .. toctree::
    :maxdepth: 2

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

-
 .. toctree::

    finance/accounting
    finance/expenses
-    finance/payment_acquirers
+    finance/documents
+    finance/sign
+    finance/spreadsheet
+    finance/payment_providers
    finance/fiscal_localizations
@@ -96,6 +96,12 @@ gains and losses after reconciling the journal items.
 .. seealso::
   :doc:`Manage a bank in a foreign currency <accounting/bank/foreign_currency>`

+Branch management
+=================
+
+Multiple branches can be managed thanks to multi-company hierarchies. This allows to post journal
+entries on each branch as well as setting up a common lock date managed by the main company.
+
 International standards
 =======================

@@ -203,8 +209,7 @@ available methods are standard price, average price, :abbr:`LIFO (Last-In, First
 :abbr:`FIFO (First-In, First-Out).`

 .. seealso::
-   :doc:`View the impact of the valuation methods on transactions
-   <../inventory_and_mrp/inventory/management/reporting/inventory_valuation_config>`
+   :doc:`../inventory_and_mrp/inventory/warehouses_storage/inventory_valuation/inventory_valuation_config`

 Retained earnings
 =================
@@ -216,6 +221,8 @@ and loss balance is automatically reported on the balance sheet report.
 .. seealso::
   :doc:`Accounting Cheat Sheet <accounting/get_started/cheat_sheet>`

+.. _fiduciaries:
+
 Fiduciaries
 ===========

@@ -83,7 +83,7 @@ You can edit the accounting information and bank account number according to you

 .. seealso::
   - :doc:`get_started/multi_currency`
-   - :doc:`bank/bank_statements`
+   - :doc:`bank/transactions`

 .. _bank_accounts/suspense:

@@ -133,7 +133,7 @@ Bank feeds

 .. seealso::
   - :doc:`bank/bank_synchronization`
-   - :doc:`bank/bank_statements`
+   - :doc:`bank/transactions`

 .. _bank/outstanding-accounts:

@@ -187,9 +187,8 @@ Payments` tab. To display the outstanding accounts column, click on the toggle b
   :titlesonly:

   bank/bank_synchronization
-   bank/bank_statements
+   bank/transactions
   bank/reconciliation
-   bank/reconciliation_cash
   bank/reconciliation_models
   bank/foreign_currency
   bank/cash_register
@@ -1,62 +0,0 @@
-===============
-Bank statements
-===============
-
-Importing your bank statements allows you to keep track of your bank account transactions and
-reconcile them with the ones recorded in Odoo.
-
-We recommend using :doc:`the bank synchronization feature <bank_synchronization>` for more
-efficiency. However, if you do not want to use it or if your bank is not yet supported, other
-options exist:
-
- Import the bank statement files delivered by your bank;
- Register the bank statements manually.
-
-Import bank statements files
-============================
-
-Odoo supports multiple file formats to import bank statements:
-
- SEPA recommended Cash Management format (CAMT.053);
- Comma-separated values (.CSV);
- Open Financial Exchange (.OFX);
- Quicken Interchange Format (.QIF);
- Belgium: Coded Statement of Account (.CODA).
-
-To import a file, go to the Accounting dashboard and click on :guilabel:`Import (Statements)` under
-the :guilabel:`Bank` window, or click on the drop-down menu (:guilabel:`⋮`) button and then on
-:guilabel:`Import Statement`.
-
-.. image:: bank_statements/bank-overview.png
-   :align: center
-   :alt: Import a bank statement file in Odoo Accounting
-
-Next, select the file you want to import and click on :guilabel:`Upload`.
-
-Once the file uploaded, the **import widget** helps you set formatting options and **map** the
-different columns you want to import. You also can :guilabel:`test` the bank statement file before
-importing it to your database.
-
-.. image:: bank_statements/import-bank-statement.png
-   :align: center
-   :alt: Register bank statements manually in Odoo Accounting
-
-Register bank statements manually
-=================================
-
-If needed, you can also record your bank statements manually. To do so, go to the
-:guilabel:`Accounting dashboard` and click on the :guilabel:`Create Statements` under the
-:guilabel:`Bank` window. Alternatively, you can click the drop-down menu (:guilabel:`⋮`) button, and
-then :guilabel:`New Statement`.
-
-To ease the reconciliation process, make sure to fill out the :guilabel:`Partner` field. You can
-also type in the payments’ references in the :guilabel:`Label` field. Add a new line for each
-transaction written on the original bank statement.
-
-.. image:: bank_statements/bank-statements-03.png
-   :align: center
-   :alt: Register bank statements manually in Odoo Accounting
-
-.. note::
-   The **Ending Balance** and the **Computed Balance** should have the same amount. If this is not
-   the case, make sure there are no mistakes in the transactions’ amounts.
--- a/Show More
+++ b/Show More