[IMP] Sign: reminders

taskid-4053507

.tx/config

@@ -21,6 +21,16 @@ replace_edited_strings = false
 keep_translations      = false
 source_lang            = en
 
+[o:odoo:p:odoo-17-doc:r:essentials]
+file_filter            = locale/<lang>/LC_MESSAGES/essentials.po
+source_file            = locale/sources/essentials.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = essentials
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
+
 [o:odoo:p:odoo-17-doc:r:finance]
 file_filter            = locale/<lang>/LC_MESSAGES/finance.po
 source_file            = locale/sources/finance.pot
@@ -41,6 +51,16 @@ replace_edited_strings = false
 keep_translations      = false
 source_lang            = en
 
+[o:odoo:p:odoo-17-doc:r:hr]
+file_filter            = locale/<lang>/LC_MESSAGES/hr.po
+source_file            = locale/sources/hr.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = hr
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
+
 [o:odoo:p:odoo-17-doc:r:index]
 file_filter            = locale/<lang>/LC_MESSAGES/index.po
 source_file            = locale/sources/index.pot
@@ -111,6 +131,16 @@ replace_edited_strings = false
 keep_translations      = false
 source_lang            = en
 
+[o:odoo:p:odoo-17-doc:r:studio]
+file_filter            = locale/<lang>/LC_MESSAGES/studio.po
+source_file            = locale/sources/studio.pot
+type                   = POT
+minimum_perc           = 0
+resource_name          = studio
+replace_edited_strings = false
+keep_translations      = false
+source_lang            = en
+
 [o:odoo:p:odoo-17-doc:r:websites]
 file_filter            = locale/<lang>/LC_MESSAGES/websites.po
 source_file            = locale/sources/websites.pot

Makefile

@@ -18,6 +18,7 @@ CONFIG_DIR     = .
 SPHINXOPTS     = -D project_root=$(ROOT) -D canonical_version=$(CANONICAL_VERSION) \
                  -D versions=$(VERSIONS) -D languages=$(LANGUAGES) -D language=$(CURRENT_LANG) \
                  -D is_remote_build=$(IS_REMOTE_BUILD) \
+                 -T \
                  -A google_analytics_key=$(GOOGLE_ANALYTICS_KEY) \
                  -A plausible_script=$(PLAUSIBLE_SCRIPT) \
                  -A plausible_domain=$(PLAUSIBLE_DOMAIN) \
@@ -26,7 +27,7 @@ SOURCE_DIR     = content
 
 HTML_BUILD_DIR = $(BUILD_DIR)/html
 ifdef VERSIONS
-  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/master
+  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/saas-17.2
 endif
 ifneq ($(CURRENT_LANG),en)
   HTML_BUILD_DIR := $(HTML_BUILD_DIR)/$(CURRENT_LANG)

README.md

