Update terms_of_sale.rst

URL was pointing to a dead end.
Update from
http://werkzeug.pocoo.org/docs/contrib/fixers/#werkzeug.contrib.fixers.ProxyFix
to
https://werkzeug.palletsprojects.com/en/0.16.x/middleware/proxy_fix/#module-werkzeug.middleware.proxy_fix
new URL as we are using 0.16.1

closes odoo/documentation#1705

X-original-commit: 7ce175ff55
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>

.github/CODEOWNERS

@@ -1,11 +0,0 @@
-# All changes to technical files (build environment and Sphinx extensions) have to be approved
-/extensions/         @odoo/doc-review
-.gitignore           @odoo/doc-review
-commit_template.txt  @odoo/doc-review
-conf.py              @odoo/doc-review
-Makefile             @odoo/doc-review
-requirements.txt     @odoo/doc-review
-
-# All changes to legal material have to be approved
-/content/legal/     @odoo/legal
-/content/legal.rst  @odoo/legal

.gitignore

@@ -4,7 +4,6 @@
 
 # Sphinx build files
 _build/
-extensions/odoo_theme/static/style.css
 
 # Dependencies
 odoo

Makefile

@@ -9,6 +9,10 @@ ifndef BUILD_DIR
   BUILD_DIR    = _build
 endif
 
+ifndef CURRENT_LANG
+  CURRENT_LANG = en
+endif
+
 SPHINX_BUILD   = sphinx-build
 CONFIG_DIR     = .
 SPHINXOPTS     = -D project_root=$(ROOT) -D canonical_version=$(CANONICAL_VERSION) \
