[FIX] website: rst and file organization for plausible.rst

- external links - notes - indentation - media filenames - images compression - images alt tags - light content improvement Co-authored-by: Nicolas Bebawi (nbe) <nbe@odoo.com> Co-authored-by: Jonathan Castillo (jcs) <jcs@odoo.com>
[IMP] legal: make PDF links relative
2022-10-20 13:26:11 +02:00 · 2022-10-19 19:11:17 +02:00 · 2022-10-19 18:53:17 +02:00 · 2022-10-19 18:53:17 +02:00 · 2022-10-18 12:53:39 +02:00 · 2022-10-17 23:02:34 +02:00
605 changed files with 254536 additions and 94034 deletions
@@ -2,62 +2,62 @@
 host = https://www.transifex.com
 type = PO

-[odoo-14-doc.applications]
+[odoo-16-doc.applications]
 file_filter = locale/<lang>/LC_MESSAGES/applications.po
 source_file = locale/sources/applications.pot
 source_lang = en

-[odoo-14-doc.finance]
+[odoo-16-doc.finance]
 file_filter = locale/<lang>/LC_MESSAGES/finance.po
 source_file = locale/sources/finance.pot
 source_lang = en

-[odoo-14-doc.general]
+[odoo-16-doc.general]
 file_filter = locale/<lang>/LC_MESSAGES/general.po
 source_file = locale/sources/general.pot
 source_lang = en

-[odoo-14-doc.index]
+[odoo-16-doc.index]
 file_filter = locale/<lang>/LC_MESSAGES/index.po
 source_file = locale/sources/index.pot
 source_lang = en

-[odoo-14-doc.inventory_and_mrp]
+[odoo-16-doc.inventory_and_mrp]
 file_filter = locale/<lang>/LC_MESSAGES/inventory_and_mrp.po
 source_file = locale/sources/inventory_and_mrp.pot
 source_lang = en

-[odoo-14-doc.marketing]
+[odoo-16-doc.marketing]
 file_filter = locale/<lang>/LC_MESSAGES/marketing.po
 source_file = locale/sources/marketing.pot
 source_lang = en

-[odoo-14-doc.productivity]
+[odoo-16-doc.productivity]
 file_filter = locale/<lang>/LC_MESSAGES/productivity.po
 source_file = locale/sources/productivity.pot
 source_lang = en

-[odoo-14-doc.sales]
+[odoo-16-doc.sales]
 file_filter = locale/<lang>/LC_MESSAGES/sales.po
 source_file = locale/sources/sales.pot
 source_lang = en

-[odoo-14-doc.services]
+[odoo-16-doc.services]
 file_filter = locale/<lang>/LC_MESSAGES/services.po
 source_file = locale/sources/services.pot
 source_lang = en

-[odoo-14-doc.theme]
+[odoo-16-doc.theme]
 file_filter = locale/<lang>/LC_MESSAGES/sphinx.po
 source_file = locale/sources/sphinx.pot
 source_lang = en

-[odoo-14-doc.user_settings]
+[odoo-16-doc.user_settings]
 file_filter = locale/<lang>/LC_MESSAGES/settings.po
 source_file = locale/sources/settings.pot
 source_lang = en

-[odoo-14-doc.websites]
+[odoo-16-doc.websites]
 file_filter = locale/<lang>/LC_MESSAGES/websites.po
 source_file = locale/sources/websites.pot
 source_lang = en
@@ -26,7 +26,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)/16.0
 endif
 ifneq ($(CURRENT_LANG),en)
  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/$(CURRENT_LANG)
@@ -4,11 +4,11 @@

 ### Requirements

