wip

Backport of commit d227ab66b0 on #1448

closes odoo/documentation#1612

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)/13.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,7 +112,7 @@ extensions = [
     # Youtube and Vimeo videos integration (youtube, vimeo directives)
     'embedded_video',
 
-    'exercise_admonition',
+    'custom_admonitions',
 
     # Redirection generator
     'redirects',
@@ -142,7 +148,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',
@@ -283,15 +302,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 +324,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/deploy.rst

@@ -303,7 +303,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;
@@ -316,7 +316,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/maintain.rst

@@ -7,8 +7,8 @@ Maintain
 .. toctree::
 
     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/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:`/applications/websites/website/publish/domain_name`
+
+.. _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,36 +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.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::
 
@@ -59,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
@@ -70,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
+   advanced/scheduled_actions

content/administration/odoo_sh/advanced/frequent_technical_questions.rst

@@ -1,32 +0,0 @@
-
-.. _odoosh-advanced-frequent_technical_questions:
-
-==================================
-Frequent Technical Questions
-==================================
-
-"Scheduled actions do not run at the exact time they were expected"
--------------------------------------------------------------------
-
-On the Odoo.sh platform, we cannot guarantee an exact running time for scheduled actions.
-
-This is due to the fact that there might be multiple customers on the same server, and we must guarantee a fair share of the server for every customer. Scheduled actions are therefore implemented slightly differently than on a regular Odoo server, and are run on a *best effort* policy.
-
-.. warning::
-    Do not expect any scheduled action to be run more often than every 5 min.
-
-Are there "best practices" regarding scheduled actions?
--------------------------------------------------------
-
-**Odoo.sh always limits the execution time of scheduled actions (*aka* crons).**
-Therefore, you must keep this fact in mind when developing your own crons.
-
-We advise that:
-
-- Your scheduled actions should work on small batches of records.
-- Your scheduled actions should commit their work after processing each batch;
-  this way, if they get interrupted by the time-limit, there is no need to start over.
-- Your scheduled actions should be
-  `idempotent <https://stackoverflow.com/a/1077421/3332416>`_: they must not
-  cause side-effects if they are started more often than expected.
-

content/administration/odoo_sh/advanced/scheduled_actions.rst

@@ -0,0 +1,29 @@
+
+.. _odoo-sh/scheduled_actions:
+
+=================
+Scheduled actions
+=================
+
+Special worker
+--------------
+
+On Odoo.sh, cron jobs and incoming mails are handled by a specific worker that is not accounted in
+the workers on your subscription. It is a kind of "hidden free worker" bound to every Odoo.sh
+instance.
+
+By default, this worker can spawn multiple concurrent threads to execute scheduled actions. The
+number of threads can be dynamically increased at runtime. However, its exact amount cannot be
+predicted as it varies according to the number of extra workers in the subscription, the current
+concurrency of incoming mails, the current server's load, etc.
+
+Limitations
+-----------
+
+- The delay between a scheduled task's next execution date and the actual triggering depends on many
+  parameters and can be delayed according to the state of the execution pool of the shared server.
+- Scheduled actions on staging branches are executed less often than production build.
+- The platform deactivates scheduled actions that repeatedly time out.
+- If the execution time of a scheduled action is business-critical, then we recommend using a
+  dedicated server as the scheduled actions timeout can be modified in the project settings.
+- We cannot guarantee an exact running time for scheduled actions on the Odoo.sh platform.

content/administration/odoo_sh/advanced/submodules.rst

@@ -109,3 +109,7 @@ Ignore modules
 If you're adding a repository that contains a lot of modules, you may want to ignore some of them in case there are any
 that are installed automatically. To do so, you can prefix your submodule folder with a :code:`.`. The platform will
 ignore this folder and you can hand pick your modules by creating symlinks to them from another folder.
+
+.. note::
+   This symlink has to be done within your GitHub repository. Do not try to create the symlink
+   with the container.

content/administration/odoo_sh/getting_started/branches.rst

@@ -74,8 +74,8 @@ The neutralization includes:
 * Setting payment acquirers and shipping providers in test mode.
 * Disabling IAP services
 
-The latest database will be kept alive indefinitely, older ones from the same branch may get garbage collected
-to make room for new ones. It will be valid for 3 months, after which you will be expected to rebuild the branch.
+The latest database will be kept alive for one year after which you will be expected to rebuild the branch.
+Older ones from the same branch may get garbage collected to make room for new ones.
 If you make configuration or view changes in these databases, make sure to document them or write them directly
 in the modules of the branch, using XML data files overriding the default configuration or views.
 
@@ -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

@@ -79,7 +79,9 @@ Import your database
 ====================
 
 You can import your database in your Odoo.sh project as long as it is in a :doc:`supported version
-</administration/maintain/supported_versions>` of Odoo.
+</administration/maintain/supported_versions>` of Odoo. The branch automatically switches to the
+Odoo version of the database.
+
 
 Push your modules in production
 -------------------------------
@@ -184,4 +186,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/odoo_sh/getting_started/settings.rst

@@ -151,14 +151,13 @@ This section shows the storage size used by your project.
 .. image:: ./media/interface-settings-storage.png
    :align: center
 
-Storage size is computed as follows:
+Storage size of a build is computed as follows:
 
 * the size of the PostgreSQL database
 
 * the size of the disk files available in your container: database filestore, sessions storage directory...
 
-.. Warning::
-  In case you want to analyze disk usage, you can run the tool `ncdu <https://dev.yorhel.nl/ncdu/man>`_ in your Web Shell.
+The total storage accounts for the production database, the staging branches, and three backups.
 
 Should your production database size grow to exceed what's provisioned in your subscription, it
 will automatically be synchronized with it.

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,3 +10,4 @@ Finance
     finance/accounting
     finance/expenses
     finance/sign
+    finance/payment_acquirers

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

@@ -59,7 +59,7 @@ look for the *Colombian Electronic Invoice* section.
 Using the Testing mode it is possible to connect with a Carvajal T&S
 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: https://cenflab.cen.biz/site/
 
 Once that Odoo and Carvajal T&S is fully configured and ready for
 production the testing environment can be disabled.

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

@@ -57,12 +57,11 @@ Configuración de las credenciales del Servicio Web de Carvajal T&S
 La funcionalidad de pruebas le permite conectarse e interactuar con el
 ambiente piloto de Carvajal T&S, 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: `Cenfinanciero <https://cenflab.cen.biz/site/>`_.
 
 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>`_.
+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

@@ -25,8 +25,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/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/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).