@@ -9,6 +9,7 @@
 - Python dependencies listed in the file `requirements.txt`.
 - Make
 - A local copy of the [odoo/odoo repository](https://github.com/odoo/odoo) (optional)
+- A local copy of the [odoo/upgrade-util repository](https://github.com/odoo/upgrade-util) (optional)
 
 ### Instructions
 
@@ -18,8 +19,9 @@
 3. See [this guide](https://www.odoo.com/documentation/latest/contributing/documentation.html)
    for more detailed instructions.
 
-Optional: place your local copy of the `odoo/odoo` repository in the parent directory or in the root
-directory of the documentation to build the latter with the documented Python docstrings.
+Optional: place your local copy of the `odoo/odoo` and `odoo/upgrade-util` repositories in
+the parent directory or in the root directory of the documentation to build the latter
+with the documented Python docstrings.
 
 ## Contribute to the documentation
 

conf.py

@@ -22,7 +22,7 @@ copyright = 'Odoo S.A.'
 # `version` is the version info for the project being documented, acts as replacement for |version|,
 # also used in various other places throughout the built documents.
 # `release` is the full version, including alpha/beta/rc tags. Acts as replacement for |release|.
-version = release = 'master'
+version = release = 'saas-17.2'
 
 # `current_branch` is the technical name of the current branch.
 # E.g., saas-15.4 -> saas-15.4; 12.0 -> 12.0, master -> master (*).
@@ -133,6 +133,24 @@ else:
         )
         odoo_dir_in_path = True
 
+if odoo_dir_in_path:
+    upgrade_util_dir = next(filter(Path.exists, [Path('upgrade-util'), Path('../upgrade-util')]), None)
+    if not upgrade_util_dir:
+        _logger.warning(
+            "Could not find Upgrade Utils sources directory in `upgrade_util`.\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/upgrade-util` or create a symbolic link."
+        )
+        odoo_dir_in_path = False
+    else:
+        _logger.info(
+            "Found Upgrade Util sources in %(directory)s",
+            {'directory': upgrade_util_dir.resolve()},
+        )
+        from odoo import upgrade
+        upgrade.__path__.append(str((upgrade_util_dir / 'src').resolve()))
+
 # Mapping between odoo models related to master data and the declaration of the
 # data. This is used to point users to available xml_ids when giving values for
 # a field with the autodoc_field extension.
@@ -213,6 +231,7 @@ sphinx.transforms.i18n.docname_to_domain = (
 # is populated. If a version is passed to `versions` but is not listed here, it will not be shown.
 versions_names = {
     'master': "Master",
+    'saas-17.2': "Odoo Online",
     'saas-17.1': "Odoo Online",
     '17.0': "Odoo 17",
     'saas-16.4': "Odoo Online",
@@ -233,8 +252,11 @@ languages_names = {
     'es': 'ES',
     'fr': 'FR',
     'it': 'IT',
+    'ko': 'KO',
     'nl': 'NL',
     'pt_BR': 'PT',
+    'ro': 'RO',
+    'sv': 'SV',
     'uk': 'UA',
     'zh_CN': 'ZH (CN)',
     'zh_TW': 'ZH (TW)'
@@ -246,6 +268,9 @@ redirects_dir = 'redirects/'
 sphinx_tabs_disable_tab_closing = True
 sphinx_tabs_disable_css_loading = True
 
+# Autodoc ordering
+autodoc_member_order = 'bysource'
+
 #=== Options for HTML output ===#
 
 html_theme = 'odoo_theme'
@@ -445,7 +470,7 @@ def _generate_alternate_urls(app, pagename, templatename, context, doctree):
         """
         _current_lang = app.config.language or 'en'
         # Replace the context value by its upper-cased value ("FR" instead of "fr")
-        context['language'] = languages_names.get(_current_lang)
+        context['language'] = languages_names.get(_current_lang, _current_lang.upper())
         context['language_code'] = _current_lang
 
         # If the list of languages is not set, assume that the project has no alternate language

content/administration.rst

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

content/administration/hosting.rst

@@ -1,4 +1,9 @@
-=======================
+=======
+Hosting
+=======
+
+.. _hosting/change-solution:
+
 Change hosting solution
 =======================
 
@@ -15,7 +20,7 @@ To Odoo Online
    - Odoo Online is *not* compatible with **non-standard apps**.
    - The database's current version must be :doc:`supported <supported_versions>`.
 
-#. Create a :ref:`duplicate <duplicate_premise>` of the database.
+#. Create a :ref:`duplicate of the database <on-premise/duplicate>`.
 #. In this duplicate, uninstall all **non-standard apps**.
 #. Use the database manager to grab a *dump with filestore*.
 #. `Submit a support ticket <https://www.odoo.com/help>`_ including the following:
@@ -41,10 +46,10 @@ Transferring an Odoo Online database
 ====================================
 
 .. important::
-   Odoo Online's :ref:`intermediary versions <supported_versions>` cannot be hosted on-premise as
-   that type of hosting does not support those versions. Therefore, if the database to transfer
-   is running an intermediary version, it must be upgraded first to the next :ref:`major version
-   <supported_versions>`, waiting for its release if necessary.
+   Odoo Online's :ref:`intermediary versions <supported_versions>` are not supported by Odoo.sh or
+   on-premise. Therefore, if the database to transfer is running an intermediary version, it must be
+   upgraded first to the next :ref:`major version <supported_versions>`, waiting for its release if
+   necessary.
 
    .. example::
       Transferring an online database running on Odoo 16.3 would require first upgrading it to Odoo
@@ -54,6 +59,11 @@ Transferring an Odoo Online database
       Click the gear icon (:guilabel:`⚙`) next to the database name on the `Odoo Online database
       manager <https://www.odoo.com/my/databases/>`_ to display its version number.
 
+   .. warning::
+      If there is an active Odoo subscription linked to the database being migrated, reach out to
+      the Customer Service Manager or `submit a support ticket <https://www.odoo.com/help>`_  to
+      complete the subscription transfer.
+
 To on-premise
 -------------
 

content/administration/install.rst

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

content/administration/install/online.rst

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

content/administration/maintain.rst

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

content/administration/maintain/domain_names.rst

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

content/administration/maintain/on_premise.rst

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

content/administration/mobile.rst

@@ -0,0 +1,67 @@
+================
+Odoo mobile apps
+================
+
+Two kind of Odoo mobile app exist: the progressive web app (PWA) and store apps. Using the PWA is
+recommended.
+
+Progressive web app (PWA)
+=========================
+
+PWAs are web-based applications designed to function across different devices and platforms,
+leveraging web browsers to deliver user experiences similar to native apps.
+
+The Odoo PWA features include:
+
+- Quick access by adding the PWA to a device's home screen
+- Seamless and borderless navigation experience
+- Push notifications
+- SSO authentication
+
+To install the Odoo PWA, launch a browser supporting PWAs, and sign in to an Odoo database. The
+instructions to install a PWA depend on the platform and browser used.
+
+.. tabs::
+
+   .. tab:: Android
+
+      **Chrome**: open Chrome's menu (:guilabel:`⋮`), select :guilabel:`Install app`, and tap
+      :guilabel:`Install`.
+
+      **Firefox**: open Firefox's menu (:guilabel:`⋮`), select :guilabel:`Install`, and either touch
+      and hold the Odoo icon or tap :guilabel:`Add automatically`.
+
+      The PWA can also be installed with **Samsung Internet**, **Edge**, and **Opera**.
+
+   .. tab:: iOS
+
+      **Safari**: open the **Share** menu by tapping the square with an arrow pointing upwards icon,
+      select :guilabel:`Add to Home Screen`, edit the PWA details if desired, and tap
+      :guilabel:`Add`.
+
+      On iOS 16.4 and above, the PWA can also be installed with **Chrome**, **Firefox**, and
+      **Edge**.
+
+   .. tab:: Desktop
+
+      **Chrome** and **Edge**: click the installation icon at the right of the address bar and click
+      :guilabel:`Install`.
+
+.. seealso::
+   - `Google Chrome Help: Use progressive web apps
+     <https://support.google.com/chrome/answer/9658361>`_
+   - `MDN Web Docs: Installing and uninstalling web apps
+     <https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps/Guides/Installing>`_
+   - `Microsoft Support: Install, manage, or uninstall apps in Microsoft Edge <https://support.microsoft.com/en-us/topic/install-manage-or-uninstall-apps-in-microsoft-edge-0c156575-a94a-45e4-a54f-3a84846f6113>`_
+
+Store apps
+==========
+
+The Odoo mobile apps are available for download on the `Google Play Store
+<https://play.google.com/store/apps/details?id=com.odoo.mobile>`_ and `Apple App Store
+<https://apps.apple.com/app/odoo/id1272543640>`_.
+
+.. important::
+   The iOS app cannot be updated and will be deprecated at some point in the future.
+
+While the store apps support multi-accounts, they are not compatible with SS0 authentication.

content/administration/neutralized_database.rst

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

content/administration/odoo_accounts.rst

@@ -1,6 +1,6 @@
-========================
-Odoo.com account changes
-========================
+=================
+Odoo.com accounts
+=================
 
 This documentation is dedicated to edits made to an Odoo.com account. The following processes
 describe how to delete an Odoo.com account, and how to change the password on an Odoo.com account.
@@ -30,6 +30,8 @@ confirmation for the account deletion.
 To confirm the deletion, enter the :guilabel:`Password` and the :guilabel:`Login` for the account
 being deleted. Then, click the :guilabel:`Delete Account` button to confirm the deletion.
 
+.. _odoocom/change_password:
+
 Odoo.com account password change
 ================================
 

content/administration/odoo_online.rst

@@ -1,6 +1,21 @@
-===============================
-Odoo Online database management
-===============================
+===========
+Odoo Online
+===========
+
+`Odoo Online <https://www.odoo.com/trial>`_ provides private databases which are fully managed and
+hosted by Odoo. It can be used for long-term production or to test Odoo thoroughly, including
+customizations that don't require code.
+
+.. note::
+   Odoo Online is incompatible with custom modules or the Odoo App Store.
+
+Odoo Online databases are accessed using any web browser and do not require a local installation.
+
+To quickly try out Odoo, shared `demo <https://demo.odoo.com>`_ instances are available. No
+registration is required, but each instance only lives for a few hours.
+
+Database management
+===================
 
 To manage a database, go to the `database manager <https://www.odoo.com/my/databases>`_ and sign in
 as the database administrator.
@@ -45,6 +60,8 @@ daily operations.
    - By checking :guilabel:`For testing purposes`, all external actions (emails, payments, delivery
      orders, etc.) are disabled by default on the duplicated database.
    - Duplicated databases expire automatically after 15 days.
+   - A maximum of five duplicates can be made per database. Under extraordinary circumstances,
+     contact `support <https://www.odoo.com/help>`_ to raise the limit.
 
 .. _odoo_online/rename:
 
@@ -69,10 +86,11 @@ Download a ZIP file containing a backup of the database.
 Domain names
 ============
 
-Use a custom :doc:`domain name <domain_names>` to access the database via another URL.
+Use a custom :doc:`domain name </applications/websites/website/configuration/domain_names>` to
+access the database via another URL.
 
 .. tip::
-   You can :ref:`register a domain name for free <domain-name/odoo-register>`.
+   You can :ref:`register a domain name for free <domain-name/register>`.
 
 .. _odoo_online/tags:
 
@@ -129,5 +147,5 @@ users, click :guilabel:`Add more users`.
 To remove users, select them and click :guilabel:`Remove`.
 
 .. seealso::
-   - :doc:`/applications/general/users/manage_users`
-   - :doc:`/applications/general/users/odoo_account`
+   - :doc:`/applications/general/users`
+   - :doc:`odoo_accounts`

content/administration/odoo_sh/getting_started/create.rst

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

content/administration/odoo_sh/getting_started/first_module.rst

@@ -85,7 +85,7 @@ From the Odoo.sh editor, in a terminal:
 
   $ odoo-bin scaffold my_module ~/src/user/
 
-Or, from your computer, if you have an :doc:`installation of Odoo <../../install/source>`:
+Or, from your computer, if you have an :doc:`installation of Odoo <../../on_premise/source>`:
 
 .. code-block:: bash
 
@@ -146,7 +146,7 @@ Manually
 --------
 
 If you want to create your module structure manually,
-you can follow the :doc:`/developer/tutorials/getting_started` tutorial to understand
+you can follow the :doc:`/developer/tutorials/server_framework_101` tutorial to understand
 the structure of a module and the content of each file.
 
 Push the development branch

content/administration/on_premise.rst

@@ -0,0 +1,123 @@
+:show-content:
+
+==========
+On-premise
+==========
+
+Register a database
+===================
+
+To register your database, enter your subscription code in the banner in the app dashboard. If the
+registration is successful, the banner will turn green and display the database expiration date.
+
+.. tip::
+   The expiration date is also displayed at the bottom of the Settings page.
+
+.. _on-premise/duplicate:
+
+Duplicate a database
+====================
+
+Duplicate a database by accessing the database manager on your server
+(`<odoo-server>/web/database/manager`). Typically, you want to duplicate your production database
+into a neutralized testing database. It can be done by checking the neutralize box when prompted,
+which executes all :file:`neutralize.sql` scripts for every installed module.
+
+Common error messages and solutions
+===================================
+
+Registration error
+------------------
+
+In case of a registration error, the following message should be displayed.
+
+.. image:: on_premise/error-message-sub-code.png
+   :alt: Database registration error message
+
+To resolve the issue:
+
+- Check the **validity of your Odoo Enterprise subscription** by verifying if your subscription
+  details have the tag :guilabel:`In Progress` on your `Odoo Account
+  <https://accounts.odoo.com/my/subscription>`_ or contact your Account Manager.
+
+- Ensure that **no other database is linked** to the subscription code, as only one database can be
+  linked per subscription.
+
+  .. tip::
+     If a test or a development database is needed, you can :ref:`duplicate a database
+     <on-premise/duplicate>`.
+
+- Verify that **no databases share the same UUID** (Universally Unique Identifier) by opening your
+  `Odoo Contract <https://accounts.odoo.com/my/subscription>`_. If two or more databases share the
+  same UUID, their name will be displayed.
+
+  .. image:: on_premise/unlink-db-name-collision.png
+     :alt: Database UUID error message
+
+  If that is the case, manually change the database(s) UUID or `send a support ticket
+  <https://www.odoo.com/help>`_.
+
+- As the update notification must be able to reach Odoo's subscription validation servers, ensure
+  your **network and firewall settings** allow the Odoo server to open outgoing connections
+  towards:
+
+  - `services.odoo.com` on port `443` (or `80`)
+  - for older deployments, `services.openerp.com` on port `443` (or `80`)
+
+  These ports must be kept open even after registering a database, as the update notification runs
+  once a week.
+
+Too many users error
+--------------------
+
+If you have more users in a local database than provisioned in your Odoo Enterprise subscription,
+the following message should be displayed.
+
+.. image:: on_premise/add-more-users.png
+   :alt: Too many users on a database error message
+
+When the message appears, you have 30 days to act before the database expires. The countdown is
+updated every day.
+
+To resolve the issue, either:
+
+- **Add more users** to your subscription by clicking the :guilabel:`Upgrade your subscription` link
+  displayed in the message to validate the upsell quotation and pay for the extra users.
+- :ref:`Deactivate users <users/deactivate>` and **reject** the upsell quotation.
+
+.. important::
+   If you are on a monthly subscription plan, the database will automatically update to reflect the
+   added user(s). If you are on a yearly or multi-year plan, an expiration banner will appear in the
+   database. You can create the upsell quotation by clicking the banner to update the subscription
+   or `send a support ticket <https://www.odoo.com/help>`_ to resolve the issue.
+
+Once your database has the correct number of users, the expiration message disappears automatically
+after a few days, when the next verification occurs.
+
+Database expired error
+----------------------
+
+If your database expires before you renew your subscription, the following message should be
+displayed.
+
+.. image:: on_premise/database-expired.png
+   :alt: Database expired error message
+
+This message appears if you fail to act before the end of the 30-day countdown.
+
+To resolve the issue, either:
+
+- Click the :guilabel:`Renew your subscription` link displayed in the message and complete the
+  process. If you pay by wire transfer, your subscription will be renewed when the payment arrives
+  which can take a few days. Credit card payments are processed immediately.
+- `Send a support ticket <https://www.odoo.com/help>`_.
+
+.. toctree::
+
+   on_premise/packages
+   on_premise/source
+   on_premise/update
+   on_premise/deploy
+   on_premise/email_gateway
+   on_premise/geo_ip
+   on_premise/community_to_enterprise

content/administration/on_premise/community_to_enterprise.rst

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

content/administration/on_premise/deploy.rst

@@ -3,13 +3,13 @@ System configuration
 ====================
 
 This document describes basic steps to set up Odoo in production or on an
-internet-facing server. It follows :doc:`installation <../install>`, and is
+internet-facing server. It follows :doc:`installation <../on_premise>`, and is
 not generally necessary for a development systems that is not exposed on the
 internet.
 
 .. warning:: If you are setting up a public server, be sure to check our :ref:`security` recommendations!
 
-.. _db_filter:
+.. _dbfilter:
 
 dbfilter
 ========
@@ -334,6 +334,9 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $scheme;
       proxy_set_header X-Real-IP $remote_addr;
+
+      add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
+      proxy_cookie_flags session_id samesite=lax secure;  # requires nginx 1.19.8
     }
 
     # Redirect requests to odoo backend server
@@ -346,10 +349,8 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
       proxy_redirect off;
       proxy_pass http://odoo;
 
-      # Enable HSTS
       add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
-      # requires nginx 1.19.8
-      proxy_cookie_flags session_id samesite=lax secure;
+      proxy_cookie_flags session_id samesite=lax secure;  # requires nginx 1.19.8
     }
 
     # common gzip
@@ -572,12 +573,12 @@ security-related topics:
 
 - Use appropriate database filters ( :option:`--db-filter <odoo-bin --db-filter>`)
   to restrict the visibility of your databases according to the hostname.
-  See :ref:`db_filter`.
+  See :ref:`dbfilter`.
   You may also use :option:`-d <odoo-bin -d>` to provide your own (comma-separated)
   list of available databases to filter from, instead of letting the system fetch
   them all from the database backend.
 
-- Once your ``db_name`` and ``db_filter`` are configured and only match a single database
+- Once your ``db_name`` and ``dbfilter`` are configured and only match a single database
   per hostname, you should set ``list_db`` configuration option to ``False``, to prevent
   listing databases entirely, and to block access to the database management screens
   (this is also exposed as the :option:`--no-database-list <odoo-bin --no-database-list>`
@@ -721,7 +722,7 @@ management screens.
   the system administrator, including provisioning of new databases and automated backups.
 
 Be sure to setup an appropriate ``db_name`` parameter
-(and optionally, ``db_filter`` too) so that the system can determine the target database
+(and optionally, ``dbfilter`` too) so that the system can determine the target database
 for each request, otherwise users will be blocked as they won't be allowed to choose the
 database themselves.
 
@@ -739,7 +740,143 @@ It should be stored securely, and should be generated randomly e.g.
 
     $ python3 -c 'import base64, os; print(base64.b64encode(os.urandom(24)))'
 
-which will generate a 32 characters pseudorandom printable string.
+which generates a 32-character pseudorandom printable string.
+
+Reset the master password
+-------------------------
+
+There may be instances where the master password is misplaced, or compromised, and needs to be
+reset. The following process is for system administrators of an Odoo on-premise database detailing
+how to manually reset and re-encrypt the master password.
+
+.. seealso::
+   For more information about changing an Odoo.com account password, see this documentation:
+   :ref:`odoocom/change_password`.
+
+When creating a new on-premise database, a random master password is generated. Odoo recommends
+using this password to secure the database. This password is implemented by default, so there is a
+secure master password for any Odoo on-premise deployment.
+
+.. warning::
+   When creating an Odoo on-premise database the installation is accessible to anyone on the
+   internet, until this password is set to secure the database.
+
+The master password is specified in the Odoo configuration file (`odoo.conf` or `odoorc` (hidden
+file)). The Odoo master password is needed to modify, create, or delete a database through the
+graphical user interface (GUI).
+
+Locate configuration file
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+First, open the Odoo configuration file (`odoo.conf` or `odoorc` (hidden file)).
+
+.. tabs::
+
+   .. tab:: Windows
+
+      The configuration file is located at: `c:\\ProgramFiles\\Odoo{VERSION}\\server\\odoo.conf`
+
+   .. tab:: Linux
+
+      Depending on how Odoo is installed on the Linux machine, the configuration file is located in
+      one of two different places:
+
+      - Package installation: `/etc/odoo.conf`
+      - Source installation: `~/.odoorc`
+
+Change old password
+~~~~~~~~~~~~~~~~~~~
+
+Once the appropriate file has been opened, proceed to modify the old password in the configuration
+file to a temporary password.
+
+.. tabs::
+
+   .. group-tab:: Graphical user interface
+
+      After locating the configuration file, open it using a (:abbr:`GUI (graphical user
+      interface)`). This can be achieved by simply double clicking on the file. Then, the device
+      should have a default :abbr:`GUI (graphical user interface)` to open the file with.
+
+      Next, modify the master password line `admin_passwd = $pbkdf2-sha…` to `admin_passwd =
+      newpassword1234`, for example. This password can be anything, as long as it is saved
+      temporarily. Make sure to modify all characters after the `=`.
+
+      .. example::
+         The line appears like this:
+         `admin_passwd =
+         $pbkdf2-sh39dji295.59mptrfW.9z6HkA$w9j9AMVmKAP17OosCqDxDv2hjsvzlLpF8Rra8I7p/b573hji540mk/.3ek0lg%kvkol6k983mkf/40fjki79m`
+
+         The modified line appears like this: `admin_passwd = newpassword1234`
+
+   .. group-tab:: Command-line interface
+
+      Modify the master password line using the following Unix command detailed below.
+
+      Connect to the Odoo server's terminal via Secure Shell (SSH) protocol, and edit the
+      configuration file. To modify the configuration file, enter the following command:
+      :command:`sudo nano /etc/odoo.conf`
+
+      After opening the configuration file, modify the master password line `admin_passwd =
+      $pbkdf2-sha…` to `admin_passwd = newpassword1234`. This password can be anything, as long as
+      it is saved temporarily. Make sure to modify all characters after the `=`.
+
+      .. example::
+         The line appears like this:
+         `admin_passwd =
+         $pbkdf2-sh39dji295.59mptrfW.9z6HkA$w9j9AMVmKAP17OosCqDxDv2hjsvzlLpF8Rra8I7p/b573hji540mk/.3ek0lg%kvkol6k983mkf/40fjki79m`
+
+         The modified line appears like this: `admin_passwd = newpassword1234`
+
+.. important::
+   It is essential that the password is changed to something else, rather than triggering a new
+   password reset by adding a semicolon `;` at the beginning of the line. This ensures the database
+   is secure throughout the entire password reset process.
+
+Restart Odoo server
+~~~~~~~~~~~~~~~~~~~
+
+After setting the temporary password, a restart of the Odoo server is **required**.
+
+.. tabs::
+
+   .. group-tab:: Graphical user interface
+
+      To restart the Odoo server, first, type `services` into the Windows :guilabel:`Search` bar.
+      Then, select the :guilabel:`Services` application, and scroll down to the :guilabel:`Odoo`
+      service.
+
+      Next, right click on :guilabel:`Odoo`, and select :guilabel:`Start` or :guilabel:`Restart`.
+      This action manually restarts the Odoo server.
+
+   .. group-tab:: Command-line interface
+
+      Restart the Odoo server by typing the command: :command:`sudo service odoo15 restart`
+
+      .. note::
+         Change the number after `odoo` to fit the specific version the server is running on.
+
+Use web interface to re-encrypt password
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+First, navigate to `/web/database/manager` or `http://server_ip:port/web/database/manager` in a
+browser.
+
+.. note::
+   Replace `server_ip` with the IP address of the database. Replace `port` with the numbered port
+   the database is accessible from.
+
+Next, click :guilabel:`Set Master Password`, and type in the previously-selected temporary password
+into the :guilabel:`Master Password` field. Following this step, type in a :guilabel:`New Master
+Password`. The :guilabel:`New Master Password` is hashed (or encrypted), once the
+:guilabel:`Continue` button is clicked.
+
+At this point, the password has been successfully reset, and a hashed version of the new password
+now appears in the configuration file.
+
+.. seealso::
+   For more information on Odoo database security, see this documentation:
+   :ref:`db_manager_security`.
 
 Supported Browsers
 ==================

content/administration/on_premise/packages.rst

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

content/administration/on_premise/source.rst

@@ -1,6 +1,6 @@
-======
-Source
-======
+==============
+Source install
+==============
 
 The source 'installation' is not about installing Odoo but running it directly from the source
 instead.
@@ -45,7 +45,7 @@ Git
 
 To clone a Git repository, choose between cloning with HTTPS or SSH. In most cases, the best option
 is HTTPS. However, choose SSH to contribute to Odoo source code or when following the :doc:`Getting
-Started developer tutorial </developer/tutorials/getting_started>`.
+Started developer tutorial </developer/tutorials/server_framework_101>`.
 
 .. tabs::
 
@@ -144,7 +144,7 @@ Odoo requires **Python 3.10** or later to run.
       to download and install Python 3 if needed.
 
 .. note::
-   If Python 3 is already installed, make sure that the version is 3.7 or above, as previous
+   If Python 3 is already installed, make sure that the version is 3.10 or above, as previous
    versions are not compatible with Odoo.
 
    .. tabs::
@@ -277,18 +277,22 @@ Dependencies
 
          .. tab:: Debian/Ubuntu
 
-            For Debian-based systems, the packages are listed in the `debian/control
-            <{GITHUB_PATH}/debian/control>`_ file of the Odoo sources.
-
             On Debian/Ubuntu, the following commands should install the required packages:
 
             .. code-block:: console
 
-               $ cd /CommunityPath
-               $ sed -n -e '/^Depends:/,/^Pre/ s/ python3-\(.*\),/python3-\1/p' debian/control | sudo xargs apt-get install -y
+               $ cd odoo #CommunityPath
+               $ sudo ./setup/debinstall.sh
+
+            The `setup/debinstall.sh` script will parse the `debian/control
+            <{GITHUB_PATH}/debian/control>`_ file and install the found packages.
 
          .. tab:: Install with pip
 
+            .. warning::
+               Using pip may lead to security issues and broken dependencies; only do this if you
+               know what you are doing.
+
             As some of the Python packages need a compilation step, they require system libraries to
             be installed.
 
@@ -479,7 +483,7 @@ http://localhost:8069 in a web browser and log into the Odoo database with the b
 account: use `admin` as the email and, again, `admin` as the password.
 
 .. tip::
-   - From there, create and manage new :doc:`users <../../applications/general/users/manage_users>`.
+   - From there, create and manage new :doc:`users <../../applications/general/users>`.
    - The user account used to log into Odoo's web interface differs from the :option:`--db_user
      <odoo-bin -r>` CLI argument.
 

content/administration/on_premise/update.rst

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

content/administration/supported_versions.rst

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

content/administration/upgrade.rst

@@ -2,11 +2,9 @@
 Upgrade
 =======
 
-.. _administration/upgrade:
-
 An upgrade is the process of moving your database from an older version to a newer :doc:`supported
-version <maintain/supported_versions>` (e.g., Odoo 14.0 to Odoo 16.0). Frequently upgrading is
-essential as each version comes with new and improved features, bug fixes, and security patches.
+version <supported_versions>` (e.g., Odoo 14.0 to Odoo 16.0). Frequently upgrading is essential as
+each version comes with new and improved features, bug fixes, and security patches.
 
 .. _upgrade_faq/rolling_release:
 
@@ -33,9 +31,9 @@ essential as each version comes with new and improved features, bug fixes, and s
 An upgrade does not cover:
 
   - Downgrading to a previous version of Odoo
-  - :doc:`Switching editions <maintain/enterprise>` (e.g., from Community to Enterprise)
-  - :doc:`Changing hosting type </administration/maintain/hosting_changes>` (e.g., from on-premise
-    to Odoo Online)
+  - :doc:`Switching editions <on_premise/community_to_enterprise>` (e.g., from Community to
+    Enterprise)
+  - :ref:`Changing hosting type <hosting/change-solution>` (e.g., from on-premise to Odoo Online)
   - Migrating from another ERP to Odoo
 
 .. warning::
@@ -45,30 +43,23 @@ An upgrade does not cover:
    <upgrade/request-test-database>` while also :doc:`upgrading the source code of your custom
    modules </developer/howtos/upgrade_custom_db>`.
 
-
 Upgrading in a nutshell
 -----------------------
 
 #. Request an upgraded test database (see :ref:`obtaining an upgraded test database
    <upgrade/request-test-database>`).
-
 #. If applicable, upgrade the source code of your custom module to be compatible with the new
    version of Odoo (see :doc:`/developer/howtos/upgrade_custom_db`).
-
 #. Thoroughly test the upgraded database (see :ref:`testing the new version of the database
    <upgrade/test_your_db>`).
-
-#. Report any issue encountered during the testing to Odoo via the `support page
-   <https://odoo.com/help?stage=migration>`__.
-
+#. Report any issue encountered during the testing to Odoo by `submitting a ticket for an issue
+   related to my future upgrade (I am testing an upgrade) <https://odoo.com/help?stage=migration>`_.
 #. Once all issues are resolved and you are confident that the upgraded database can be used as
    your main database without any issues, plan the upgrade of your production database.
-
 #. Request the upgrade for the production database, rendering it unavailable for the time it takes
    to complete the process (see :ref:`upgrading the production database <upgrade/upgrade-prod>`).
-
-#. Report any issue encountered during the upgrade to Odoo via the `support page
-   <https://odoo.com/help?stage=post_upgrade>`__.
+#. Report any issue encountered during the upgrade to Odoo by `submitting a ticket for an issue
+   related to my upgrade (production) <https://odoo.com/help?stage=post_upgrade>`_.
 
 .. _upgrade/request-test-database:
 
@@ -254,9 +245,9 @@ working correctly and to get more familiar with the new version.
    This list is **not** exhaustive. Extend the example to your other apps based on your use of Odoo.
 
 If you face an issue while testing your upgraded test database, you can request the assistance of
-Odoo via the `support page <https://odoo.com/help?stage=migration>`__ by selecting the option
-related to testing the upgrade. In any case, it is essential to report any
-problem encountered during the testing to fix it before upgrading your production database.
+Odoo by `submitting a ticket for an issue related to my future upgrade (I am testing an upgrade)
+<https://odoo.com/help?stage=migration>`_. In any case, it is essential to report any problem
+encountered during the testing to fix it before upgrading your production database.
 
 You might encounter significant differences with standard views, features, fields, and models during
 testing. Those changes cannot be reverted on a case-by-case basis. However, if a change introduced
@@ -280,24 +271,22 @@ Upgrading the production database
 ---------------------------------
 
 Once the :ref:`tests <upgrade/test_your_db>` are completed and you are confident that the upgraded
-database can be used as your main database without any issues, it is time to plan the go-live day. It
-can be planned in coordination with Odoo's upgrade support analysts, reachable via the `support page
-<https://odoo.com/help>`__.
+database can be used as your main database without any issues, it is time to plan the go-live day.
 
 Your production database will be unavailable during its upgrade. Therefore, we recommend planning
 the upgrade at a time when the use of the database is minimal.
 
 As the standard upgrade scripts and your database are constantly evolving, it is also recommended
-to frequently request another upgraded test database to ensure that the upgrade process is
-still successful, especially if it takes a long time to finish. **Fully rehearsing the upgrade
-process the day before upgrading the production database is also recommended.**
+to frequently request another upgraded test database to ensure that the upgrade process is still
+successful, especially if it takes a long time to finish. **Fully rehearsing the upgrade process the
+day before upgrading the production database is also recommended.**
 
 .. important::
-   - Going into production without first testing may lead to:
+   Going into production without first testing may lead to:
 
-     - Users failing to adjust to the changes and new features
-     - Business interruptions (e.g., no longer having the possibility to validate an action)
-     - Poor customer experience (e.g., an eCommerce website that does not work correctly)
+   - Users failing to adjust to the changes and new features
+   - Business interruptions (e.g., no longer having the possibility to validate an action)
+   - Poor customer experience (e.g., an eCommerce website that does not work correctly)
 
 The process of upgrading a production database is similar to upgrading a test database with a few
 exceptions.
@@ -358,10 +347,9 @@ exceptions.
          a filestore. Therefore, the upgraded database filestore must be merged with the production
          filestore before deploying the new version.
 
-In case of an issue with your production database, you can request the assistance of Odoo via the
-`support page <https://odoo.com/help?stage=post_upgrade>`__ by selecting the option related to
-the upgrade in production.
-
+In case of an issue with your production database, you can request the assistance of Odoo by
+`submitting a ticket for an issue related to my upgrade (production)
+<https://odoo.com/help?stage=post_upgrade>`_.
 
 .. _upgrade/sla:
 
@@ -404,4 +392,4 @@ The following upgrade-related services are **not** included:
 
 .. seealso::
    - :doc:`Odoo.sh documentation <odoo_sh>`
-   - :doc:`Supported Odoo versions <maintain/supported_versions>`
+   - :doc:`Supported Odoo versions <supported_versions>`

content/applications.rst

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

content/applications/essentials.rst

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

content/applications/essentials/activities.rst

@@ -0,0 +1,345 @@
+==========
+Activities
+==========
+
+.. |clock| replace:: :icon:`fa-clock-o` :guilabel:`(clock)` icon
+
+*Activities* are follow-up tasks tied to a record in an Odoo database.
+
+.. _activities/important:
+
+The icon used to display activities varies, depending on the :ref:`activity type
+<activities/types>`:
+
+- :icon:`fa-clock-o` :guilabel:`(clock)` icon: the default activities icon.
+- :icon:`fa-phone` :guilabel:`(phone)` icon: a phone call is scheduled.
+- :icon:`fa-envelope` :guilabel:`(envelope)` icon: an email is scheduled.
+- :icon:`fa-check` :guilabel:`(check)` icon: a "to-do" is scheduled.
+- :icon:`fa-users` :guilabel:`(people)` icon: a meeting is scheduled.
+- :icon:`fa-upload` :guilabel:`(upload)` icon: a document is scheduled to be uploaded.
+- :icon:`fa-pencil-square-o` :guilabel:`(request signature)` icon: a signature request is scheduled.
+
+Schedule activities
+===================
+
+Activities can be scheduled on any page of the database that contains a :ref:`chatter
+<activities/chatter>` thread, :ref:`Kanban view <activities/kanban>`, :ref:`list view
+<activities/list>`, or :ref:`activities view <activities/activity>` of an application.
+
+.. _activities/chatter:
+
+Chatter
+-------
+
+Activities can be created from the chatter on any record.
+
+To schedule a new activity, click the :guilabel:`Activities` button, located at the top of the
+chatter. In the :guilabel:`Schedule Activity` pop-up window that appears, :ref:`fill out the
+Schedule Activity form <activities/form>`.
+
+.. image:: activities/chatter.png
+   :align: center
+   :alt: New activity type form.
+
+.. _activities/kanban:
+
+Kanban view
+-----------
+
+Activities can also be created from the :icon:`oi-view-kanban` :guilabel:`(Kanban)` view.
+
+To do so, click on the |clock| located at the bottom of an individual record.
+
+Click :guilabel:`+ Schedule An Activity`, then proceed to :ref:`fill out the Schedule Activity form
+<activities/form>`.
+
+.. image:: activities/schedule-kanban-activity.png
+   :align: center
+   :alt: Kanban view of the CRM pipeline and the option to schedule an activity.
+
+.. note::
+   If a record already has a scheduled activity, the |clock| is replaced by the icon that represents
+   the existing scheduled activity. Click on the activity type's icon to schedule another activity.
+
+.. _activities/list:
+
+List view
+---------
+
+Activities can also be created from a :icon:`oi-view-list` :guilabel:`(list)` view.
+
+If the :guilabel:`Activities` column is hidden, reveal it using the :icon:`oi-settings-adjust`
+:guilabel:`(settings adjust)` icon in the far-right of the top row.
+
+Then, click on the |clock| for the record the activity is being added to, and click :guilabel:`+
+Schedule an activity`. Proceed to :ref:`fill out the Schedule Activity form <activities/form>` that
+appears.
+
+.. note::
+   If a record already has a scheduled activity, the |clock| is replaced by the icon that represents
+   the existing scheduled activity. Click on the activity type's icon to schedule another activity.
+
+.. image:: activities/schedule-list-activity.png
+   :align: center
+   :alt: List view of the CRM pipeline and the option to schedule an activity.
+
+.. _activities/activity:
+
+Activity view
+-------------
+
+Most applications in Odoo have an *Activity* view available. If available, a |clock| is visible in
+the top-right corner of the main menu bar, amongst the other view option icons.
+
+To open the activity view, click the |clock|.
+
+.. image:: activities/activities.png
+   :align: center
+   :alt: Top-right menu with the Activities icon called out.
+
+In this view, all the available activities are listed in the columns, while the horizontal entries
+represent all the individual records.
+
+Activities that appear green have a due date in the future, activities that appear orange are due
+today, while activities appearing red are overdue.
+
+Color bars in each column represent records for specific activity types, and display a number
+indicating how many activities are scheduled for that type.
+
+If multiple activity types are scheduled for a record, a number appears in the box, indicating the
+total number of scheduled activities.
+
+.. note::
+   Activity colors, and their relation to an activity's due date, are consistent throughout Odoo,
+   regardless of the activity type, or the view.
+
+To schedule an activity for a record, hover over the corresponding field. Click the :icon:`fa-plus`
+:guilabel:`(plus)` icon that appears, and then :ref:`fill out the Schedule Activity form
+<activities/form>`.
+
+.. image:: activities/activity-view.png
+   :align: center
+   :alt: Activity view of the CRM pipeline and the option to schedule an activity.
+
+.. _activities/form:
+
+Schedule Activity form
+----------------------
+
+Activities can be scheduled from many different places, such as from the :ref:`chatter
+<activities/chatter>` of a record, or from one of multiple views in an application, when available:
+the :ref:`Kanban view <activities/kanban>`, :ref:`list view <activities/list>`, or :ref:`activity
+view <activities/activity>`.
+
+Enter the following information on the form:
+
+- :guilabel:`Activity Type`: select the type of activity from the drop-down menu. The default
+  options are: :guilabel:`Email`, :guilabel:`Call`, :guilabel:`Meeting`, or :guilabel:`To-Do`.
+  Depending on what other applications are installed, additional options may be available.
+- :guilabel:`Summary`: enter a short title for the activity, such as `Discuss Proposal`.
+- :guilabel:`Due Date`: using the calendar popover, select the activity's deadline.
+- :guilabel:`Assigned to`: by default, the current user populates this field. To assign a different
+  user to the activity, select them from the drop-down menu.
+- :guilabel:`Notes`: add any additional information for the activity in this field.
+
+When the :guilabel:`Schedule Activity` pop-up window is completed, click one of the following
+buttons:
+
+- :guilabel:`Open Calendar`: opens the user's calendar to add and schedule the activity.
+
+  Click on the desired date and time for the activity, and a :guilabel:`New Event` pop-up window
+  appears. The summary from the *Schedule Activity* pop-up window populates the :guilabel:`Title`
+  field.
+
+  Enter the information in the :guilabel:`New Event` pop-up window, then click :guilabel:`Save &
+  Close` to schedule it. Once scheduled, the activity is added to the chatter under the
+  :guilabel:`Planned Activities` section.
+
+  .. important::
+    The :guilabel:`Open Calendar` button **only** appears if the :guilabel:`Activity Type` is set
+    to either :guilabel:`Call` or :guilabel:`Meeting`.
+
+- :guilabel:`Schedule`: schedules the activity, and adds the activity to the chatter under
+  :guilabel:`Planned Activities`.
+- :guilabel:`Schedule & Mark as Done`: adds the details of the activity to the chatter under
+  :guilabel:`Today`. The activity is not scheduled, and is automatically marked as done.
+- :guilabel:`Done & Schedule Next`: adds the details of the activity to the chatter under
+  :guilabel:`Today`. The activity is not scheduled, is automatically marked as done, and a new
+  :guilabel:`Schedule Activity` pop-up window appears.
+- :guilabel:`Cancel`: discards any changes made on the :guilabel:`Schedule Activity` pop-up window.
+
+.. image:: activities/schedule-pop-up.png
+   :align: center
+   :alt: View of CRM leads and the option to schedule an activity.
+
+.. _activities/all:
+
+All scheduled activities
+========================
+
+To view a consolidated list of activities, organized by application, click the |clock| in the header
+menu, located in the top-right corner.
+
+If any activities are scheduled, the number of activities appear in a red bubble on the
+|clock|.
+
+All activities for each application are further divided into subsections, indicating where in the
+application the activity is to be completed. Each sub-section lists the number of scheduled
+activities that are :guilabel:`Late`, due :guilabel:`Today`, and scheduled in the
+:guilabel:`Future`.
+
+.. example::
+   In the *Time Off* application, one activity is scheduled to be done in the *All Time Off*
+   requests dashboard, and six activities are scheduled to be done in the *Allocations* dashboard.
+
+   These requests appear in two separate lists in the all activities drop-down menu: one labeled
+   `Time Off` and one labeled `Time Off Allocation`.
+
+   .. image:: activities/activities-menu.png
+      :align: center
+      :alt: The list of activities that is accessed from the main menu bar. Two entries for the Time
+            Off application are highlighted.
+
+Request a document
+------------------
+
+The option to :guilabel:`Request a Document` is available at the bottom of the list of :ref:`all
+scheduled activities <activities/all>`, the option to :guilabel:`Request a Document` appears. Click
+:guilabel:`Request a Document`, and a :guilabel:`Request a file` pop-up window appears.
+
+Enter the following information on the form:
+
+- :guilabel:`Document Name`: enter a name for the document being requested.
+- :guilabel:`Request To`: select the user the document is being requested from using the drop-down
+  menu.
+- :guilabel:`Due Date In`: enter a numerical value indicating when the document is due. Next to
+  this field, a :guilabel:`Days` field is visible. Click :guilabel:`Days`, the default option, to
+  reveal a drop-down menu. Select the desired time-frame option from the list. The options are
+  :guilabel:`Days`, :guilabel:`Weeks`, or :guilabel:`Months`.
+- :guilabel:`Workspace`: using the drop-down menu, select the specific :ref:`Workspace
+  <documents/workspaces>` the document is being uploaded to.
+- :guilabel:`Tags`: select any desired tags from the drop-down menu. The available tags displayed
+  are based on the tags configured for the selected :guilabel:`Workspace`.
+- :guilabel:`Message`: enter a message to clarify the document request in this field.
+
+When all the fields are completed, click :guilabel:`Request` to send the document request.
+
+.. image:: activities/request-doc.png
+   :align: center
+   :alt: The Request a file form, with all fields filled out to request a contract.
+
+.. _activities/types:
+
+Activity types
+==============
+
+To view the currently configured types of activities in the database, navigate to
+:menuselection:`Settings app --> Discuss section --> Activities setting --> Activity Types`.
+
+.. image:: activities/settings-activities-types.png
+   :align: center
+   :alt: Activity Types button in the Settings application under the Discuss section.
+
+Doing so reveals the :guilabel:`Activity Types` page, where the existing activity types are found.
+
+.. tip::
+   Individual applications have a list of *Activity Types* dedicated to that application. For
+   example, to view and edit the activities available for the *CRM* application, go to
+   :menuselection:`CRM app --> Configuration --> Activity Types`.
+
+.. image:: activities/activity-list.png
+   :align: center
+   :alt: The list of activity types already configured and available.
+
+Edit activity types
+-------------------
+
+To edit an existing :ref:`activity type <activities/types>`, click on the activity type, and the
+activity type form loads.
+
+Make any desired changes to the activity type form. The form automatically saves, but it can be
+saved manually at any time by clicking the :guilabel:`Save Manually` option, represented by a
+:icon:`fa-cloud-upload` :guilabel:`(cloud upload)` icon, located in the top-left corner of the page.
+
+Create new activity types
+-------------------------
+
+To create a new :ref:`activity type <activities/types>`, click :guilabel:`New` from the
+:guilabel:`Activity Types` page, and a blank activity type form loads.
+
+Enter a :guilabel:`Name` for the activity type at the top of the form, then enter the following
+information on the form.
+
+Activity Settings section
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- :guilabel:`Action`: using the drop-down menu, select an action associated with this new activity
+  type. Some actions trigger specific behaviors after an activity is scheduled, such as:
+
+  - :guilabel:`Upload Document`: if selected, a link to upload a document is automatically added to
+    the planned activity in the chatter.
+  - :guilabel:`Call` or :guilabel:`Meeting`: if selected, users have the option to open their
+    calendar to select a date and time for the activity.
+  - :guilabel:`Request Signature`: if selected, a link to open a signature request pop-up window is
+    automatically added to the planned activity in the chatter. This requires the Odoo *Sign*
+    application to be installed.
+
+  .. note::
+     Available activity types vary based on the installed applications in the database.
+
+- :guilabel:`Folder`: select a specific :ref:`workspace <documents/workspaces>` folder to save a
+  document to. This field **only** appears if :guilabel:`Upload Document` is selected for the
+  :guilabel:`Action`.
+
+  Using the drop-down menu, select the :guilabel:`Folder` the document is saved to.
+
+- :guilabel:`Default User`: select a user from the drop-down menu to automatically assign this
+  activity to the selected user when this activity type is scheduled. If this field is left blank,
+  the activity is assigned to the user who creates the activity.
+- :guilabel:`Default Summary`: enter a note to include whenever this activity type is created.
+
+  .. note::
+     The information in the :guilabel:`Default User` and :guilabel:`Default Summary` fields are
+     included when an activity is created. However, they can be altered before the activity is
+     scheduled or saved.
+
+- :guilabel:`Keep Done`: tick this checkbox to keep activities that have been marked as `Done`
+  visible in the :ref:`activity view <activities/activity>`.
+- :guilabel:`Default Note`: enter any notes to appear with the activity.
+
+Next Activity section
+~~~~~~~~~~~~~~~~~~~~~
+
+It is possible to have another activity either suggested or triggered. To do so, configure the
+:guilabel:`Next Activity` section.
+
+- :guilabel:`Chaining Type`: select either :guilabel:`Suggest Next Activity` or :guilabel:`Trigger
+  Next Activity` from the drop-down menu. Depending on the selected option, either the
+  :guilabel:`Suggest` or :guilabel:`Trigger` field is displayed.
+
+  .. note::
+     The :guilabel:`Chaining Type` field does **not** appear if :guilabel:`Upload Document` is
+     selected for the :guilabel:`Action`.
+
+- :guilabel:`Suggest/Trigger`: depending on what is selected for the :guilabel:`Chaining Type`, this
+  field either displays :guilabel:`Suggest` or :guilabel:`Trigger`. Using the drop-down menu, select
+  the activity to recommend or schedule as a follow-up task to the activity type.
+- :guilabel:`Schedule`: configure when the next activity is suggested or triggered.
+
+  First, enter a numerical value indicating when the activity is suggested or triggered.
+
+  Next to this field, a :guilabel:`Days` field is visible. Click :guilabel:`Days`, the default
+  option, to reveal a drop-down menu. Select the desired time-frame option from the list. The
+  options are :guilabel:`Days`, :guilabel:`Weeks`, or :guilabel:`Months`.
+
+  Lastly, using the drop-down menu, select whether the activity is scheduled or triggered either
+  :guilabel:`after previous activity deadline` or :guilabel:`after completion date`.
+
+.. image:: activities/new-activity.png
+   :align: center
+   :alt: A new Activity form with all the fields filled out.
+
+.. seealso::
+   - :doc:`../productivity/discuss`
+   - :doc:`../productivity/discuss/team_communication`
+   - :doc:`../sales/crm/optimize/utilize_activities`

content/applications/essentials/contacts.rst

@@ -0,0 +1,263 @@
+:show-content:
+
+========
+Contacts
+========
+
+The *Contacts* application comes installed on all Odoo databases. Contacts are created for customers
+the company does business with through Odoo. A contact is a repository of vital business
+information, facilitating communication and business transactions.
+
+Contact form
+============
+
+To create a new contact, navigate to the :menuselection:`Contacts app`, and click
+:guilabel:`Create`. A new form appears where various contact information can be added.
+
+Contact type
+------------
+
+Odoo allows for both :guilabel:`Individual` and :guilabel:`Company` contacts. Select either
+:guilabel:`Individual` or :guilabel:`Company`, depending on the type of contact that is being added.
+
+Name
+----
+
+First, fill in the name of the :guilabel:`Individual` or :guilabel:`Company`. This is how the name
+appears throughout the database. This field is **mandatory**.
+
+.. tip::
+   :guilabel:`Individual` contacts can have a :guilabel:`Company` contact linked to it. After
+   selecting :guilabel:`Individual`, a new :guilabel:`Company Name...` field appears below the
+   first name field.
+
+Address
+-------
+
+Next, enter the :guilabel:`Address` of the :guilabel:`Company` or :guilabel:`Individual`.
+
+.. tip::
+   If the :guilabel:`Individual` option is chosen, then the *type of address* can be chosen from a
+   drop-down menu. Options for this drop-down menu include: :guilabel:`Contact`, :guilabel:`Invoice
+   Address`, :guilabel:`Delivery Address`, :guilabel:`Other Address`, and :guilabel:`Private
+   Address`.
+
+Additional fields
+-----------------
+
+Additional details are included on the initial form. The following fields are available:
+
+- :guilabel:`VAT`: Value Added Tax number.
+- :guilabel:`Citizen Identification`: citizen or government identification number (only available
+  on :guilabel:`Individual`).
+- :guilabel:`Job Position`: list the job position of the :guilabel:`Individual` (only available on
+  :guilabel:`Individual`).
+- :guilabel:`Phone`: list phone number (with country code). Make a call, send an SMS, or WhatsApp
+  message by hovering over the field on the saved form, and clicking the desired option.
+- :guilabel:`Mobile`: list mobile phone number (with country code). Make a call, send an SMS, or
+  WhatsApp message by hovering over the field on the saved form, and clicking on the desired option.
+- :guilabel:`Email`: enter the email address with the domain.
+- :guilabel:`Website`: enter the full website address, starting with `http` or `https`.
+- :guilabel:`Title`: select :guilabel:`Doctor`, :guilabel:`Madam`, :guilabel:`Miss`,
+  :guilabel:`Mister`, :guilabel:`Professor`, or create a new one directly from this field.
+- :guilabel:`Tags`: enter preconfigured tags by typing them in the field, or clicking the drop-down
+  menu, and selecting one. To create a new one, type the new tag in the field, and click
+  :guilabel:`Create` from the resulting drop-down menu.
+
+Contacts & Addresses tab
+------------------------
+
+At the bottom of the contact form are several tabs. On the :guilabel:`Contacts & Addresses` tab,
+contacts can be added that are associated with a :guilabel:`Company` and related addresses. For
+example, a specific contact person for the company can be listed here.
+
+Multiple addresses can be added on both :guilabel:`Individual` and :guilabel:`Company` contacts. To
+do so, click :guilabel:`Add` in the :guilabel:`Contacts & Addresses` tab. Doing so reveals a
+:guilabel:`Create Contact` pop-up form, in which additional addresses can be configured.
+
+.. image:: contacts/contact-form-add-address.png
+   :align: center
+   :alt: Add a contact/address to the contact form.
+
+On the :guilabel:`Create Contact` pop-up form, start by clicking the default :guilabel:`Other
+Address` field at the top to reveal a drop-down menu of address-related options.
+
+Select any of the following options:
+
+- :guilabel:`Contact`: adds another contact to the existing contact form.
+- :guilabel:`Invoice Address`: adds a specific invoice address to the existing contact form.
+- :guilabel:`Delivery Address`: adds a specific delivery address to the existing contact form.
+- :guilabel:`Other Address`: adds an alternate address to the existing contact form.
+- :guilabel:`Private Address`: adds a private address to the existing contact form.
+
+.. image:: contacts/create-contact-window.png
+   :align: center
+   :alt: Create a new contact/address on a contact form.
+
+Once an option is selected, enter the corresponding contact information that should be used for the
+specified address type.
+
+Add the :guilabel:`Contact Name`, :guilabel:`Address`, :guilabel:`Email`, along with the
+:guilabel:`Phone` and/or :guilabel:`Mobile` numbers below.
+
+Set the :guilabel:`Job Position`, which appears if the :guilabel:`Contact` address type has been
+selected. This is similar to the :guilabel:`Individual` contact.
+
+To add a note, click on the text field next to :guilabel:`Notes`, and write anything that is
+applicable to the customer or contact.
+
+Then, click :guilabel:`Save & Close` to save the address, and close the :guilabel:`Create Contact`
+window. Or, click :guilabel:`Save & New` to save the address, and immediately input another one.
+
+Sales & Purchase tab
+--------------------
+
+Next, is the :guilabel:`Sales & Purchases` tab, which only appears when the *Sales*, *Purchase*,
+**or** *Point of Sale* applications are installed.
+
+The :guilabel:`Fiscal Position` can be set on the :guilabel:`Sales & Purchases` tab. Select a
+:guilabel:`Fiscal Position` from the drop-down menu.
+
+Sales section
+~~~~~~~~~~~~~
+
+Under the :guilabel:`Sales` heading, a specific :guilabel:`Salesperson` can be assigned to a
+contact. To do that, click the :guilabel:`Salesperson` drop-down field, and select one. Create a new
+:guilabel:`Salesperson` by typing the user's name, and making the appropriate selection.
+
+Certain :guilabel:`Payment Terms`, or a certain :guilabel:`Pricelist`, can also be set, if needed.
+Click the drop-down menu next to :guilabel:`Payment Terms`, and change it to one of the preselected
+:guilabel:`Payment Terms`, or :guilabel:`Create` a new one. Select the :guilabel:`Pricelist`
+drop-down menu to choose the appropriate :guilabel:`Pricelist`.
+
+Click into the :guilabel:`Delivery Method` field to select an option from the drop-down menu.
+
+Point Of Sale section
+~~~~~~~~~~~~~~~~~~~~~
+
+Under the :guilabel:`Point Of Sale` heading, enter a :guilabel:`Barcode` that can be used to
+identify the contact. Use the :guilabel:`Loyalty Points` field to track points the user won as part
+of a *Loyalty Program*.
+
+Purchase section
+~~~~~~~~~~~~~~~~
+
+Specify :guilabel:`Payment Terms`, :guilabel:`1099 Box` information, and a preferred
+:guilabel:`Payment Method` here. A :guilabel:`Receipt Reminder` can be set here, as well.
+
+Misc section
+~~~~~~~~~~~~
+
+Under the :guilabel:`Misc.` heading, use :guilabel:`Reference` field to add any additional
+information for this contact. If this contact should only be accessible for one company in a
+multi-company database, select it from the :guilabel:`Company` field drop-down list. Use the
+:guilabel:`Website` drop-down menu to restrict the publishing of this contact to one website (if
+working on a database with multiple websites). Select one or more :guilabel:`Website Tags` to assist
+in filtering published customers on the `/customers` website page. Select an :guilabel:`Industry`
+for this contact from the drop-down menu. Use the :guilabel:`SLA Policies` field to assign a
+*Helpdesk* SLA policy to this contact.
+
+Accounting tab
+--------------
+
+The :guilabel:`Accounting` tab appears when the *Accounting* application is installed. Here, a user
+can add any related :guilabel:`Bank Accounts`, or set default :guilabel:`Accounting entries`.
+
+Under the :guilabel:`Miscellaneous` heading, use the :guilabel:`LEI` field to enter a Legal Entity
+Identifier, if necessary.
+
+Internal Notes tab
+------------------
+
+Following the :guilabel:`Accounting` tab is the :guilabel:`Internal Notes` tab, where notes can be
+left on this contact form, just like on the contact form noted above.
+
+Partner Assignment tab
+----------------------
+
+Next is the :guilabel:`Partner Assignment` tab, which by default, includes a :guilabel:`Geolocation`
+section, and other partner options, including :guilabel:`Partner Activation` and :guilabel:`Partner
+Review` configurations. These are **only** present when the *Resellers* module is installed.
+
+.. seealso::
+   Follow the :doc:`Resellers documentation <../sales/crm/track_leads/resellers>` for more
+   information on publishing partners on the website.
+
+Membership tab
+--------------
+
+Finally, there is the :guilabel:`Membership` tab on contact forms, which can help users manage any
+memberships that are being offered to this specific contact. It should be noted that this tab
+**only** appears when the *Members* application is installed.
+
+Activate membership
+~~~~~~~~~~~~~~~~~~~
+
+To activate a contact's membership, click :guilabel:`Buy Membership` in the :guilabel:`Membership`
+tab of a contact form. On the pop-up window that appears, select a :guilabel:`Membership` from the
+drop-down menu. Then, configure a :guilabel:`Member Price`. Click :guilabel:`Invoice Membership`
+when both fields are filled in.
+
+Alternatively, to offer a free membership, tick the :guilabel:`Free Member` checkbox, in the
+:guilabel:`Membership` tab of a contact form.
+
+.. seealso::
+   Follow the :doc:`Members documentation <../sales/members>` for more information on publishing
+   members on the website.
+
+Smart buttons
+=============
+
+At the top of the contact form, there are some additional options available, known as *smart
+buttons*.
+
+Here, Odoo displays a variety of records, related to this contact, that were created on other apps.
+Odoo integrates information from every single app, so there are many smart buttons.
+
+.. example::
+   For example, there is an :guilabel:`Opportunities` smart button, where all the opportunities
+   related to this customer from the *CRM* app are accessible.
+
+.. tip::
+   If the corresponding applications are installed, their related smart buttons appear
+   automatically on a contact form.
+
+A user can see any :guilabel:`Meetings`, :guilabel:`Sales`, :guilabel:`POS Orders`,
+:guilabel:`Subscriptions`, project :guilabel:`Tasks`, and the :guilabel:`More` smart button reveals
+additional options, via a drop-down menu. A user can even quickly access :guilabel:`Purchases`,
+:guilabel:`Helpdesk` tasks, :guilabel:`On-time Rate` for deliveries, :guilabel:`Invoiced`
+information, :guilabel:`Vendor Bills`, and the :guilabel:`Partner Ledger` connected to this contact.
+
+Deliveries, documents, loyalty cards, and direct debits are *also* linked to smart buttons, like
+this, should there be any outstanding/on-file for this contact.
+
+If the contact is a partner, the user can visit their partner page on the Odoo-built website by
+clicking the :guilabel:`Go to Website` smart button.
+
+Archive contacts
+----------------
+
+If a user decides they no longer want to have this contact active, the record can be archived. To do
+that, go to the :icon:`fa-cog` :guilabel:`Action` menu at the top of the contact form, and click
+:guilabel:`Archive`.
+
+Then, click :guilabel:`OK` from the resulting :guilabel:`Confirmation` pop-up window.
+
+With this contact successfully archived, as indicated by a banner at the top, they do not show up
+in the main contacts page, but they can still be searched for with the :guilabel:`Archived` filter.
+
+.. tip::
+   A contact can be *unarchived*, if the user decides to work with them again. To do that, just
+   click the :icon:`fa-cog` :guilabel:`Action` menu again at the top of the archived contact form,
+   and click :guilabel:`Unarchive`. Upon doing so, the :guilabel:`Archived` banner is removed, and
+   the contact is restored.
+
+.. seealso::
+   - :doc:`Add different addresses in CRM <../sales/sales/send_quotations/different_addresses>`
+   - `Odoo's eLearning Contacts tutorial
+     <https://www.odoo.com/slides/slide/contacts-2527?fullscreen=1>`_
+
+.. toctree::
+   :titlesonly:
+
+   contacts/merge

content/applications/essentials/contacts/merge.rst

@@ -0,0 +1,78 @@
+==============
+Merge contacts
+==============
+
+Odoo's *Contacts* application allows user's to merge duplicate contacts, without losing any
+information in the process. This keeps the database organized, and prevents contacts from being
+contacted by more than one salesperson.
+
+.. _contacts/merge-duplicate:
+
+Merge duplicate contacts
+========================
+
+.. danger::
+   Merging is an irreversible action. Do **not** merge contacts unless absolutely certain they
+   should be combined.
+
+Navigate to the :menuselection:`Contacts app`, and select the :icon:`oi-view-list`
+:guilabel:`(list)` icon. Select two or more duplicate contacts from the list, and tick the checkbox
+(on the far-left) for the contacts that should be merged. Then, click the :icon:`fa-cog`
+:guilabel:`Actions` icon, and select :guilabel:`Merge` from the resulting drop-down menu.
+
+.. image:: merge/merge-menu.png
+   :align: center
+   :alt: The merge contacts option in the Contacts application.
+
+This opens the :guilabel:`Merge` pop-up window. From here, review the details of the contacts before
+confirming they should be merged. If any contacts in the list should **not** be merged, click the
+:icon:`fa-times` :guilabel:`(delete)` icon at the far right of the contact.
+
+.. tip::
+   Click the individual contact to open the record for that contact, and view additional
+   information.
+
+.. image:: merge/merge-window.png
+   :align: center
+   :alt: The merge pop-up window in the Contacts application.
+
+Click the :guilabel:`Destination Contact` field, and select an option from the drop-down list. This
+field defaults to the contact record that was created first in the system.
+
+After confirming the information on the pop-up window, click :guilabel:`Merge Contacts`.
+
+Deduplicate contacts
+====================
+
+After the merge is finished, a pop-up window appears confirming it is complete. This pop-up window
+also contains a :guilabel:`Deduplicate the other Contacts` button. This feature searches for
+duplicated records, based on selected criteria, and merges them automatically, or after manual
+approval.
+
+Click the :guilabel:`Deduplicate the other Contacts` button to open the :guilabel:`Deduplicate
+Contacts` pop-up window.
+
+Select one or more fields to be used in the search for duplicated records. Duplicated contacts can
+be searched, based on the following criteria:
+
+- :guilabel:`Email`
+- :guilabel:`Name`
+- :guilabel:`Is Company`
+- :guilabel:`VAT`
+- :guilabel:`Parent Company`
+
+.. note::
+   If more than one field is selected, only records that have **all** fields in common are suggested
+   as duplicates.
+
+If necessary, select criteria to be used to exclude potential duplicates from the search. Potential
+duplicates can be excluded from the search, based on the following criteria:
+
+- :guilabel:`A user associated to the contact`
+- :guilabel:`Journal Items associated to the contact`
+
+After confirming the search criteria, click either :guilabel:`Merge with Manual Check`,
+:guilabel:`Merge Automatically`, or :guilabel:`Merge Automatically all process`.
+
+If :guilabel:`Merge with Manual Check` is selected, complete the merge by following the :ref:`steps
+above <contacts/merge-duplicate>`.

content/applications/essentials/export_import_data.rst

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

content/applications/essentials/in_app_purchase.rst

@@ -1,6 +1,6 @@
-=====================
-In-app purchase (IAP)
-=====================
+======================
+In-app purchases (IAP)
+======================
 
 .. |IAP| replace:: :abbr:`IAP (In-app purchases)`
 
@@ -22,7 +22,9 @@ the service in the app to activate it. However, each service requires its own pr
 when they run out, users **must** :ref:`buy more <iap/buying_credits>` in order to keep using it.
 
 .. note::
-   Users with an Enterprise version of Odoo Online get free credits to test IAP features.
+   Enterprise Odoo users with a valid subscription get free credits to test IAP features before
+   deciding to purchase more credits for the database. This includes demo/training databases,
+   educational databases, and one-app-free databases.
 
 .. _in_app_purchase/portal:
 
@@ -31,7 +33,7 @@ IAP services
 
 |IAP| services are provided by Odoo, as well as third-parties, and have a wide range of uses.
 
-The following |IAP| services are provided by Odoo:
+The following |IAP| services are offered by Odoo:
 
 - :guilabel:`Documents Digitization`: digitizes scanned or PDF vendor bills, expenses, and resumes
   with OCR and AI.
@@ -40,9 +42,12 @@ The following |IAP| services are provided by Odoo:
 - :guilabel:`Lead Generation`: generates leads based on a set of criteria, and converts web visitors
   into quality leads and opportunities.
 - :guilabel:`Snailmail`: sends customer invoices and follow-up reports by post, worldwide.
+- :guilabel:`Signer identification with itsme®️`: ask document signatories in Odoo *Sign* to provide
+  their identity using the *itsme®* identity platform, which is available in Belgium and the
+  Netherlands.
 
-For more information on every service currently available, visit the `Odoo IAP Catalog
-<https://iap.odoo.com/iap/all-in-app-services>`_.
+For more information on every service currently available (offered from developers other than Odoo),
+visit the `Odoo IAP Catalog <https://iap.odoo.com/iap/all-in-app-services>`_.
 
 Use IAP services
 ----------------
@@ -53,7 +58,7 @@ settings. To use a service, simply interact with it wherever it appears in the d
 .. example::
    The following flow focuses on the *SMS* |IAP| service being used from a contact's record.
 
-   This can be done by clicking the :guilabel:`📱 (phone) SMS` icon within the database.
+   This can be done by clicking the :guilabel:`📱 SMS` icon within the database.
 
    .. image:: in_app_purchase/sms-icon.png
       :align: center
@@ -61,16 +66,17 @@ settings. To use a service, simply interact with it wherever it appears in the d
 
    One way to utilize the *SMS* |IAP| service with Odoo is showcased in the following steps:
 
-   #. Navigate to the :menuselection:`Contacts application`, and click on a contact with a mobile
-      phone number entered in either the :guilabel:`Phone` or :guilabel:`Mobile` field of the
-      contact form.
-   #. Hover the mouse over the :guilabel:`Phone` or :guilabel:`Mobile` field, and a :guilabel:`📱
-      (phone) SMS` icon appears to the right.
-   #. Click the :guilabel:`📱 (phone) SMS` icon, and a :guilabel:`Send SMS Text Message` pop-up
-      window appears.
-   #. Type a message in the :guilabel:`Message` field of the :guilabel:`Send SMS Text Message`
-      pop-up window. Then, click the :guilabel:`Send SMS` button. Odoo then sends the message, via
-      SMS, to the contact, and logs what was sent in the *chatter* of the contact's form.
+   First, navigate to the :menuselection:`Contacts application`, and click on a contact with a
+   mobile phone number entered in either the :guilabel:`Phone` or :guilabel:`Mobile` field of the
+   contact form.
+
+   Next, find the :guilabel:`📱 SMS` icon that appears to the right of the :guilabel:`Phone` or
+   :guilabel:`Mobile` fields. Click the :guilabel:`📱 SMS` icon, and a :guilabel:`Send SMS Text
+   Message` pop-up window appears.
+
+   Type a message in the :guilabel:`Message` field of the pop-up window. Then, click the
+   :guilabel:`Send SMS` button. Odoo then sends the message, via SMS, to the contact, and logs what
+   was sent in the *chatter* of the contact's form.
 
    Upon sending the SMS message, the prepaid credits for the *SMS* |IAP| service are automatically
    deducted from the existing credits. If there are not enough credits to send the message, Odoo
@@ -80,10 +86,10 @@ settings. To use a service, simply interact with it wherever it appears in the d
    For more information on how to use various |IAP| services, and for more in-depth instructions
    related to SMS functionality in Odoo, review the documentation below:
 
-   - :doc:`Lead mining </applications/sales/crm/acquire_leads/lead_mining>`
+   - :doc:`Lead mining <../sales/crm/acquire_leads/lead_mining>`
    - :doc:`Enrich your contacts base with Partner Autocomplete
-     </applications/sales/crm/optimize/partner_autocomplete>`
-   - :doc:`SMS essentials </applications/marketing/sms_marketing/essentials/sms_essentials>`
+     <../sales/crm/optimize/partner_autocomplete>`
+   - :doc:`SMS essentials <../marketing/sms_marketing/essentials/sms_essentials>`
 
 .. _in_app_purchase/credits:
 
@@ -113,7 +119,7 @@ Credits are purchased in *Packs* from the `Odoo IAP Catalog
    The number of credits consumed depends on the length of the SMS and the country of destination.
 
    For more information, refer to the :doc:`SMS Pricing and FAQ
-   </applications/marketing/sms_marketing/pricing/pricing_and_faq>` documentation.
+   <../marketing/sms_marketing/pricing/pricing_and_faq>` documentation.
 
 .. _iap/buying_credits:
 
@@ -124,9 +130,10 @@ If there are not enough credits to perform a task, the database automatically pr
 of more credits.
 
 Users can check the current balance of credits for each service, and manually purchase more credits,
-by navigating to the :menuselection:`Settings app --> Search IAP --> View My Services`.
+by navigating to the :menuselection:`Settings app --> Contacts section`, and beneath the
+:guilabel:`Odoo IAP` setting, click :guilabel:`View My Services`.
 
-Doing so reveals an :guilabel:`IAP Account` page, listing the various |IAP| services in the
+Doing so reveals an :guilabel:`IAP Service` page, listing the various |IAP| services in the
 database. From here, click an |IAP| service to open its :guilabel:`Account Information` page, where
 additional credits can be purchased.
 
@@ -135,32 +142,29 @@ Manually buy credits
 
 To manually buy credits in Odoo, follow these steps:
 
-#. Go to the :menuselection:`Settings application`.
-#. Type `IAP` in the search bar.
-#. Click :guilabel:`View My Services`.
+First, go to the :menuselection:`Settings application` and type `IAP` in the :guilabel:`Search...`
+bar. Alternatively users can scroll down to the :guilabel:`Contacts` section. Under the
+:guilabel:`Contacts` section, where it says :guilabel:`Odoo IAP`, click :guilabel:`View My
+Services`.
 
-   .. image:: in_app_purchase/view-services.png
-      :align: center
-      :alt: The Settings app showing the Odoo IAP heading and View My Services button.
+.. image:: in_app_purchase/view-services.png
+   :align: center
+   :alt: The Settings app showing the Odoo IAP heading and View My Services button.
 
-#. Doing so reveals an :guilabel:`IAP Account` page, listing the various |IAP| services in the
-   database. From here, click an |IAP| service to open its :guilabel:`Account Information` page,
-   where additional credits can be purchased.
-#. On the :guilabel:`Account Information` page, click the :guilabel:`Buy Credit` button.
+Doing so reveals an :guilabel:`IAP Account` page, listing the various |IAP| services in the
+database. From here, click an |IAP| service to open its :guilabel:`Account Information` page, where
+additional credits can be purchased.
 
-   .. image:: in_app_purchase/account-info.png
-      :align: center
-      :alt: The Account Information page for an IAP service showing the Buy Credit button.
+On the :guilabel:`Account Information` page, click the :guilabel:`Buy Credit` button. Doing so loads
+a :guilabel:`Buy Credits for (IAP Account)` page in a new tab. From here, click :guilabel:`Buy` on
+the desired pack of credits. Then, follow the prompts to enter payment details, and confirm the
+order.
 
-#. Doing so loads a :guilabel:`Buy Credits for (IAP Account)` page in a new tab. From here, click
-   :guilabel:`Buy` on the desired pack of credits. Then, follow the prompts to enter payment
-   details, and confirm the order.
+.. image:: in_app_purchase/buy-pack.png
+   :align: center
+   :alt: The SMS service page on IAP.Odoo.com with four packs of credits available for purchase.
 
-   .. image:: in_app_purchase/buy-pack.png
-      :align: center
-      :alt: The SMS service page on IAP.Odoo.com with four packs of credits available for purchase.
-
-#. Once the transaction is complete, the credits are available for use in the database.
+Once the transaction is complete, the credits are available for use in the database.
 
 .. _in_app_purchase/low-credits:
 
@@ -170,23 +174,19 @@ Low-credit notification
 It is possible to be notified when credits are low, in order to avoid running out of credits, while
 using an |IAP| service. To do that, follow this process:
 
-#. Go to the :menuselection:`Settings application`.
-#. Type `IAP` in the search bar.
-#. Click :guilabel:`View My Services`.
-#. The available |IAP| accounts appear in a list view on the :guilabel:`IAP Account` page. From
-   here, click on the desired |IAP| account to view that service's :guilabel:`Account Information`
-   page.
-#. On the :guilabel:`Account Information` page, tick the :guilabel:`Warn Me` box. Doing so reveals
-   two fields on the form: :guilabel:`Threshold` and :guilabel:`Warning Email`.
+Go to the :menuselection:`Settings application`, and type `IAP` in the :guilabel:`Search...` bar.
+Under the :guilabel:`Contacts` section, where it says :guilabel:`Odoo IAP`, click :guilabel:`View My
+Services`.
 
-   .. image:: in_app_purchase/low-credits.png
-      :align: center
-      :alt: Odoo will send an email alert when credits for this service fall below the threshold.
+The available |IAP| accounts appear in a list view on the :guilabel:`IAP Account` page. From here,
+click on the desired |IAP| account to view that service's :guilabel:`Account Information` page.
 
-#. In the :guilabel:`Threshold` field, enter an amount of credits Odoo should use as the minimum
-   threshold for this service.
-#. In the :guilabel:`Warning Email` field, enter the email address that should receive the
-   notification.
+On the :guilabel:`Account Information` page, tick the :guilabel:`Warn Me` checkbox. Doing so reveals
+two fields on the form: :guilabel:`Threshold` and :guilabel:`Warning Email`.
+
+In the :guilabel:`Threshold` field, enter an amount of credits Odoo should use as the
+minimum threshold for this service. In the :guilabel:`Warning Email` field, enter the email address
+that receives the notification.
 
 Odoo sends a low-credit alert to the :guilabel:`Warning Email` when the balance of credits falls
 below the amount listed as the :guilabel:`Threshold`.