- [Git](https://www.odoo.com/documentation/master/contributing/documentation.html#install-git)
- [Python 3.7 or 3.8](https://www.odoo.com/documentation/master/contributing/documentation.html#python)
- Python dependencies listed in the file [`requirements.txt`](https://github.com/odoo/documentation/tree/master/requirements.txt).
- [Make](https://www.odoo.com/documentation/master/contributing/documentation.html#make)
- A local copy of the [odoo/odoo repository in master](https://github.com/odoo/odoo/tree/master) (Optional)
+- [Git](https://www.odoo.com/documentation/16.0/contributing/documentation.html#install-git)
+- [Python 3.7 or 3.8](https://www.odoo.com/documentation/16.0/contributing/documentation.html#python)
+- Python dependencies listed in the file [`requirements.txt`](https://github.com/odoo/documentation/tree/16.0/requirements.txt).
+- [Make](https://www.odoo.com/documentation/16.0/contributing/documentation.html#make)
+- A local copy of the [odoo/odoo repository in 16.0](https://github.com/odoo/odoo/tree/16.0) (Optional)

 ### Instructions

@@ -23,7 +23,7 @@

 2. Open the file `documentation/_build/html/index.html` in your web browser to display the render.

-3. See [this guide](https://www.odoo.com/documentation/master/contributing/documentation.html#preview-your-changes)
+3. See [this guide](https://www.odoo.com/documentation/16.0/contributing/documentation.html#preview-your-changes)
   for more detailed instructions.

 Optional: to fully build the developer documentation with inline docstrings for documented Python
@@ -34,7 +34,7 @@ be shown.
 ## Contribute to the documentation

 For contributions to the content of the documentation, please refer to the
-[Introduction Guide](https://www.odoo.com/documentation/master/contributing/documentation.html).
+[Introduction Guide](https://www.odoo.com/documentation/16.0/contributing/documentation.html).

 To **report a content issue**, **request new content** or **ask a question**, use the
 [repository's issue tracker](https://github.com/odoo/documentation-user/issues) as usual.
@@ -43,4 +43,4 @@ To **report a content issue**, **request new content** or **ask a question**, us

 To learn more about Odoo, in addition to the documentation, have a look at
 [the official eLearning](https://odoo.com/slides) and
-[Scale-up, The Business Game](https://www.odoo.com/page/scale-up-business-game).
+[Scale-up, The Business Game](https://www.odoo.com/page/scale-up-business-game).
@@ -22,7 +22,7 @@ copyright = 'Odoo S.A.'
 # `version` if 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 = '16.0'

 # The minimal Sphinx version required to build the documentation.
 needs_sphinx = '3.0.0'
@@ -51,6 +51,10 @@ exclude_patterns = [
 # See https://docutils.sourceforge.io/docs/ref/rst/roles.html#standard-roles for other roles.
 default_role = 'literal'

+
+# Whether scaled down images should be be wrapped in a `<a/>` tag linking to the image file or not.
+html_scaled_image_link = False
+
 # If true, '()' will be appended to :func: etc. cross-reference text
 add_function_parentheses = True

@@ -87,12 +91,11 @@ else:
        sys.version_info = (3, 7, 0)
    odoo_dir = odoo_sources_dirs[0].resolve()
    source_read_replace_vals['ODOO_RELPATH'] = '/../' + str(odoo_sources_dirs[0])
-    source_read_replace_vals['ODOO_ABSPATH'] = str(odoo_dir)
    sys.path.insert(0, str(odoo_dir))
    import odoo.addons
    odoo.addons.__path__.append(str(odoo_dir) + '/addons')
    from odoo import release as odoo_release  # Don't collide with Sphinx's 'release' config option
-    odoo_version = odoo_release.version.replace('~', '-')  # Change saas~XX.Y to saas-XX.Y
+    odoo_version = '.'.join(str(s) for s in odoo_release.version_info[:2]).replace('~', '-')  # Change saas~XX.Y to saas-XX.Y
    odoo_version = 'master' if 'alpha' in odoo_release.version else odoo_version
    if release != odoo_version:
        _logger.warning(
@@ -184,8 +187,9 @@ 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",
+    '16.0': "Odoo 16",
+    'saas-15.3': "Odoo Online",
    'saas-15.2': "Odoo Online",
-    'saas-15.1': "Odoo Online",
    '15.0': "Odoo 15",
    '14.0': "Odoo 14",
    '13.0': "Odoo 13",
@@ -194,18 +198,18 @@ versions_names = {
 # The language names that should be shown in the language switcher, if the config option `languages`
 # is populated. If a language is passed to `languages` but is not listed here, it will not be shown.
 languages_names = {
-    'de': 'Deutsch',
-    'en': 'English',
-    'es': 'Español',
-    'fr': 'Français',
-    'nl': 'Nederlands',
-    'pt_BR': 'Português (BR)',
-    'uk': 'українська',
-    'zh_CN': '简体中文',
+    'de': 'DE',
+    'en': 'EN',
+    'es': 'ES',
+    'fr': 'FR',
+    'nl': 'NL',
+    'pt_BR': 'PT',
+    'uk': 'UA',
+    'zh_CN': 'ZH',
 }

-# The specifications of redirect rules used by the redirects extension.
-redirects_file = 'redirects.txt'
+# The directory in which files holding redirect rules used by the 'redirects' extension are listed.
+redirects_dir = 'redirects/'

 sphinx_tabs_disable_tab_closing = True
 sphinx_tabs_disable_css_loading = True
@@ -229,12 +233,12 @@ html_favicon = os.path.join(html_theme_path[0], html_theme, 'static', 'img', 'fa
 # They are copied after the builtin static files, so a file named "default.css" will overwrite the
 # builtin "default.css".
 html_static_path = ['static']
-html_add_permalinks = '¶'  # Sphinx < 3.5
-html_permalinks = True  # Sphinx >= 3.5
+html_permalinks = True
+
 # Additional JS & CSS files that can be imported with the 'custom-js' and 'custom-css' metadata.
 # Lists are empty because the files are specified in extensions/themes.
 html_js_files = []
-html_css_files = ["css/js.css"]
+html_css_files = []

 # PHP lexer option to not require <?php
 highlight_options = {
@@ -97,7 +97,7 @@ Configuration sample
 * Allow tcp connection on localhost
 * Allow tcp connection from 192.168.1.x network

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

 .. code-block:: text

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

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

 .. code-block:: text

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

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

 .. _builtin_server:

@@ -215,11 +215,11 @@ LiveChat
 --------

 In multiprocessing, a dedicated LiveChat worker is automatically started and
-listening on :option:`the longpolling port <odoo-bin --longpolling-port>` but
+listening on :option:`the gevent port <odoo-bin --gevent-port>` but
 the client will not connect to it.

 Instead you must have a proxy redirecting requests whose URL starts with
-``/longpolling/`` to the longpolling port. Other request should be proxied to
+``/websocket/`` to the gevent port. Other request should be proxied to
 the :option:`normal HTTP port <odoo-bin --http-port>`

 To achieve such a thing, you'll need to deploy a reverse proxy in front of Odoo,
@@ -323,9 +323,15 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
    access_log /var/log/nginx/odoo.access.log;
    error_log /var/log/nginx/odoo.error.log;

-    # Redirect longpoll requests to odoo longpolling port
-    location /longpolling {
+    # Redirect websocket requests to odoo gevent port
+    location /websocket {
      proxy_pass http://odoochat;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection $connection_upgrade;
+      proxy_set_header X-Forwarded-Host $host;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_set_header X-Real-IP $remote_addr;
    }

    # Redirect requests to odoo backend server
@@ -381,12 +387,12 @@ notifications.
 The solutions to support livechat/motifications in a WSGI application are:

 * Deploy a threaded version of Odoo (instead of a process-based preforking
-  one) and redirect only requests to URLs starting with ``/longpolling/`` to
-  that Odoo, this is the simplest and the longpolling URL can double up as
-  the cron instance.
+  one) and redirect only requests to URLs starting with ``/websocket/`` to
+  that Odoo, this is the simplest and the websocket URL can double up as the cron 
+  instance.
 * Deploy an evented Odoo via ``odoo-gevent`` and proxy requests starting
-  with ``/longpolling/`` to
-  :option:`the longpolling port <odoo-bin --longpolling-port>`.
+  with ``/websocket/`` to
+  :option:`the gevent port <odoo-bin --gevent-port>`.

 .. _deploy/streaming:

@@ -735,8 +741,8 @@ Here are the supported browsers:
 .. _socat: http://www.dest-unreach.org/socat/
 .. _PostgreSQL connection settings:
 .. _listen to network interfaces:
-    https://www.postgresql.org/docs/9.6/static/runtime-config-connection.html
+    https://www.postgresql.org/docs/12/static/runtime-config-connection.html
 .. _use an SSH tunnel:
-    https://www.postgresql.org/docs/9.6/static/ssh-tunnels.html
+    https://www.postgresql.org/docs/12/static/ssh-tunnels.html
 .. _WSGI: https://wsgi.readthedocs.org/
 .. _POSBox: https://www.odoo.com/page/point-of-sale-hardware#part_2
@@ -272,55 +272,80 @@ Enterprise Edition:
 * `Official download page <download_>`_
 * `GitHub repository <enterprise-repository_>`_

+.. _setup/install/source/git:
+
 Git
 ~~~

-The following requires `git <https://git-scm.com/>`_ to be installed on your machine and that you
-have basic knowledge of git commands.
+The following requires `Git <git_>`_ to be installed on your machine and that you have basic
+knowledge of Git commands. To clone a Git repository, you must choose between cloning with HTTPS or
+SSH. If you do not know the difference between the two, the best option is most likely HTTPS. If you
+are following the :doc:`Getting started </developer/howtos/rdtraining>` developer tutorial, or plan
+on contributing to Odoo source code, choose SSH.

-Community Edition:
+.. note::
+   **The Enterprise Git repository does not contain the full Odoo source code**. It is only a
+   collection of extra add-ons. The main server code is in the Community version. Running the
+   Enterprise version actually means running the server from the Community version with the
+   addons-path option set to the folder with the Enterprise version. You need to clone both the
+   Community and Enterprise repository to have a working Odoo Enterprise installation. See
+   :ref:`setup/install/editions` to get access to the Enterprise repository.

 .. tabs::

   .. group-tab:: Windows

-      .. code-block:: doscon
+      .. tabs::

-          C:\> git clone https://github.com/odoo/odoo.git
+         .. tab:: Clone with HTTPS
+
+            .. code-block:: doscon
+
+               C:\> git clone https://github.com/odoo/odoo.git
+               C:\> git clone https://github.com/odoo/enterprise.git
+
+         .. tab:: Clone with SSH
+
+            .. code-block:: doscon
+
+               C:\> git clone git@github.com:odoo/odoo.git
+               C:\> git clone git@github.com:odoo/enterprise.git

   .. group-tab:: Linux

-      .. code-block:: console
+      .. tabs::

-          $ git clone https://github.com/odoo/odoo.git
+         .. tab:: Clone with HTTPS
+
+            .. code-block:: console
+
+               $ git clone https://github.com/odoo/odoo.git
+               $ git clone https://github.com/odoo/enterprise.git
+
+         .. tab:: Clone with SSH
+
+            .. code-block:: console
+
+               $ git clone git@github.com:odoo/odoo.git
+               $ git clone git@github.com:odoo/enterprise.git

   .. group-tab:: Mac OS

-      .. code-block:: console
+      .. tabs::

-          $ git clone https://github.com/odoo/odoo.git
+         .. tab:: Clone with HTTPS

-Enterprise Edition: (see :ref:`setup/install/editions` to get access)
+            .. code-block:: console

-.. tabs::
+               $ git clone https://github.com/odoo/odoo.git
+               $ git clone https://github.com/odoo/enterprise.git

-   .. group-tab:: Windows
+         .. tab:: Clone with SSH

-      .. code-block:: doscon
+            .. code-block:: console

-        C:\> git clone https://github.com/odoo/enterprise.git
-
-   .. group-tab:: Linux
-
-      .. code-block:: console
-
-        $ git clone https://github.com/odoo/enterprise.git
-
-   .. group-tab:: Mac OS
-
-      .. code-block:: console
-
-        $ git clone https://github.com/odoo/enterprise.git
+               $ git clone git@github.com:odoo/odoo.git
+               $ git clone git@github.com:odoo/enterprise.git

 .. note::
   **The Enterprise git repository does not contain the full Odoo source code**. It is only a
@@ -329,6 +354,8 @@ Enterprise Edition: (see :ref:`setup/install/editions` to get access)
   addons-path option set to the folder with the Enterprise version. You need to clone both the
   Community and Enterprise repository to have a working Odoo Enterprise installation.

+.. _setup/install/source/prepare:
+
 Prepare
 -------

@@ -405,7 +432,7 @@ PostgreSQL
   .. group-tab:: Windows

      Odoo uses PostgreSQL as database management system. `Download and install PostgreSQL
-      <https://www.postgresql.org/download/windows/>`_ (supported version: 10.0 and later).
+      <https://www.postgresql.org/download/windows/>`_ (supported version: 12.0 and later).

      By default, the only user is `postgres` but Odoo forbids connecting as `postgres`, so you need
      to create a new PostgreSQL user:
@@ -425,7 +452,7 @@ PostgreSQL
   .. group-tab:: Linux

      Odoo uses PostgreSQL as database management system. Use your package manager to download and
-      install PostgreSQL (supported version: 10.0 and later).
+      install PostgreSQL (supported version: 12.0 and later).

      It can be achieved by executing the following:

@@ -448,9 +475,14 @@ PostgreSQL
   .. group-tab:: Mac OS

      Odoo uses PostgreSQL as database management system. Use `postgres.app
-      <https://postgresapp.com>`_ to download and install PostgreSQL (supported version: 10.0 and
+      <https://postgresapp.com>`_ to download and install PostgreSQL (supported version: 12.0 and
      later).

+      .. tip::
+         To make the command line tools bundled with `postgres.app` available, make sure to setup your
+         `$PATH` variable by following the `Postgres.app CLI Tools Instructions
+         <https://postgresapp.com/documentation/cli-tools.html>`_.
+
      By default, the only user is `postgres` but Odoo forbids connecting as `postgres`, so you need
      to create a new PostgreSQL user:

@@ -515,7 +547,7 @@ Dependencies
         .. tab:: Debian/Ubuntu

            For Debian-based systems, the packages are listed in the `debian/control
-            <https://github.com/odoo/odoo/blob/master/debian/control>`_ file of the Odoo sources.
+            <https://github.com/odoo/odoo/blob/16.0/debian/control>`_ file of the Odoo sources.

            On Debian/Ubuntu, the following commands should install the required packages:

@@ -645,8 +677,8 @@ A typical way to run the server would be:
          C:\> python odoo-bin -r dbuser -w dbpassword --addons-path=addons -d mydb

      Where `CommunityPath` is the path of the Odoo Community installation, `dbuser` is the
-      PostgreSQL login, `dbpassword` is the PostgreSQL password and `mydb` is the default database
-      to serve on `localhost:8069`.
+      PostgreSQL login, `dbpassword` is the PostgreSQL password, and `mydb` is the name of the
+      PostgreSQL database.

   .. group-tab:: Linux

@@ -655,8 +687,8 @@ A typical way to run the server would be:
          $ cd /CommunityPath
          $ python3 odoo-bin --addons-path=addons -d mydb

-      Where `CommunityPath` is the path of the Odoo Community installation and `mydb` is the default
-      database to serve on `localhost:8069`.
+      Where `CommunityPath` is the path of the Odoo Community installation, and `mydb` is the name
+      of the PostgreSQL database.

   .. group-tab:: Mac OS

@@ -665,11 +697,22 @@ A typical way to run the server would be:
          $ cd /CommunityPath
          $ python3 odoo-bin --addons-path=addons -d mydb

-      Where `CommunityPath` is the path of the Odoo Community installation and `mydb` is the default
-      database to serve on `localhost:8069`.
+      Where `CommunityPath` is the path of the Odoo Community installation, and `mydb` is the name
+      of the PostgreSQL database.
+
+After the server has started (the INFO log `odoo.modules.loading: Modules loaded.` is printed), open
+http://localhost:8069 in your web browser and log in with the base administrator account: Use
+`admin` for the :guilabel:`Email` and, again, `admin` for the :guilabel:`Password`. That's it, you
+just logged into your own Odoo database!
+
+.. tip::
+   - From there, you can create and manage new :doc:`users
+     </applications/general/users/manage_users>`.
+   - The user account you use to log into Odoo's web interface differs from the :option:`--db_user
+     <odoo-bin -r>` CLI argument.

 .. seealso::
-   - :doc:`The exhaustive list of arguments for odoo-bin </developer/misc/other/cmdline>`.
+   :doc:`The exhaustive list of CLI arguments for odoo-bin </developer/cli>`.

 .. _setup/install/docker:

@@ -683,24 +726,24 @@ official Odoo `docker image <https://hub.docker.com/_/odoo/>`_ page.
 .. _demo: https://demo.odoo.com
 .. _docker: https://www.docker.com
 .. _download: https://www.odoo.com/page/download
-.. _Ubuntu 20.04 (Focal): http://releases.ubuntu.com/20.04/
+.. _Ubuntu 20.04 (Focal): https://releases.ubuntu.com/20.04/
 .. _EPEL: https://fedoraproject.org/wiki/EPEL
-.. _PostgreSQL: http://www.postgresql.org
+.. _PostgreSQL: https://www.postgresql.org
 .. _the official installer:
 .. _install pip:
    https://pip.pypa.io/en/latest/installing.html#install-pip
-.. _Quilt: http://en.wikipedia.org/wiki/Quilt_(software)
+.. _Quilt: https://en.wikipedia.org/wiki/Quilt_(software)
 .. _saas: https://www.odoo.com/page/start
 .. _the wkhtmltopdf download page: https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.5
-.. _UAC: http://en.wikipedia.org/wiki/User_Account_Control
-.. _wkhtmltopdf: http://wkhtmltopdf.org
+.. _UAC: https://en.wikipedia.org/wiki/User_Account_Control
+.. _wkhtmltopdf: https://wkhtmltopdf.org
 .. _pip: https://pip.pypa.io
 .. _macports: https://www.macports.org
-.. _homebrew: http://brew.sh
+.. _homebrew: https://brew.sh
 .. _wheels: https://wheel.readthedocs.org/en/latest/
 .. _virtualenv: https://pypi.python.org/pypi/virtualenv
 .. _virtualenvwrapper: https://virtualenvwrapper.readthedocs.io/en/latest/
-.. _pywin32: http://sourceforge.net/projects/pywin32/files/pywin32/
+.. _pywin32: https://sourceforge.net/projects/pywin32/files/pywin32/
 .. _community-repository: https://github.com/odoo/odoo
 .. _enterprise-repository: https://github.com/odoo/enterprise
 .. _Editions: https://www.odoo.com/pricing#pricing_table_features
@@ -7,6 +7,7 @@ Maintain
 .. toctree::

    maintain/domain_names
+    maintain/google_oauth
    maintain/update
    maintain/enterprise
    maintain/hosting_changes
@@ -59,12 +59,14 @@ database manager.
     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 --> Go to website --> Promote --> Domain Name`.
-Alternatively, open your `database manager <https://www.odoo.com/my/databases>`_, click on the
-:guilabel:`settings` button next to your database, then on :guilabel:`Domain names`.
+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-promote.png
+.. image:: domain_names/register-menu.png
   :align: center
   :alt: Clicking on Domain Names from an Odoo website

@@ -0,0 +1,192 @@
+========================================
+Connect Gmail to Odoo using Google OAuth
+========================================
+
+Odoo is compatible with Google's OAuth for Gmail. In order to send secure emails from a custom
+domain, all that is required is to configure a few settings on Google's *Workspace* platform, as
+well as on the back end of the Odoo database. This configuration works by using either a personal
+email address or an address created by a custom domain.
+
+.. tip::
+   For more information, visit `Google's documentation
+   <https://support.google.com/cloud/answer/6158849>`_ on setting up OAuth.
+
+Setup in Google
+===============
+
+Create a new project
+--------------------
+
+To get started, go to the `Google API Platform
+<https://console.cloud.google.com/apis/credentials/consent>`_. Log in with your *Google Workspace*
+account if you have one, otherwise log in with your personal Gmail account (this should match the
+email address you want to configure in Odoo).
+
+After that, click on :guilabel:`Create Project`, located on the far right of the OAuth consent
+screen. If a project has already been created in this account, then the :guilabel:`New Project`
+option will be located on the top left under the :guilabel:`Select a project` drop-down menu.
+
+On the :guilabel:`New Project` screen, rename the :guilabel:`Project name` to `Odoo` and browse for
+the :guilabel:`Location`. Set the :guilabel:`Location` as the `Google Workspace` organization. If
+you are using a personal Gmail account, then leave the :guilabel:`Location` as `No Organization`.
+
+.. image:: google_oauth/new-project.png
+   :align: center
+   :alt: Project Name and Location for Google Oauth.
+
+Click on :guilabel:`Create` to finish this step. On the next screen, :guilabel:`User Type` options,
+select the :guilabel:`External` option, and then click on :guilabel:`Create` again, which will
+finally navigate to the :guilabel:`Edit app registration` page.
+
+Edit app registration
+---------------------
+
+- On the :guilabel:`Oauth consent screen` step, under the :guilabel:`App information` section,
+  enter `Odoo` in the :guilabel:`App name` field. Select the organization's email address under the
+  :guilabel:`User support` email field.
+- Next, under :menuselection:`App Domain --> Authorized domains`, click on :guilabel:`Add Domain`
+  and enter `odoo.com`.
+- After that, under the :guilabel:`Developer contact information` section, enter the organization's
+  email address. Google uses this email address to notify the organization about any changes to
+  your project.
+- Next, click on the :guilabel:`Save and Continue` button.
+- Then, skip the :guilabel:`Scopes` page by scrolling to the bottom and clicking on
+  :guilabel:`Save and Continue`.
+- Next, add the email being configured under the :guilabel:`Test users` step by clicking on
+  :guilabel:`Add Users` and then the :guilabel:`Save and Continue` button. A summary of the
+  :guilabel:`App registration` appears.
+- Finally, scroll to the bottom and click on :guilabel:`Back to Dashboard`.
+
+Create Credentials
+------------------
+
+Now that you have set up the project, you need to create credentials, which includes the
+:guilabel:`Client ID` and :guilabel:`Client Secret`. First, click on :guilabel:`Credentials` in the
+left sidebar menu.
+
+Then, click on :guilabel:`Create Credentials` in the top menu and select
+:guilabel:`OAuth client ID` from the dropdown menu.
+
+- Under :guilabel:`Application Type`, select :guilabel:`Web Application` from the dropdown menu.
+- In the :guilabel:`Client ID` field, enter `Odoo`.
+- Under the :guilabel:`Authorized redirect URIs` label, click the button :guilabel:`ADD URI`, and
+  then input `https://yourdbname.odoo.com/google_gmail/confirm` in the :guilabel:`URIs 1` field. Be
+  sure to replace the *yourdbname* part of the URL with your actual Odoo database name.
+- Next, click on :guilabel:`Create` to generate an OAuth :guilabel:`Client ID` and
+  :guilabel:`Client Secret`. Finally, copy each generated value for later use when configuring in
+  Odoo, and then navigate to the Odoo database.
+
+.. image:: google_oauth/client-credentials.png
+   :align: center
+   :alt: Client ID and Client Secret for Google OAuth.
+
+Setup in Odoo
+=============
+
+Enter Google Credentials
+------------------------
+
+First, open Odoo and navigate to the :guilabel:`Apps` module. Then, remove the :guilabel:`Apps`
+filter from the search bar and type in `Google`. Install the module called :guilabel:`Google Gmail`.
+
+Next, navigate to :menuselection:`Settings --> General Settings`, and under the :guilabel:`Discuss`
+section, ensure that the checkbox for :guilabel:`Custom Email Servers` is checked. This populates a
+new option for :guilabel:`Gmail Credentials`. Then, copy and paste the :guilabel:`Client ID` and
+:guilabel:`Client Secret` into the respective fields and :guilabel:`Save` the settings.
+
+Configure outgoing email server
+-------------------------------
+
+After that, on the :guilabel:`General Settings` page, under :guilabel:`Custom Email Servers`, click
+:guilabel:`Outgoing Email Servers` to configure the external Gmail account.
+
+.. image:: google_oauth/outgoing-servers.png
+   :align: center
+   :alt: Configure Outgoing Email Servers in Odoo.
+
+Then, :guilabel:`Create` a new email server and select the option for :guilabel:`Gmail`. Next, fill
+in the :guilabel:`Description` (can be anything) and the email :guilabel:`Username` and click on
+:guilabel:`Connect your Gmail account`.
+
+A new window from :guilabel:`Google` opens to complete the authorization process. Select the
+appropriate email address that is being configured in Odoo.
+
+If the email address is a personal account, an extra step pops up, click :guilabel:`Continue` to
+allow the verification and connect the Gmail account to Odoo.
+
+Then, allow Odoo to access the Google account by clicking on :guilabel:`Continue` or
+:guilabel:`Allow`. After that, the page navigates back to the newly configured outgoing email
+server in Odoo. The configuration automatically loads the token in Odoo, and a tag stating
+:guilabel:`Gmail Token Valid` appears in green.
+
+.. image:: google_oauth/green-token.png
+   :align: center
+   :alt: Configure Outgoing Email Servers in Odoo.
+
+Finally, save the settings and :guilabel:`Test the Connection`. A confirmation message should 
+appear. The Odoo database can now send safe, secure emails through Google using OAuth
+authentication.
+
+Google OAuth FAQ
+================
+
+Production VS Testing Publishing Status
+---------------------------------------
+
+Choosing :guilabel:`Production` as the :guilabel:`Publishing Status` (instead of Testing) will
+display the following warning message:
+
+.. image:: google_oauth/published-status.png
+   :align: center
+   :alt: OAuth is Limited to 100 Sensitive Scope Logins.
+
+To correct this warning, navigate to the `Google API Platform
+<https://console.cloud.google.com/apis/credentials/consent>`_. If the :guilabel:`Publishing status`
+is :guilabel:`In Production`, click :guilabel:`Back to Testing` to correct the issue.
+
+No Test Users Added
+-------------------
+
+If no test users are added to the OAuth consent screen, then a 403 access denied error will
+populate.
+
+.. image:: google_oauth/403-error.png
+   :align: center
+   :alt: 403 Access Denied Error.
+
+To correct this error, return to the :guilabel:`OAuth consent screen` under
+:guilabel:`APIs & Services` and add test user(s) to the app. Add the email that you are configuring
+in Odoo.
+
+Gmail Module not updated
+------------------------
+
+If the :guilabel:`Gmail Module` in Odoo has not been updated to the latest version, then a
+:guilabel:`Forbidden` error message populates.
+
+.. image:: google_oauth/forbidden-error.png
+   :align: center
+   :alt: Forbidden you don't have the permission to access the requested resource.
+
+To correct this error, go to the :guilabel:`Apps` module and clear out the search terms. Then,
+search for `Gmail` or `Google` and upgrade the :guilabel:`Google Gmail` module. Finally, click on
+the three dots on the upper right of the module and select :guilabel:`Upgrade`.
+
+Application Type
+----------------
+
+When creating the :guilabel:`Credentials` (OAuth Client ID and Client Secret), if
+:guilabel:`Desktop App` is selected for the :guilabel:`Application Type`, an
+:guilabel:`Authorization Error` appears.
+
+.. image:: google_oauth/error-400.png
+   :align: center
+   :alt: Error 400 Redirect URI Mismatch.
+
+To correct this error, delete the credentials already created and create new credentials, selecting
+:guilabel:`Web Application` for the :guilabel:`Application Type`. Then, under
+:guilabel:`Authorized redirect URIs`, click :guilabel:`ADD URI` and type:
+`https://yourdbname.odoo.com/google_gmail/confirm` in the field.
+
+.. note::
+   Replace *yourdbname* in the URL with the Odoo database name.
@@ -48,13 +48,37 @@ From Odoo Online to Odoo.sh
 From Odoo.sh to Odoo Online
 ===========================

-.. warning:: Odoo Online is not compatible with **non-standard apps**.
+#. Uninstall all the **non-standard apps**.
+#. `Create a support ticket <https://www.odoo.com/help>`_ and include the following:

-1.  Uninstall all the **non-standard apps**: test it in a staging build first, then do it in your production build.
-2.  **If you have time constraints, contact us earlier to schedule the transfer.**
-3. `Create a support ticket <https://www.odoo.com/help>`_ and include your subscription number and the URL you want to use for your database (e.g.: my-company.odoo.com).
-4.  We will make sure your database is compatible and upload it to our cloud. In case of technical issues, we will get in touch with you.
-5.  It's done!
+   - Your subscription number
+   - The URL you want to use for your database (e.g., `example.odoo.com`)
+   - Which branch you want to migrate
+   - In which region you want to be hosted:
+
+     - Americas
+     - Europe
+     - Asia
+
+   - Which user(s) will be the administrator(s)
+   - When (and in which timezone) you want the database to be up and running
+
+#. We will make sure your database is compatible and upload it to our cloud. In case of technical
+   issues, we will get in touch with you.
+#. All done!
+
+.. important::
+   - Odoo Online is not compatible with **non-standard apps**.
+   - Make sure to uninstall all the **non-standard apps** in a staging build before doing it in your
+     production build.
+
+.. note::
+   - Make sure you select the **region** that is closest to your users to reduce latency.
+   - The future **administrator(s)** must have an odoo.com account.
+   - The specific **date and time** at which you want the database to be up and running are mainly
+     helpful to organize the switch from the odoo.sh server to the Odoo Online servers.
+   - Databases are **not reachable** during their migration.
+   - **If you have time constraints, contact us earlier to schedule the transfer**.

 From Odoo.sh to on-premises
 ===========================
@@ -25,6 +25,8 @@ This matrix shows the support status of every version.
 +-----------------+-------------+----------+-------------+----------------+------------------------+
 |                 | Odoo Online | Odoo.sh  | On-Premise  | Release date   | End of support         |
 +=================+=============+==========+=============+================+========================+
+| **Odoo 16.0**   | |green|     | |green|  | |green|     | October 2022   | October 2025 (planned) |
+-----------------+-------------+----------+-------------+----------------+------------------------+
 | Odoo saas~15.2  | |green|     | N/A      | N/A         | March 2022     |                        |
 +-----------------+-------------+----------+-------------+----------------+------------------------+
 | Odoo saas~15.1  | |red|       | N/A      | N/A         | February 2022  |                        |
@@ -33,7 +35,7 @@ This matrix shows the support status of every version.
 +-----------------+-------------+----------+-------------+----------------+------------------------+
 | **Odoo 14.0**   | |green|     | |green|  | |green|     | October 2020   | October 2023 (planned) |
 +-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 13.0**   | |green|     | |green|  | |green|     | October 2019   | October 2022 (planned) |
+| **Odoo 13.0**   | |red|       | |red|    | |red|       | October 2019   | October 2022           |
 +-----------------+-------------+----------+-------------+----------------+------------------------+
 | Odoo saas~12.3  | |red|       | N/A      | N/A         | August 2019    |                        |
 +-----------------+-------------+----------+-------------+----------------+------------------------+
@@ -68,14 +70,13 @@ This matrix shows the support status of every version.

    🏁 Future version, not released yet

-.. This is an awful way to display colored circles but "Large Green Circle Emoji" was only released
-   in 2019 (see https://unicode-table.com/en/1F7E2/). Let's wait a few more years...
+.. |green| raw:: html

-.. |green| image:: data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMzIuMTkgMjMyLjE5Ij48Y2lyY2xlIGN4PSIxMTYuMDkiIGN5PSIxMTYuMDkiIHI9IjExNi4wOSIgc3R5bGU9ImZpbGw6IzAwYTcwMCIvPjwvc3ZnPg==
-   :width: 15
+   <span class="text-success" style="font-size: 32px; line-height: 0.5">●</span>

-.. |red| image:: data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMzIuMTkgMjMyLjE5Ij48Y2lyY2xlIGN4PSIxMTYuMDkiIGN5PSIxMTYuMDkiIHI9IjExNi4wOSIgc3R5bGU9ImZpbGw6I2QwMDAwMCIvPjwvc3ZnPg==
-   :width: 15
+.. |red| raw:: html
+
+   <span class="text-danger" style="font-size: 32px; line-height: 0.5">●</span>

 I run an older version of Odoo/OpenERP/TinyERP
 ==============================================
@@ -167,7 +167,7 @@ In the above commands, the argument:
 * ``--stop-after-init`` will immediately shutdown the server instance after it completed the operations you asked.

 More options are available and detailed in the
-:doc:`CLI documentation </developer/misc/other/cmdline>`.
+:doc:`CLI documentation </developer/cli>`.

 You can find in the logs (*~/logs/odoo.log*) the addons path used by Odoo.sh to run your server.
 Look for "*odoo: addons paths*":
@@ -42,7 +42,7 @@ instance will be held temporarily unavailable for maintenance reason.

 This method is equivalent to perform an upgrade of the module through the Apps menu,
 or through the :code:`-u` switch of
-:doc:`the command line </developer/misc/other/cmdline>`.
+:doc:`the command line </developer/cli>`.

 In the case the changes in the commit prevent the server to restart,
 or if the modules update fails,
@@ -71,7 +71,7 @@ The neutralization includes:
 * Disabling outgoing emails by intercepting them with a mailcatcher. An
  :ref:`interface to view <odoosh-gettingstarted-branches-tabs-mails>` the emails sent by your
  database is provided. That way, you do not have to worry about sending test emails to your contacts.
-* Setting payment acquirers and shipping providers in test mode.
+* Setting payment providers and shipping providers in test mode.
 * Disabling IAP services

 The latest database will be kept alive indefinitely, older ones from the same branch may get garbage collected
@@ -279,10 +279,21 @@ The *import database* feature accepts database archives in the format provided b
 * the Odoo.sh backup download button of this *Backups* tab,
 * the Odoo.sh dump download button in the :ref:`Builds view <odoosh-gettingstarted-builds>`.

+.. _odoo_sh/upgrade:
+
+Upgrade
+-------
+
+Available for production and staging branches for valid projects.
+
+.. seealso::
+    :doc:`Upgrade - Odoo.sh <../../upgrade/odoo_sh>`
+
 .. _odoosh-gettingstarted-branches-tabs-settings:

 Settings
 --------
+
 Here you can find a couple of settings that only apply to the currently selected branch.

 .. image:: branches/interface-branches-settings.jpg
@@ -384,7 +395,7 @@ we are considering the feature if there is enough demand.
 In case the domain of your users email addresses use SPF (Sender Policy Framework) or DKIM
 (DomainKeys Identified Mail), don't forget to authorize Odoo as a sending host in your domain name
 settings to increase the deliverability of your outgoing emails.
-The configuration steps are explained in the documentation about :ref:`SPF 
+The configuration steps are explained in the documentation about :ref:`SPF
 <email_communication/spf_compliant>` and :ref:`DKIM <email_communication/dkim_compliant>`.


@@ -37,7 +37,6 @@ The working directory is composed of the following folders:
  │         │    ├── enterprise          Odoo Enterprise source code
  │         │    ├── themes              Odoo Themes source code
  │         │    └── user                Your repository branch source code
-  │         ├── repositories             The Git repositories used by your project
  │         ├── data
  │         │    ├── filestore           database attachments, as well as the files of binary fields
  │         │    └── sessions            visitors and users sessions
@@ -1,66 +1,132 @@
-
 =======
 Odoo.sh
 =======

-Test upgrade request
-====================
+.. _upgrade/odoo_sh/overview:

-Download a dump of your database (from the :ref:`Builds view
-<odoosh-gettingstarted-builds-download-dump>`), choose the **exact copy** and **without filestore**
-options. Upload the .sql.gz dump on https://upgrade.odoo.com/upload and select the testing purpose.
-Once it's processed, you'll get a dump of the database in return.
+Overview
+========

-.. important::
-   To have the most up-to-date test version of your database, create a backup of your production
-   database just before creating your request. Upload it in your staging branch, select **Exact
-   dump** and **Without filestore**, and then click *start*.
-
-Test your upgraded database
-===========================
-
-At the beginning of your upgrade project, make sure that you create a new staging branch for testing
-purposes by forking your main branch.
-
-Once the staging build is complete (it doesn't matter if it failed due to the version
-incompatibility), import your upgraded dump in the *Backups* tab of the branch.
+Odoo.sh is integrated with the upgrade platform to make the upgrade process easier.

 .. note::
-   The platform automatically detects the version of the dump and changes the version of Odoo's
-   source code to the corresponding version of the build.
+   The :guilabel:`Upgrade` tab is available in the branches view. It is only available for valid
+   projects with a valid production build.

-Test the upgraded database and make sure everything runs as it's supposed to.
+.. image:: odoo_sh/odoo-sh-menu.png
+   :align: center
+   :alt: Click on the upgrade menu

-Upgrade your production database
-================================
+The suggested upgrade steps on Odoo.sh are:

-Once you've tested everything and you're satisfied, start the process over to get an up-to-date
-upgraded dump:
-
-* Make a new dump of your production database (as described in step 1)
-* Upload it on upgrade.odoo.com and select the Production purpose
-* Receive the newly upgraded dump and import it in your production branch. The build might get
-  marked as failed because the platform will run it with the upgraded databases' Odoo version
-  together with the old custom code.
-* Merge or commit the upgraded custom code in the production branch
-
-If anything goes wrong, remember you can restore a backup. The platform will always make one before
-you make any Odoo.sh operation on the production database. If the restored backup comes from a
-previous version, the platform will detect it and change the project's Odoo version back if it needs
-to.
-
-Custom modules (if applicable)
-==============================
-
-The upgrade of a database that contains custom modules is a 2 step process.
-
-#. The standard upgrade is done when your upgrade request is completed.
-#. Your custom modules also need to be upgraded to keep them compatible with the new version.
-
-Depending on your contract, the upgrade of your custom modules can be done
- by yourself
- by your Partner
- by Odoo (if you hold a subscription to 'Maintenance of Customizations')
+#. On a :guilabel:`Development` branch, upgrade your custom modules to keep them compatible with the
+   new version and thoroughly **test them**.
+#. Switch that branch to the :guilabel:`Staging` branch, **upgrade** the last daily production
+   backup and **test it**. Write upgrade scripts if necessary.
+#. Trigger the production upgrade from your :guilabel:`Production` branch and sit tight.

 .. seealso::
-   - :ref:`upgrade/sla`
+   - :doc:`../../administration/upgrade`
+   - :doc:`Upgrade FAQ <../upgrade/faq>`
+   - :doc:`Introduction to Odoo.sh <../odoo_sh/overview/introduction>`
+
+.. _upgrade/odoo_sh/custom-modules:
+
+Upgrade your custom modules
+===========================
+
+The first step is to upgrade your custom modules to keep them compatible with the new version. Fork
+your :guilabel:`Production` branch in the :guilabel:`Development` stage, then go to the settings of
+your :guilabel:`Development` branch and select the Odoo version you target. If needed, modify your
+code to be compatible with the new version. Make sure to **test** your features are still working
+correctly.
+
+.. note::
+   Depending on your contract, the upgrade of your custom modules can be done by yourself, by your
+   Partner or by Odoo (if you hold a subscription including maintenance of customizations).
+
+.. _upgrade/odoo_sh/testing-phase:
+
+Upgrade your database on a staging branch
+=========================================
+
+Take the upgraded development branch and drag & drop it to :guilabel:`Staging`.
+
+Go to the :guilabel:`Upgrade` tab and select the :guilabel:`target version`. Then, click on
+:guilabel:`Test Upgrade`.
+
+.. image:: odoo_sh/odoo-sh-staging.png
+   :align: center
+   :alt: Odoo.sh project and tabs
+
+The **latest production daily automatic backup** is sent to the
+`upgrade platform <https://www.upgrade.odoo.com>`_ to start the upgrade test process.
+
+.. note::
+   You can follow the upgrade process by going to the :guilabel:`Upgrade` menu of your
+   :guilabel:`Production` branch.
+
+When the upgraded backup is ready on the `upgrade platform <https://www.upgrade.odoo.com>`_, it is
+automatically downloaded back to your project.
+
+The branch is now in a **special mode**: each time a **commit is pushed** on the branch, a
+**restore operation** of the upgraded backup occurs, and an **update of all the custom modules**
+happens. This allows you to quickly iterate on your custom modules upgrade scripts. The log file of
+the upgrade process can be found at :file:`~/logs/upgrade.log` in your newly upgraded staging build.
+
+.. note::
+   - The **special upgrade mode** is automatically closed after 30 days.
+   - It may happen that custom modules are no longer needed after an upgrade. Custom modules in the
+     upgraded database are set to be updated. If the modules are missing in the code, the update
+     fails, thus failing the whole process. An empty module with a manifest and possibly some custom
+     upgrade script are necessary to clean up the database. The complete removal of the module has
+     to be handled afterwards.
+
+Functionally test your upgraded database
+========================================
+
+Now that the test upgraded database is available on your staging branch, **thoroughly test it** and
+make sure everything runs as it's supposed to. Once you are satisfied with the result, you are ready
+to upgrade your production database.
+
+Production upgrade
+==================
+
+Once you are happy with your testing, you can start the process on the :guilabel:`Production`
+branch.
+
+On your :guilabel:`Production` branch, go to the :guilabel:`Upgrade` tab, select the
+:guilabel:`targeted version` and click on the :guilabel:`start Upgrade` button.
+
+.. image:: odoo_sh/odoo-sh-prod.png
+   :align: center
+   :alt: View from the upgrade tab
+
+The actual process is **triggered as soon as you push a new commit** in your branch. Make sure you
+are pushing code that is compatible with the new version. For example by merging the code from your
+upgraded staging branch.
+
+.. note::
+   You can see the progress of the upgrade by going to the :guilabel:`Upgrade` tab of the main
+   branch.
+
+.. image:: odoo_sh/odoo-sh-progress.png
+   :align: center
+   :alt: View showing the progress of the upgrade
+
+.. important::
+   Your database is unavailable throughout the process.
+
+.. note::
+   If anything goes wrong, the platform automatically reverts the upgrade, the same as it would be
+   for a regular update. In case of success, a backup is always made.
+
+The update of your custom modules must be successful to complete the entire upgrade process. Make
+sure the status of your staging upgrade is :guilabel:`successful` before trying it in production.
+
+.. note::
+   It may happen that custom modules are no longer needed after an upgrade. Custom modules in the
+   upgraded database are set to be updated. If the modules are missing in the code, the update
+   fails, thus failing the whole process. An empty module with a manifest and possibly some custom
+   upgrade script are necessary to clean up the database. The complete removal of the module has to
+   be handled afterwards.
@@ -11,4 +11,4 @@ Finance
    finance/expenses
    finance/documents
    finance/sign
-    finance/payment_acquirers
+    finance/payment_providers
@@ -15,7 +15,6 @@ development with features such as AI-powered invoice recognition, synchronizatio
 accounts, smart matching suggestions, etc.

 .. seealso::
-   - `Odoo Tutorials: Invoicing <https://www.odoo.com/slides/invoicing-18>`_
   - `Odoo Tutorials: Accounting <https://www.odoo.com/slides/accounting-19>`_
   - :doc:`Accounting Cheat Sheet <accounting/getting_started/memento>`

@@ -64,8 +64,8 @@ Link your Ponto account with your Odoo database
 #. Finish the flow.

 .. note::
-   You have to authorize all the accounts you want to access in Odoo but, Odoo will filter the
-   accounts based on the institution you selected at the second step.
+   You have to authorize all the accounts you want to access in Odoo, but Odoo will filter the
+   accounts based on the institution you selected in the second step.

 Update your synchronization credentials
 ---------------------------------------
@@ -1,117 +1,117 @@
-===================================
-Manage a bank in a foreign currency
-===================================
+===========================================
+Manage a bank account in a foreign currency
+===========================================

-In Odoo, every transaction is recorded in the default currency of the
-company. Reports are all based on the currency of the company. But for
-transactions occurring in another currency, Odoo stores both the value
-in the currency of the company and the value in the currency of the
-transaction.
-
-When you have a bank account in a foreign currencies, for every
+In Odoo, every transaction is recorded in the default currency of the company, and reports are all
+based on that default currency. When you have a bank account in a foreign currency, for every
 transaction, Odoo stores two values:

-  The debit/credit in the currency of the company
+-  The debit/credit in the currency of the *company*;
+-  The debit/credit in the currency of the *bank account*.

-  The debit/credit in the currency of the bank account
-
-Currency rates are updated automatically using yahoo.com, or the
-European Central bank web-services.
+Currency rates are updated automatically using the web services of a banking institution. By
+default, Odoo uses the European Central Bank's web services but other options are available.

 Configuration
 =============

-Activate the multi-currency feature
-----------------------------------
+Activate multi-currencies
+-------------------------

-In order to allow your company to work with multiple currencies, you
-should activate the multi-currency mode. In the accounting application,
-go into :menuselection:`Configuration --> Settings --> Accounting & Finance Features`
-make sure the **Allow Multi-currencies** box is ticked. Provide
-a **Currency Exchange Gain / Loss** account, then click on **Apply**.
+To work with multiple currencies, go to :menuselection:`Accounting --> Configuration --> Settings
+--> Currencies` and tick :guilabel:`Multi-Currencies`. Under :guilabel:`Post Exchange difference
+entries in:`, provide a :guilabel:`Journal`, a :guilabel:`Gain Account`, a :guilabel:`Loss Account`,
+and then click on :guilabel:`Save`.

 Configure currencies
 --------------------

-Once the Odoo is configured to support multiple currencies, you should
-activate the currencies you plan to work with. To do that, go to the menu
-:menuselection:`Configuration --> Currencies`. All the currencies are created by default,
-but you should activate the ones you plan to support (to activate a
-currency, check its "Active" field).
+Once Odoo is configured to support multiple currencies, they are all created by default, but not
+necessarily active. To activate the new currencies, click on :guilabel:`Activate Other Currencies`
+under the :guilabel:`Multi-Currencies` setting or go to :menuselection:`Accounting --> Configuration
+--> Accounting: Currencies`.

-After having activated the currencies, you can configure the parameters
-to automate the currency rate update. These options are also in the
-settings of the Accounting application, in the bottom of the page:
+When the currencies are activated, you can choose to **automate** the currency rate update, or leave
+it on **manual**. To configure the rate update, go back to :menuselection:`Accounting -->
+Configuration --> Settings --> Currencies`, check :guilabel:`Automatic Currency Rates`, set
+:guilabel:`Interval` to your desired frequency, and then click on :guilabel:`Save`. You also have
+the option to choose the :guilabel:`Service` you wish to obtain currency rates from.

-.. image:: foreign_currency/foreign01.png
-   :align: center
-
-Click on the **Update Now** link to update the currency rates now.
+Click on the Update now button (:guilabel:`🗘`) besides the :guilabel:`Next Run` field to update
+the currency rates manually.

 Create a new bank account
 -------------------------

-In the accounting application, we first go to :menuselection:`Configuration -->
-Accounting / Bank account`, and we create a new one.
+In the accounting application, go to :menuselection:`Accounting --> Configuration --> Journals` and
+create a new one. Enter a :guilabel:`Journal Name` and set the :guilabel:`Type` to `Bank`. In the
+:guilabel:`Journal Entries` tab, enter a **short code**, a **currency**, and then finally click on
+the :guilabel:`Bank Account` field to create a new account. In the pop-up window of the account
+creation, enter a name, a code (ex.: 550007), set its type to `Bank and Cash`, set a currency type,
+and save. When you are back on the **journal**, click on the :guilabel:`Account Number` field, and
+in the pop-up window, fill out the :guilabel:`Account Number`, :guilabel:`Bank` of your account, and
+save.

-.. image:: foreign_currency/foreign02.png
+.. image:: foreign_currency/foreign-journal.png
   :align: center
+   :alt: Example of a created bank journal.

-Once you save this bank account, Odoo will create all the documents for
-you:
+Upon creation of the journal, Odoo automatically links the bank account to the journal. It can be
+found under :menuselection:`Accounting --> Configuration --> Accounting: Chart of Accounts`.

- An account in the trial balance
+Vendor bill in a foreign currency
+=================================

- A journal in your dashboard
+To pay a bill in a foreign currency, simply select the currency next to the :guilabel:`Journal`
+field and register the payment. Odoo automatically creates and posts the foreign **exchange gain or
+loss** as a new journal entry.

- Information about the bank account in the footer of your invoices if
-  checked the box **Show in Invoices Footer**
-
-Example: A vendor bill in a foreign currency
-============================================
-
-Based on the above example, let's assume we receive the following bill
-from a supplier in China.
-
-In the :menuselection:`Purchase --> Vendor Bills` , this is what you could see:
-
-.. image:: foreign_currency/foreign03.png
+.. image:: foreign_currency/foreign-bill-currency.png
   :align: center
+   :alt: How to set a bill currency.

-Once you are ready to pay this bill, click on register payment on the
-bill to record a payment.
+.. note::
+   Note that you can pay a foreign bill with another currency. In that case, Odoo automatically
+   converts between the two currencies.

-.. image:: foreign_currency/foreign04.png
+Unrealized Currency Gains/Losses Report
+=======================================
+
+This report gives an overview of all unrealized amounts in a foreign currency on your balance sheet,
+and allows you to adjust an entry or manually set an exchange rate. To access this report, go to
+:menuselection:`Reporting --> Management: Unrealized Currency Gains/Losses`. From here, you have
+access to all open entries in your **balance sheet**.
+
+.. image:: foreign_currency/foreign-gains-losses.png
   :align: center
+   :alt: View of the Unrealized Gains/Losses journal.

-That's all you have to do. Odoo will automatically post the foreign
-exchange gain or loss at the reconciliation of the payment with the
-invoice, depending if the currency rate increased or decreased between
-the invoice and the payment date.
+If you wish to use a different currency rate than the one set in :menuselection:`Accounting -->
+Configuration --> Settings --> Currencies`, click the :guilabel:`Exchange Rates` button and change
+the rate of the foreign currencies in the report.

-Note that you can pay a foreign bill with another currency. In such a
-case, Odoo will automatically convert between the two currencies.
-
-Customers Statements
-====================
-
-Customers and vendor statements are managed in the currency of the
-invoice. So, the amount due by your customer (to your vendor) is always
-expressed in the currency of the invoice.
-
-If you have several invoices with different currencies for the same
-customer, Odoo will split the customer statement by currency, as shown
-in the report below.
-
-.. image:: foreign_currency/foreign05.png
+.. image:: foreign_currency/foreign-exchange-rates.png
   :align: center
+   :alt: Menu to manually change exchange rates.

-In the above report, the account receivable associated to Camptocamp is
-not managed in a secondary currency, which means that it keeps every
-transaction in its own currency. If you prefer, you can set the account
-receivable for this customer in a secondary currency and all its debts
-will automatically be converted to this currency.
+When manually changing **exchange rates**, a yellow banner appears allowing you to reset back to
+Odoo's rate. To do so, simply click on :guilabel:`Reset to Odoo's Rate`.

-In such a case, the customer statement always has only one currency. In
-general, this is not what the customer expect as he prefers to see the
-amounts in the currency of the invoices he received;
+.. image:: foreign_currency/foreign-reset-rates.png
+   :align: center
+   :alt: Banner to reset back to Odoo's rates.
+
+In order to update your **balance sheet** with the amount of the :guilabel:`adjustment` column,
+click on the :guilabel:`Adjustment Entry` button. In the pop-up window, select a
+:guilabel:`Journal`, :guilabel:`Expense Account` and :guilabel:`Income Account` to calculate and
+process the **unrealized gains and losses**.
+
+You can set the date of the report in the :guilabel:`Date` field. Odoo automatically reverses the
+booking entry to the date set in :guilabel:`Reversal Date`.
+
+Once posted, the :guilabel:`adjustment` column should indicate `0.00`, meaning all **unrealized
+gains/losses** have been adjusted.
+
+.. image:: foreign_currency/foreign-adjustment.png
+   :align: center
+   :alt: Unrealized Currency Gains/Losses report once adjusted.
@@ -42,5 +42,8 @@ Payments` tab. To display the outstanding accounts column, click on the toggle b
   :alt: Select the toggle button and click on outstanding Accounts

 .. note::
-   If you do not specify an outstanding payments account or an outstanding receipts account for a
-   specific journal, Odoo uses the default outstanding accounts.
+   - If you do not specify an outstanding payments account or an outstanding receipts account for a
+     specific journal, Odoo uses the default outstanding accounts.
+   - If your main bank account is added as an outstanding receipts account or outstanding payments
+     account, when a payment is registered, the invoice or bill's status is directly set to
+     :guilabel:`Paid`.
@@ -15,6 +15,7 @@ Localizations
   localizations/egypt
   localizations/france
   localizations/germany
+   localizations/india
   localizations/indonesia
   localizations/italy
   localizations/italy_IT
@@ -13,17 +13,17 @@ Below you can find videos with a general description of the localization, and ho
 Introduction
 ============

-The Chilean localization has been improved and extended in Odoo v13. In this version, the next 
+The Chilean localization has been improved and extended in Odoo v13. In this version, the next
 modules are available:

- **l10n_cl:** Adds accounting features for the Chilean localization, which represent the minimal 
-  configuration required for a company to operate in Chile and under the SII 
-  (Servicio de Impuestos Internos) regulations and guidelines.
-  
- **l10n_cl_edi:** Includes all technical and functional requirements to generate and receive 
-  Electronic Invoice via web service, based on the SII regulations. 
+- **l10n_cl:** Adds accounting features for the Chilean localization, which represent the minimal
+  configuration required for a company to operate in Chile and under the SII (Servicio de Impuestos
+  Internos) regulations and guidelines.

- **l10n_cl_reports:** Adds the reports Propuesta F29 y  Balance Tributario (8 columnas). 
+- **l10n_cl_edi:** Includes all technical and functional requirements to generate and receive
+  Electronic Invoice via web service, based on the SII regulations.
+
+- **l10n_cl_reports:** Adds the reports Propuesta F29 y Balance Tributario (8 columnas).

 Configuration
 =============
@@ -31,7 +31,7 @@ Configuration
 Install the Chilean localization modules
 ----------------------------------------

-For this, go to *Apps* and search for Chile. Then click *Install* in the module **Chile 
+For this, go to *Apps* and search for Chile. Then click *Install* in the module **Chile
 E-invoicing**. This module has a dependency with **Chile - Accounting**. In case this last
 one is not installed, Odoo installs it automatically with E-invoicing.

@@ -42,24 +42,24 @@ one is not installed, Odoo installs it automatically with E-invoicing.
 .. note::
   When you install a database from scratch selecting Chile as country, Odoo will automatically
   install the base module: Chile - Accounting.
-   
-   
+
+
 Company Settings
 ----------------

 Once the modules are installed, the first step is to set up your company data. Additional
-to the basic information, you need to add all the data and elements required for Electronic 
-Invoice, the easiest way to configure it is in 
+to the basic information, you need to add all the data and elements required for Electronic
+Invoice, the easiest way to configure it is in
 :menuselection:`Accounting --> Settings --> Chilean Localization`.

 .. important::
-   All the following configuration and functionality is only available in Odoo if your 
+   All the following configuration and functionality is only available in Odoo if your
   company already passed the `Certification process <https://www.sii.cl/factura_electronica/
-   factura_mercado/proceso_certificacion.htm>`_ 
-   in the SII - Sistema de Facturación de Mercado, this certification enables you to 
-   generate electronic invoices from your ERP and send them automatically to the SII. 
-   If your company has not passed this certification yet, make sure you communicate this 
-   to your Account Manager as a special process outside Odoo is required in order to complete 
+   factura_mercado/proceso_certificacion.htm>`_
+   in the SII - Sistema de Facturación de Mercado, this certification enables you to
+   generate electronic invoices from your ERP and send them automatically to the SII.
+   If your company has not passed this certification yet, make sure you communicate this
+   to your Account Manager as a special process outside Odoo is required in order to complete
   this certification.

 Fiscal Information
@@ -71,7 +71,7 @@ instructions on each section.
 .. image:: chile/Chile02.png
   :align: center
   :alt: Chilean company fiscal data.
-   
+
 Electronic Invoice Data
 ~~~~~~~~~~~~~~~~~~~~~~~

@@ -87,7 +87,7 @@ Configure DTE Incoming email server
 ***********************************

 In order to receive you the claim and acceptance emails from your customers, it is
-crucial to define the DTE incoming email server, considering this configuration: 
+crucial to define the DTE incoming email server, considering this configuration:

 .. image:: chile/Chile03_2.png
   :align: center
@@ -95,13 +95,13 @@ crucial to define the DTE incoming email server, considering this configuration:

 .. tip::
   For your Go-live make sure you archive/remove from your inbox all the emails
-   related to vendor bills that are not required to be processed in Odoo. 
-   
+   related to vendor bills that are not required to be processed in Odoo.
+
 Certificate
 ~~~~~~~~~~~

-In order to generate the electronic invoice signature, a digital certificate with the extension ``.pfx``
-is required, proceed to this section and load your file and password. 
+In order to generate the electronic invoice signature, a digital certificate with the extension
+``pfx`` is required, proceed to this section and load your file and password.

 .. image:: chile/Chile03_3.png
   :align: center
@@ -109,22 +109,22 @@ is required, proceed to this section and load your file and password.

 .. image:: chile/Chile04.png
   :align: center
-   :alt: Digital certificate configuration.   
+   :alt: Digital certificate configuration.

 A certificate can be shared between several users. If this is the case leave the user field empty,
-so all your billing users can use the same one. On the other hand,  if you need to restrict the
+so all your billing users can use the same one. On the other hand, if you need to restrict the
 certificate for a particular user, just define the users in the certificate.

 .. note::
   In some cases, depending on the certificate format, it is possible that the field Subject Serial
   Number is not loaded automatically. If this is the case, you can manually edit this field by
-   filling it with the Certificate’s legal representative RUT.
+   filling it with the Certificate's legal representative RUT.

 Financial Reports
 ~~~~~~~~~~~~~~~~~

 The report Propuesta F29 requires two values that need to be defined as part of the company
-configuration: 
+configuration:

 .. image:: chile/Chile05.png
   :align: center
@@ -134,18 +134,18 @@ Multicurrency
 ~~~~~~~~~~~~~

 The official currency rate in Chile is provided by the Chilean service `mindicador.cl
-<https://mindicador.cl>`_. You can find this service in the currency rate configuration, and you can
-set a predefined interval for the rate updates.
+<https://mindicador.cl>`_. You can find this service in the currency rate configuration, and you
+can set a predefined interval for the rate updates.

 .. image:: chile/Chile05_2.png
   :align: center
   :alt: Currency reate service for Chile.
-   
+
 Chart of accounts
 ~~~~~~~~~~~~~~~~~

 The chart of accounts is installed by default as part of the set of data included in
-the localization module. The accounts are mapped automatically in: 
+the localization module. The accounts are mapped automatically in:

 - Taxes.
 - Default Account Payable.
@@ -169,7 +169,7 @@ are now available on the Partner form. This information is essential for most tr
 .. image:: chile/Chile06.png
   :align: center
   :alt: Chilean identification types for partners.
- 
+
 TaxpayerType
 ************

@@ -179,20 +179,20 @@ a customer is important you make sure this value is set:

 .. image:: chile/Chile07.png
   :align: center
-   :alt: Chilean taxpayer types for partners.   
- 
+   :alt: Chilean taxpayer types for partners.
+

 Electronic Invoice Data
 ***********************

 As part of the information that is sent in the electronic Invoice, you need to define the
 email that is going to appear as the sender of the electronic invoice to your customer, and
-the Industry description. 
+the Industry description.

 .. image:: chile/Chile07_2.png
   :align: center
   :alt: Chilean electronic invoice data for partners.
-   
+

 Taxes
 ~~~~~
@@ -209,7 +209,7 @@ Taxes Types

 Chile has several tax types, the most common ones are:

- VAT. Is the regular VAT and it can have several rates. 
+- VAT. Is the regular VAT and it can have several rates.
 - ILA (Impuesto a la Ley de Alcholes). Taxes for alcoholic drinks. It has a different rate.


@@ -217,7 +217,7 @@ Fiscal Positions
 ~~~~~~~~~~~~~~~~

 Based on the purchase transactions, the VAT can have different affections. This will be done
-in Odoo using the default purchase fiscal positions. 
+in Odoo using the default purchase fiscal positions.


 Document Types
@@ -230,7 +230,7 @@ Chile case: SII).
 The document type is essential information that needs to be displayed in the printed reports and
 that needs to be easily identified within the set of invoices as well of account moves.

-Each document type can have a unique sequence per company.  As part of the localization,
+Each document type can have a unique sequence per company. As part of the localization,
 the Document Type includes the country on which the document is applicable and the data
 is created automatically when the localization module is installed.

@@ -239,7 +239,7 @@ fill anything on this view:

 .. image:: chile/Chile09.png
   :align: center
-   :alt: Chilean fiscal document types list. 
+   :alt: Chilean fiscal document types list.

 .. note::
   There are several document types that are inactive by default but can be activated if needed.
@@ -253,7 +253,7 @@ The document type on each transaction will be determined by:
 - The Journal related to the Invoice, identifying if the journal uses documents.
 - Condition applied based on the type of Issues and Receiver (ex. Type of fiscal
  regimen of the buyer and type of fiscal regimen of the vendor).
-  
+

 Journals
 --------
@@ -269,7 +269,7 @@ Sales Journals in Odoo usually represent a business unit or location, example:
 - Ventas Santiago.
 - Ventas Valparaiso.

-For the retail stores is common to have one journal per POS: 
+For the retail stores is common to have one journal per POS:

 - Cashier 1.
 - Cashier 2.
@@ -289,50 +289,51 @@ bills but can be easily registered using this model, for example:
 Configuration
 ~~~~~~~~~~~~~

-When creating sales journals the next information must be filled in: 
+When creating sales journals the next information must be filled in:

 **Point of sale type**: If the Sales journal will be used for electronic documents, the option
 Online must be selected. Otherwise, if the journal is used for invoices imported from a previous
-system or if you are using the SII portal “Facturación MiPyme“ you can use the option Manual. 
+system or if you are using the SII portal “Facturación MiPyme“ you can use the option Manual.

 **Use Documents**: This field is used to define if the journal will use Document Types. It is only
-applicable to Purchase and Sales journals that can be related to the
-different sets of document types available in Chile. By default, all the sales journals created will
-use documents. 
-  
+applicable to Purchase and Sales journals that can be related to the different sets of document
+types available in Chile. By default, all the sales journals created will use documents.
+
 .. image:: chile/Chile41.png
   :align: center
   :alt: Document type configuration on Journal.
-   
+
 .. important::
   For the Chilean localization, it is important to define the default Debit and Credit accounts
   as they are required for one of the debit notes use cases.
-   
+
+.. _chile/caf-documentation:
+
 CAF
 ---

 A CAF (Folio Authorization Code) is required, for each document type that is issued to your
-customers, the CAF is a file the SII provides to the Emisor with the folio/sequence authorized 
+customers, the CAF is a file the SII provides to the Emisor with the folio/sequence authorized
 for the electronic invoice documents.

 Your company can make several requests for folios and obtain several CAFs, each one associated
 with different ranges of folios. The CAFs are shared within all the journals, this means
 that you only need one active CAF per document type and it will be applied on all journals.

-Please refer to the SII documentation to check the detail on how to acquire the CAF:
-`SII Timbraje <https://palena.sii.cl/dte/mn_timbraje.html>`_.
+Please refer to the `SII documentation <https://palena.sii.cl/dte/mn_timbraje.html>`_ to check the
+detail on how to acquire the CAF.

 .. important::
   The CAFs required by the SII are different from Production to Test (Certification mode). Make
   sure you have the correct CAF set depending on your environment.

-	
+
 Configuration
 ~~~~~~~~~~~~~

 Once you have the CAF files you need to associate them with a document type in Odoo,
 in order to add a CAF, just follow these steps:
- 
+
 1. Access to :menuselection:`Accounting --> Settings --> CAF`
 2. Upload the file.
 3. Save the CAF.
@@ -342,11 +343,11 @@ in order to add a CAF, just follow these steps:
   :alt: Steps to add a new CAF.

 Once loaded, the status changes to *In Use*. At this moment, when a transaction is used
-for this document type, the invoice number takes the first folio in the sequence. 
+for this document type, the invoice number takes the first folio in the sequence.

 .. important::
   In case you have used some folios in your previous system, make sure you set the next valid
-   folio when the first transaction is created. 
+   folio when the first transaction is created.



@@ -356,40 +357,42 @@ Usage and Testing
 Electronic Invoice Workflow
 ---------------------------

-In the Chilean localization the electronic Invoice workflow covers the Emission of
-Customer Invoices and the reception of Vendor Bills, in the next diagram we explain how
-the information transmitted to the SII and between the customers and Vendors. 
+In the Chilean localization the electronic Invoice workflow covers the Emission of Customer
+Invoices and the reception of Vendor Bills, in the next diagram we explain how the information
+transmitted to the SII and between the customers and Vendors.

 .. image:: chile/Chile14.png
   :align: center
   :alt: Diagram with Electronic invoice transactions.
-   
+

 Customer invoice Emission
 -------------------------

-After the partners and journals are created and configured, the invoices are created in
-the standard way, for Chile one of the differentiators is the document type which is selected
-automatically based on the Taxpayer. 
+After the partners and journals are created and configured, the invoices are created in the
+standard way, for Chile one of the differentiators is the document type which is selected
+automatically based on the Taxpayer.

-You can manually change the document type if needed. 
+You can manually change the document type if needed.

 .. image:: chile/Chile15.png
   :align: center
   :alt: Document type selection on invoices.
-   
+
 .. important::
   Documents type 33: Electronic Invoice must have at least one item with tax, otherwise the SII
   rejects the document validation.

+.. _chile/electronic-invoice-validation:
+
 Validation and DTE Status
 ~~~~~~~~~~~~~~~~~~~~~~~~~

-When all the invoice information is filled, either manually or automatically when it’s created
-from a sales order, proceed to validate the invoice.  After the invoice is posted:
+When all the invoice information is filled, either manually or automatically when it's created
+from a sales order, proceed to validate the invoice. After the invoice is posted:

 - The DTE File (Electronic Tax Document) is created automatically and added in the chatter.
- The DTE SII status is set as: Pending to be sent. 
+- The DTE SII status is set as: Pending to be sent.

  .. image:: chile/Chile16.png
     :align: center
@@ -397,60 +400,59 @@ from a sales order, proceed to validate the invoice.  After the invoice is poste

 The DTE Status is updated automatically by Odoo with a scheduled action that runs every day
 at night, if you need to get the response from the SII immediately you can do it manually as well.
-The DTE status workflow is as follows: 
+The DTE status workflow is as follows:

 .. image:: chile/Chile17.png
   :align: center
   :alt: Transition of DTE statuses.
-   
+

 1. In the first step the DTE is sent to the SII, you can manually send it using the button: Enviar
-   Ahora, a SII Tack number is generated and assigned to the invoice, you can use this number to 
+   Ahora, a SII Tack number is generated and assigned to the invoice, you can use this number to
   check the details the SII sent back by email. The DTE status is updated to Ask for Status.


-2. Once the SII response is received Odoo updates the DTE Status, in case you want to do it 
-   manually just click on the button: Verify on SII. The result can either be Accepted, Accepted 
+2. Once the SII response is received Odoo updates the DTE Status, in case you want to do it
+   manually just click on the button: Verify on SII. The result can either be Accepted, Accepted
   With Objection or Rejected.
-   
+
   .. image:: chile/Chile18.png
      :align: center
      :alt: Identification transaction for invoice and Status update.


-   There are several internal status in the SII before you get Acceptance or Rejection, in
-   case you click continuously  the Button Verify in SII, you will receive in the chatter the
-   detail of those intermediate statuses:
-   
+   There are several internal status in the SII before you get Acceptance or Rejection, in case you
+   click continuously the Button Verify in SII, you will receive in the chatter the detail of
+   those intermediate statuses:
+
   .. image:: chile/Chile18_2.png
      :align: center
      :alt: Descprtion of each DTE status in the chatter.

 3. The final response from the SII, can take on of these values:

-
   **Accepted:** Indicates the invoice information is correct, our document is now fiscally valid
-   and it’s automatically sent to the customer. 
+   and it's automatically sent to the customer.

-   **Accepted with objections:** Indicates the invoice information is correct but a minor issue
-   was identified, nevertheless our document is now fiscally valid and it’s automatically
-   sent to the customer.
+   **Accepted with objections:** Indicates the invoice information is correct but a minor issue was
+   identified, nevertheless our document is now fiscally valid and it's automatically sent to the
+   customer.

   .. image:: chile/Chile19.png
      :align: center
      :alt: Email track once it is sent to the customer.

-   **Rejected:** Indicates the information in the invoice is incorrect and needs to be
-   corrected, the detail of the issue is received in the emails you registered in the
-   SII, if it is properly configured in Odoo, the details are also retrieved
-   in the chatter once the email server is processed.
-	 
+   **Rejected:** Indicates the information in the invoice is incorrect and needs to be corrected,
+   the detail of the issue is received in the emails you registered in the SII, if it is properly
+   configured in Odoo, the details are also retrieved in the chatter once the email server is
+   processed.
+
   If the invoice is Rejected please follow this steps:
-	 
+
   * Change the document to draft.
   * Make the required corrections based on the message received from the SII.
   * Post the invoice again.
-	 
+
   .. image:: chile/Chile20.png
      :align: center
      :alt: Message when an invoice is rejected.
@@ -460,9 +462,9 @@ Crossed references
 ~~~~~~~~~~~~~~~~~~

 When the Invoice is created as a result of another fiscal document, the information related to the
-originator document must be registered in the Tab Cross Reference, which is commonly used for 
-credit or debit notes, but in some cases can be used on Customer Invoices as well. In the case of the
-credit and debit notes, they are set automatically by Odoo:
+originator document must be registered in the Tab Cross Reference, which is commonly used for
+credit or debit notes, but in some cases can be used on Customer Invoices as well. In the case of
+the credit and debit notes, they are set automatically by Odoo:

 .. image:: chile/Chile21.png
   :align: center
@@ -496,14 +498,14 @@ Once the invoice has been sent to the customer:
 .. image:: chile/Chile23.png
   :align: center
   :alt: Message with the commercial acceptance from the customer.
-   
+

 Processed for Claimed invoices
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-Once the invoice has been Accepted by the SII **it can not be cancelled in Odoo**.  In case you
-get a Claim for your customer the correct way to proceed is with a Credit Note to either cancel
-the Invoice or correct it. Please refer to the Credit Notes section for more details. 
+Once the invoice has been Accepted by the SII **it can not be cancelled in Odoo**. In case you get
+a Claim for your customer the correct way to proceed is with a Credit Note to either cancel the
+Invoice or correct it. Please refer to the :ref:`chile/credit-notes` section for more details.

 .. image:: chile/Chile24.png
   :align: center
@@ -513,55 +515,56 @@ Common Errors
 ~~~~~~~~~~~~~

 There are multiple reasons behind a rejection from the SII, but these are some of the common errors
-you might have and which is the related solution. 
+you might have and which is the related solution.

 - Error: ``RECHAZO- DTE Sin Comuna Origen.``
-  
-  *Hint:* Make sure the Company Address is properly filled including the State and City. 
+
+  *Hint:* Make sure the Company Address is properly filled including the State and City.

 - Error en Monto: ``- IVA debe declararse.``
-  
-  *Hint:* The invoice lines should include one VAT tax, make sure you add one on each invoice line. 
+
+  *Hint:* The invoice lines should include one VAT tax, make sure you add one on each invoice line.

 - Error: ``Rut No Autorizado a Firmar.``
-  
-  *Hint:* The invoice lines should include one VAT tax, make sure you add one on each invoice line. 
+
+  *Hint:* The invoice lines should include one VAT tax, make sure you add one on each invoice line.

 - Error: ``Fecha/Número Resolucion Invalido RECHAZO- CAF Vencido : (Firma_DTE[AAAA-MM-DD] -
  CAF[AAAA-MM-DD]) &gt; 6 meses.``
-  
-  *Hint:* Try to add a new CAF related to this document as the one you’re using is expired.
-  
+
+  *Hint:* Try to add a new CAF related to this document as the one you're using is expired.
+
 - Error: ``Element '{http://www.sii.cl/SiiDte%7DRutReceptor': This element is not expected. Expected
  is ( {http://www.sii.cl/SiiDte%7DRutEnvia ).``
-  
+
  *Hint:* Make sure the field Document Type and VAT are set either in the Customer and in the main
  company.
-   
+
 - GLOSA: ``Usuario sin permiso de envio.``
-  
+
  *Hint:* This error indicates that most likely, your company has not passed the `Certification
-  process <https://www.sii.cl/factura_electronica/factura_mercado/proceso_certificacion.htm>`_ in 
-  the SII - Sistema de Facturación de Mercado. If this is the case, please contact your Account 
-  Manager or Customer Support as this certification is not part of the the Odoo services,
-  but we can give you some alternatives.
-
+  process <https://www.sii.cl/factura_electronica/factura_mercado/proceso_certificacion.htm>`_ in
+  the SII - Sistema de Facturación de Mercado. If this is the case, please contact your Account
+  Manager or Customer Support as this certification is not part of the the Odoo services, but we
+  can give you some alternatives.

+.. _chile/credit-notes:

 Credit Notes
 ------------

 When a cancellation or correction is needed over a validated invoice, a credit note must be
 generated. It is important to consider that a CAF file is required for the Credit Note,
-which is identified as document 64 in the SII.  
+which is identified as document 64 in the SII.

 .. image:: chile/Chile40.png
   :align: center
   :alt: Creation of CAF for Credit notes.


-.. tip:: Refer to the CAF section where we described the process to load the CAF on each 
-   document type.
+.. tip::
+   Refer to the :ref:`CAF section <chile/caf-documentation>` where we described the process to load
+   the CAF on each document type.

 Use Cases
 ~~~~~~~~~
@@ -569,24 +572,24 @@ Use Cases
 Cancel Referenced document
 **************************

-In case you need  to cancel or invalid an Invoice, use the button Add Credit note and select Full
+In case you need to cancel or invalid an Invoice, use the button Add Credit note and select Full
 Refund, in this case the SII reference Code is automatically set to: Anula Documento de referencia.

 .. image:: chile/Chile26.png
-   :align: center 
-   :alt: Full invoice refund with SII reference code 1. 
+   :align: center
+   :alt: Full invoice refund with SII reference code 1.

 Corrects Referenced Document Text
 *********************************

 If a correction in the invoice information is required, for example the Street Name, use the button
 Add Credit note,select Partial Refund and select the option “Solo corregir Texto”. In this case
-the SII reference Code is automatically set to: Corrige el monto del Documento de Referencia. 
+the SII reference Code is automatically set to: Corrige el monto del Documento de Referencia.

 .. image:: chile/Chile27.png
   :align: center
   :alt: Partial refund to correct text including the corrected value.
-   
+
 Odoo creates a Credit Note with the corrected text in an invoice and price 0.

 .. image:: chile/Chile28.png
@@ -594,15 +597,15 @@ Odoo creates a Credit Note with the corrected text in an invoice and price 0.
   :alt: Credit note with the corrected value on the invoice lines.

 .. important::
-   It’s important to define the default credit account in the Sales journal as it
-   is taken for this use case in specific. 
+   It's important to define the default credit account in the Sales journal as it
+   is taken for this use case in specific.

 Corrects Referenced Document Amount
 ***********************************

-When a correction on the amounts is required, use the button Add Credit note
-and select Partial Refund. In this case the SII reference Code is automatically
-set to: Corrige el monto del Documento de Referencia.
+When a correction on the amounts is required, use the button Add Credit note and select Partial
+Refund. In this case the SII reference Code is automatically set to: Corrige el monto del Documento
+de Referencia.

 .. image:: chile/Chile30.png
   :align: center
@@ -612,8 +615,8 @@ Debit Notes
 -----------

 As part of the Chilean localization, besides creating credit notes from an existing document you
-can also create debit Notes. For this just use the button “Add Debit Note”.  The two main use
-cases for debit notes are detailed below. 
+can also create debit Notes. For this just use the button “Add Debit Note”. The two main use cases
+for debit notes are detailed below.

 Use Cases
 ~~~~~~~~~
@@ -627,8 +630,8 @@ need to select option 3 in the field Reference code SII:
 .. image:: chile/Chile31.png
   :align: center
   :alt: Debit note for partial refund to crrect amounts, using the SII reference code 3.
-   
-   
+
+
 In this case Odoo automatically includes the source invoice in the cross reference section:

 .. image:: chile/Chile32.png
@@ -639,64 +642,230 @@ Cancel Credit Notes
 *******************

 In Chile the debits notes are used to cancel a validated Credit Note, in this case just
-select the button Add debit note and select the first option in the wizard: *1: Anula 
+select the button Add debit note and select the first option in the wizard: *1: Anula
 Documentos de referencia.*

 .. image:: chile/Chile33.png
   :align: center
   :alt: Creating a debit note to cancel a credit note with the SII code reference 1.

-
 Vendor Bills
 ------------

 As part of the Chilean localization, you can configure your Incoming email server as the same you
 have register in the SII in order to:

- Automatically receive the vendor bills DTE and create the vendor bill based on this information. 
- Automatically Send the reception acknowledgement to your vendor. 
- Accept or Claim the document and send this status to your vendor. 
-
+- Automatically receive the vendor bills DTE and create the vendor bill based on this information.
+- Automatically Send the reception acknowledgement to your vendor.
+- Accept or Claim the document and send this status to your vendor.

 Reception
 ~~~~~~~~~

 As soon as the vendor email with the attached DTE is received:
 1. The vendor Bill mapping all the information included in the xml.
-2. An email is sent to the vendor with the Reception acknowledgement. 
-3. The DTE status is set as:  Acuse de Recibido Enviado
+2. An email is sent to the vendor with the Reception acknowledgement.
+3. The DTE status is set as: Acuse de Recibido Enviado

 .. image:: chile/Chile34.png
   :align: center
-   :alt: Messages recorded in the chatter with the reception notification for the vendor. 
+   :alt: Messages recorded in the chatter with the reception notification for the vendor.

 Acceptation
 ~~~~~~~~~~~

-If all the commercial information is correct on your vendor bill, you can accept the document using
-the button: Aceptar Documento, once this is done the DTE Acceptation Status  changes to: Accepted and
-an email of acceptance is sent to the vendor. 
+If all the commercial information is correct on your vendor bill then you can accept the document
+using the :guilabel:`Aceptar Documento` button. Once this is done the DTE Acceptation Status
+changes to :guilabel:`Accepted`` and an email of acceptance is sent to the vendor.

 .. image:: chile/Chile35.png
   :align: center
-   :alt: Acceptance button in vendor bills to inform the vendor all the document is comercially accepted.
-   
+   :alt: Acceptance button in vendor bills to inform vendor the document is comercially accepted.

 Claim
 ~~~~~

 In case there is a commercial issue or the information is not correct on your vendor bill, you can
-Claim the document before validating it,  using the button: Claim, once this is done the DTE
-Acceptation Status  change to: Claim  and an email of acceptance is sent to the vendor. 
+Claim the document before validating it, using the button: Claim, once this is done the DTE
+Acceptation Status change to: Claim and an email of acceptance is sent to the vendor.

 .. image:: chile/Chile36.png
   :align: center
   :alt: Claim button in vendor bills to inform the vendor all the document is comercially rejected.
-   
-If you claim a vendor bill, the status changes from draft to cancel automatically. Considering this
-as best practice, all the Claim documents should be canceled as they won’t be valid for your
-accounting records. 

+If you claim a vendor bill, the status changes from draft to cancel automatically. Considering this
+as best practice, all the Claim documents should be canceled as they won't be valid for your
+accounting records.
+
+Delivery Guide
+--------------
+
+To install the Delivery Guide module, go to :menuselection:`Apps` and search for :guilabel:`Chile
+(l10n_cl)`. Then click :guilabel:`Install` on the module :guilabel:`Chile - E-Invoicing Delivery
+Guide`.
+
+.. note::
+   *Chile - E-Invoicing Delivery Guide* has a dependency with *Chile - Facturación Electrónica*.
+   Odoo will install the dependency automatically when the Delivery Guide module is installed.
+
+The Delivery Guide module includes sending the DTE to SII and the stamp in PDF reports for
+deliveries.
+
+.. image:: chile/chile42.png
+   :align: center
+   :alt: Install Delivery Guide Module
+
+Once all configurations have been made for electronic invoices (e.g., uploading a valid company
+certificate, setting up master data, etc.), Delivery Guides need their own CAFs. Please refer to the
+:ref:`CAF documentation <chile/caf-documentation>` to check the details on how to acquire the CAFs
+for electronic Delivery Guides.
+
+Verify the following important information in the *Price for the Delivery Guide* configuration:
+
+- :guilabel:`From Sales Order`: Delivery Guide takes the product price from the Sales Order and
+  shows it on the document.
+- :guilabel:`From Product Template`: Odoo takes the price configured in the product template and
+  shows it on the document.
+- :guilabel:`No show price`: no price is shown in the Delivery Guide.
+
+Electronic delivery guides are used to move stock from one place to another and they can represent
+sales, sampling, consignment, internal transfers, and basically any product move.
+
+Delivery Guide from a Sales Process
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When a Sales Order is created and confirmed, a Delivery Order is generated. After validating the
+Delivery Order, the option to create a Delivery Guide is activated.
+
+.. image:: chile/chile43.png
+   :align: center
+   :alt: Create Delivery Guide Button
+
+When clicking on :guilabel:`Create Delivery Guide` for the first time, a warning message pops up,
+showing the following:
+
+.. image:: chile/chile44.png
+   :align: center
+   :alt: An example sequence error when creating a Delivery Guide in Odoo
+
+This warning message means the user needs to indicate the next sequence number Odoo has to take to
+generate the Delivery Guide, and only only happens the *first time* a Delivery Guide is created in
+Odoo. After the first document has been correctly generated, Odoo takes the CAFs next available
+number to generate the following Delivery Guide and so on.
+
+After the Delivery Guide is created:
+
+- The DTE file (Electronic Tax Document) is automatically created and added to the chatter.
+- The DTE SII status is set as: Pending to be sent.
+
+.. image:: chile/chile45.png
+   :align: center
+   :alt: DTE Status in SII and creation of DTE/XML
+
+The DTE Status is automatically updated by Odoo with a scheduled action that runs every day at
+night. To get a response from the SII immediately, press the :guilabel:`Send now to SII` button.
+
+Once the Delivery Guide is sent, it may then be printed by clicking on the :guilabel:`Print
+Delivery Guide` button.
+
+.. image:: chile/chile46.png
+   :align: center
+   :alt: Printing Delivery Guide PDF
+
+Electronic Receipt
+------------------
+
+To install the Electronic Receipt module, go to :menuselection:`Apps` and search for
+:guilabel:`Chile (l10n_cl)`. Then click :guilabel:`Install` on the module :guilabel:`Chile -
+Electronic Receipt`.
+
+.. note::
+   *Chile - Electronic Receipt* has a dependency with *Chile - Facturación Electrónica*. Odoo will
+   install the dependency automatically when the E-invoicing Delivery Guide module is installed.
+
+This module contains the electronic receipt and daily sales report, which are automatically sent to
+SII.
+
+.. image:: chile/chile47.png
+   :align: center
+   :alt: Install Electronic Receipt module
+
+Once all configurations have been made for Electronic Invoices (e.g., uploading a valid company
+certificate, setting up master data, etc.), Electronic Receipts need their own CAFs. Please refer
+to the :ref:`CAF documentation <chile/caf-documentation>` to check the details on how to acquire the
+CAFs for Electronic Receipts.
+
+Electronic Receipts are useful when clients do not need an Electronic Invoice. By default, there is
+a partner in the database called *Anonymous Final Consumer* with a generic RUT 66666666-6 and
+taxpayer type of *Final Consumer*. This partner can be used for Electronic Receipts or a new record
+may be created for the same purpose.
+
+Although Electronic Receipts should be used for final consumers with a generic RUT, it can also be
+used for specific partners. After the partners and journals are created and configured, the
+Electronic Receipts are created in the standard way as Electronic Invoice, but the type of document
+:guilabel:`(39) Electronic Receipt` should be selected, like so:
+
+.. image:: chile/chile48.png
+   :align: center
+   :alt: Select type of Document: (39) Boleta Electrónica
+
+Validation and DTE Status
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When all of the Electronic Receipt information is filled, either manually or automatically from a
+Sales Order, proceed to validate the receipt. By default, Electronic Invoice is selected as the
+Document Type, however in order to validate the receipt correctly, make sure to edit the Document
+Type and change to Electronic Receipt.
+
+After the receipt is posted:
+
+- The DTE file (Electronic Tax Document) is created automatically and added to the chatter.
+- The DTE SII status is set as: Pending to be sent.
+
+.. image:: chile/chile49.png
+   :align: center
+   :alt: DTE status in SII and creation of DTE/XML
+
+The DTE Status is automatically updated by Odoo with a scheduled action that runs every day at
+night. To get a response from the SII immediately, press the :guilabel:`Send now to SII` button.
+
+Please refer to the :ref:`DTE Workflow <chile/electronic-invoice-validation>` for Electronic
+Invoices as the workflow for Electronic Receipt follows the same process.
+
+Daily Sales Report
+~~~~~~~~~~~~~~~~~~
+
+Once Electronic Receipts have been created, the system creates a daily sales report containing all
+Electronic Receipts per day. This report is electronically stamped and sent to the SII overnight in
+XML format. These daily reports can be found in :menuselection:`Reports --> Daily Sales Reports`.
+
+.. image:: chile/chile50.png
+   :align: center
+   :alt: Find Electronic Receipts in the Reports menu, under Daily Sales Reports
+
+A list of daily reports is displayed with all daily DTE sent to SII.
+
+.. image:: chile/chile51.png
+   :align: center
+   :alt: List of Daily Reports
+
+If no Electronic Receipt was made on a particular day, the report is sent but it will not have any
+receipts in it. The report will also have an answer from the SII if it was accepted or rejected
+(depending on the company's certificate and validated receipts).
+
+.. image:: chile/chile52.png
+   :align: center
+   :alt: Daily Sales Book example
+
+.. important::
+   For Chilean localization, note that the feature tax included in the price is *not* supported for
+   the Electronic Receipt.
+
+   If a Daily Sales Report has already been created for a specific day in another system, the daily
+   report in Odoo will be rejected due to the sequence number used. If that is the case, the user
+   has to manually click on :guilabel:`Retry` in order for a new sequence number to be generated
+   (this action is automatically done by Odoo). Afterwards, users can manually verify report status
+   with SII or wait for Odoo to update status later at night.

 Financial Reports
 =================
@@ -706,7 +875,7 @@ Balance Tributario de 8 Columnas

 This report presents the accounts in detail (with their respective balances), classifying them
 according to their origin and determining the level of profit or loss that the business had within
-the evaluated period of time, so that a real and complete knowledge of the status of a company. 
+the evaluated period of time, so that a real and complete knowledge of the status of a company.

 You can find this report in :menuselection:`Accounting --> Accounting --> Reports`

@@ -719,9 +888,9 @@ Propuesta F29

 The form F29 is a new system that the SII enabled to taxpayers, and that replaces the Purchase and
 Sales Books. This report is integrated by Purchase Register (CR) and the Sales Register (RV).
-Its purpose is to support the transactions related to VAT, improving its control and declaration. 
+Its purpose is to support the transactions related to VAT, improving its control and declaration.

-This record is supplied by the electronic tax documents (DTE’s) that have been received by the
+This record is supplied by the electronic tax documents (DTE's) that have been received by the
 SII.

 You can find this report in :menuselection:`Accounting --> Accounting --> Reports`
@@ -0,0 +1,189 @@
+=====
+India
+=====
+
+.. _india/installation:
+
+Installation
+============
+
+:ref:`Install <general/install>` the following modules to get all the features of the Indian
+localization:
+
+.. list-table::
+   :header-rows: 1
+
+   * - Name
+     - Technical name
+     - Description
+   * - :guilabel:`Indian - Accounting`
+     - `l10n_in`
+     - Default :doc:`fiscal localization package <../overview/fiscal_localization_packages>`
+   * - :guilabel:`Indian E-invoice Integration`
+     - `l10n_in_edi`
+     - :ref:`Indian e-invoicing integration <india/e-invoicing>`
+
+.. _india/e-invoicing:
+
+Indian e-invoicing
+==================
+
+Odoo is compliant with the **Indian Good and Services Tax (GST) e-Invoice system** requirements.
+
+.. important::
+   Indian e-invoicing is available from Odoo 15.0. If needed, :doc:`upgrade
+   </administration/upgrade>` your database.
+
+.. _india/e-invoicing-api:
+
+Registration on your NIC e-Invoice web portal
+---------------------------------------------
+
+You must register on the **NIC e-Invoice** web portal to get your **API credentials**. You need
+these credentials to :ref:`configure your Odoo Accounting app <india/e-invoicing-configuration>`.
+
+#. Login to the NIC e-Invoice web portal on - https://einvoice1.gst.gov.in/ by clicking on
+   :guilabel:`Login` and entering your :guilabel:`Username` and :guilabel:`Password`.
+
+   .. note::
+      If you have already registered on the NIC Eway Bill Production portal, then you can use the
+      same login credentials here.
+
+   .. image:: india/e-invoice-system-login.png
+      :align: center
+      :alt: Register Odoo ERP system on e-invoice web portal
+
+#. From your dashboard, go to :menuselection:`API Registration --> User Credentials --> Create API
+   User`.
+
+   .. image:: india/e-invoice-create-api-user.png
+      :align: center
+      :alt: Click on User Credentials and Create API User
+
+#. After that, you receive an :abbr:`OTP (one-time password)` code to your registered mobile number.
+#. Enter the OTP code and click on :guilabel:`Verify OTP`.
+
+   .. image:: india/trigger-otp.png
+      :align: center
+      :alt: Trigger an OTP to your registerd phone number
+
+#. Select :guilabel:`Through GSP` in the first field, select :guilabel:`Tera Software Limited`
+   as your GSP, and type in a :guilabel:`Username` and :guilabel:`Password` for your API.
+
+   .. image:: india/submit-api-registration-details.png
+      :align: center
+      :alt: Submit API specific Username and Password
+
+#. Click on :guilabel:`Submit`.
+
+.. _india/e-invoicing-configuration:
+
+Configuration on Odoo
+---------------------
+
+To set up the e-invoice service, go to :menuselection:`Accounting --> Configuration --> Settings -->
+Indian Electronic Invoicing`, and enter the :guilabel:`Username` and :guilabel:`Password`.
+
+.. image:: india/e-invoice-setup.png
+   :align: center
+   :alt: Setup e-invoice service
+
+.. _india/e-invoicing-journals:
+
+Journals
+~~~~~~~~
+
+Your default *sales* journal should be already configured correctly. You can check it or configure
+other journals by going to :menuselection:`Accounting --> Configuration --> Journals`. Then, open
+your *sales* journal, and in the :guilabel:`Advanced Settings` tab, under :guilabel:`Electronic Data
+Interchange`, check :guilabel:`E-Invoice (IN)` and :guilabel:`Save`.
+
+.. image:: india/journal-configuration.png
+   :align: center
+   :alt: Journal configuration
+
+.. _india/e-invoicing-workflow:
+
+Workflow
+--------
+
+To start invoicing from Odoo, an invoice must be created using the standard invoicing flow, that is,
+either from a sales order or the invoice menu in the Accounting application.
+
+.. _india/invoice-validation:
+
+Invoice validation
+~~~~~~~~~~~~~~~~~~
+
+Once the invoice is validated, a confirmation message is displayed at the top.
+
+Odoo automatically uploads the JSON-signed file to the government portal after a while. If you want
+to process the invoice immediately, you can click on :guilabel:`Process Now`.
+
+.. image:: india/e-invoice-process.png
+   :align: center
+   :alt: Indian e-invoicing confirmation message: "The invoice will be processed asynchronously by
+         the following E-invoicing service : E-Invoice (IN)"
+
+.. note::
+   - You can find the JSON-signed file in the attached files, in the chatter.
+   - You can check the status of EDI with web-service under the :guilabel:`EDI Document` tab or the
+     :guilabel:`Electronic invoicing` field.
+
+.. _india/invoice-pdf-report:
+
+Invoice PDF Report
+~~~~~~~~~~~~~~~~~~
+
+Once the invoice is submitted and validated, you can print the invoice PDF report. The report
+includes the :abbr:`IRN (Invoice Reference Number)`, acknowledgment number and date, and QR code.
+They certify that the invoice is a valid fiscal document.
+
+.. image:: india/invoice-report.png
+   :align: center
+   :alt: IRN and QR code
+
+.. _india/edi-cancellation:
+
+EDI Cancellation
+~~~~~~~~~~~~~~~~
+
+If you want to cancel an e-invoice, go to the :guilabel:`Other info` tab of the invoice and fill out
+the :guilabel:`Cancel reason` and :guilabel:`Cancel remarks` fields. Then, click on
+:guilabel:`Request EDI cancellation`. The status of the :guilabel:`Electronic invoicing` field
+changes to :guilabel:`To Cancel`.
+
+.. image:: india/e-invoice-cancellation.png
+   :align: center
+   :alt: cancel reason and remarks
+
+.. note::
+   If you want to abort the cancellation before processing the invoice, then click on
+   :guilabel:`Call Off EDI Cancellation`.
+
+Once you request to cancel the e-invoice, Odoo automatically submits the JSON Signed file to the
+government portal. If you want to process the invoice immediately, you can process it by clicking on
+:guilabel:`Process Now`.
+
+.. _india/verify-e-invoice:
+
+Verify the e-invoice from the GST
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+After submitting an e-invoice, you can also verify the signed invoice from the GST e-Invoice system
+website.
+
+#. Download the JSON file from the attached files.
+#. Open the e-invoice portal: https://einvoice1.gst.gov.in/ and go to :menuselection:`Search -->
+   Verify Signed Invoice`.
+#. Select the JSON file and submit it.
+
+   .. image:: india/verify-invoice.png
+      :align: center
+      :alt: select the JSON file for verify invoice
+
+#. You can check the verified signed e-invoice here.
+
+   .. image:: india/signed-invoice.png
+      :align: center
+      :alt: verified e-invoice
@@ -8,9 +8,21 @@ Configuration
 :ref:`Install <general/install>` the following modules to get all the features of the Luxembourgish
 localization:

- :guilabel:`Luxembourg - Accounting` (module's technical name: ``l10n_lu``).
- :guilabel:`Luxembourg - Accounting Reports` (module's technical name: ``l10n_lu_reports``).
- :guilabel:`Luxembourg - Annual VAT Report` (module's technical name: ``l10n_lu_reports_annual_vat``).
+.. list-table::
+   :header-rows: 1
+
+   * - Name
+     - Technical name
+     - Description
+   * - :guilabel:`Luxembourg - Accounting`
+     - `l10n_lu`
+     - Default :doc:`fiscal localization package <../overview/fiscal_localization_packages>`
+   * - :guilabel:`Luxembourg - Accounting Reports`
+     - `l10n_lu_reports`
+     - Country-specific reports
+   * - :guilabel:`Luxembourg - Annual VAT Report`
+     - `l10n_lu_reports_annual_vat`
+     - Country-specific reports

 .. image:: luxembourg/modules.png
   :align: center
@@ -31,8 +31,8 @@ localization in Odoo, it is necessary to meet the following requirements:
 #. Be registered with the SAT and have an RFC.
 #. Have a `Certificate of Digital Seal
   <https://www.gob.mx/sat/acciones-y-programas/certificado-de-sello-digital>`_ (CSD).
-#. Choose a PAC and purchase stamps. Currently the Mexican location in Odoo works with two PACs:
-   `Solución Factible <https://solucionfactible.com/>`_, `Quadrum (formerly Finkok)
+#. Choose a PAC and purchase stamps. Currently the Mexican location in Odoo works with the following
+   PACs: `Solución Factible <https://solucionfactible.com/>`_, `Quadrum (formerly Finkok)
   <https://cfdiquadrum.com.mx/index.html>`_ and `SW Sapien - Smarter Web <https://sw.com.mx/>`_.
 #. Have knowledge and experience with billing, sales and accounting in Odoo. This documentation
   contains only the information necessary to enable the use of Odoo in a company based in Mexico.
@@ -232,9 +232,8 @@ directly to its services and get the currency rate either automatically or manua
   :align: center
   :alt: Bank of Peru is displayed in Multicurrency Service option
   
-Please refer to the next section in our documentation for more information about :doc:`multicurrency
-<../../others/multicurrencies/how_it_works>`.
-
+Please refer to the next section in our documentation for more information about
+:doc:`multicurrencies <../../others/multi_currency>`.

 Configure Master data
 ---------------------
@@ -176,7 +176,7 @@ Payment Method
 This menu helps you configure the payment methods with which your customers can pay you.

 .. important::
-   Configuring a *Payment Acquirer* with this tool also activates the *Invoice Online Payment*
+   Configuring a *Payment Provider* with this tool also activates the *Invoice Online Payment*
   option automatically. With this, users can directly pay online, from their Customer Portal.

 .. _invoicing-setup-sample:
@@ -7,7 +7,7 @@ Others
 .. toctree::
   :titlesonly:

+   others/multi_currency
   others/analytic
   others/adviser
-   others/multicurrencies
   others/inventory
@@ -0,0 +1,167 @@
+=====================
+Multi-currency system
+=====================
+
+Odoo allows you to issue invoices, receive bills, and record transactions in currencies other than
+the main currency configured for your company. You can also set up bank accounts in other currencies
+and run reports on your foreign currency activities.
+
+.. seealso::
+   - :doc:`../bank/setup/foreign_currency`
+
+.. _multi-currency/config:
+
+Configuration
+=============
+
+.. _multi-currency/config-main-currency:
+
+Main currency
+-------------
+
+The **main currency** is defined by default according to the company's country. You can change it by
+going to :menuselection:`Accounting --> Configuration --> Settings --> Currencies` and changing the
+currency in the :guilabel:`Main Currency` setting.
+
+.. _multi-currency/config-enable:
+
+Enable foreign currencies
+-------------------------
+
+Go to :menuselection:`Accounting --> Configuration --> Currencies`, and enable the currencies you
+wish to use by toggling the :guilabel:`Active` button.
+
+.. image:: multi_currency/enable-foreign-currencies.png
+   :align: center
+   :alt: Enable the currencies you wish to use.
+
+.. _multi-currency/config-rates:
+
+Currency rates
+--------------
+
+Manual update
+~~~~~~~~~~~~~
+
+To manually create and set a currency rate, go to :menuselection:`Accounting --> Configuration -->
+Currencies`, click on the currency you wish to change the rate of, and under the :guilabel:`Rates`
+tab, click :guilabel:`Add a line` to create a new rate.
+
+.. image:: multi_currency/manual-rate-update.png
+  :align: center
+  :alt: Create or modify the currency rate.
+
+Automatic update
+~~~~~~~~~~~~~~~~
+
+When you activate a second currency for the first time, :guilabel:`Automatic Currency Rates` appears
+under :menuselection:`Accounting Dashboard --> Configuration --> Settings --> Currencies`. By
+default, you have to click on the **Update now** button (:guilabel:`🗘`) to update the rates.
+
+Odoo can update the rates at regular intervals. To do so, change the :guilabel:`Interval` from
+:guilabel:`Manually` to :guilabel:`Daily`, :guilabel:`Weekly`, or :guilabel:`Monthly`. You can also
+select the web service from which you want to retrieve the latest currency rates by clicking on the
+:guilabel:`Service` field.
+
+.. _multi-currency/config-exch-diff:
+
+Exchange difference entries
+---------------------------
+
+Odoo automatically records exchange differences entries on dedicated accounts, in a dedicated
+journal.
+
+You can define which journal and accounts to use to **post exchange difference entries** by
+going to :menuselection:`Accounting --> Configuration --> Settings --> Default Accounts` and editing
+the :guilabel:`Journal`, :guilabel:`Gain Account`, and :guilabel:`Loss Account`.
+
+.. example::
+   If you receive a payment for a customer invoice one month after it was issued, the exchange rate
+   has likely changed since. Therefore, this fluctuation implies some profit or loss due to the
+   exchange difference, which Odoo automatically records in the default **Exchange Difference**
+   journal.
+
+.. _multi-currency/config-coa:
+
+Chart of accounts
+-----------------
+
+Each account can have a set currency. By doing so, all moves relevant to the account are forced to
+have that account's currency.
+
+To do so, go to :menuselection:`Accounting --> Configuration --> Charts of Accounts` and select a
+currency in the field :guilabel:`Account Currency`. If left empty, all active currencies are handled
+instead of just one.
+
+.. _multi-currency/config-journals:
+
+Journals
+--------
+
+If a currency is set on a **journal**, that journal only handles transactions in that currency.
+
+To do so, go to :menuselection:`Accounting --> Configuration --> Journals`, open the journal you
+want to edit, and select a currency in the field :guilabel:`Currency`. If left empty, all active
+currencies are handled instead of just one.
+
+.. image:: multi_currency/journal-currency.png
+   :align: center
+   :alt: Select the currency for the journal to handle.
+
+.. _multi-currency/mca:
+
+Multi-currency accounting
+=========================
+
+.. _multi-currency/mca-documents:
+
+Invoices, bills, and other documents
+------------------------------------
+
+For all documents, you can select the currency and journal to use for the transaction.
+
+.. image:: multi_currency/currency-field.png
+   :align: center
+   :alt: Select the currency and journal to use.
+
+.. _multi-currency/mca-payment:
+
+Payment registration
+--------------------
+
+To register a payment in a currency other than your company's main currency, click on the
+:guilabel:`Register Payment` payment button of your document and, in the pop-up window, select a
+**currency** in the :guilabel:`Amount` field.
+
+.. image:: multi_currency/register-payment.png
+  :align: center
+  :alt: Select the currency and journal to use before registering the payment.
+
+.. _multi-currency/mca-statements:
+
+Bank statements
+---------------
+
+When creating or importing bank statements, the amount is in the company's main currency. To see
+additional fields related to foreign currencies, click on the **columns dropdown button**
+(:guilabel:`⋮`) next to :guilabel:`Amount`, and check :guilabel:`Amount Currency` and
+:guilabel:`Foreign Currency`.
+
+.. image:: multi_currency/foreign-fields.png
+  :align: center
+  :alt: The extra fields related to foreign currencies.
+
+When reconciling, Odoo displays both the foreign currency amount and the equivalent amount in your
+company's main currency.
+
+.. _multi-currency/mca-exch-entries:
+
+Exchange rate journal entries
+-----------------------------
+
+To see **exchange difference journal entries**, go to :menuselection:`Accounting Dashboard -->
+Accounting --> Journals: Miscellaneous`.
+
+.. image:: multi_currency/exchange-journal-currency.png
+   :align: center
+   :alt: Exchange rate journal entry.
@@ -1,12 +0,0 @@
-:nosearch:
-
-=============
-Multicurrency
-=============
-
-.. toctree::
-   :titlesonly:
-
-   multicurrencies/how_it_works
-   multicurrencies/invoices_payments
-   multicurrencies/exchange
@@ -1,112 +0,0 @@
-=================================
-Record exchange rates at payments
-=================================
-
-Overview
-========
-
-Any company doing international trade faces the case where the payments
-are in a different currency.
-
-After receiving their payments, you have the option to convert the
-amount into your company currency. Multi currency payment implies rates
-fluctuations. The rate differences are automatically recorded by Odoo.
-
-Configuration
-=============
-
-Enable multi-currencies
-----------------------
-
-In the accounting module, Go to :menuselection:`Configuration --> Settings` 
-and flag **Allow multi currencies**, then click on **apply**.
-
-.. image:: exchange/exchange_rate03.png
-   :align: center
-
-Configure the currency rates in :menuselection:`Configuration --> Currencies`.
-Write down the rate and make sure the currency is active.
-
-.. image:: exchange/exchange_rate02.png
-   :align: center
-
-In this document, the base currency is **Euro** and we will record payments
-in **Dollars**.
-
-.. image:: exchange/exchange_rate08.png
-   :align: center
-
-.. tip:: 
-    You can automatically fetch the currency rates from the **European
-    Central Bank** or from **Yahoo**. Please read the document : 
-    :doc:`how_it_works`.
-
-Configure your journal
----------------------
-
-In order to register payments in other currencies, you have to **remove
-the currency constraint** on the journal. Go to the accounting
-application, Click on **More** on the journal and **Settings**.
-
-.. image:: exchange/exchange_rate06.png
-   :align: center
-
-Check if the **Currency** field is empty or in the foreign currency in which
-you will register the payments. If a currency is filled in, it means
-that you can register payments only in this currency.
-
-.. image:: exchange/exchange_rate10.png
-   :align: center
-
-Record a payment in a different currency
-========================================
-
-In the **Accounting** application, go to :menuselection:`Sales --> Payments`. 
-Register the payment and indicate that it was done in the foreign currency. Then
-click on **confirm**.
-
-.. image:: exchange/exchange_rate05.png
-   :align: center
-
-The journal entry has been posted but not allocated.
-
-Go back to your invoice (:menuselection:`Sales --> Customer Invoices`) and click on
-**Add** to allocate the payment.
-
-.. image:: exchange/exchange_rate04.png
-   :align: center
-
-Record a bank statement in a different currency
-===============================================
-
-Create or import the bank statement of your payment. The **Amount** is in
-the company currency. There are two complementary fields, the **Amount currency**, 
-which is the amount that was actually paid and the **Currency** in which it was paid.
-
-.. image:: exchange/exchange_rate07.png
-   :align: center
-
-When reconciling it, Odoo will directly match the payment with the right
-**Invoice**. You will get the invoice price in the invoice currency and the
-amount in your company currency.
-
-.. image:: exchange/exchange_rate09.png
-   :align: center
-
-Check the exchange rate differences
-===================================
-
-Go to :menuselection:`Adviser --> Journal Entries` and look for the **Exchange difference**
-journal entries. All the exchange rates differences are recorded in it.
-
-.. image:: exchange/exchange_rate01.png
-   :align: center
-
-.. tip::
-    The Exchange difference journal can be changed in your accounting settings.
-
-.. include:: exchange/full_reconcile_warning.rst
-
-.. seealso::
-    * :doc:`../../bank/reconciliation/reconciliation_models`
-    * :doc:`../../bank/reconciliation/use_cases`
@@ -1,7 +0,0 @@
-.. warning::
-    In order for an exchange difference entry to be created automatically, the
-    corresponding invoices and payments need to be fully reconciled. This means
-    the invoices are fully paid and the payments are fully spent on invoices.
-    If you partially pay 3 invoices from 2 payments, and the last invoice still
-    has an amount due, there will be no exchange difference entry for any of
-    them until that final amount is paid.
@@ -1,171 +0,0 @@
-============================
-Odoo's multi-currency system
-============================
-
-Overview
-========
-
-Choosing to use the multi-currency option in Odoo will allow you to send
-sales invoices, quotes and purchase orders or receive bills and payments
-in currencies other than your own. With multi-currency, you can also set
-up bank accounts in other currencies and run reports on your foreign
-currency activities.
-
-Configuration
-=============
-
-Turn on multi-currency
----------------------
-
-In the accounting module, Go to :menuselection:`Configuration --> Settings` and flag
-**Allow multi currencies**, then click on **Apply**.
-
-.. image:: how_it_works/works01.png
-   :align: center
-
-Exchange Rate Journal
---------------------
-
-The **Rate Difference Journal** records the differences between the payment
-registration and the expected amount. For example, if a payment is paid
-1 month after the invoice was issued, the exchange rate has probably
-changed. The fluctuation implies some loss or profit that are recorded
-by Odoo.
-
-You can change it in the settings:
-
-.. image:: how_it_works/works02.png
-   :align: center
-
-View or edit rate being used
----------------------------
-
-You can manually configure the currency rates in :menuselection:`Configuration -->
-Currencies`. Open the currencies you want to use in Odoo and edit it.
-Make sure the currency is active.
-
-.. image:: how_it_works/works03.png
-   :align: center
-
-Click on **View Rates** to edit it and to see the history :
-
-.. image:: how_it_works/works04.png
-   :align: center
-
-Click on **Create** to add the rate. Fill in the date and the rate.
-Click on **Save** when you are done.
-
-.. image:: how_it_works/works05.png
-   :align: center
-
-Live Currency Rate
------------------
-
-By default, the currencies need to be updated manually. But you can
-synchronize it with `Yahoo <https://finance.yahoo.com/currency-converter/>`__ or
-the `European Central Bank <http://www.ecb.europa.eu>`__. In 
-:menuselection:`Configuration --> Settings`, go to the **Live Currency Rate** section.
-
-Choose the interval : Manually, Daily, Weekly or Monthly. You can always
-force the update by clicking on **Update Now**. Select the provider, and you
-are set !
-
-.. image:: how_it_works/works06.png
-   :align: center
-
-.. note::
-   Only the **active** currencies are updated
-
-Configure your charts of account
--------------------------------
-
-In the accounting application, go to :menuselection:`Adviser --> Charts of Accounts`.
-On each account, you can set a currency. It will force all moves for
-this account to have the account currency.
-
-If you leave it empty, it means that it can handle all currencies that
-are Active.
-
-.. image:: how_it_works/works07.png
-   :align: center
-
-Configure your journals
-----------------------
-
-In order to register payments in other currencies, you have to remove
-the currency constraint on the journal. Go to the accounting
-application, Click on **More** on the journal and **Settings**.
-
-.. image:: how_it_works/works08.png
-   :align: center
-
-Check if the currency field is empty or in the foreign currency in which
-you will register the payments. If a currency is filled in, it means
-that you can register payments only in this currency.
-
-.. image:: how_it_works/works09.png
-   :align: center
-
-How is Odoo's multi-currency working?
-=====================================
-
-Now that you are working in a multi-currency environment, all
-accountable items will be linked to a currency, domestic or foreign.
-
-Sales Orders and Invoices
-------------------------
-
-You are now able to set a different currency than the company one on
-your sale orders and on your invoices. The currency is set for the whole
-document.
-
-.. image:: how_it_works/works10.png
-   :align: center
-
-Purchases orders and Vendor Bills
---------------------------------
-
-You are now able to set a different currency than the company one on
-your purchase orders and on your vendor bills. The currency is set for
-the whole document.
-
-.. image:: how_it_works/works11.png
-   :align: center
-
-Payment Registrations
---------------------
-
-In the accounting application, go to :menuselection:`Sales --> Payments`. Register the payment and
-set the currency.
-
-.. image:: how_it_works/works12.png
-   :align: center
-
-Bank Statements
---------------
-
-When creating or importing bank statements, the amount is in the company
-currency. But there are now two complementary fields, the amount that
-was actually paid and the currency in which it was paid.
-
-.. image:: how_it_works/works13.png
-   :align: center
-
-When reconciling it, Odoo will directly match the payment with the right
-Invoice. You will get the invoice price in the invoice currency and the
-amount in your company currency.
-
-Exchange Rate Journal
---------------------
-
-Go to :menuselection:`Adviser --> Journal Entries` and look for the Exchange difference
-journal entries. All the exchange rates differences are recorded in it.
-
-.. image:: how_it_works/works14.png
-   :align: center
-
-.. include:: exchange/full_reconcile_warning.rst
-
-.. seealso::
-   * :doc:`invoices_payments`
-   * :doc:`exchange`
--- a/Show More
+++ b/Show More