@@ -18,7 +22,6 @@ SPHINXOPTS     = -D project_root=$(ROOT) -D canonical_version=$(CANONICAL_VERSIO
 				 -j $(WORKERS)
 SOURCE_DIR     = content
 
-
 HTML_BUILD_DIR = $(BUILD_DIR)/html
 ifdef VERSIONS
   HTML_BUILD_DIR := $(HTML_BUILD_DIR)/14.0
@@ -43,7 +46,7 @@ clean:
 	rm -rf $(BUILD_DIR)/*
 	@echo "Cleaning finished."
 
-html: $(BUILD_DIR)/html/_static/style.css
+html: $(HTML_BUILD_DIR)/_static/style.css
 	@echo "Starting build..."
 	$(SPHINX_BUILD) -c $(CONFIG_DIR) -b html $(SPHINXOPTS) $(SOURCE_DIR) $(HTML_BUILD_DIR)
 	@echo "Build finished."
@@ -63,10 +66,10 @@ gettext:
 	$(SPHINX_BUILD) -c $(CONFIG_DIR) -b gettext $(SOURCE_DIR) locale/sources
 	@echo "Generation finished."
 
-$(BUILD_DIR)/html/_static/style.css: extensions/odoo_theme/static/style.scss extensions/odoo_theme/static/scss/*.scss
+$(HTML_BUILD_DIR)/_static/style.css: extensions/odoo_theme/static/style.scss extensions/odoo_theme/static/scss/*.scss
 	@echo "Compiling stylesheets..."
-	mkdir -p $(BUILD_DIR)/html/_static
-	pysassc extensions/odoo_theme/static/style.scss $(BUILD_DIR)/html/_static/style.css
+	mkdir -p $(HTML_BUILD_DIR)/_static
+	pysassc extensions/odoo_theme/static/style.scss $(HTML_BUILD_DIR)/_static/style.css
 	@echo "Compilation finished."
 
 #=== Development and debugging rules ===#
@@ -74,6 +77,6 @@ $(BUILD_DIR)/html/_static/style.css: extensions/odoo_theme/static/style.scss ext
 fast: SPHINXOPTS += -A collapse_menu=True
 fast: html
 
-static: $(BUILD_DIR)/static/style.css
-	cp -r extensions/odoo_theme/static/* $(BUILD_DIR)/html/_static/
-	cp -r static/* $(BUILD_DIR)/html/_static/
+static: $(HTML_BUILD_DIR)/static/style.css
+	cp -r extensions/odoo_theme/static/* $(HTML_BUILD_DIR)/_static/
+	cp -r static/* $(HTML_BUILD_DIR)/_static/

README.md

@@ -39,10 +39,6 @@ For contributions to the content of the documentation, please refer to the
 To **report a content issue**, **request new content** or **ask a question**, use the
 [repository's issue tracker](https://github.com/odoo/documentation-user/issues) as usual.
 
-If you have a pull request that is ready for review, request one from the
-[odoo/doc-review](https://github.com/orgs/odoo/teams/doc-review) team.
-
-
 ## Learn More
 
 To learn more about Odoo, in addition to the documentation, have a look at

conf.py

@@ -58,34 +58,40 @@ extension_dir = Path('extensions')
 sys.path.insert(0, str(extension_dir.absolute()))
 
 # Search for the directory of odoo sources to know whether autodoc should be used on the dev doc
-odoo_dir = Path('odoo')
+odoo_sources_candidate_dirs = (Path('odoo'), Path('../odoo'))
+odoo_sources_dirs = [
+    d for d in odoo_sources_candidate_dirs if d.is_dir() and (d / 'odoo-bin').exists()
+]
 odoo_dir_in_path = False
-if not odoo_dir.is_dir():
-    parent_odoo_dir = Path('../odoo')
-    if parent_odoo_dir.is_dir():
-        _logger.info('Using parent dir to find odoo sources')
-        odoo_dir = parent_odoo_dir
-if not odoo_dir.is_dir():
+
+if not odoo_sources_dirs:
     _logger.warning(
-        f"Could not find Odoo sources directory at {odoo_dir.absolute()}.\n"
-        f"The 'Developer' documentation will be built but autodoc directives will be skipped.\n"
-        f"In order to fully build the 'Developer' documentation, clone the repository with "
-        f"`git clone https://github.com/odoo/odoo` or create a symbolink link."
+        "Could not find Odoo sources directory in neither of the following folders:\n"
+        "%(dir_list)s\n"
+        "The 'Developer' documentation will be built but autodoc directives will be skipped.\n"
+        "In order to fully build the 'Developer' documentation, clone the repository with "
+        "`git clone https://github.com/odoo/odoo` or create a symbolic link.",
+        {'dir_list': '\n'.join([f'\t- {d.resolve()}' for d in odoo_sources_candidate_dirs])},
     )
 else:
-    sys.path.insert(0, str(odoo_dir.absolute()))
+    odoo_dir = odoo_sources_dirs[0].resolve()
+    sys.path.insert(0, str(odoo_dir))
     from odoo import release as odoo_release  # Don't collide with Sphinx's 'release' config option
     odoo_version = odoo_release.version if 'alpha' not in odoo_release.version else 'master'
     if release != odoo_version:
         _logger.warning(
-            f"Found Odoo sources directory but with version '{odoo_version}' incompatible with "
-            f"documentation version '{version}'.\n"
-            f"The 'Developer' documentation will be built but autodoc directives will be skipped.\n"
-            f"In order to fully build the 'Developer' documentation, checkout the matching branch"
-            f" with `cd odoo && git checkout {version}`."
+            "Found Odoo sources in %(directory)s but with version '%(odoo_version)s' incompatible "
+            "with documentation version '%(doc_version)s'.\n"
+            "The 'Developer' documentation will be built but autodoc directives will be skipped.\n"
+            "In order to fully build the 'Developer' documentation, checkout the matching branch"
+            " with `cd odoo && git checkout %(doc_version)s`.",
+            {'directory': odoo_dir, 'odoo_version': odoo_version, 'doc_version': version},
         )
     else:
-        _logger.info(f"Found Odoo sources directory matching documentation version {release}.")
+        _logger.info(
+            "Found Odoo sources in %(directory)s matching documentation version '%(version)s'.",
+            {'directory': odoo_dir, 'version': release},
+        )
         odoo_dir_in_path = True
 
 # The Sphinx extensions to use, as module names.
@@ -106,17 +112,18 @@ extensions = [
     # Youtube and Vimeo videos integration (youtube, vimeo directives)
     'embedded_video',
 
-    'exercise_admonition',
+    'custom_admonitions',
 
     # Redirection generator
     'redirects',
 
-    # Code switcher (switcher and case directives)
-    'switcher',
+    # Content tabs
+    'sphinx_tabs.tabs',
 
     # Strange html domain logic used in memento pages
     'html_domain',
 ]
+
 if odoo_dir_in_path:
     # GitHub links generation
     extensions += [
@@ -142,7 +149,20 @@ sphinx.transforms.i18n.docname_to_domain = (
     sphinx.util.i18n.docname_to_domain
 ) = lambda docname, compact: docname.split('/')[1 if docname.startswith('applications/') else 0]
 
-supported_languages = {
+# The version names that should be shown in the version switcher, if the config option `versions`
+# is populated. If a version is passed to `versions` but is not listed here, it will not be shown.
+versions_names = {
+    'master': "Master",
+    'saas-15.2': "Odoo Online",
+    'saas-15.1': "Odoo Online",
+    '15.0': "Odoo 15",
+    '14.0': "Odoo 14",
+    '13.0': "Odoo 13",
+}
+
+# The language names that should be shown in the language switcher, if the config option `languages`
+# is populated. If a language is passed to `languages` but is not listed here, it will not be shown.
+languages_names = {
     'de': 'Deutsch',
     'en': 'English',
     'es': 'Español',
@@ -156,6 +176,9 @@ supported_languages = {
 # The specifications of redirect rules used by the redirects extension.
 redirects_file = 'redirects.txt'
 
+sphinx_tabs_disable_tab_closing = True
+sphinx_tabs_disable_css_loading = True
+
 #=== Options for HTML output ===#
 
 html_theme = 'odoo_theme'
@@ -283,15 +306,18 @@ def _generate_alternate_urls(app, pagename, templatename, context, doctree):
 
         The entry 'version' is added by Sphinx in the rendering context.
         """
-        # If the list of versions is not set, assume that the project has no alternate version
-        _alternate_versions = app.config.versions and app.config.versions.split(',') or []
-        context['alternate_versions'] = [
-            (_alternate_version, _build_url(_version=_alternate_version))
-            for _alternate_version in sorted(_alternate_versions, reverse=True)
-            if _alternate_version != version and (
-                _alternate_version != 'master' or pagename.startswith('developer')
-            )
-        ]
+        context['version_display_name'] = versions_names[version]
+
+        # If the list of versions is not set, assume the project has no alternate version
+        _provided_versions = app.config.versions and app.config.versions.split(',') or []
+
+        # Map alternate versions to their display names and URLs.
+        context['alternate_versions'] = []
+        for _alternate_version, _display_name in versions_names.items():
+            if _alternate_version in _provided_versions and _alternate_version != version:
+                context['alternate_versions'].append(
+                    (_display_name, _build_url(_alternate_version))
+                )
 
     def _localize():
         """ Add the pairs of (lang, code, url) for the current document in the rendering context.
@@ -302,19 +328,22 @@ def _generate_alternate_urls(app, pagename, templatename, context, doctree):
         """
         _current_lang = app.config.language or 'en'
         # Replace the context value by its translated description ("Français" instead of "french")
-        context['language'] = supported_languages.get(_current_lang)
+        context['language'] = languages_names.get(_current_lang)
 
         # If the list of languages is not set, assume that the project has no alternate language
-        _alternate_languages = app.config.languages and app.config.languages.split(',') or []
-        context['alternate_languages'] = [
-            (
-                supported_languages.get(_alternate_lang),
-                _alternate_lang.split('_')[0] if _alternate_lang != 'en' else 'x-default',
-                _build_url(_lang=_alternate_lang),
-            )
-            for _alternate_lang in _alternate_languages
-            if _alternate_lang in supported_languages and _alternate_lang != _current_lang
-        ]
+        _provided_languages = app.config.languages and app.config.languages.split(',') or []
+
+        # Map alternate languages to their display names and URLs.
+        context['alternate_languages'] = []
+        for _alternate_lang, _display_name in languages_names.items():
+            if _alternate_lang in _provided_languages and _alternate_lang != _current_lang:
+                context['alternate_languages'].append(
+                    (
+                        _display_name,
+                        _alternate_lang.split('_')[0] if _alternate_lang != 'en' else 'x-default',
+                        _build_url(_lang=_alternate_lang),
+                    )
+                )
 
     def _build_url(_version=None, _lang=None):
         if app.config.is_remote_build:

content/administration.rst

@@ -18,4 +18,5 @@ These guides provide instructions on how to install, maintain and upgrade Odoo d
 
     administration/install
     administration/maintain
+    administration/upgrade
     administration/odoo_sh

content/administration/install.rst

@@ -4,6 +4,8 @@
 Install
 =======
 
+.. If you add content on this page, remove the redirect rule 'install -> install/install'
+
 .. toctree::
 
     install/install

content/administration/install/deploy.rst

@@ -299,7 +299,7 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
   }
 
   server {
-    listen 443;
+    listen 443 ssl;
     server_name odoo.mycompany.com;
     proxy_read_timeout 720s;
     proxy_connect_timeout 720s;
@@ -312,7 +312,6 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
     proxy_set_header X-Real-IP $remote_addr;
 
     # SSL parameters
-    ssl on;
     ssl_certificate /etc/ssl/nginx/server.crt;
     ssl_certificate_key /etc/ssl/nginx/server.key;
     ssl_session_timeout 30m;

content/administration/install/email_gateway.rst

@@ -44,4 +44,4 @@ For Exim
 
 .. tip::
    If you don't have access/manage your email server, use :ref:`inbound messages
-   <discuss/email_servers/inbound_messages>`.
+   <email_communication/inbound_messages>`.

content/administration/install/install.rst

@@ -409,8 +409,10 @@ A typical way to run the server would be:
 
 Where `CommunityPath` is the path of the Odoo Community installation, `dbuser` is the
 PostgreSQL login, `dbpassword` is the PostgreSQL password
-and `mydb` is the default database to serve on `localhost:8069`. You can add other
-directory paths separated by a comma to ``addons`` at the end of the addons-path option.
+and `mydb` is the default database to serve on `localhost:8069`.
+
+.. seealso::
+   - :doc:`The exhaustive list of arguments for odoo-bin </developer/misc/other/cmdline>`.
 
 Linux
 -----
@@ -578,8 +580,10 @@ A typical way to run the server would be:
     $ python3 odoo-bin --addons-path=addons -d mydb
 
 Where `CommunityPath` is the path of the Odoo Community installation
-and `mydb` is the default database to serve on `localhost:8069`. You can add other
-directory paths separated by a comma to ``addons`` at the end of the addons-path option.
+and `mydb` is the default database to serve on `localhost:8069`.
+
+.. seealso::
+   - :doc:`The exhaustive list of arguments for odoo-bin </developer/misc/other/cmdline>`.
 
 Mac OS
 ------
@@ -740,9 +744,10 @@ A typical way to run the server would be:
     $ python3 odoo-bin --addons-path=addons -d mydb
 
 Where `CommunityPath` is the path of the Odoo Community installation
-and `mydb` is the default database to serve on `localhost:8069`. You can add other
-directory paths separated by a comma to ``addons`` at the end of the addons-path option.
+and `mydb` is the default database to serve on `localhost:8069`.
 
+.. seealso::
+   - :doc:`The exhaustive list of arguments for odoo-bin </developer/misc/other/cmdline>`.
 
 .. _setup/install/docker:
 
@@ -750,7 +755,7 @@ Docker
 ======
 
 The full documentation on how to use Odoo with Docker can be found on the
-official Odoo `docker image <https://registry.hub.docker.com/_/odoo/>`_ page.
+official Odoo `docker image <https://hub.docker.com/_/odoo/>`_ page.
 
 .. _Debian Buster: https://www.debian.org/releases/buster/
 .. _demo: https://demo.odoo.com

content/administration/maintain.rst

@@ -6,9 +6,10 @@ Maintain
 
 .. toctree::
 
+    maintain/domain_names
     maintain/update
-    maintain/db_upgrade
     maintain/enterprise
     maintain/hosting_changes
-    maintain/db_premise
+    maintain/online
+    maintain/on_premise
     maintain/supported_versions

content/administration/maintain/db_upgrade.rst

@@ -1,413 +0,0 @@
-
-.. |assistance-contact| replace::
-   If you need Odoo assistance on this matter, please contact your Odoo Account Manager or contact
-   our `Sales department`_.
-.. _Sales department: mailto:sales@odoo.com
-
-.. _db-upgrade:
-
-================
-Versions upgrade
-================
-
-.. _db-upgrade/overview:
-
-Overview
-========
-
-.. _db-upgrade/process:
-
-The upgrade process
--------------------
-
-This documentation is for our *On-Premise* (self-hosted) and *Odoo.sh* customers.
-
-.. _db-upgrade/definition:
-
-Definition
-~~~~~~~~~~
-
-An upgrade is switching to a newer version of Odoo (e.g., Odoo 13.0 to Odoo 14.0)
-
-An upgrade does not cover:
-
-* changing :ref:`Editions <db-upgrade/faq/editions-change>` (i.e., Community to Enterprise edition)
-* switching :ref:`hosting type <db-upgrade/faq/hosting-types-switch>` (i.e., On-Premise to Online or
-  Odoo.sh)
-* migration from another ERP to Odoo
-
-.. note:: |assistance-contact|
-
-.. _db-upgrade/process-workflow:
-
-Process workflow
-~~~~~~~~~~~~~~~~
-
-The upgrade process in a nutshell:
-
-#. You create a test upgrade request.
-#. | The request is processed by Odoo:
-   | This happens via an automated process that runs the database through an upgrade script and
-     takes between 20 and 120 minutes. Only if an issue(s) arises will we have to intervene
-     manually and adjust the script specifically to your database until the upgrade succeeds.
-#. Odoo delivers a test database.
-#. You test your database for possible discrepancies (see :ref:`db-upgrade/test-guidance`)
-#. If there are any discrepancies, you report them to the Upgrade support team via the
-   :ref:`Help portal <db-upgrade/test-assistance>`.
-#. We will fix the issues and send you a new test database.
-#. Once you completed the testing and are happy with the result, you decide on a date and time when
-   you stop users from accessing Odoo, freeze all data entries and create an upgrade request for the
-   production upgrade.
-#. Odoo delivers the production database through the automated process.
-#. You restore it in your Production environment a few short hours later and continue working on the
-   newly upgraded database.
-
-.. _db-upgrade/service-level:
-
-Service Level Agreement
------------------------
-
-What is covered by the Enterprise Licence?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Databases hosted on Odoo’s Cloud platforms (Saas and Odoo.sh) or On-Premise (Self-Hosting) enjoy the
-following service at all times.
-
-The upgrade of:
-
-* standard applications
-* Studio customization (as long as the Studio app is still active)
-* customizations done by our consulting and developer services *if* they are covered by a
-  ‘Maintenance of Customisations’ subscription
-
-The Upgrade Service is limited to the technical conversion and adaptation of your database (standard
-modules and data) to make it compatible with the targeted version.
-
-What upgrading does NOT cover
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* The cleaning of pre-existing data & configuration while upgrading
-* Any new developments and/or upgrade of your own :ref:`custom modules
-  <db-upgrade/faq/custom-modules>`
-* `Training <https://www.odoo.com/learn>`_ on the new version
-
-You can get more information about your Enterprise Licence on our :ref:`Odoo Enterprise Subscription
-Agreement <upgrade>` page.
-
-.. note:: |assistance-contact|
-
-.. _db-upgrade/get-started:
-
-Get started
-===========
-
-The upgrade process varies depending on where your database is hosted.
-
-.. _db-upgrade/online:
-
-Online (SaaS)
--------------
-
-If you are hosted Online, please check your `database manager <https://www.odoo.com/my/databases>`_.
-
-.. _db-upgrade/odoo-sh:
-
-Odoo.sh
--------
-
-If you are Odoo.sh hosted, check our :doc:`specific instructions to be able to upgrade
-<../odoo_sh/advanced/upgrade_your_database>`.
-
-.. _db-upgrade/on-premise:
-
-On-Premise
-----------
-
-There are two possibilities:
-
-#. Via the interface of our `website form <https://upgrade.odoo.com>`_
-#. | For technically-advanced users and partners, via the following command line (to be used on the
-     machine where your database is hosted):
-   | ``python <(curl -s beta.upgrade.odoo.com/upgrade) test -d <your db name> -t 14.0``
-
-What does it do?
-~~~~~~~~~~~~~~~~
-
-The above command will dump your database to a file, then send it to the upgrade platform for
-upgrade, displaying you the live logs, then restore the upgraded database back on your server as a
-duplicate test database.
-
-.. _db-upgrade/steps:
-
-Steps
-=====
-
-.. _db-upgrade/steps-test:
-
-The testing phase
------------------
-
-.. _db-upgrade/test-process:
-
-Test process
-~~~~~~~~~~~~
-
-Also referred to as the pre-production phase, the test phase allows you to review an upgraded
-version of your database without affecting your production database in any way.
-
-We suggest that you run the test upgrade process at least once, but you can do it as often as you
-want (one at a time).
-
-Once you receive your upgraded test database, you should check that all data, processes and
-functionality are still correct and working as expected.
-
-If you do find discrepancies, you'll be able to:
-
-* | :ref:`Report your issues <db-upgrade/test-assistance>`
-  | and/or
-* Ask for a new :ref:`test request <db-upgrade/test-db-request>` after the reported issues have
-  been fixed in the upgrade script.
-
-When you do not find any discrepancies, you'll be able to:
-
-* Move on to the upgrade of your :ref:`production database <db-upgrade/production-live>`.
-
-.. _db-upgrade/test-db-request:
-
-Request a test database
-~~~~~~~~~~~~~~~~~~~~~~~
-
-When filling the `website form <https://upgrade.odoo.com>`_, select *Testing* purpose.
-
-.. image:: media/db-upgrade-test-purpose.png
-   :align: center
-   :alt: Selection of the "Testing" purpose in the upgrade form on Odoo
-
-.. _db-upgrade/test-guidance:
-
-Test guidance
-~~~~~~~~~~~~~
-
-Every business and organization has its own operational needs and will have to test its specific
-Odoo instance respectively. However, we recommend you look at `the test scenario
-<https://drive.google.com/open?id=1Lm4JqbsHBirB1wMi14UChoz_YHLjx5ec>`_ we created, a high-level idea
-of what you should test and look out for.
-
-.. todo:: change link "test scenario" once the related doc is published
-
-.. _db-upgrade/test-assistance:
-
-Assistance
-~~~~~~~~~~
-
-If you encounter issues or problems in the **test database**, please contact the Odoo Upgrade
-Support:
-
-#. Connect to our `Odoo Support page <https://www.odoo.com/help>`_.
-#. Under the *Ticket Description* section, select *An issue related to my upgrade* ticket type.
-
-   .. image:: media/db-upgrade-test-assistance.png
-      :align: center
-      :alt: Selection of "An issue related to my upgrade" as Ticket Type in the support form on Odoo
-
-   .. warning::
-      If you choose another *Ticket Description* type, the request will be redirected to another
-      team than the upgrade one and will slow down the processing and response time.
-
-#. Please provide as much detail as you can. Where applicable, illustrate the current and previous
-   flows with videos and/or screenshots. This will avoid clarifying questions and speed up the
-   resolution process significantly.
-
-   .. image:: media/db-upgrade-test-assistance-details.png
-      :align: center
-      :alt: "Detailed Description" field in the support form on Odoo
-
-.. note::
-   * The purpose of the test phase is not to correct existing data or configurations in your
-     database.
-   * |assistance-contact|
-
-.. _db-upgrade/steps-production:
-
-The production launch
----------------------
-
-.. _db-upgrade/production-live:
-
-Production goes live
-~~~~~~~~~~~~~~~~~~~~
-
-The production upgrade request is when you decide to upgrade your current database with all your
-production data (invoices, VAT returns, inventories, current orders) to a new version of your choice.
-
-After your :ref:`tests <db-upgrade/steps-test>` are completed to your satisfaction, submit the
-request to upgrade your production database via our `website form <https://upgrade.odoo.com>`_.
-Select *Production* purpose.
-
-.. image:: media/db-upgrade-production-purpose.png
-   :align: center
-   :alt: Selection of the "Production" purpose in the upgrade form on Odoo
-
-.. danger::
-   Going into production without first testing may lead to:
-
-   - business interruptions (e.g. no longer having the possibility to validate an action)
-   - poor customer experiences (e.g. an eCommerce website that does not work correctly)
-
-.. _db-upgrade/production-assistance:
-
-Assistance
-~~~~~~~~~~
-
-If you encounter issues or problems in the **production database**, please contact the **Odoo
-Support**:
-
-#. Connect to our `Odoo Support page <https://www.odoo.com/help>`_.
-#. Under the *Ticket Description* section, select the appropriate type related to your issue but
-   **do not select** the option *An issue related to my upgrade*.
-
-   .. note::
-      After upgrading to production, the support will be provided by the Support team instead of the
-      Upgrade team.
-
-#. Please provide as much detail as you can. Where applicable, illustrate the current and previous
-   flows with videos and/or screenshots. This will avoid clarifying questions and speed up the
-   resolution process significantly.
-
-   .. image:: media/db-upgrade-production-assistance-details.png
-      :align: center
-      :alt: "Detailed Description" field in the support form on Odoo
-
-   .. warning::
-      If you choose *An issue related to my upgrade* as ticket type, the request will be redirected
-      to another team than the support one and will slow down the processing and response time.
-
-.. _db-upgrade/faq:
-
-FAQ
-===
-
-.. _db-upgrade/faq/why:
-
-Why upgrade?
-------------
-
-* You benefit from the latest features of the :ref:`new major version
-  <db-upgrade/faq/release-notes>` released by Odoo.
-* If you are in an :ref:`unsupported version <db-upgrade/supported-versions>`, you get a new version
-  with support.
-
-.. _db-upgrade/faq/when:
-
-When to upgrade?
-----------------
-
-Whenever you want. You can make your upgrade request as soon as a new version is released on our
-`website form <https://upgrade.odoo.com>`_.
-
-.. _db-upgrade/faq/availability:
-
-Availability of the new version
--------------------------------
-
-Please kindly note that as soon as we announce the release of a new major version (usually at the
-end of year), the Upgrade Service team needs to adapt the upgrade scripts to it, which is why the
-new version is not immediately available for existing databases.
-
-.. _db-upgrade/faq/finalization:
-
-Finalization of the upgrade (:abbr:`ETA (Estimated Time of Arrival)`)
----------------------------------------------------------------------
-
-Unfortunately, it is impossible to give time estimates for every upgrade request. Odoo offers so
-many possibilities (e.g. branding, workflows, customization, etc) that it can get tricky to upgrade,
-and translate to the new structure. If you use multiple apps managing sensitive data (e.g.,
-Accounting, Inventory, etc.), some cases may still require a human intervention, making the process
-slower.
-
-This is especially true during the first months following the release of a new major version, which
-can significantly lengthen the upgrade delay.
-
-In general, the ‘smaller’ the database, the quickest the upgrade. A single-user database that uses
-only CRM will be processed faster than a multi-company, multi-user database that uses Accounting,
-Sales, Purchase, and Manufacturing.
-
-So, in a nutshell, what can impact your upgrade lead time?
-
-* Source & targeted versions
-* Installed apps
-* Volume of data
-* Amount of customization (models, fields, methods, workflows, reports, website, etc.)
-* Installation of new apps or configuration changes after the start of the test phase
-
-Usually, the delays experienced during the first request (waiting time between the time you
-submitted your first request for a test upgrade) can generally give you an idea of the time to wait
-for the production request.
-
-.. _db-upgrade/faq/custom-modules:
-
-Upgrade of the custom modules
------------------------------
-
-As stated in our :doc:`/legal/terms/enterprise`, section :ref:`charges_standard`, this optional
-service is subject to additional fees.
-
-If you have a custom code, you can choose to have it upgraded by our services, by one of our
-`partners <https://www.odoo.com/partners>`_ or you can do it yourself.
-
-.. note:: |assistance-contact|
-
-.. _db-upgrade/faq/editions-change:
-
-Editions change (from Community to Enterprise)
-----------------------------------------------
-
-An upgrade does not cover a change of `Editions <https://www.odoo.com/page/editions>`_
-
-.. note:: |assistance-contact|
-
-.. _db-upgrade/faq/hosting-types-switch:
-
-Switching the hosting types (Self-hosted vs Online vs Odoo.sh)
---------------------------------------------------------------
-
-An upgrade does not cover a change of `Hosting types <https://www.odoo.com/page/hosting-types>`_.
-
-Open the following link to get :doc:`more information about how to change your hosting type
-<hosting_changes>`.
-
-.. note:: |assistance-contact|
-
-.. _db-upgrade/faq/release-notes:
-
-Release Notes by version
-------------------------
-
-Open our `Release Note <https://www.odoo.com/page/release-notes>`_ page to get a summary of the new
-features and improvements made in each version.
-
-.. _db-upgrade/assistance:
-
-Assistance
-==========
-
-.. _db-upgrade/contact:
-
-Contact our Upgrade service support
------------------------------------
-
-Should you have any more questions about the upgrade, do not hesitate to send a message to `Odoo
-Upgrade Team <mailto:upgrade@odoo.com>`_. We will be very pleased to answer it as soon as possible.
-
-.. _db-upgrade/supported-versions:
-
-Supported versions
-------------------
-
-Please note that Odoo provides support and bug fixing only for the three last major versions of Odoo.
-
-This is a factor to take into consideration before upgrading. If you are on an older version, we
-suggest you to prefer the most recent version to benefit from a longer support (before having to
-upgrade again).
-
-You can get more information about our :doc:`supported versions <supported_versions>`.

content/administration/maintain/domain_names.rst

@@ -0,0 +1,318 @@
+============
+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``.
+
+.. _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/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.
+
+To do so, go to :menuselection:`Website --> Go to website --> Promote --> 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-promote.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 may take up to three days.
+   - 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>`.
+#. Optionnally: :ref:`Change the web base address of your database <domain-name/web-base-url>`. 
+
+.. _domain-name/cname:
+
+Add a CNAME record
+------------------
+
+A **CNAME record** is a type of DNS record that points to the IP address of another website rather
+than to 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
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+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.
+- 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/welcome>`_ to fix this.
+
+.. seealso::
+  - :doc:`/applications/general/email_communication/email_servers`

content/administration/maintain/hosting_changes.rst

@@ -49,7 +49,7 @@ From Odoo.sh to Odoo Online
 
 1.  Uninstall all the **non-standard apps**: test it in a staging build first, then do it in your production build.
 2.  **If you have time constraints, contact us earlier to schedule the transfer.**
-3. `Create a support ticket <https://www.odoo.com/help>`_ and attach the dump (if the file is too large, use any file transfer service and attach the link to your ticket). Also include your subscription number and the URL you want to use for your database (e.g.: my-company.odoo.com).
+3. `Create a support ticket <https://www.odoo.com/help>`_ and include your subscription number and the URL you want to use for your database (e.g.: my-company.odoo.com).
 4.  We will make sure your database is compatible and upload it to our cloud. In case of technical issues, we will get in touch with you.
 5.  It's done!
 

content/administration/maintain/on_premise.rst

@@ -1,9 +1,6 @@
-
-.. _db_premise:
-
-===============================
-On-premises Database management
-===============================
+==============================
+On-premise database management
+==============================
 
 Register a database
 ===================
@@ -12,7 +9,7 @@ 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 Epiration Date in the About menu (Odoo 9) or in the Settings Dashboard
+can check this Expiration Date in the About menu (Odoo 9) or in the Settings Dashboard
 (Odoo 10).
 
 Registration Error Message
@@ -21,7 +18,7 @@ Registration Error Message
 If you are unable to register your database, you will likely encounter this
 message:
 
-.. image:: media/error_message_sub_code.png
+.. 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
@@ -44,14 +41,14 @@ Solutions
   * You can unlink the old database yourself on your `Odoo Contract
     <https://accounts.odoo.com/my/subscription>`__ with the button "Unlink database"
 
-    .. image:: media/unlink_single_db.png
+    .. 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:: media/unlink_confirm_enterprise_edition.png
+    .. image:: on_premise/unlink_confirm_enterprise_edition.png
         :align: center
 
 
@@ -65,7 +62,7 @@ Solutions
     <https://accounts.odoo.com/my/subscription>`__, a short message will appear
     specifying which database is problematic:
 
-    .. image:: media/unlink_db_name_collision.png
+    .. image:: on_premise/unlink_db_name_collision.png
         :align: center
 
 
@@ -96,7 +93,7 @@ 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:: media/add_more_users.png
+.. 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
@@ -125,7 +122,7 @@ Database expired error message
 If your database reaches its expiration date before your renew your subscription,
 you will encounter this message:
 
-.. image:: media/database_expired.png
+.. image:: on_premise/database_expired.png
     :align: center
     :alt: This database has expired.
 
@@ -157,7 +154,7 @@ 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:: media/db_manager.gif
+.. image:: on_premise/db_manager.gif
     :align: center
 
 
@@ -175,5 +172,5 @@ System Parameters`, we advise you to use a `uuid generator <https://www.uuidtool
 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:: media/db_uuid.png
+.. image:: on_premise/db_uuid.png
     :align: center

content/administration/maintain/online.rst

@@ -0,0 +1,155 @@
+=================================
+Online (SaaS) database management
+=================================
+
+To manage a database, sign in to https://www.odoo.com and access the `database management page
+<https://www.odoo.com/my/databases>`_ by clicking on the user icon, then on *My Databases*.
+
+.. image:: online/my-databases.png
+   :align: center
+   :alt: Clicking on the user icon opens a drop-down menu. "My databases" button is highlighted.
+
+.. note::
+   Make sure you are connected as the administrator of the database you want to manage.
+
+.. image:: online/dropdown-menu.png
+   :align: right
+   :alt: Clicking on the gear icon opens the drop-down menu.
+
+Open the drop-down menu next to the database you want to manage by clicking on the gear icon.
+
+Several actions are available:
+
+- :ref:`online/upgrade`
+- :ref:`online/duplicate`
+- :ref:`online/rename`
+- :ref:`online/download`
+- :ref:`online/domains`
+- :ref:`online/tags`
+- :ref:`online/delete`
+- :ref:`online/contact-support`
+- :ref:`online/users`
+
+.. _online/upgrade:
+
+Upgrade
+=======
+
+If you are *not* on the latest **Online version**, you should receive an invitation to :doc:`upgrade
+<../upgrade/process>` your database. A **Rolling Release button** on your database's main screen
+proposes an upgrade to the latest version (e.g., 13.0 to 15.1).
+
+.. important::
+   - | **If your Odoo database's version is lower than the latest major release:**
+     | You must upgrade your database within two months. After these two months, an automatic
+       upgrade is initiated.
+   - | **If your Odoo database's version is equal to or higher than the latest major release:**
+     | You can disregard the invitation to upgrade as you probably wouldn't benefit from new
+       features every two months.
+
+.. note::
+   Versions that are not supported anymore become deprecated and need to be updated to avoid
+   security issues. We recommend you initiate the upgrade of the database yourself, as this method
+   allows you to request a test upgrade of your database to check for any discrepancies.
+
+.. seealso::
+   - :doc:`../upgrade/process`
+   - :doc:`supported_versions`
+
+.. _online/duplicate:
+
+Duplicate
+=========
+
+Make an exact copy of the database to be able to perform testing without compromising the daily
+operations.
+
+.. important::
+   - By checking *For testing purposes*, all external communication (emails, payments, delivery
+     orders, etc.) are disabled by default on the duplicated database.
+   - Duplicate databases expire automatically after 15 days.
+
+.. _online/rename:
+
+Rename
+======
+
+Rename the database and its URL.
+
+.. _online/download:
+
+Download
+========
+
+Download instantly a ZIP file with a backup of the database.
+
+.. note::
+   Databases are backed up daily according to the `Odoo Cloud SLA
+   <https://www.odoo.com/cloud-sla>`_.
+
+.. _online/domains:
+
+Domains
+=======
+
+Configure custom domains to access the database via another URL.
+
+.. seealso::
+   - :doc:`domain_names`
+
+.. _online/tags:
+
+Tags
+====
+
+Add tags to sort your databases out. You can search the tags in the search bar.
+
+.. _online/delete:
+
+Delete
+======
+
+Delete a database instantly.
+
+.. danger::
+   Deleting a database means that all data is permanently lost. The deletion is instant and for all
+   users. It is recommended to create a backup of the database before deleting it.
+
+Read carefully the warning message that pops up and proceed only if you fully understand the
+implications of deleting a database:
+
+.. image:: online/delete.png
+   :align: center
+   :alt: A warning message is prompted before deleting a database.
+
+.. note::
+   - Only an administrator can delete a database.
+   - The database name is immediately available for a new database.
+   - It is not possible to delete a database if it is expired or linked to a subscription. If
+     needed, please get in touch with `Odoo Support <https://www.odoo.com/help>`_.
+   - To delete your account, please get in touch with `Odoo Support <https://www.odoo.com/help>`_.
+
+.. _online/contact-support:
+
+Contact Support
+===============
+
+Access the Odoo `support page <https://www.odoo.com/help>`_ with your database's details already
+pre-filled.
+
+.. _online/users:
+
+Invite / Remove Users
+=====================
+
+To invite users, fill out the email address of the new user and click on *Invite*. To add multiple
+users, click on *Add more users*.
+
+.. image:: online/invite-users.png
+   :align: center
+   :alt: Clicking on "Add more users" adds additional email fields.
+
+To remove users, select the users to remove and click on *Remove*.
+
+.. seealso::
+   - :doc:`/applications/general/users/manage_users`

content/administration/maintain/supported_versions.rst

@@ -5,13 +5,16 @@
 Supported versions
 ==================
 
-
 Odoo provides support and bug fixing **for the 3 last major versions** of Odoo.
 
-Users hosted on **Odoo Online** may use intermediary versions (sometimes called *SaaS versions*) that are
-supported as well. These versions are not published for Odoo.sh or On-Premise
-installations.
+.. note::
+   Odoo releases intermediary versions called **Online versions** on the :doc:`Odoo Online <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/process>` them
+     regularly.
+   - Online versions are *not* released for Odoo.sh and On-Premise installations.
+   - Online versions are listed below as *SaaS*.
 
 What's the support status of my Odoo?
 =====================================
@@ -20,38 +23,39 @@ This matrix shows the support status of every version.
 
 **Major releases are in bold type.**
 
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-|                    | Odoo Online | Odoo.sh  | On-Premise   |   Release date |                                              |
-+====================+=============+==========+==============+================+==============================================+
-| **Odoo 14.0**      |    |green|  | |green|  |   |green|    | October 2020   |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| Odoo 13.saas~4     |    |green|  | N/A      | N/A          | August 2019    |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| **Odoo 13.0**      |    |green|  | |green|  |   |green|    | October 2019   |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| Odoo 12.saas~3     |    |green|  | N/A      | N/A          | August 2019    |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| **Odoo 12.0**      |    |green|  | |green|  |   |green|    | October 2018   | *End-of-support is planned for October 2021* |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| Odoo 11.saas~3     |   |orange|  | N/A      | N/A          | April 2018     |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| **Odoo 11.0**      |   |orange|  | |orange| |    |red|     | October 2017   |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| Odoo 10.saas~15    |   |orange|  | N/A      | N/A          | March 2017     |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| Odoo 10.saas~14    |   |orange|  | N/A      | N/A          | January 2017   |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| **Odoo 10.0**      |   |orange|  | |orange| |    |red|     | October 2016   |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| Odoo 9.saas~11     |   |orange|  | N/A      | N/A          | May 2016       |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| **Odoo 9.0**       |   |orange|  | N/A      |    |red|     | October 2015   |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| Odoo 8.saas~6      |   |orange|  | N/A      | N/A          | February 2015  |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-| **Odoo 8.0**       |   |orange|  | N/A      |    |red|     | September 2014 |                                              |
-+--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
-
++-----------------+-------------+----------+-------------+----------------+------------------------+
+|                 | Odoo Online | Odoo.sh  | On-Premise  | Release date   | End of support         |
++=================+=============+==========+=============+================+========================+
+| Odoo 15.saas~1  | |green|     | N/A      | N/A         | February 2022  |                        |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| **Odoo 15.0**   | |green|     | |green|  | |green|     | October 2021   | October 2024 (planned) |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| **Odoo 14.0**   | |green|     | |green|  | |green|     | October 2020   | October 2023 (planned) |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| **Odoo 13.0**   | |green|     | |green|  | |green|     | October 2019   | October 2022 (planned) |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| Odoo 12.saas~3  | |red|       | N/A      | N/A         | August 2019    |                        |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| **Odoo 12.0**   | |red|       | |red|    | |red|       | October 2018   | October 2021           |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| Odoo 11.saas~3  | |red|       | N/A      | N/A         | April 2018     |                        |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| **Odoo 11.0**   | |red|       | |red|    | |red|       | October 2017   | October 2020           |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| Odoo 10.saas~15 | |red|       | N/A      | N/A         | March 2017     |                        |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| Odoo 10.saas~14 | |red|       | N/A      | N/A         | January 2017   |                        |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| **Odoo 10.0**   | |red|       | |red|    | |red|       | October 2016   | October 2019           |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| Odoo 9.saas~11  | |red|       | N/A      | N/A         | May 2016       |                        |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| **Odoo 9.0**    | |red|       | N/A      | |red|       | October 2015   | October 2018           |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| Odoo 8.saas~6   | |red|       | N/A      | N/A         | February 2015  |                        |
++-----------------+-------------+----------+-------------+----------------+------------------------+
+| **Odoo 8.0**    | |red|       | N/A      | |red|       | September 2014 | October 2017           |
++-----------------+-------------+----------+-------------+----------------+------------------------+
 
 .. note::
 
@@ -61,10 +65,10 @@ This matrix shows the support status of every version.
 
     N/A Never released for this platform
 
-    |orange| Some of our older customers may still run this version on our Odoo Online servers, we provide help only on blocking issues and advise you to upgrade.
-
     🏁 Future version, not released yet
 
+.. This is an awful way to display colored circles but "Large Green Circle Emoji" was only released
+   in 2019 (see https://unicode-table.com/en/1F7E2/). Let's wait a few more years...
 
 .. |green| image:: data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMzIuMTkgMjMyLjE5Ij48Y2lyY2xlIGN4PSIxMTYuMDkiIGN5PSIxMTYuMDkiIHI9IjExNi4wOSIgc3R5bGU9ImZpbGw6IzAwYTcwMCIvPjwvc3ZnPg==
    :width: 15
@@ -72,9 +76,6 @@ This matrix shows the support status of every version.
 .. |red| image:: data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMzIuMTkgMjMyLjE5Ij48Y2lyY2xlIGN4PSIxMTYuMDkiIGN5PSIxMTYuMDkiIHI9IjExNi4wOSIgc3R5bGU9ImZpbGw6I2QwMDAwMCIvPjwvc3ZnPg==
    :width: 15
 
-.. |orange| image:: data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMzIuMTkgMjMyLjE5Ij48Y2lyY2xlIGN4PSIxMTYuMDkiIGN5PSIxMTYuMDkiIHI9IjExNi4wOSIgc3R5bGU9ImZpbGw6I2ZmYTcwMCIvPjwvc3ZnPg==
-   :width: 15
-
 I run an older version of Odoo/OpenERP/TinyERP
 ==============================================
 

content/administration/odoo_sh/advanced.rst

@@ -9,5 +9,4 @@ Advanced
 
    advanced/containers
    advanced/submodules
-   advanced/upgrade_your_database
    advanced/frequent_technical_questions

content/administration/odoo_sh/getting_started/branches.rst

@@ -213,6 +213,8 @@ This link contains various monitoring metrics of the current build.
 You can zoom, change the time range or select a specific metric on each graph.
 On the graphs, annotations help you relate to changes on the build (database import, git push, etc...).
 
+.. _odoosh/logs:
+
 Logs
 ----
 A viewer to have a look to your server logs.
@@ -382,7 +384,9 @@ we are considering the feature if there is enough demand.
 In case the domain of your users email addresses use SPF (Sender Policy Framework) or DKIM
 (DomainKeys Identified Mail), don't forget to authorize Odoo as a sending host in your domain name
 settings to increase the deliverability of your outgoing emails.
-The configuration steps are explained in the :ref:`Discuss app documentation <discuss-email_servers-spf-compliant>`.
+The configuration steps are explained in the documentation about :ref:`SPF 
+<email_communication/spf_compliant>` and :ref:`DKIM <email_communication/dkim_compliant>`.
+
 
 .. Warning::
   Forgetting to configure your SPF or DKIM to authorize Odoo as a sending host can lead to the

content/administration/odoo_sh/getting_started/create.rst

@@ -184,4 +184,4 @@ 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 :ref:`database registration documentation <db_premise>` for instructions.
+Read the :doc:`database registration documentation <../../maintain/on_premise>` for instructions.

content/administration/upgrade.rst

@@ -0,0 +1,12 @@
+:nosearch:
+
+=======
+Upgrade
+=======
+
+.. toctree::
+
+    upgrade/process
+    upgrade/odoo_sh
+    upgrade/service_level
+    upgrade/faq

content/administration/upgrade/faq.rst

@@ -0,0 +1,171 @@
+.. |assistance-contact| replace::
+   If you need Odoo assistance on this matter, please get in touch with your Odoo Account Manager or
+   our `Sales department`_.
+.. _Sales department: mailto:sales@odoo.com
+
+===
+FAQ
+===
+
+.. _upgrade-faq/why:
+
+Why upgrade
+===========
+
+* You benefit from the latest features of the :ref:`new major version
+  <upgrade-faq/release-notes>` released by Odoo.
+* If you are in an :ref:`unsupported version <upgrade/supported-versions>`, you get a new version
+  with support.
+
+.. _upgrade-faq/when:
+
+When to upgrade
+===============
+
+Whenever you want. You can make your upgrade request as soon as a new version is released or when
+your version turns unsupported, and you still wish to enjoy support.
+
+.. _upgrade-faq/availability:
+
+Availability of the new version
+===============================
+
+As soon as Odoo announces the release of a new major version, you can create a test upgrade request
+to try the latest version. Please note that at this point, the upgrade scripts will only have been
+tested with demo data. Please report any issue you might encounter while testing via the `Odoo
+Support page <https://www.odoo.com/help>`_ and make sure to be happy with your test version before
+requesting the upgrade of your database in production.
+
+.. _upgrade-faq/duration:
+
+Duration of the upgrade
+=======================
+
+It is impossible to give time estimates for every upgrade request.
+
+In general, the "smaller" the database, the quickest the upgrade request is completed. A single-user
+database that uses only CRM will be processed faster than a multi-company, multi-user database that
+uses Accounting, Sales, Purchase, and Manufacturing.
+
+You can expect the time it takes for the platform to upgrade the test database will be similar to
+the production upgrade.
+
+.. _upgrade-faq/project:
+
+The upgrade project
+===================
+
+It depends on the user involvement (the time spent on testing, reporting problems, etc.) and the
+issues encountered that might need to be addressed by our technical team.
+
+So, in a nutshell, what can impact your upgrade lead time?
+
+* Source & targeted versions
+* Installed apps
+* Volume of data
+* Amount of customization (models, fields, methods, workflows, reports, website, etc.)
+* Installation of new apps or configuration changes after the start of the test phase
+* User commitment
+
+.. _upgrade-faq/custom-modules:
+
+Upgrade of the custom modules
+=============================
+
+As stated in our :doc:`/legal/terms/enterprise`, section :ref:`charges_standard`, this optional
+service is subject to additional fees.
+
+Depending on your situation, the custom code could be upgraded by our services, by one of our
+partners, or you can do it yourself.
+
+.. note:: |assistance-contact|
+
+.. _upgrade-faq/editions-change:
+
+Editions change (from Community to Enterprise)
+==============================================
+
+The upgrade always returns an Enterprise edition of Odoo, whether the database you sent was a
+community or enterprise edition. It is required to have an enterprise subscription to upgrade.
+
+.. note:: |assistance-contact|
+
+.. seealso::
+   - `Editions <https://www.odoo.com/page/editions>`_
+
+.. _upgrade-faq/hosting-types-switch:
+
+Switching the hosting types (Self-Hosting vs. Online Hosting - SaaS vs. Cloud Platform - Odoo.sh)
+=================================================================================================
+
+An upgrade does not cover a change of `Hosting types <https://www.odoo.com/page/hosting-types>`_.
+
+Open the following link to get :doc:`more information about how to change your hosting type
+<../maintain/hosting_changes>`.
+
+.. note:: |assistance-contact|
+
+.. _upgrade-faq/release-notes:
+
+Release Notes by version
+========================
+
+Open our `Release Note <https://www.odoo.com/page/release-notes>`_ page to get a summary of the new
+features and improvements made in each version.
+
+How long is my test available for
+---------------------------------
+
+An Odoo Online (SaaS) test database is available for one month by default. We can extend this trial
+period upon request. For Odoo.sh or on-premise, there is no restriction.
+
+How many tests to perform before upgrading to production?
+---------------------------------------------------------
+
+As many as needed. When you are comfortable with the database, run a last test upgrade 48 hours
+before requesting your production upgrade and test your workflows one last time.
+
+How to/Where to report upgrade issues?
+--------------------------------------
+
+If you encounter issues during the upgrade process, please contact the Odoo Support through the
+`Odoo Support page <https://www.odoo.com/help>`_
+
+- To report an issue discovered during the testing phase, please select **An issue related to my
+  upgrade (test phase)**.
+- To report an issue discovered post-upgrade, please select **An issue related to my upgrade
+  (production)**
+
+Upgrading to production
+-----------------------
+
+Once you have completed testing and are happy with the result, you decide on a date and time when
+you stop users from accessing Odoo, freeze all data entries, and create an upgrade request for the
+production upgrade.
+
+
+How is my data handled in the Upgrade Platform?
+-----------------------------------------------
+
+The Odoo Upgrade platform uses the same Privacy Policy as the rest of Odoo.com services.
+
+Your data is hosted on servers that follow our security guidelines, namely:
+
+- SSL - All web connections to client instances are protected with 256-bit SSL encryption
+  (HTTPS with a 2048-bit modulus SSL certificate), and running behind Grade A SSL stacks. All our
+  certificate chains are using SHA-2 already.
+- Safe System - Our servers are running recent Linux distribution with up-to-date security patches,
+  with firewall and intrusion countermeasures (not disclosed for obvious reasons).
+
+Servers are located at the same locations as our Cloud providers with the following services:
+
+- Restricted perimeter, physically accessed by authorized data center employees only
+- Physical access control with security badges or biometrical security
+- Security cameras monitoring the data center locations 24/7
+- Security personnel on-site 24/7
+
+The uploaded and migrated databases uploaded to the Upgrade platform are kept for up to 3 months and
+are permanently deleted following that period.
+
+You can learn more about privacy and data handling at Odoo by visiting our `General Data Protection
+Regulation page <https://www.odoo.com/gdpr>`_.

content/administration/upgrade/odoo_sh.rst

@@ -1,9 +1,7 @@
 
-=====================
-Upgrade your database
-=====================
-
-.. _odoosh-advanced-upgrade_your_database:
+=======================
+Odoo.sh version upgrade
+=======================
 
 Download and Upload your database
 =================================

content/administration/upgrade/process.rst

@@ -0,0 +1,256 @@
+.. |assistance-contact| replace::
+   If you need Odoo assistance on this matter, please get in touch with your Odoo Account Manager or
+   our `Sales department`_.
+.. _Sales department: mailto:sales@odoo.com
+
+===============
+Upgrade process
+===============
+
+.. _upgrade/overview:
+
+Overview
+========
+
+An upgrade is switching to a newer version of Odoo (e.g., Odoo 14.0 to Odoo 15.0).
+
+An upgrade does not cover:
+
+* Changing :ref:`editions <upgrade-faq/editions-change>` (i.e., Community to Enterprise edition)
+* Switching :ref:`hosting type <upgrade-faq/hosting-types-switch>` (i.e., On-Premise to Online or
+  Odoo.sh)
+* Migration from another ERP to Odoo
+
+.. note:: |assistance-contact|
+
+.. _upgrade/process-workflow:
+
+Process workflow
+----------------
+
+The upgrade process in a nutshell:
+
+#. You create a test upgrade request.
+#. | Odoo processes the request:
+   | This happens via an automated process that runs the database through an upgrade script and
+     takes between 20 and 120 minutes. Only if an issue(s) arises will we have to intervene
+     manually and adjust the script specifically to your database until the upgrade succeeds.
+#. Odoo delivers a test database.
+#. You test your database for possible discrepancies (see :ref:`upgrade/test-guidance`)
+#. If there are any discrepancies, you report them to the Upgrade support team via the help portal
+   (see :ref:`upgrade/test-assistance`).
+#. We will fix the issues and send you a new test database.
+#. Once you have completed the testing and are happy with the result, you decide on a date and time
+   when you stop users from accessing Odoo, freeze all data entries, and create an upgrade request
+   for the production upgrade.
+#. Odoo delivers the production database through the automated process.
+#. You restore it in your Production environment a few short hours later and continue working on the
+   newly upgraded database (this is done automatically on SaaS).
+
+.. _upgrade/get-started:
+
+Get started
+===========
+
+The upgrade process varies depending on where your database is hosted.
+
+.. _upgrade/online:
+
+Online Hosting (SaaS)
+---------------------
+
+The upgrade request is made via your `database manager <https://www.odoo.com/my/databases>`_.
+
+.. image:: process/online-access-databases.png
+   :align: center
+   :alt: Click on the profile button then on "My Databases"
+
+.. image:: process/online-upgrade-button.png
+   :align: center
+   :alt: Click on the settings button next to your database, then on "Upgrade"
+
+.. _upgrade/odoo-sh:
+
+Cloud Platform (Odoo.sh)
+------------------------
+
+:doc:`odoo_sh`
+
+.. _upgrade/on-premise:
+
+Self-Hosting (On-Premise)
+-------------------------
+
+There are two possibilities:
+
+#. Via `Odoo Upgrade service <https://upgrade.odoo.com>`_
+#. | For technically advanced users and partners, via the following command line on the machine
+     where your database is hosted:
+   | ``python <(curl -s https://upgrade.odoo.com/upgrade) test -d <your db name> -t <target
+     version>``
+
+The above command will dump your database to a file, send it to the upgrade platform for an upgrade,
+display you the live logs, and restore the upgraded database back on your server as a duplicate test
+database.
+
+.. _upgrade/testing-phase:
+
+Testing Phase (pre-production phase)
+====================================
+
+This phase allows you to review an upgraded version of your database without affecting your
+production database in any way.
+
+We suggest that you run the test upgrade process at least once, but you can do it as many times as
+you need (one at a time).
+
+Once you receive your upgraded test database, check that all data, processes, and functionality are
+still correct and working as expected.
+
+If you do find discrepancies, report your issues (see :ref:`upgrade/test-assistance`) and request
+a new test database (see :ref:`upgrade/test-db-request`) when the reported issues are fixed in
+the upgrade script.
+
+If you do not find any discrepancies, you'll be able to move on to the upgrade of your
+:ref:`production database <upgrade/production-live>`.
+
+.. _upgrade/test-db-request:
+
+Request a test database
+-----------------------
+
+When filling the `website form <https://upgrade.odoo.com>`_, select *Testing* purpose.
+
+.. image:: process/test-purpose.png
+   :align: center
+   :alt: Selection of the "Testing" purpose in the upgrade form on Odoo
+
+.. _upgrade/test-guidance:
+
+Test guidance
+-------------
+
+Every business and organization has its own operational needs and has to test its specific Odoo
+instance respectively. We recommend you look at `the test scenario
+<https://docs.google.com/document/d/1ypNs7JKPOsjNbKpdiKFH7Al6g6whZ9jr7f7duAQ5E1w/>` for further
+information.
+
+.. todo:: change link "test scenario" once the related doc is published
+
+.. _upgrade/test-assistance:
+
+Assistance
+----------
+
+If you encounter an issue in the **test database**, please get in touch with Odoo Upgrade Support
+via the `Odoo Support page <https://www.odoo.com/help>`_.
+
+Under the *Ticket Description* section, select *An issue related to my upgrade* ticket type.
+
+   .. image:: process/test-assistance.png
+      :align: center
+      :alt: Selection of "An issue related to my upgrade" as Ticket Type in the support form on Odoo
+
+   .. warning::
+      If you choose another *Ticket Description* type, the request will be redirected to another
+      team. This will slow down the processing and response time.
+
+Please provide as much detail as you can (i.e., videos and screenshots to illustrate your issue).
+This will avoid clarifying questions and speed up the resolution process significantly.
+
+   .. image:: process/test-assistance-details.png
+      :align: center
+      :alt: "Detailed Description" field in the support form on Odoo
+
+.. note::
+   * The purpose of the test phase is not to correct existing data or configurations in your
+     database.
+   * |assistance-contact|
+
+.. _upgrade/steps-production:
+
+The production launch
+---------------------
+
+.. _upgrade/production-live:
+
+Production goes live
+~~~~~~~~~~~~~~~~~~~~
+
+The production upgrade request is when you decide to upgrade your current database with all your
+production data (invoices, VAT returns, inventories, current orders) to a new version of your
+choice.
+
+After your :ref:`tests <upgrade/testing-phase>` are completed to your satisfaction, submit the
+request to upgrade your production database via our `website form <https://upgrade.odoo.com>`_.
+Select *Production* purpose.
+
+.. image:: process/production-purpose.png
+   :align: center
+   :alt: Selection of the "Production" purpose in the upgrade form on Odoo
+
+.. danger::
+   Going into production without first testing may lead to:
+
+   - business interruptions (e.g., no longer having the possibility to validate an action)
+   - poor customer experiences (e.g., an eCommerce website that does not work correctly)
+
+.. _upgrade/production-assistance:
+
+Assistance
+~~~~~~~~~~
+
+If you encounter issues or problems in the **production database**, please get in touch with **Odoo
+Support**:
+
+#. Connect to our `Odoo Support page <https://www.odoo.com/help>`_.
+#. Under the *Ticket Description* section, select the appropriate type related to your issue but
+   **do not select** the option *An issue related to my upgrade*.
+
+   .. note::
+      After upgrading to production, the support will be provided by the Support team instead of the
+      Upgrade team.
+
+#. Please provide as much detail as you can (i.e., videos and screenshots to illustrate your issue).
+   This will avoid clarifying questions and speed up the resolution process significantly.
+
+   .. image:: process/production-assistance-details.png
+      :align: center
+      :alt: "Detailed Description" field in the support form on Odoo
+
+   .. warning::
+      If you choose *An issue related to my upgrade* as ticket type, the request will be redirected
+      to another team than the support one and will slow down the processing and response time.
+
+.. _upgrade/assistance:
+
+Assistance
+==========
+
+.. _upgrade/contact:
+
+Contact our Upgrade service support
+-----------------------------------
+
+Should you have any more questions about the upgrade, do not hesitate to send a message to `Odoo
+Upgrade Team <mailto:upgrade@odoo.com>`_. We will be happy to answer it as soon as possible.
+
+.. _upgrade/supported-versions:
+
+Supported versions
+------------------
+
+Please note that Odoo provides support and bug fixing only for the three last major versions of
+Odoo.
+
+This is a factor to take into consideration before upgrading. If you are on an older version, we
+suggest you to prefer the most recent version to benefit from longer support (before having to
+upgrade again).
+
+You can get more information about our :doc:`supported versions <../maintain/supported_versions>`.
+
+.. seealso::
+   - :doc:`faq`
+   - :doc:`odoo_sh`
+   - :doc:`service_level`
+   - :doc:`../maintain/supported_versions`

content/administration/upgrade/service_level.rst

@@ -0,0 +1,37 @@
+.. |assistance-contact| replace::
+   If you need Odoo assistance on this matter, please get in touch with your Odoo Account Manager or
+   our `Sales department`_.
+.. _Sales department: mailto:sales@odoo.com
+
+=======================
+Service Level Agreement
+=======================
+
+What is covered by the Enterprise Licence?
+==========================================
+
+Databases hosted on Odoo’s Cloud platforms (Saas and Odoo.sh) or On-Premise (Self-Hosting) enjoy the
+following service at all times.
+
+The upgrade of:
+
+* standard applications
+* Studio customization (as long as the Studio app is still active)
+* customizations done by our consulting and developer services *if* they are covered by a
+  ‘Maintenance of Customisations’ subscription
+
+The Upgrade Service is limited to your database's technical conversion and adaptation (standard
+modules and data) to make it compatible with the targeted version.
+
+What upgrading does NOT cover
+=============================
+
+* The cleaning of pre-existing data & configuration while upgrading
+* Any new developments and/or upgrades of your own :ref:`custom modules
+  <upgrade-faq/custom-modules>`
+* `Training <https://www.odoo.com/learn>`_ on the latest version
+
+You can get more information about your Enterprise Licence on our :ref:`Odoo Enterprise Subscription
+Agreement <upgrade>` page.
+
+.. note:: |assistance-contact|

content/applications/finance.rst

@@ -10,4 +10,5 @@ Finance
     finance/accounting
     finance/expenses
     finance/documents
-    finance/sign
+    finance/sign
+    finance/payment_acquirers

content/applications/finance/accounting/fiscal_localizations/localizations/colombia.rst

@@ -19,7 +19,7 @@ requires the next modules:
    contains the default setup for: chart of accounts, taxes,
    retentions, identification document types
 #. **l10n_co_edi**: This module includes all the extra fields that are
-   required for the Integration with Carvajal T&S and generate the
+   required for the Integration with Carvajal and generate the
    electronic invoice, based on the DIAN legal requirements.
 
 
@@ -43,12 +43,12 @@ filter and search for "Colombia". Then click on *Install* for the first two modu
    :align: center
 
 
-Configure credentials for Carvajal T&S web service
---------------------------------------------------
+Configure credentials for Carvajal web service
+----------------------------------------------
 
 Once that the modules are installed, in order to be able to connect
-with Carvajal T&S Web Service, it's necessary to configure the user
-and credentials, this information will be provided by Carvajal T&S.
+with Carvajal Web Service, it's necessary to configure the user
+and credentials, this information will be provided by Carvajal.
 
 Go to :menuselection:`Accounting --> Configuration --> Settings` and
 look for the *Colombian Electronic Invoice* section.
@@ -56,12 +56,20 @@ look for the *Colombian Electronic Invoice* section.
 .. image:: media/colombia03.png
    :align: center
 
-Using the Testing mode it is possible to connect with a Carvajal T&S
+Using the Testing mode it is possible to connect with a Carvajal
 testing environment. This allows users to test the complete workflow
 and integration with the CEN Financiero portal, which is accessible
-here: https://cenfinancierolab.cen.biz
+here:
 
-Once that Odoo and Carvajal T&S is fully configured and ready for
+CTS (Carvajal T&S)
+  https://cenflab.cen.biz/site/
+
+CSC (Carvajal Servicios de Comunicación)
+  https://web-stage.facturacarvajal.com/
+
+CSC is the default for new databases.
+
+Once that Odoo and Carvajal are fully configured and ready for
 production the testing environment can be disabled.
 
 

content/applications/finance/accounting/fiscal_localizations/localizations/colombia_ES.rst

@@ -18,7 +18,7 @@ requiere los siguientes Módulos:
    - Tipos de Documentos de Identificación
 
 #. **l10n_co_edi**: Este módulo incluye todos los campos adicionales que son
-   requeridos para la Integración entre Carvajal T&S y la generación de la
+   requeridos para la Integración entre Carvajal y la generación de la
    Factura Electrónica, basado en los requisitos legales de la DIAN.
 
 
@@ -42,12 +42,12 @@ Instalar a los primeros dos módulos:
    :align: center
 
 
-Configuración de las credenciales del Servicio Web de Carvajal T&S
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Configuración de las credenciales del Servicio Web de Carvajal
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 | Una vez que los módulos están instalados, para poderte conectar con el
-  Servicio Web de Carvajal T&S, es necesario configurar el Usuario y las
-  Credenciales. Esta información será provista por Carvajal T&S.
+  Servicio Web de Carvajal, es necesario configurar el Usuario y las
+  Credenciales. Esta información será provista por Carvajal.
 | Ve a :menuselection:`Facturación --> Configuración --> Configuración` y busca la sección
   **Facturación Electrónica Colombiana**
 
@@ -55,14 +55,21 @@ Configuración de las credenciales del Servicio Web de Carvajal T&S
   :align: center
 
 La funcionalidad de pruebas le permite conectarse e interactuar con el
-ambiente piloto de Carvajal T&S, esto permite a los usuarios probar el
+ambiente piloto de Carvajal, esto permite a los usuarios probar el
 flujo completo y la integración con el Portal Financiero CEN, al cual
-se accede a través de la siguiente liga: `Cenfinanciero <https://cenfinancierolab.cen.biz>`_.
+se accede a través de la siguiente liga:
+
+CTS (Carvajal T&S)
+   https://cenflab.cen.biz/site/
+
+CSC (Carvajal Servicios de Comunicación)
+   https://web-stage.facturacarvajal.com/
+
+CSC es el predeterminado para nuevas bases de datos.
 
 Una vez que el ambiente de producción está listo en Odoo y en Carvajal
-T&S el ambiente de pruebas debe ser deshabilitado para poder enviar la
-información al ambiente de producción de Carvajal, para el cual es
-utilizada la siguiente URL: `Cenfinanciero <https://cenfinancierolab.cen.biz>`_.
+el ambiente de pruebas debe ser deshabilitado para poder enviar la
+información al ambiente de producción de Carvajal.
 
 
 Configuración de Información para PDF

content/applications/finance/accounting/fiscal_localizations/localizations/italy_IT.rst

@@ -30,8 +30,7 @@ elettronica sono i seguenti:
    di posta elettronica certificata sono fornite dal tuo fornitore o dal
    Ministero. Lo stesso server deve essere configurato come server che
    gestisce tutta la corrispondenza mail in Odoo, per saperne di più si
-   può consultare la relativa :doc:`guida
-   </applications/productivity/discuss/advanced/email_servers>`.
+   può consultare la relativa :doc:`guida </applications/general/email_communication/email_servers>`.
 
 -  Indirizzo PEC dell’Azienda, tale indirizzo deve essere lo stesso
    registrato presso l’Agenzia delle Entrate per l’utilizzo dei servizi

content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst

@@ -59,33 +59,20 @@ The following modules are necessary for all databases that require Mexican local
    | All the basic data to manage accounting, taxes and the chart of accounts. The installed chart
      of accounts is based on `the SAT account grouping code
      <https://www.gob.mx/cms/uploads/attachment/file/151586/codigo_agrupador.pdf>`_.
-#. | **EDI for Mexico (l10n_mx_edi)**
+#. | **EDI for Mexico (l10n_mx_edi & l10n_mx_edi_extended)**
    | Necessary for electronic transactions, CFDI 3.3, payment complement, and addenda on invoices.
-#. | **Odoo Mexican localization reports (l10n_mx_reports)**
+#. | **Odoo Mexican localization reports (l10n_mx_reports & l10n_mx_reports_closing)**
    | All mandatory reports for electronic accounting. (Requires the accounting application).
 
 The following modules are optional, and should be installed only if they meet a specific
 organization requirement. Installing these modules is not recommended unless you are sure they
 are needed as they add fields that can unnecessarily complicate form filling.
 
-#. | **EDI External Trade Complement for Mexico (l10n_mx_edi_external_trade)**
-   | For clients that export, add the foreign trade complement to the CFDI, and the logic for
-     filling it.
-#. | **Odoo Mexico Localization for Invoice with customs Number (l10n_mx_edi_customs)**
-   | For importing customers, this module allows adding to the CFDI the request number with which
-     the merchandise to be resold entered. When it is imported into Mexico, in the invoice that
-     comes from any foreign country it is necessary to specify which was the import document; This
-     is known as a "pedimento", and it is processed at customs.
 #. | **Odoo Mexico Localization for Stock / Landing (l10n_mx_edi_landing)**
-   | Related to the import module (*l10n_mx_edi_customs*), this module allows managing the requests
-     as part of the shipping costs.
-#. | **Bank account payment to Mexico (l10n_mx_edi_payment_bank)**
-   | Add optional attributes to the payment plugin, allowing the user to select the bank account
-     that was used to pay the bills.
-#. | **Odoo Mexico Localization for Sale Coupon (l10n_mx_edi_sale_coupon)**
-   | Complements the Odoo coupon module (*sale_coupon*) to avoid errors in the generation of CFDIs.
-#. | **Tax Cash Basis Entries at Payment Date (l10n_mx_tax_cash_basis)** Create journal entries for
-   | taxes on the payment date (instead of the issue date).
+   | This module allows managing the requests as part of the shipping costs.
+#. | **Odoo Mexican XML Polizas Export (l10n_mx_xml_polizas)**
+   | With this module, you will be able to export your Journal Entries in XML ready to be uploaded
+     to the SAT.
 
 Configuration
 =============

content/applications/finance/accounting/payables/supplier_bills/ocr.rst

@@ -3,13 +3,16 @@ Digitize Vendor Bills with Optical Character Recognition (OCR)
 ==============================================================
 
 Encoding bills manually can be a time-consuming task. Having a solution that allows you to digitize
-them and automatically import the data to your database reduces errors and saves you time.
+them and automatically import the data into your database reduces errors and saves you time.
 
+.. important::
+   `Try it out <https://www.odoo.com/app/invoice-automation>`_! Upload one of your Bills or try one of our samples.
+   
 Set up the feature
 ==================
 
 Go to :menuselection:`Accounting --> Settings --> Bill Digitalization`, and choose whether the bills
-should be processed automatically or manually.
+should be processed automatically (with OCR) or manually (on demand).
 
 .. image:: media/setup_ocr.png
    :align: center
@@ -41,7 +44,7 @@ Pricing
 =======
 
 | The *Bill Digitalization* is an *In-App Purchase (IAP)* service which requires prepaid credits to
-  work. Digitalizing one document consumes one credit.
+  work. Digitizing one document consumes one credit.
 | To buy credits, go to :menuselection:`Accounting --> Configuration --> Settings --> Bill
   Digitalization` and click on *Buy credits*, or go to :menuselection:`Settings --> Odoo IAP` and
   click on *View My Services*.
@@ -49,4 +52,5 @@ Pricing
 .. important::
    - If you are on Odoo Online (SAAS) and have the Enterprise version, you benefit from free trial
      credits to test the feature.
-   - Click `here <https://iap.odoo.com/privacy#header_4>`_ to know about our *Privacy Policy*.
+.. seealso::
+   - Our `Privacy Policy <https://iap.odoo.com/privacy#header_6>`_.

content/applications/finance/accounting/receivables/customer_payments/online_payment.rst

@@ -17,7 +17,7 @@ Configuration
 Make sure your :ref:`Payment Acquirers are correctly configured <payment_acquirers/configuration>`.
 
 .. note::
-   By default, ":doc:`Wire Transfer </applications/general/payment_acquirers/wire_transfer>`" is the only
+   By default, ":doc:`Wire Transfer </applications/finance/payment_acquirers/wire_transfer>`" is the only
    Payment Acquirer activated, but you still have to fill out the payment details.
 
 To activate the Invoice Online Payment, go to :menuselection:`Accounting --> Configuration --> 
@@ -42,4 +42,4 @@ They can choose which Payment Acquirer to use by clicking on *Pay Now*.
 
 .. seealso::
 
-   - :doc:`/applications/general/payment_acquirers`
+   - :doc:`/applications/finance/payment_acquirers`

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

@@ -7,4 +7,5 @@ Declarations
 .. toctree::
    :titlesonly:
 
-   declarations/tax_returns
+   declarations/tax_returns
+   declarations/intrastat

content/applications/finance/accounting/reporting/declarations/intrastat.rst

@@ -0,0 +1,29 @@
+=========
+Intrastat
+=========
+
+**Intrastat** is the system for data collection and statistic production of goods traded among the
+EU Member States. Organizations whose annual trade surpasses a certain threshold must provide data
+about the goods traded with other EU countries.
+
+.. seealso::
+   - `Eurostat Statistics Explained - Glossary: Intrastat
+     <https://ec.europa.eu/eurostat/statistics-explained/index.php?title=Glossary:Intrastat>`_
+
+.. note::
+   As of January 1, 2022, the reporting requirements have changed. One main modification concerns
+   the transaction codes which are now switching to a 2-digits format. All transactions recorded
+   after this date have to follow the new system’s rules.
+
+Configuration
+=============
+
+Go to :menuselection:`Accounting --> Settings --> Customer Invoices`, then enable **Intrastat** and
+*Save*. Once the Intrastat has been activated you are able to choose the **Default incoterm**.
+
+.. important::
+   If you created your Odoo database prior to **January 13, 2022**, please :ref:`upgrade
+   <general/upgrade>` the ``account_intrastat`` module to add the new transaction codes and
+   :ref:`install <general/install>` the ``account_intrastat_expiry`` module to archive the old
+   codes.
+

content/applications/finance/accounting/reporting/overview/main_reports.rst

@@ -8,7 +8,6 @@ countries :
 
 -  **Balance Sheet**
 -  **Profit and Loss**
--  **Chart of Account**
 -  **Executive Summary**
 -  **General Ledger**
 -  **Aged Payable**
@@ -45,14 +44,6 @@ report period.
 .. image:: media/main_reports10.png  
    :align: center
 
-Chart of account
-----------------
-
-A listing of all your accounts grouped by class.
-
-.. image:: media/main_reports08.png  
-   :align: center
-
 Executive Summary
 -----------------
 

content/applications/finance/accounting/taxation/taxes/eu_distance_selling.rst

@@ -14,7 +14,7 @@ While this regulation mainly applies to :doc:`eCommerce <../../../../websites/ec
 private EU consumers, it is also valid for mail order sales and telesales.
 
 The Union **One-Stop Shop (OSS)** is an online portal where businesses can register for the OSS and
-declare their intra-community distance sales. Each EU member states integrates an online OSS portal.
+declare their intra-community distance sales. Each EU member state integrates an online OSS portal.
 
 The **EU intra-community Distance Selling** feature helps your organization comply with this
 regulation by creating and configuring new :doc:`fiscal positions <fiscal_positions>` and

content/applications/finance/accounting/taxation/taxes/taxcloud.rst

@@ -43,6 +43,52 @@ In Odoo
   and the zip code). Go to :menuselection:`Settings --> Users & Companies --> Companies`
   to open and edit your Company record.
 
+Automatically post taxes to the correct Tax Payable account
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* For each one of your companies that uses TaxCloud, it might be necessary to create a 
+  **User-Defined Default** so that the new taxes generated by the TaxCloud integration are created 
+  with the correct Tax Payable account:
+  
+.. warning::
+   A User-Defined Default impacts all records at creation.  It means that **every** new tax will be 
+   set up to record income in the specified Tax Payable account, unless the tax is manually edited
+   to specify a different income account (or there exists another User-Defined Default that takes 
+   precedence).
+
+* In :menuselection:`Accounting --> Configuration --> Chart of Accounts`, select the Tax Payable
+  account for the company. Take note of the account's ``id`` in the URL string. 
+
+.. image:: taxcloud/user-default-find-account-id.png
+   :alt: The account's ID can be found in the URL string as 'id=...'. 
+   :align: center
+
+* Activate the :ref:`developer mode <developer-mode>`, then go to 
+  :menuselection:`Settings --> Technical --> Actions --> User-Defined Defaults`, and 
+  click on *Create*.
+
+* Click on *Field*, then, in the drop-down menu, on *Search More*. 
+
+.. image:: taxcloud/user-default-search-field.png
+   :alt: Click on 'Search More' in the 'Field' drop-down menu. 
+   :align: center
+
+* In the pop-up's search box, filter on the model ``tax.repartition.line`` and the field ``account``. 
+  Select the ``account`` field of the ``tax.repartition.line`` model. 
+
+.. image:: taxcloud/user-default-select-field.png
+   :alt: Select the 'account' field of the 'tax.repartition.line' model. 
+   :align: center
+
+* In the **Default Value** field, enter the ID of the company's Tax Payable account. 
+  Select the company for which this configuration should apply in the *Company* field. 
+  Click *Save*. 
+
+.. image:: taxcloud/user-default-enter-default-account-id.png
+   :alt: Enter the ID of the company's Tax Payable account. 
+   :align: center
+
+
 How it works
 ============
 

content/applications/finance/expenses.rst

@@ -21,7 +21,7 @@ Otherwise keep the cost at 0.0 and employees will report the real cost per expen
 .. image:: expenses/product.png
    :align: center
 
-Here are some examples to configure:
+Here are some examples:
 
 * Restaurant:
 
@@ -45,7 +45,7 @@ That way, employees report expenses with
 prices including taxes, which is usually the expected behaviour.
 
 .. tip:: 
-    The *Sales* app allows you to specify unit of measures for your 
+    The *Sales* app allows you to specify units of measure for your 
     expense types (units, miles, nights, etc.). 
     Go to :menuselection:`Sales --> Configuration --> Settings` and check
     *Some products may be sold/purchased in different units of measure (advanced)*.
@@ -181,10 +181,10 @@ Setup
 -  Go to the product configuration menu and set the invoicing method on
    all your Expense types:
 
-   -  Ordered quantities : it will invoice expenses based on the ordered
+   -  Ordered quantities: it will invoice expenses based on the ordered
       quantity
 
-   -  Delivered quantities :it will invoice expenses based on the
+   -  Delivered quantities: it will invoice expenses based on the
       expenses quantity
 
    -  At cost: will invoice expenses at their real cost.
@@ -231,4 +231,4 @@ lines. Such items show up in blue (i.e. to invoice).
 .. image:: expenses/invoicing_04.png
   :align: center
 
-e (i.e. to invoice). 
+e (i.e. to invoice). 

content/applications/finance/sign.rst

@@ -1,5 +1,3 @@
-:show-content:
-
 ====
 Sign
 ====
@@ -11,6 +9,9 @@ filled out with the user's detail if they are logged in.
 
 .. seealso::
    - `Odoo Sign: product page <https://www.odoo.com/app/sign>`_
+   - `Odoo Tutorials: Sign <https://www.odoo.com/slides/sign-61>`_
+
+.. _sign/validity:
 
 Validity of electronic signatures
 =================================
@@ -68,6 +69,53 @@ Overall, to be recognized as valid, electronic signatures have to meet five crit
 
 .. note::
    The information provided here does not constitute legal advice; it is provided for general
-   informational purposes only. As laws governing electronic signatures evolve rapidly, we cannot
-   guarantee that the information is up to date. We advise you to should contact a local attorney to
-   obtain legal advice.
+   informational purposes only. As laws governing electronic signatures rapidly evolve, we cannot
+   guarantee whether all information is up to date or not. We advise contacting a local attorney for
+   legal advice regarding electronic signature compliance and validity.
+
+.. _sign/field-types:
+
+Field Types
+===========
+
+By configuring your own *Field Types*, also known as *Signature Item Types*, you can make the
+signing process even faster for your customers, partners, and employees.
+
+To create and customize fields, activate the :ref:`developer mode <developer-mode>`. Then head to
+:menuselection:`Documents --> Configuration --> Field Types` and click on *Create*.
+
+After giving your new field a name, select one of the six *Types* available:
+
+- **Signature**: users are prompted to enter their signature either by drawing it, automatically
+  generating one based on their name, or uploading a local file (usually an image). Each subsequent
+  *Signature* field then reuses the data entered in the first field.
+- **Initial**: users are prompted to enter their initials, in a similar way to the *Signature*
+  field.
+- **Text**: users enter text on a single line.
+- **Multiline Text**: users enter text on multiple lines.
+- **Checkbox**: users can tick a box (e.g.,to mark their approval or consent).
+- **Selection**: users choose a single option from a variety of options.
+
+Next, you have the option to auto-complete fields for users based on their Odoo profile information
+by using *Automatic Partner Field*. To this end, the *Name*, *Email*, *Phone*, and *Company* fields
+are preconfigured in your database.
+
+.. note::
+   Users can freely edit auto-completed fields.
+
+.. image:: sign/field-example.png
+   :align: center
+   :alt: Company field example in Odoo Sign
+
+You can then change the size of the field by editing the *Default Width* and *Default Height*. Both
+sizes are defined as a percentage of the full-page expressed as a decimal, with 1 equalling the
+full-page's width or height. By default, the width of new fields you create is set to 15% (0.150)
+of a full-page's width, while their height is set to 1.5% (0.015) of a full-page's height.
+
+Next, write a *Tip*. Tips are displayed inside arrows on the left-hand side of the user's screen
+during the signing process. You can also use a *Placeholder* text to be displayed inside the field
+before it is completed.
+
+.. image:: sign/tip-placeholder.png
+   :align: center
+   :alt: Tip and placeholder example in Odoo Sign

content/applications/general.rst

@@ -8,8 +8,9 @@ Miscellaneous
     general/auth
     general/apps_modules
     general/export_import_data
-    general/payment_acquirers
+    general/email_communication
     general/voip
     general/calendars
     general/in_app_purchase
     general/developer_mode
+