Typo fix

Cf #1054

closes odoo/documentation#1086

X-original-commit: 1211d3ae40
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>

Makefile

@@ -9,10 +9,6 @@ ifndef BUILD_DIR
   BUILD_DIR    = _build
 endif
 
-ifndef CURRENT_LANG
-  CURRENT_LANG = en
-endif
-
 SPHINX_BUILD   = sphinx-build
 CONFIG_DIR     = .
 SPHINXOPTS     = -D project_root=$(ROOT) -D canonical_version=$(CANONICAL_VERSION) \
@@ -24,7 +20,7 @@ SOURCE_DIR     = content
 
 HTML_BUILD_DIR = $(BUILD_DIR)/html
 ifdef VERSIONS
-  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/15.0
+  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/14.0
 endif
 ifneq ($(CURRENT_LANG),en)
   HTML_BUILD_DIR := $(HTML_BUILD_DIR)/$(CURRENT_LANG)

README.md

@@ -4,11 +4,11 @@
 
 ### Requirements
 
-- [Git](https://www.odoo.com/documentation/15.0/contributing/documentation.html#install-git)
-- [Python 3.6, 3.7, or 3.8](https://www.odoo.com/documentation/15.0/contributing/documentation.html#python)
-- Python dependencies listed in the file [`requirements.txt`](https://github.com/odoo/documentation/tree/15.0/requirements.txt).
-- [Make](https://www.odoo.com/documentation/15.0/contributing/documentation.html#make)
-- A local copy of the [odoo/odoo repository in 15.0](https://github.com/odoo/odoo/tree/15.0) (Optional)
+- [Git](https://www.odoo.com/documentation/14.0/contributing/documentation.html#install-git)
+- [Python 3.6, 3.7, or 3.8](https://www.odoo.com/documentation/14.0/contributing/documentation.html#python)
+- Python dependencies listed in the file [`requirements.txt`](https://github.com/odoo/documentation/tree/14.0/requirements.txt).
+- [Make](https://www.odoo.com/documentation/14.0/contributing/documentation.html#make)
+- A local copy of the [odoo/odoo repository in 14.0](https://github.com/odoo/odoo/tree/14.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/15.0/contributing/documentation.html#preview-your-changes)
+3. See [this guide](https://www.odoo.com/documentation/14.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/15.0/contributing/documentation.html).
+[Introduction Guide](https://www.odoo.com/documentation/14.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.

conf.py

@@ -19,7 +19,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 = '15.0'
+version = release = '14.0'
 
 # The minimal Sphinx version required to build the documentation.
 needs_sphinx = '3.0.0'
@@ -70,20 +70,19 @@ if not odoo_dir.is_dir():
         f"Could not find Odoo sources directory at {odoo_dir.absolute()}.\n"
         f"The 'Developer' documentation will be built but autodoc directives will be skipped.\n"
         f"In order to fully build the 'Developer' documentation, clone the repository with "
-        f"`git clone https://github.com/odoo/odoo` or create a symbolic link."
+        f"`git clone https://github.com/odoo/odoo` or create a symbolink link."
     )
 else:
     sys.path.insert(0, str(odoo_dir.absolute()))
     from odoo import release as odoo_release  # Don't collide with Sphinx's 'release' config option
-    odoo_version = odoo_release.version.replace('~', '-') \
-        if 'alpha' not in odoo_release.version else 'master'
+    odoo_version = odoo_release.version if 'alpha' not in odoo_release.version else 'master'
     if release != odoo_version:
         _logger.warning(
             f"Found Odoo sources directory but with version '{odoo_version}' incompatible with "
             f"documentation version '{version}'.\n"
             f"The 'Developer' documentation will be built but autodoc directives will be skipped.\n"
-            f"In order to fully build the 'Developer' documentation, checkout the matching branch "
-            f"with `cd odoo && git checkout {version}`."
+            f"In order to fully build the 'Developer' documentation, checkout the matching branch"
+            f" with `cd odoo && git checkout {version}`."
         )
     else:
         _logger.info(f"Found Odoo sources directory matching documentation version {release}.")
@@ -291,7 +290,7 @@ def _generate_alternate_urls(app, pagename, templatename, context, doctree):
             for _alternate_version in sorted(_alternate_versions, reverse=True)
             if _alternate_version != version and (
                 _alternate_version != 'master' or pagename.startswith('developer')
-            ) and not _alternate_version.startswith('saas')
+            )
         ]
 
     def _localize():

content/administration/install/deploy.rst

@@ -233,8 +233,8 @@ Configuration sample
 * Server with 4 CPU, 8 Thread
 * 60 concurrent users
 
-* 60 users / 6 = 10 <- theoretical number of worker needed
-* (4 * 2) + 1 = 9 <- theoretical maximal number of worker
+* 60 users / 6 = 10 <- theorical number of worker needed
+* (4 * 2) + 1 = 9 <- theorical maximal number of worker
 * We'll use 8 workers + 1 for cron. We'll also use a monitoring system to measure cpu load, and check if it's between 7 and 7.5 .
 * RAM = 9 * ((0.8*150) + (0.2*1024)) ~= 3Go RAM for Odoo
 

content/administration/maintain/db_premise.rst

@@ -12,7 +12,7 @@ To register your database, you just need to enter your Subscription Code in the
 banner in the App Switcher. Make sure you do not add extra spaces before or after
 your subscription code. If the registration is successful, it will turn green and
 will provide you with the Expiration Date of your freshly-registered database. You
-can check this Epiration Date in the About menu (Odoo 9) or in the Settings Dashboard
+can check this Expiration Date in the About menu (Odoo 9) or in the Settings Dashboard
 (Odoo 10).
 
 Registration Error Message

content/administration/maintain/db_upgrade.rst

@@ -128,7 +128,7 @@ There are two possibilities:
 #. Via the interface of our `website form <https://upgrade.odoo.com>`_
 #. | For technically-advanced users and partners, via the following command line (to be used on the
      machine where your database is hosted):
-   | ``python <(curl -s https://upgrade.odoo.com/upgrade) test -d <your db name> -t 14.0``
+   | ``python <(curl -s beta.upgrade.odoo.com/upgrade) test -d <your db name> -t 14.0``
 
 What does it do?
 ~~~~~~~~~~~~~~~~
@@ -190,8 +190,8 @@ Test guidance
 
 Every business and organization has its own operational needs and will have to test its specific
 Odoo instance respectively. However, we recommend you look at `the test scenario
-<https://docs.google.com/document/d/1ypNs7JKPOsjNbKpdiKFH7Al6g6whZ9jr7f7duAQ5E1w/>`_ we created, a
-high-level idea of what you should test and look out for.
+<https://drive.google.com/open?id=1Lm4JqbsHBirB1wMi14UChoz_YHLjx5ec>`_ we created, a high-level idea
+of what you should test and look out for.
 
 .. todo:: change link "test scenario" once the related doc is published
 

content/administration/maintain/supported_versions.rst

@@ -20,37 +20,37 @@ This matrix shows the support status of every version.
 
 **Major releases are in bold type.**
 
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-|                 | Odoo Online | Odoo.sh  | On-Premise  | Release date   | End of support         |
-+=================+=============+==========+=============+================+========================+
-| **Odoo 15.0**   | |green|     | |green|  | |green|     | October 2021   | October 2024 (planned) |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 14.0**   | |green|     | |green|  | |green|     | October 2020   | October 2023 (planned) |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 13.0**   | |green|     | |green|  | |green|     | October 2019   | October 2022 (planned) |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 12.saas~3  | |orange|    | N/A      | N/A         | August 2019    |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 12.0**   | |orange|    | |orange| | |red|       | October 2018   | October 2021           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 11.saas~3  | |orange|    | N/A      | N/A         | April 2018     |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 11.0**   | |orange|    | |orange| | |red|       | October 2017   | October 2020           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 10.saas~15 | |orange|    | N/A      | N/A         | March 2017     |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 10.saas~14 | |orange|    | N/A      | N/A         | January 2017   |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 10.0**   | |orange|    | |orange| | |red|       | October 2016   | October 2019           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 9.saas~11  | |orange|    | N/A      | N/A         | May 2016       |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 9.0**    | |orange|    | N/A      | |red|       | October 2015   | October 2018           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| Odoo 8.saas~6   | |orange|    | N/A      | N/A         | February 2015  |                        |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
-| **Odoo 8.0**    | |orange|    | N/A      | |red|       | September 2014 | October 2017           |
-+-----------------+-------------+----------+-------------+----------------+------------------------+
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
+|                    | Odoo Online | Odoo.sh  | On-Premise   |   Release date |                                              |
++====================+=============+==========+==============+================+==============================================+
+| **Odoo 14.0**      |    |green|  | |green|  |   |green|    | October 2020   |                                              |
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
+| Odoo 13.saas~4     |    |green|  | N/A      | N/A          | August 2019    |                                              |
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
+| **Odoo 13.0**      |    |green|  | |green|  |   |green|    | October 2019   |                                              |
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
+| Odoo 12.saas~3     |    |green|  | N/A      | N/A          | August 2019    |                                              |
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
+| **Odoo 12.0**      |    |green|  | |green|  |   |green|    | October 2018   | *End-of-support is planned for October 2021* |
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
+| Odoo 11.saas~3     |   |orange|  | N/A      | N/A          | April 2018     |                                              |
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
+| **Odoo 11.0**      |   |orange|  | |orange| |    |red|     | October 2017   |                                              |
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
+| Odoo 10.saas~15    |   |orange|  | N/A      | N/A          | March 2017     |                                              |
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
+| Odoo 10.saas~14    |   |orange|  | N/A      | N/A          | January 2017   |                                              |
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
+| **Odoo 10.0**      |   |orange|  | |orange| |    |red|     | October 2016   |                                              |
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
+| Odoo 9.saas~11     |   |orange|  | N/A      | N/A          | May 2016       |                                              |
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
+| **Odoo 9.0**       |   |orange|  | N/A      |    |red|     | October 2015   |                                              |
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
+| Odoo 8.saas~6      |   |orange|  | N/A      | N/A          | February 2015  |                                              |
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
+| **Odoo 8.0**       |   |orange|  | N/A      |    |red|     | September 2014 |                                              |
++--------------------+-------------+----------+--------------+----------------+----------------------------------------------+
 
 
 .. note::
@@ -66,9 +66,6 @@ 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| image:: data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMzIuMTkgMjMyLjE5Ij48Y2lyY2xlIGN4PSIxMTYuMDkiIGN5PSIxMTYuMDkiIHI9IjExNi4wOSIgc3R5bGU9ImZpbGw6IzAwYTcwMCIvPjwvc3ZnPg==
    :width: 15
 

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

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

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

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

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

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

content/applications/general/calendars/outlook/outlook_calendar.rst

@@ -100,5 +100,5 @@ The synchronization is a two-way process, meaning that events are reconciled in
    to manage a specific instance of Microsoft cloud services for your internal and external users.
 
 .. seealso::
-   - :doc:`../../../productivity/mail_plugins/outlook`
+   - :doc:`../../../sales/crm/optimize/outlook_extension`
    - :doc:`../google/google_calendar_credentials`

content/applications/general/payment_acquirers.rst

@@ -1,25 +1,19 @@
 :show-content:
 
-=================================================
-Payment acquirers (credit cards, online payments)
-=================================================
+================================================
+Payment Acquirers (Credit Cards, Online Payment)
+================================================
 
 .. toctree::
    :titlesonly:
 
    payment_acquirers/wire_transfer
-   payment_acquirers/adyen
-   payment_acquirers/alipay
    payment_acquirers/authorize
-   payment_acquirers/buckaroo
-   payment_acquirers/mollie
-   payment_acquirers/ogone
    payment_acquirers/paypal
-   payment_acquirers/sips
    payment_acquirers/stripe
 
 Odoo embeds several **payment acquirers** that allow your customers to pay on their *Customer
-Portals* or your *eCommerce website*. They can pay sales orders, invoices, or subscriptions with
+Portals* or your *eCommerce website*. They can pay Sales Orders, invoices, or subscriptions with
 recurring payments with their favorite payment methods such as **Credit Cards**.
 
 Offering several payment methods increases the chances of getting paid in time, or even immediately,
@@ -34,13 +28,13 @@ trust.
    Odoo apps delegate the handling of sensitive information to the certified payment acquirer so
    that you don't ever have to worry about PCI compliance.
 
-   This means that no sensitive information (such as credit card numbers) is stored on Odoo servers
-   or Odoo databases hosted elsewhere. Instead, Odoo apps use a unique reference number to the data
-   stored safely in the payment acquirers' systems.
+   This means that no sensitive information (such as credit card numbers or credentials) is stored
+   on Odoo servers or Odoo databases hosted elsewhere. Instead, Odoo apps use a unique reference
+   number to the data stored safely in the payment acquirers' systems.
 
 .. _payment_acquirers/acquirers:
 
-Payment acquirers
+Payment Acquirers
 =================
 
 From an accounting perspective, we can distinguish two types of payment acquirers: the payments that
@@ -49,7 +43,7 @@ acquirers that are third-party services and require you to follow another accoun
 
 .. _payment_acquirers/bank_payments:
 
-Bank payments
+Bank Payments
 -------------
 
 - | :doc:`Wire Transfer <payment_acquirers/wire_transfer>`
@@ -57,58 +51,43 @@ Bank payments
     approve the payment manually once you have received it on your bank account.
 - | SEPA Direct Debit
   | Your customers can sign a SEPA Direct Debit mandate online and get their bank account charged
-    directly. :doc:`Click here <../finance/accounting/receivables/customer_payments/batch_sdd>` for
-    more information about this payment method.
+    directly. :doc:`Click here <../finance/accounting/receivables/customer_payments/batch_sdd>` for more
+    information about this payment method.
 
 .. _payment_acquirers/online_providers:
 
-Online payment providers
+Online Payment Providers
 ------------------------
 
-+-------------------------------+----------------------+------------+-----------------+-----------+
-|                               | Payment flow         | Save cards | Capture amount  | Refund    |
-|                               |                      |            | manually        | from Odoo |
-+===============================+======================+============+=================+===========+
-| :doc:`Adyen                   | Payment from Odoo    | |V|        |                 | |V|       |
-| <payment_acquirers/adyen>`    |                      |            |                 |           |
-+-------------------------------+----------------------+------------+-----------------+-----------+
-| :doc:`Alipay                  | Redirection to the   |            |                 |           |
-| <payment_acquirers/alipay>`   | acquirer website     |            |                 |           |
-+-------------------------------+----------------------+------------+-----------------+-----------+
-| :doc:`Authorize.Net           | Payment from Odoo    | |V|        | |V|             |           |
-| <payment_acquirers/authorize>`|                      |            |                 |           |
-+-------------------------------+----------------------+------------+-----------------+-----------+
-| :doc:`Buckaroo                | Redirection to the   |            |                 |           |
-| <payment_acquirers/buckaroo>` | acquirer website     |            |                 |           |
-+-------------------------------+----------------------+------------+-----------------+-----------+
-| :doc:`Mollie                  | Redirection to the   |            |                 |           |
-| <payment_acquirers/mollie>`   | acquirer website     |            |                 |           |
-+-------------------------------+----------------------+------------+-----------------+-----------+
-| :doc:`Ogone                   | Redirection to the   | |V|        |                 |           |
-| <payment_acquirers/ogone>`    | acquirer website     |            |                 |           |
-+-------------------------------+----------------------+------------+-----------------+-----------+
-| :doc:`PayPal                  | Redirection to the   |            |                 |           |
-| <payment_acquirers/paypal>`   | acquirer website     |            |                 |           |
-+-------------------------------+----------------------+------------+-----------------+-----------+
-| PayU Latam                    | Redirection to the   |            |                 |           |
-|                               | acquirer website     |            |                 |           |
-+-------------------------------+----------------------+------------+-----------------+-----------+
-| PayUMoney                     | Redirection to the   |            |                 |           |
-|                               | acquirer website     |            |                 |           |
-+-------------------------------+----------------------+------------+-----------------+-----------+
-| :doc:`SIPS                    | Redirection to the   |            |                 |           |
-| <payment_acquirers/sips>`     | acquirer website     |            |                 |           |
-+-------------------------------+----------------------+------------+-----------------+-----------+
-| :doc:`Stripe                  | Redirection to the   | |V|        |                 |           |
-| <payment_acquirers/stripe>`   | acquirer website     |            |                 |           |
-+-------------------------------+----------------------+------------+-----------------+-----------+
-
-.. |V| replace:: ✔
++-------------------------------------+----------------------+-----------+------------+-----------------+
+|                                     | Redirection to       | Payment   | Save Cards | Capture Amount  |
+|                                     | the acquirer website | from Odoo |            | Manually        |
++=====================================+======================+===========+============+=================+
+| Adyen                               | ✔                    |           |            |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| Alipay                              | ✔                    |           |            |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| :doc:`Authorize.Net                 | ✔                    | ✔         | ✔          | ✔               |
+| <payment_acquirers/authorize>`      |                      |           |            |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| Buckaroo                            | ✔                    |           |            |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| Ingenico                            | ✔                    | ✔         | ✔          |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| :doc:`PayPal                        | ✔                    |           |            |                 |
+| <payment_acquirers/paypal>`         |                      |           |            |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| PayUMoney                           | ✔                    |           |            |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| SIPS                                | ✔                    |           |            |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
+| Stripe                              | ✔                    | ✔         | ✔          |                 |
++-------------------------------------+----------------------+-----------+------------+-----------------+
 
 .. note::
-   Some of these online payment providers can also be added as :doc:`bank accounts
-   <../finance/accounting/bank/setup/bank_accounts>`, but this is **not** the same process as adding
-   them as payment acquirers. Payment acquirers allow customers to pay online, and bank accounts are
+   Some of these Online Payment Providers can also be added as :doc:`Bank Accounts
+   <../finance/accounting/bank/setup/bank_accounts>`, but this is **not** the same process as adding them
+   as Payment Acquirers. Payment Acquirers allow customers to pay online, and Bank Accounts are
    added and configured on your Accounting app to do a bank reconciliation, which is an accounting
    control process.
 
@@ -117,15 +96,15 @@ Online payment providers
 Configuration
 =============
 
-Some of the features described in this section are available only with some payment acquirers. Refer
+Some of the features described in this section are available only with some Payment Acquirers. Refer
 to :ref:`the table above <payment_acquirers/online_providers>` for more details.
 
 .. _payment_acquirers/add_new:
 
-Add a new payment acquirer
+Add a new Payment Acquirer
 --------------------------
 
-To add a new payment acquirer and make it available to your customers, go to
+To add a new Payment acquirer and make it available to your customers, go to
 :menuselection:`Accounting --> Configuration --> Payment Acquirers`, look for your payment acquirer,
 install the related module, and activate it. To do so, open the payment acquirer and change its
 state from *Disabled* to *Enabled*.
@@ -145,11 +124,11 @@ state from *Disabled* to *Enabled*.
 Credentials tab
 ~~~~~~~~~~~~~~~
 
-If not done yet, go to the online payment provider website, create an account, and make sure to have
-the credentials required for third-party use. Odoo requires these credentials to communicate with
-the payment acquirer.
+If not done yet, go to the **Online Payment Provider**'s website, create an account, and make sure
+to have the credentials required for third-party use. Odoo requires these credentials to communicate
+with the Payment Acquirer and get the confirmation of the *payment authentication*.
 
-The form in this section is specific to the payment acquirer you are configuring. Please refer to
+The form in this section is specific to the Payment Acquirer you are configuring. Please refer to
 the related documentation for more information.
 
 .. _payment_acquirers/configuration_tab:
@@ -157,66 +136,66 @@ the related documentation for more information.
 Configuration tab
 ~~~~~~~~~~~~~~~~~
 
-You can change the payment acquirer's front-end appearance by modifying its name under the
-**Displayed as** field and which credit card icons to display under the **Supported Payment Icons**
-field.
+You can change the Payment Acquirer front-end appearance by modifying its name under the **Displayed
+as** field and which credit card icons to display under the **Supported Payment Icons** field.
 
 .. _payment_acquirers/save_cards:
 
-Save and reuse credit cards
+Save and reuse Credit Cards
 ***************************
 
 With the **Save Cards** feature, Odoo can store **Payment Tokens** in your database, which can be
 used for subsequent payments, without having to reenter the payment details. This is particularly
-useful for the eCommerce conversion rate and subscriptions' recurring payments.
+useful for subscriptions' recurring payments.
 
 .. _payment_acquirers/capture_amount:
 
 Place a hold on a card
 **********************
 
-If you wish to manually capture an amount instead of having an immediate capture, you can enable the
-manual capture. Capturing payments manually has many advantages:
-
-  - Receive the payment confirmation and wait until the order is shipped to capture the payment.
-  - Review and verify that orders are legitimate before the payment is completed and the fulfillment
-    process starts.
-  - Avoid potentially high credit card fees in the event of overselling or cancelled orders.
-
-The **Capture Amount Manually** field is under the **Configuration** tab. If enabled, the funds are
-reserved for a few days on the customer's card, but not charged yet. Please refer to your acquirer's
-documentation for the exact reservation duration.
-
-.. image:: payment_acquirers/media/capture_manually.png
-   :align: center
-   :alt: Configuration tab on Odoo
-
-To capture the payment, you must then go to the related sales order or invoice and manually
+If the **Capture Amount Manually** field is enabled, the funds are reserved for a few days on the
+customer's card, but not charged yet. You must then go to the related Sales Order and manually
 *capture* the funds before its automatic cancellation, or *void the transaction* to unlock the funds
 from the customer's card.
 
-.. image:: payment_acquirers/media/capture.png
-   :align: center
-   :alt: Hold the credit card payment until you capture or revoke it on Odoo
+.. _payment_acquirers/payment_flow:
+
+Payment Flow
+************
+
+Choose in the **Payment Flow** field if to redirect the user to the payment acquirer's portal to
+authenticate the payment, or if to stay on the current page and authenticate the payment from Odoo.
 
 .. note::
-   Odoo may not yet support the manual capture for all acquirers, but some acquirers allow managing
-   the capture from their interfaces.
+   Some features are available only if you select *Redirection to the acquirer website*.
 
 .. _payment_acquirers/countries:
 
 Countries
 *********
 
-Restrict the use of the payment acquirer to a selection of countries. Leave this field blank to make
-the payment acquirer available to all countries.
+Restrict the use of the Payment Acquirer to a selection of countries. Leave this field blank to make
+the Payment Acquirer available to all countries.
 
 .. _payment_acquirers/journal:
 
-Payment journal
+Payment Journal
 ***************
 
-The **Payment journal** selected for your payment acquirer must be a *Bank* journal.
+The **Payment Journal** selected for your Payment Acquirer must be a *Bank* journal.
+
+.. important::
+   In many cases, Odoo automatically creates a new **Journal** and a new **Account** when you
+   activate a new Payment Acquirer. Both of them are preset to work out-of-the-box, but we strongly
+   recommend you to make sure these fields are correctly set according to your accounting needs, and
+   adapt them if necessary.
+
+.. _payment_acquirers/messages:
+
+Messages tab
+~~~~~~~~~~~~
+
+Change here the messages displayed by Odoo after a payment's confirmation or failure.
 
 .. _payment_acquirers/accounting:
 
@@ -228,30 +207,33 @@ reconciliation workflows. However, payments recorded with **Online Payment Provi
 to consider how you want to record your payments' journal entries. We recommend you to ask your
 accountant for advice.
 
-You need to select a *Payment Journal* on your acquirer configuration to record the payments,
-on a **Outstanding Account**. The Journal's **type** must be *Bank Journal*.
+Odoo default method is to record the payments on a *Current Assets Account*, on a dedicated *Bank
+Journal*, once the *Payment Authentication* is confirmed. At some point, you transfer the funds from
+the *Payment Acquirer* to your *Bank Account*.
 
-You can use a single journal for many payment methods. And for each payment method, you can either:
+Here are the requirements for this to work:
 
-- Define an **Accounting Account** to separate these payments from another payment method.
-- Leave blank to fallback on the default account, which you can see or change in the settings.
+- Bank Journal
 
-.. image:: payment_acquirers/media/bank_journal.png
-   :align: center
-   :alt: A bank journal in the "Incoming Payments Tab".
+  - The Journal's **type** must be *Bank Journal*.
+  - Select the right **Default Debit Account** and **Default Credit Account**.
+  - | Under the *Advanced Settings* tab, make sure that **Posting** is set as *Post At Payment
+      Validation*.
+    | This implies that the Journal Entry is recorded directly when your Odoo database receives the
+      confirmation of the *Payment Authentication* from the Online Payment Provider.
 
-You can have the same bank account for the whole company, or for some journals only, or a single
-payment method... What best suit your needs.
+- Current Asset Account
+
+  - The Account's **type** is *Current Assets*
+  - The Account must **Allow Reconciliation**
+
+.. note::
+   In many cases, Odoo automatically creates a new **Journal** and a new **Current Asset Account**
+   when you activate a new Payment Acquirer. You can modify them if necessary.
 
 .. seealso::
+
+   - :doc:`../finance/accounting/receivables/customer_payments/recording`
    - :doc:`payment_acquirers/wire_transfer`
-   - :doc:`payment_acquirers/adyen`
-   - :doc:`payment_acquirers/alipay`
    - :doc:`payment_acquirers/authorize`
-   - :doc:`payment_acquirers/buckaroo`
-   - :doc:`payment_acquirers/mollie`
-   - :doc:`payment_acquirers/ogone`
-   - :doc:`payment_acquirers/paypal`
-   - :doc:`payment_acquirers/sips`
-   - :doc:`payment_acquirers/stripe`
-   - :doc:`../websites/ecommerce/shopper_experience/payment_acquirer`
+   - :doc:`payment_acquirers/paypal`

content/applications/general/payment_acquirers/adyen.rst

@@ -1,103 +0,0 @@
-=====
-Adyen
-=====
-
-`Adyen <https://www.adyen.com/>`_ is a Dutch-based company that offers several online payment
-possibilities.
-
-Configuration
-=============
-
-.. seealso::
-   - :ref:`payment_acquirers/add_new`
-
-Credentials tab
----------------
-
-Odoo needs your **API Credentials** to connect with your Adyen account, which comprise:
-
-- **Merchant Account**: The code of the merchant account to use with Adyen.
-- :ref:`API Key <adyen/api_and_client_keys>`: The API key of the webservice user.
-- :ref:`Client Key <adyen/api_and_client_keys>`: The client key of the webservice user.
-- :ref:`HMAC Key <adyen/hmac_key>`: The HMAC key of the webhook.
-- :ref:`Checkout API URL <adyen/urls>`: The base URL for the Checkout API endpoints.
-- :ref:`Recurring API URL <adyen/urls>`: The base URL for the Recurring API endpoints.
-
-You can copy your credentials from your Adyen account, and paste them in the related fields under
-the **Credentials** tab.
-
-.. important::
-   If you are trying Adyen as a test, with a *test account*, change the **State** to *Test Mode*. We
-   recommend doing this on a test Odoo database, rather than on your main database.
-
-.. _adyen/api_and_client_keys:
-
-API Key and Client Key
-~~~~~~~~~~~~~~~~~~~~~~
-
-In order to retrieve the API Key and the Client Key, log into your Adyen account, go to
-:menuselection:`Developers --> API Credentials`.
-- If you already have an API user, open it.
-- If you don't have an API user yet, click on **Create new credential**.
-Go to :menuselection:`Authentication` and get or generate your **API Key** and **Client Key**. Be
-careful to copy your API key as you'll not be allowed to get it later without generating a new one.
-
-This is also the place where you'll :ref:`allow payments to be made from your website
-<adyen/allowed_origins>`.
-
-.. _adyen/hmac_key:
-
-HMAC key
-~~~~~~~~
-
-In order to retrieve the HMAC Key, you'll need to configure a `Standard Notification` webhook. For
-this, log into your Adyen account then go to :menuselection:`Developers --> Webhooks --> Add webhook
---> Add Standard notification`.
-
-.. image:: media/adyen_add_webhook.png
-   :align: center
-   :alt: Configure a webhook.
-
-There, in :menuselection:`Transport --> URL`, enter your server address followed by
-`/payment/adyen/notification`.
-
-.. image:: media/adyen_webhook_url.png
-   :align: center
-   :alt: Enter the notification URL.
-
-Then continue in :menuselection:`Additional Settings --> HMAC Key --> Generate new HMAC key`. Be
-careful to copy it as you'll not be allowed to get it later without generating a new one.
-
-You have to save the webhook to finalize its creation.
-
-.. _adyen/urls:
-
-URLs
-~~~~
-
-To retrieve the URLs, log into your Adyen account, go to :menuselection:`Developers --> API URLs`.
-Pick one of the URLs listed next to **Recurring** as your **Recurring API URL** and one of the URLs
-listed next to **Checkout API** as your **Checkout API URL**.
-
-.. image:: media/adyen_api_urls.png
-   :align: center
-   :alt: Get the links for the different API.
-
-Adyen Account
--------------
-
-.. _adyen/allowed_origins:
-
-Allow payments from a specific origin
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To allow payment originated from your website, follow the steps in :ref:`adyen/api_and_client_keys`
-to navigate to your API user and go to :menuselection:`Allowed Origins`, then add the URLs from
-where payments will be made (the URLs of the servers hosting your Odoo instances).
-
-.. image:: media/adyen_allowed_origins.png
-   :align: center
-   :alt: Allows payments originated from a specific domain.
-
-.. seealso::
-   - :doc:`../payment_acquirers`

content/applications/general/payment_acquirers/alipay.rst

@@ -1,36 +0,0 @@
-======
-Alipay
-======
-
-`Alipay <https://www.alipay.com/>`_ is an online payments platform established in China by Alibaba
-Group.
-
-Configuration
-=============
-
-.. seealso::
-   - :ref:`payment_acquirers/add_new`
-
-Credentials tab
----------------
-
-Odoo needs your **API Credentials** to connect with your Alipay account, which comprise:
-
-- **Account**: Depending on where you are situated
-  - `Express Checkout` if your are a Chinese Merchant.
-  - `Cross-border` if you are not.
-- **Alipay Seller Email**: Your public Alipay partner email (for express checkout only).
-- **Merchant Partner ID**: The public partner ID solely used to identify the account with Alipay.
-- **MD5 Signature Key**: The signature key.
-
-You can copy your credentials from your Alipay account, and paste them in the related fields under
-the **Credentials** tab.
-
-To retrieve them, log into your Alipay account, they are on the front page.
-
-.. important::
-   If you are trying Alipay as a test, in the *sandbox*, change the **State** to *Test Mode*. We
-   recommend doing this on a test Odoo database, rather than on your main database.
-
-.. seealso::
-   - :doc:`../payment_acquirers`

content/applications/general/payment_acquirers/authorize.rst

@@ -2,46 +2,116 @@
 Authorize.Net
 =============
 
-`Authorize.Net <https://www.authorize.net>`_ is a United States-based online payment solution
+`Authorize.Net <https://www.authorize.net>`__ is a United States-based online payment solution
 provider, allowing businesses to accept **credit cards**.
 
-Configuration
-=============
+.. image:: media/authorize-net.png
+   :align: center
+   :alt: Authorize.Net logo
 
-.. seealso::
-   - :ref:`payment_acquirers/add_new`
+This Payment Acquirer offers additional options that are not available for other :doc:`Payment
+Acquirers <../payment_acquirers>`, such as the ability to process your customer's payment after
+delivery.
 
-Credentials tab
----------------
+Authorize.Net account
+=====================
+
+If not done yet, choose a plan and `Sign Up for an Authorize.Net account
+<https://www.authorize.net/sign-up.html>`__.
 
 Odoo needs your **API Credentials & Keys** to connect with your Authorize.Net account, which
 comprise:
 
-- **API Login ID**: The ID solely used to identify the account with Authorize.Net.
-- **API Transaction Key**
-- **API Signature Key**
-- **API Client Key**
+- API Login ID
+- Transaction Key
+- Signature Key
 
-To retrieve them, log into your Authorize.Net account, go to :menuselection:`Account --> Settings
---> Security Settings --> API Credentials & Keys`, generate your **Transaction Key** and
-**Signature Key**, and paste them on the related fields in Odoo. Then, click on **Generate Client
-Key**.
+To retrieve them, log into your Authorize.Net account, go to :menuselection:`Account --> Security
+Settings --> General Security Settings --> API Credentials & Keys`, and generate your **Transaction
+Key** and **Signature Key**.
+
+.. image:: media/authorize-api-keys.png
+   :align: center
+   :alt: Generate your Transaction Key and Signature Key on your Authorize.Net account
+
+.. seealso::
+
+   - `Authorize.Net: Getting Started Guide
+     <https://support.authorize.net/s/article/Authorize-Net-Getting-Started-Guide>`__
+
+Payment Acquirer Configuration
+==============================
+
+To configure Authorize.Net as Payment Acquirer in Odoo, go to :menuselection:`Accounting -->
+Configuration --> Payment Acquirers`, open **Authorize.Net**, and change the **State** to *Enabled*.
+Don't forget to click on *Save* once you've set everything up.
+
+.. note::
+   Please refer to the :doc:`Payment Acquirers documentation <../payment_acquirers>` to read how to
+   configure this payment acquirer.
+
+Credentials
+-----------
+
+Copy your credentials from your Authorize.Net account (API Login Id, API Transaction Key, and API
+Signature Key), paste them in the related fields under the **Credentials** tab, then click on
+**Generate Client Key**.
+
+.. note::
+   The **API Client Key** is necessary only if you select *Payment from Odoo* option as
+   :ref:`Payment Flow <payment_acquirers/payment_flow>`.
 
 .. important::
    If you are trying Authorize.Net as a test, with a *sandbox account*, change the **State** to
    *Test Mode*. We recommend doing this on a test Odoo database, rather than on your main database.
 
-Configuration tab
------------------
+Payment Flow
+------------
 
-Place a hold on a card
-~~~~~~~~~~~~~~~~~~~~~~
+The **Payment Flow** lets you decide if to redirect the user to the payment acquirer's portal to
+authenticate the payment, or if to stay on the current page and authenticate the payment from Odoo.
+This field is under the **Configuration** tab.
 
-With Authorize.net, you can enable the :ref:`manual capture <payment_acquirers/capture_amount>`. If
-enabled, the funds are reserved for 30 days on the customer's card, but not charged yet.
+If you select *Redirection to the acquirer website*, make sure you add a **Default Receipt URL** and
+a **Default Relay Response URL** to your Authorize.net account.
+
+To do so, log into your Authorize.Net account, go to :menuselection:`Account --> Transaction Format
+Settings --> Transaction Response Settings --> Response/Receipt URLs`, and set the default links:
+
+- | Default Receipt URL:
+  | *https://[yourcompany.odoo.com]*/**payment/authorize/return**
+- | Default Relay Response URL:
+  | *https://[yourcompany.odoo.com]*/**shop/confirmation**
+
+.. note::
+   | Failing to complete this step results in the following error:
+   | *The referrer, relay response or receipt link URL is invalid.*
+
+Capture the payment after the delivery
+--------------------------------------
+
+The **Capture Amount Manually** field is under the **Configuration** tab. If enabled, the funds are
+reserved for 30 days on the customer's card, but not charged yet.
+
+.. image:: media/authorize-configuration.png
+   :align: center
+   :alt: Authorize.Net Configuration tab on Odoo
+
+To capture the payment, go to the related Sales Order and click on *Capture Transaction*. If the
+order is canceled, you can click on *Void Transaction* to unlock the funds from the customer's card.
+
+.. image:: media/authorize-capture.png
+   :align: center
+   :alt: Hold the credit card payment until you capture or revoke it on Odoo
 
 .. warning::
    After **30 days**, the transaction is **voided automatically** by Authorize.net.
 
+.. note::
+   With other payment acquirers, you can manage the capture in their own interfaces, not from Odoo.
+
 .. seealso::
+   - `Authorize.Net: Getting Started Guide
+     <https://support.authorize.net/s/article/Authorize-Net-Getting-Started-Guide>`__
    - :doc:`../payment_acquirers`
+   - :doc:`../../websites/ecommerce/shopper_experience/payment_acquirer`

content/applications/general/payment_acquirers/buckaroo.rst

@@ -1,47 +0,0 @@
-========
-Buckaroo
-========
-
-`Buckaroo <https://www.buckaroo.eu/>`_ is a Dutch-based company that offers several online payment
-possibilities.
-
-Configuration
-=============
-
-.. seealso::
-   - :ref:`payment_acquirers/add_new`
-
-Credentials tab
----------------
-
-Odoo needs your **API Credentials** to connect with your Buckaroo account, which comprise:
-
-- :ref:`Website Key <buckaroo/website_key>`: The key solely used to identify the website with
-  Buckaroo.
-- :ref:`Secret Key <buckaroo/secret_key>`: The secret key you entered on Buckaroo.
-
-You can copy your credentials from your Buckaroo account, and paste them in the related fields under
-the **Credentials** tab.
-
-.. _buckaroo/website_key:
-
-Website Key
-~~~~~~~~~~~
-
-In order to retrieve the Website Key, log into your Buckaroo account, go to
-:menuselection:`Configuration --> Templates --> Your Website`.
-
-.. _buckaroo/secret_key:
-
-Secret Key
-~~~~~~~~~~
-
-In order to retrieve the Website Key, log into your Buckaroo account, go to
-:menuselection:`Configuration --> Security --> Secret Key`.
-
-.. important::
-   If you are trying Buckaroo in a test account, change the **State** to *Test Mode*. We
-   recommend doing this on a test Odoo database, rather than on your main database.
-
-.. seealso::
-   - :doc:`../payment_acquirers`

content/applications/general/payment_acquirers/mollie.rst

@@ -1,31 +0,0 @@
-======
-Mollie
-======
-
-`Mollie <https://www.mollie.com/>`_ is an online payments platform established in the Netherlands.
-
-Configuration
-=============
-
-.. seealso::
-   - :ref:`payment_acquirers/add_new`
-
-Credentials tab
----------------
-
-Odoo needs your **API Credentials** to connect with your Mollie account, which comprise:
-
-- **API Key**: The test or live API Key depending on the configuration of the acquirer.
-
-You can copy your credentials from your Mollie account, and paste them in the related fields under
-the **Credentials** tab.
-
-To retrieve your API key, log into your Mollie account, go to
-:menuselection:`Developers --> API keys`, and copy your Test or Live **API Key**.
-
-.. important::
-   If you are trying Mollie as a test, with the Test API key, change the **State** to *Test Mode*.
-   We recommend doing this on a test Odoo database, rather than on your main database.
-
-.. seealso::
-   - :doc:`../payment_acquirers`

content/applications/general/payment_acquirers/ogone.rst

@@ -1,69 +0,0 @@
-=====
-Ogone
-=====
-
-`Ogone <https://www.ingenico.com/>`_, also known as **Ingenico Payment Services** is a France-based
-company that provides the technology involved in secure electronic transactions.
-
-Configuration
-=============
-
-.. seealso::
-   - :ref:`payment_acquirers/add_new`
-
-Credentials tab
----------------
-
-Odoo needs your **API Credentials** to connect with your Ogone account, which comprise:
-
-- **PSPID**: The ID solely used to identify the account with Ogone. You chose it when you opened
-  your account.
-- :ref:`API User ID <ogone/api_user>`: The ID solely used to identify the user with Ogone.
-- :ref:`API User Password <ogone/api_user>`: Value used to identify the user with Ogone.
-- :ref:`SHA Key IN <ogone/sha_key_in>`: Key used in the signature Odoo send to Ogone.
-- :ref:`SHA Key OUT <ogone/sha_key_out>`: Key used in the signature Ogone send to Odoo.
-
-You can copy your credentials from your Ogone account, and paste them in the related fields under
-the **Credentials** tab.
-
-.. _ogone/api_user:
-
-API User ID and Password
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you already created a user and have both its ID and password, just copy them. You can also
-generate a new password from :menuselection:`Configuration --> Users --> Your chosen user --> change
-password`.
-
-If you don't have a user, create one by going to :menuselection:`Configuration --> Users -->
-New User`. Set your **User ID** to get your **password** when you save your new user.
-
-.. image:: media/ogone_new_user.png
-   :align: center
-   :alt: Get your password when you save the new user.
-
-.. _ogone/sha_key_in:
-
-SHA Key IN
-~~~~~~~~~~
-
-In order to retrieve the SHA Key IN, log into your ogone account, go to
-:menuselection:`Configuration --> Technical Information --> Data and origin verification -->
-Checks for e-Commerce & Alias Gateway`, and retrieve **SHA Key IN**.
-
-.. _ogone/sha_key_out:
-
-SHA Key OUT
-~~~~~~~~~~~
-
-In order to retrieve the API Key and the Client Key, log into your ogone account, go to
-:menuselection:`Configuration --> Technical Information --> Transaction feedback --> All transaction
-submission modes`, and get or generate your **API Key** and **Client Key**. Be careful to copy your
-API key as you'll not be allowed to get it later without generating a new one.
-
-.. important::
-   If you are trying Ogone as a test, with the Test Account, change the **State** to *Test Mode*. We
-   recommend doing this on a test Odoo database, rather than on your main database.
-
-.. seealso::
-   - :doc:`../payment_acquirers`

content/applications/general/payment_acquirers/paypal.rst

@@ -1,123 +1,185 @@
-======
-Paypal
-======
+=============================
+Configure your Paypal account
+=============================
 
-`Paypal <https://www.paypal.com/>`_ is available and popular worldwide. It doesn't charge any
-subscription fee and creating an account is very easy. That's why we definitely recommend it for
-starters in Odoo. It works as a seamless flow where the customer is routed to Paypal website to
-register the payment.
+Paypal is available and popular worldwide. It doesn’t charge any
+subscription fee and creating an account is very easy. That’s why we
+definitely recommend it for starters in Odoo. It works as a seamless
+flow where the customer is routed to Paypal website to register the
+payment.
+
+Paypal account
+==============
+
+A business account is needed to get paid with Paypal. Create a
+`Paypal Business Account <https://www.paypal.com/us/merchantsignup/
+applicationChecklist?signupType=CREATE_NEW_ACCOUNT&productIntentId=wp_standard>`_
+or upgrade your Personal account to a Business account. Go to the Paypal
+settings and click on *Upgrade to a Business account*.
+Then follow the few configuration steps.
+
+
+Settings in Paypal
+==================
+
+| First, let’s see how to set up your Paypal account in order to build a
+  seamless customer experience with Odoo.
+| Log in and open the settings. Go to :menuselection:`Products & Services -->
+  Website payments` and click **Update** on **Website preferences**.
+
+.. image:: media/paypal01.png
+    :align: center
+
+Auto Return
+-----------
+
+*Auto Return* automatically redirects your customers to Odoo once the
+payment is processed. Check *Auto Return* and enter your domain name
+with the suffix ``/shop/confirmation`` as *Return URL*
+(e.g. ``https://yourcompany.odoo.com/shop/confirmation``).
+
+This URL is requested in Paypal but not used in practice as Odoo
+transmits it at each transaction. Don’t worry if you manage several
+sales channels or Odoo databases.
+
+.. image:: media/paypal02.png
+    :align: center
+
+Payment Data Transfer (PDT)
+---------------------------
+
+*Payment Data Transfer* delivers the payment confirmation to Odoo as
+soon as it is processed. Without it, Odoo cannot end the sales flow.
+This setting must be activated as well. When saving, an *Identity
+Token* is generated. You will be later requested to enter it in Odoo.
+
+.. image:: media/paypal03.png
+    :align: center
+
+Paypal Account Optional
+
+We advise you to not prompt customers to log in with a Paypal account
+when they get to pay. Let them pay with debit/credit cards as well, or you might lose some deals. Make sure this setting is turned on.
+
+.. image:: media/paypal04.png
+    :align: center
+
+Instant Payment Notification (IPN)
+----------------------------------
+
+PDT sends order confirmations once and only once. As a result, your site
+must be running when it happens; otherwise, it will never receive the
+message. That’s why we advise to activate the *Instant Payment
+Notification* (IPN) on top. With IPN, delivery of order confirmations
+is virtually guaranteed since IPN resends a confirmation until your site acknowledges receipt.
+
+| To activate IPN, get back to *Website payments* menu and click
+  *Update* in *Instant Payment Notification*.
+| The *Notification URL* to set is your domain name +
+  “payment/paypal/ipn” (e.g. ``https://yourcompany.odoo.com/payment/paypal/ipn``).
+
+.. image:: media/paypal05.png
+    :align: center
+
+Payment Messages Format
+-----------------------
+
+If you use accented characters (or anything else than basic Latin characters)
+for your customer names, addresses... you MUST configure the encoding format of
+the payment request sent by Odoo to Paypal.
+
+.. danger::
+
+    If you don't configure this setting, some transactions fail without notice.
+
+To do so, open:
+
+* `this page for a test account <https://sandbox.paypal.com/cgi-bin/customerprofileweb?cmd=_profile-language-encoding>`__
+
+* `this page for a production account <https://www.paypal.com/cgi-bin/customerprofileweb?cmd=_profile-language-encoding>`__
+
+Then, click *More Options* and set the two default encoding formats as **UTF-8**.
+
+.. image:: media/paypal07.png
+    :align: center
+
+.. image:: media/paypal08.png
+    :align: center
+
+Your Paypal account is ready!
+
+.. tip::
+   If you want your customers to pay without creating a Paypal account,
+   *Paypal Account Optional* needs to be turned on.
+    
+   .. image:: media/paypal_account_optional.png
+
+.. tip::
+   For Encrypted Website Payments & EWP_SETTINGS error,
+   please check the `Paypal documentation <https://developer.paypal.com/docs/
+   classic/paypal-payments-standard/integration-guide/encryptedwebpayments/
+   #encrypted-website-payments-ewp>`_.
 
 Settings in Odoo
 ================
 
-.. seealso::
-   - :ref:`payment_acquirers/add_new`
+Activation
+----------
 
-Credentials tab
----------------
+Activate *Paypal* from the config bar of Sales, Invoicing and
+eCommerce apps, or from the configuration menu of *Payment Acquirers*.
 
-Odoo needs your **API Credentials** to connect with your PayPal account, which comprise:
+Credentials
+-----------
 
-- **Email ID**: your login email address in Paypal.
-- **Merchant ID**: the code of the merchant account used to identify your Paypal account.
-- **Use IPN**: either you want to use Instant Payment Notification. Already checked, you don't have
-  to change it.
+Odoo requires three Paypal credentials:
 
-You can copy your credentials from your Paypal account, and paste them in the related fields under
-the **Credentials** tab.
+- *Email ID* is your login email address in Paypal.
+- *Merchant ID* can be found in the settings of your Paypal account, in
+  :menuselection:`Account Settings --> Business information`.
+- *Paypal PDT Token* is given in *Website payments* configuration as explained here above.
 
-To retrieve them, log into your Paypal account, and go to :menuselection:`Your account menu -->
-Account settings --> Business Profile --> Business Information`
+.. image:: media/paypal09.png
+    :align: center
 
-.. important::
-   If you are trying Paypal as a test, with a *sandbox account*, change the **State** to *Test
-   Mode*. We recommend doing this on a test Odoo database, rather than on your main database.
-
-Configuration tab
------------------
+Transaction fees
+----------------
 
 You can charge extra fees to your customers for paying with Paypal;
-This to cover the transaction fees Paypal charges you. Once redirected to Paypal, your customer sees
-an extra applied to the order amount.
+This to cover the transaction fees Paypal charges you. Once redirected to Paypal, your customer sees an extra applied to the order amount.
 
-To activate this, go to the Configuration tab of Paypal configuration in Odoo and check *Add Extra
-Fees*.
+To activate this, go to the Configuration tab of Paypal configuration in
+Odoo and check *Add Extra Fees*.
 
-You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-fees>`_ to set up fees.
+.. image:: media/paypal10.png
+    :align: center
+
+You can refer to `Paypal Fees <https://www.paypal.com/webapps/mpp/paypal-fees>`__ to set up
+fees.
 
 .. note::
    `Traders in the EU <https://europa.eu/youreurope/citizens/consumers/shopping/pricing-payments/
    index_en.htm>`_ are not allowed to charge extra fees for paying with credit cards.
 
-Settings in Paypal
-==================
+Go live!
+========
 
-First, let’s see how to set up your Paypal account in order to build a seamless customer experience
-with Odoo.
+Your configuration is ready to roll. Make sure *Production* mode is
+on. Then publish the payment method by clicking the *Published* button right next to it.
 
-Log in and open the settings. Go to :menuselection:`Your account menu --> Account settings -->
-Product & Services --> Website payments` and click **Update** on **Website preferences**.
+.. image:: media/paypal11.png
+    :align: center 
 
-Auto Return
------------
+.. image:: media/paypal12.png
+    :align: Center
 
-*Auto Return* automatically redirects your customers to Odoo once the payment is processed. Check
-*Auto Return* and enter your domain name with the suffix ``/shop/confirmation`` as *Return URL*
-(e.g. `https://yourcompany.odoo.com/shop/confirmation`).
+Paypal is now available in your payment form available in eCommerce,
+Sales and Invoicing apps. Customers are redirected to Paypal website
+when hitting *Pay Now*. They get back to a confirmation page in Odoo
+once the payment is processed.
 
-This URL is requested in Paypal but not used in practice as Odoo transmits it at each transaction.
-Don’t worry if you manage several sales channels or Odoo databases.
-
-Payment Data Transfer (PDT)
----------------------------
-
-*Payment Data Transfer* delivers the payment confirmation to Odoo as soon as it is processed.
-Without it, Odoo cannot end the sales flow. This setting must be activated as well. When saving, an
-*Identity Token* is generated. You will be later requested to enter it in Odoo.
-
-Paypal Account Optional
------------------------
-
-We advise you to not prompt customers to log in with a Paypal account when they get to pay. Let them
-pay with debit/credit cards as well, or you might lose some deals. Make sure this setting is turned
-on.
-
-Instant Payment Notification (IPN)
-----------------------------------
-
-PDT sends order confirmations once and only once. As a result, your site must be running when it
-happens; otherwise, it will never receive the message. That’s why we advise to activate the *Instant
-Payment Notification* (IPN) on top. With IPN, delivery of order confirmations is virtually
-guaranteed since IPN resends a confirmation until your site acknowledges receipt.
-
-| To activate IPN, get back to *Website payments* menu and click *Update* in *Instant Payment
-  Notification*.
-| The *Notification URL* to set is your domain name + “payment/paypal/ipn” (e.g.
-  `https://yourcompany.odoo.com/payment/paypal/ipn`).
-
-Payment Messages Format
------------------------
-
-If you use accented characters (or anything else than basic Latin characters) for your customer
-names, addresses... you MUST configure the encoding format of the payment request sent by Odoo to
-Paypal.
-
-.. danger::
-   If you don't configure this setting, some transactions fail without notice.
-
-To do so, open:
-
-- `this page for a test account <https://sandbox.paypal.com/cgi-bin/customerprofileweb?cmd=_profile-language-encoding>`_
-- `this page for a production account <https://www.paypal.com/cgi-bin/customerprofileweb?cmd=_profile-language-encoding>`_
-
-Then, click *More Options* and set the two default encoding formats as **UTF-8**.
-
-Your Paypal account is ready!
-
-.. tip::
-   For Encrypted Website Payments & EWP_SETTINGS error, please check the `Paypal documentation
-   <https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/
-   encryptedwebpayments#encrypted-website-payments-ewp>`_.
+.. image:: media/paypal13.png
+    :align: center
 
 Test environment
 ================
@@ -133,10 +195,13 @@ This will create two sandbox accounts:
 -  A default personal account (to use as shopper, e.g. `pp.merch01-buyer@example.com <mailto:pp.merch01-buyer@example.com>`__).
 
 Log in to Paypal Sandbox with the merchant account and follow the same configuration instructions.
-Enter your sandbox credentials in Odoo and make sure Paypal is still set on *Test Mode*. We
-recommend doing this on a test Odoo database, rather than on your main database.
+Enter your sandbox credentials in Odoo and make sure Paypal is still
+set on *Test Environment*. Also, make sure the automatic invoicing
+is not activated in your eCommerce settings, to not generate invoices
+when a fictitious transaction is completed.
 
 Run a test transaction from Odoo using the sandbox personal account.
 
 .. seealso::
    - :doc:`../payment_acquirers`
+   - :doc:`../../websites/ecommerce/shopper_experience/payment_acquirer`

content/applications/general/payment_acquirers/sips.rst

@@ -1,32 +0,0 @@
-====
-SIPS
-====
-
-`SIPS <https://sips.worldline.com/>`_ is an online payments solution from the multinational
-Worldline.
-
-Configuration
-=============
-
-.. seealso::
-   - :ref:`payment_acquirers/add_new`
-
-Credentials tab
----------------
-
-Odoo needs your **API Credentials** to connect with your SIPS account, which comprise:
-
-- **Merchant ID**: The ID solely used to identify the merchant account with SIPS.
-- **Secret Key**: The key to sign the merchant account with SIPS.
-- **Secret Key Version**: The version of the key, pre-filled.
-- **Interface Version**: Pre-filled, don't change it.
-
-You can copy your credentials from your SIPS environment info documentation, in the section
-**PROD**, and paste them in the related fields under the **Credentials** tab.
-
-.. important::
-   If you are trying SIPS as a test, with the *TEST* credentials, change the **State** to *Test
-   Mode*. We recommend doing this on a test Odoo database, rather than on your main database.
-
-.. seealso::
-   - :doc:`../payment_acquirers`

content/applications/general/payment_acquirers/stripe.rst

@@ -2,48 +2,31 @@
 Stripe
 ======
 
-`Stripe <https://stripe.com/>`_ is a United States-based online payment solution provider, allowing
-businesses to accept **credit cards** and other payment methods.
+`Stripe <https://stripe.com/>`_ is a United States-based online payment solution
+provider, allowing businesses to accept **credit cards** and other payment methods.
 
-Configuration
-=============
+Enable Local Payment Methods
+============================
 
-.. seealso::
-   - :ref:`payment_acquirers/add_new`
+Local payment methods are payment methods that are only available for certain merchants
+and customers countries and currencies.
 
-Credentials tab
----------------
+The Stripe connector in Odoo supports the following local payment methods:
 
-Odoo needs your **API Credentials** to connect with your Stripe account, which comprise:
+- Bancontact
+- EPS
+- Giropay
+- iDeal:
+- Przelewy24 (P24)
 
-- Publishable Key: The key solely used to identify the account with Stripe.
-- Secret Key: The key to sign the merchant account with Stripe.
-- Webhook Signing Secret: If a webhook is enabled on your Stripe account
-  (:menuselection:`Developers --> webhooks`), this signing secret must be set to authenticate the
-  messages sent from Stripe to Odoo.
-
-To retrieve the publishable and secret keys, log into your Stripe dashboard and go to
-:menuselection:`Developers --> API Keys --> Standard Keys`
-
-.. important::
-   If you are trying Stripe as a test, in the **test mode**, change the **State** to *Test
-   Mode*. We recommend doing this on a test Odoo database, rather than on your main database.
-
-Enable local payment methods
-****************************
-
-Local payment methods are payment methods that are only available for certain merchants and
-customers countries and currencies.
-
-To enable specific local payment methods with Stripe, list them as supported payment icons. To do
-so, go to :menuselection:`Payment Acquirers --> Stripe --> Configuration` and add the desired
-payment methods in the **Supported Payment Icons** field. If the desired payment method is already
-listed, you don't have anything to do. If a payment icon record doesn't exist in the database, its
-related payment method is considered enabled with Stripe.
+To enable specific Local Payment Methods with Stripe, list them as supported payment icons.
+To do so, go to :menuselection:`Payment Acquirers --> Stripe --> Configuration` and add the desired payment methods in
+the **Supported Payment Icons** field. If the desired payment method is already listed, you don't have anything to do.
 
 .. image:: media/stripe_enable_local_payment_method.png
    :align: center
-   :alt: Select and add icons of the payment methods you want to enable
+   :alt: Select and add icons of payment methods you want to enable
 
-.. seealso::
-   - :doc:`../payment_acquirers`
+.. note::
+    If a payment method icon doesn't exist at all in the database, the corresponding local payment method is always offered
+    to customers.

content/applications/general/payment_acquirers/wire_transfer.rst

@@ -2,38 +2,41 @@
 How to get paid with wire transfers
 =======================================
 
-**Wire Transfer** is the default payment method available. The aim is providing your customers with
-your bank details so they can pay on their own. This is very easy to start with but slow and
-inefficient process-wise. Opt for payment acquirers as soon as you can!
+**Wire Transfer** is the default payment method available. 
+The aim is providing your customers with your bank details 
+so they can pay on their own.
+This is very easy to start with but slow and inefficient process-wise. 
+Opt for payment acquirers as soon as you can!
+
 
 How to provide customers with payment instructions
 ==================================================
-
 Put your payment instructions in the **Thanks Message** of your payment method.
 
 .. image:: media/payment_instructions.png
-   :align: center
+  :align: center
 
 They will appear to the customers when they place an order.
 
 .. image:: media/payment_customer_instructions.png
-   :align: center
+  :align: center
+
 
 How to manage an order once you get paid
 ========================================
 
-Whenever a customer pays by wire transfer, the order stays in an intermediary stage **Quotation
-Sent** (i.e. unpaid order). When you get paid, you confirm the order manually to launch the
-delivery.
+Whenever a customer pays by wire transfer, the order stays in an 
+intermediary stage **Quotation Sent** (i.e. unpaid order). 
+When you get paid,
+you confirm the order manually to launch the delivery.
+
 
 How to create other manual payment methods
 ==========================================
 
-If you manage a B2B business, you can create other manually-processed payment methods like paying by
-check. To do so, just rename *Wire Transfer* or duplicate it.
+If you manage a B2B business, you can create other manually-processed 
+payment methods like paying by check.
+To do so, just rename *Wire Transfer* or duplicate it.
 
 .. image:: media/payment_check.png
-   :align: center
-
-.. seealso::
-   - :doc:`../payment_acquirers`
+  :align: center

content/applications/productivity.rst

@@ -9,5 +9,4 @@ Productivity
 
     productivity/discuss
     productivity/iot
-    productivity/mail_plugins
     productivity/studio

content/applications/productivity/mail_plugins.rst

@@ -1,57 +0,0 @@
-:show-content:
-
-============
-Mail Plugins
-============
-
-.. toctree::
-   :titlesonly:
-
-   mail_plugins/outlook
-   mail_plugins/gmail
-
-Mail Plugins are connectors that bridge your mailbox with your Odoo database. With them, you can
-interact with your Odoo database directly from your mailbox by:
-
-- Creating leads and centralizing prospects' emails into the CRM app.
-- Generating tasks in any Odoo project.
-- Creating tickets in the Helpdesk app.
-- Searching and storing insights on your contacts.
-
-Mail Plugins are available for :doc:`Outlook <mail_plugins/outlook>` and :doc:`Gmail
-<mail_plugins/gmail>`.
-
-.. _mail_plugins/pricing:
-
-Pricing
-=======
-
-Mail Plugins are **free** to install and use.
-
-However, they can provide **Lead Enrichment**, which is part of a paid service known as **Lead
-Generation**.
-
-Mail plugins allow you to test Lead Enrichment for free, whether you connect the plugins to a
-database or not. After a while, the plugins ask you to buy :doc:`../general/in_app_purchase`
-credits if you would like to keep using this service.
-
-.. _mail_plugins/lead-generation:
-
-Lead Generation IAP service
----------------------------
-
-Lead Enrichment uses the *Lead Generation IAP service*. Each request consumes one *Lead Generation
-credit*.
-
-To buy credits, go to :menuselection:`Settings --> CRM --> Lead Enrichment --> Buy credits` and
-select a package.
-
-.. note::
-   - If you are out of credits, the only information populated when clicking on the suggested
-     company is its website link and logo.
-   - Check out the `Lead Generation IAP service Privacy Policy
-     <https://iap.odoo.com/privacy#header_3>`_.
-
-.. seealso::
-   - :doc:`../general/in_app_purchase`
-   - `Odoo Tutorials: Lead Enrichment <https://www.odoo.com/r/p73>`_

content/applications/productivity/mail_plugins/gmail.rst

@@ -1,95 +0,0 @@
-============
-Gmail Plugin
-============
-
-Configuration
-=============
-
-The Gmail :doc:`Mail Plugin <../mail_plugins>` needs to be configured both on Odoo and Gmail.
-
-.. _mail-plugin/gmail/enable-mail-plugin:
-
-Enable Mail Plugin
-------------------
-
-First, you need to enable the *Mail Plugin* feature in your database. Go to :menuselection:`Settings
---> General Settings --> Integrations`, enable *Mail Plugin*, and *Save* the configuration.
-
-.. _mail-plugin/gmail/install-plugin:
-
-Install the Gmail Plugin
-------------------------
-
-#. Open the `Gmail Plugin Apps Script project
-   <https://script.google.com/d/1n7cxtaR4fGXKcP0RwinNQmL8S4FhVqpo-ZZ_cUAhYuuDpZAP_CnHE_7q/edit>`_.
-
-#. Verify you are logged in using the Google account you want to install the plugin on.
-
-#. Click on *Publish* then *Deploy from manifest...*
-
-   .. image:: gmail/deploy-from-manifest.png
-      :align: center
-      :alt: Deploying from manifest the Gmail Plugin from the Apps Script project
-
-   .. important::
-      Make sure you are using the legacy editor; otherwise the *Deploy from manifest* functionality
-      may not be available.
-
-      .. image:: gmail/legacy-editor.png
-         :align: center
-         :alt: Using the legacy editor in the Gmail Plugin Apps Script project
-
-#. Click on *Install add-on*. A "Deployment installed" notification should appear. You can then
-   click on *Close*.
-
-   .. image:: gmail/install-add-on.png
-      :align: center
-      :alt: Installing the Gmail Plugin from the Apps Script project
-
-.. _mail-plugin/gmail/configure-mailbox:
-
-Configure your Gmail mailbox
-----------------------------
-
-#. Open any email in your Gmail mailbox. On the right-side panel, click on the Odoo icon and then
-   *Authorize Access*.
-
-   .. image:: gmail/authorize-access.png
-      :align: center
-      :alt: Authorizing access to the Gmail Plugin
-
-#. Choose the right Google account.
-
-   .. image:: gmail/choose-account.png
-      :align: center
-      :alt: Choosing your Google account
-
-#. Allow the Gmail Plugin to access some of your data.
-
-   .. image:: gmail/allow-permissions.png
-      :align: center
-      :alt: Allowing the Gmail Plugin to access Google data
-
-#. The right-side panel can now display **Company Insights**. At the bottom, click on *Login*.
-
-   .. image:: gmail/panel-login.png
-      :align: center
-      :alt: Logging in your Odoo database
-
-   .. note::
-      Only a limited amount of *Company Insights* (*Lead Enrichment*) requests are available as a
-      trial. This feature requires :ref:`prepaid credits <mail_plugins/pricing>`.
-
-#. Enter your Odoo database URL and click on *Login*.
-
-   .. image:: gmail/database-url.png
-      :align: center
-      :alt: Entering your Odoo database URL
-
-#. If you aren't logged into your database, enter your credentials.
-
-#. Click on *Allow* to let the Gmail Plugin connect to your database.
-
-   .. image:: gmail/odoo-permission.png
-      :align: center
-      :alt: Allowing the Gmail Plugin to connect to a database

content/applications/productivity/mail_plugins/outlook.rst

@@ -1,122 +0,0 @@
-==============
-Outlook Plugin
-==============
-
-Configuration
-=============
-
-The Outlook :doc:`Mail Plugin <../mail_plugins>` needs to be configured both on Odoo and Outlook.
-
-.. _mail-plugin/outlook/enable-mail-plugin:
-
-Enable Mail Plugin
-------------------
-
-First, you need to enable the *Mail Plugin* feature in your database. Go to :menuselection:`Settings
---> General Settings --> Integrations`, enable *Mail Plugin*, and *Save* the configuration.
-
-.. _mail-plugin/outlook/install-plugin:
-
-Install the Outlook Plugin
---------------------------
-
-#. Open your Outlook mailbox and select any email.
-
-#. Click on the *More actions* button and select *Get Add-ins*.
-
-   .. image:: outlook/more-actions.png
-      :align: center
-      :alt: More actions button in Outlook
-
-#. Select the *My add-ins* tab.
-
-   .. image:: outlook/my-add-ins.png
-      :align: center
-      :alt: My add-ins in Outlook
-
-#. Under *Custom add-ins*, click on *+ Add a custom add-in*, and then on *Add from URL...*
-
-   .. image:: outlook/custom-add-ins.png
-      :align: center
-      :alt: Custom add-ins in Outlook
-
-#. Enter the following URL `https://download.odoo.com/plugins/v15/outlook/manifest.xml` and press
-   *OK*.
-
-   .. image:: outlook/enter-add-in-url.png
-      :align: center
-      :alt: Entering the add-in URL in Outlook
-
-#. Read the warning and click on *Install*.
-
-   .. image:: outlook/add-in-warning.png
-      :align: center
-      :alt: Custom add-in installation warning in Outlook
-
-.. _mail-plugin/outlook/connect-database:
-
-Connect your database
----------------------
-
-#. Open any email in your Outlook mailbox, click on the *More actions* button, and select *Odoo for
-   Outlook*.
-
-   .. image:: outlook/odoo-for-outlook.png
-      :align: center
-      :alt: Odoo for Outlook add-in button
-
-#. The right-side panel can now display **Company Insights**. At the bottom, click on *Login*.
-
-   .. image:: outlook/panel-login.png
-      :align: center
-      :alt: Logging in your Odoo database
-
-   .. note::
-      Only a limited amount of *Company Insights* (*Lead Enrichment*) requests are available as a
-      trial. This feature requires :ref:`prepaid credits <mail_plugins/pricing>`.
-
-#. Enter your Odoo database URL and click on *Login*.
-
-   .. image:: outlook/enter-database-url.png
-      :align: center
-      :alt: Entering your Odoo database URL
-
-#. Click on *Allow* to open the pop-up window.
-
-   .. image:: outlook/new-window-warning.png
-      :align: center
-      :alt: New window pop-up warning
-
-#. If you aren't logged into your database, enter your credentials.
-
-#. Click on *Allow* to let the Outlook Plugin connect to your database.
-
-   .. image:: outlook/odoo-permission.png
-      :align: center
-      :alt: Allowing the Outlook Plugin to connect to a database
-
-.. _mail-plugin/outlook/add-shortcut:
-
-Add a shortcut to the plugin
-----------------------------
-
-By default, the Outlook Plugin can be opened from the *More actions* menu. However, to save
-time, it's possible to add it next to the other default actions.
-
-#. In your Outlook mailbox, click on *Settings*, then on *View all Outlook settings*.
-
-   .. image:: outlook/all-outlook-settings.png
-      :align: center
-      :alt: Viewing all Outlook settings
-
-#. Select *Customize actions* under *Mail*, click on *Odoo for Outlook*, and then *Save*.
-
-   .. image:: outlook/customize-actions.png
-      :align: center
-      :alt: Odoo for Outlook customized action
-
-#. Open any email; the shortcut should be displayed.
-
-   .. image:: outlook/odoo-outlook-shortcut.png
-      :align: center
-      :alt: Odoo for Outlook customized action

content/applications/sales/crm/optimize.rst

@@ -8,4 +8,5 @@ Optimize your Day-to-Day work
    :titlesonly:
 
    optimize/partner_autocomplete
+   optimize/outlook_extension
    optimize/gamification

content/applications/sales/crm/optimize/outlook_extension.rst

@@ -0,0 +1,175 @@
+=================
+Outlook Extension
+=================
+
+The **Odoo CRM Extension** is a connector that bridges your Outlook mailbox with your Odoo database.
+This extension allows you to:
+
+- Create leads from emails sent to your mailbox.
+- Centralize Prospects' emails into a CRM.
+- Search and store insights on your contacts.
+
+.. image:: media/outlook-extension-overview.png
+   :align: center
+   :alt: Overview of the Outlook Extension in Outlook
+
+.. note::
+   This extension is compatible with the Web version of Outlook as well as the desktop apps.
+
+.. important::
+   The Outlook Extension uses *Partner Autocomplete IAP credits* to search and store insights on
+   your contacts. See the :ref:`Pricing section <outlook_extension/pricing>` below for more
+   information.
+
+.. _outlook_extension/configuration:
+
+Configuration
+=============
+
+The Outlook Extension requires to be configured both in Odoo and in Outlook.
+
+.. _outlook_extension/enable-feature:
+
+Enable the feature on your database
+-----------------------------------
+
+To enable this feature on your Odoo database, go to :menuselection:`CRM --> Configuration --> Lead
+Generation`, enable **Outlook CRM Extension**, and click on *Save*.
+
+.. _outlook_extension/add-in-installation:
+
+Install the add-in on Outlook
+-----------------------------
+
+You can install the Outlook Extension as a **Custom Add-in**. To do so, follow these steps:
+
+.. important::
+   | URL of the **Odoo for Outlook** add-in's manifest file:
+   | ``https://download.odoo.com/plugins/outlook/manifest.xml``
+
+   .. todo:: add copy button when the feature is added to the doc
+
+#. Connect to your Outlook mailbox, open any email, and click on the *More actions* button,
+   displayed as three little dots.
+
+   .. image:: media/outlook-extension-more-actions.png
+      :align: center
+      :alt: The button "More actions" in Outlook
+
+#. Click on *Get add-ins*.
+
+   .. image:: media/outlook-extension-get-add-ins.png
+      :align: center
+      :alt: List of actions in Outlook, including the installation of new add-ins
+
+#. In the new window, select the tab named *My add-ins*, click on *+ Add a custom add-in*, and then
+   on *Add from URL...*
+
+   .. image:: media/outlook-extension-custom-add-ins.png
+      :align: center
+      :alt: Installation of a custom add-in in Outlook
+
+#. | Outlook prompts you to **enter the URL of the add-in's manifest file**. To do so, copy the
+     following URL, paste it in the box, and click on *OK*.
+   | ``https://download.odoo.com/plugins/outlook/manifest.xml``
+
+   .. image:: media/outlook-extension-add-in-url.png
+      :align: center
+      :alt: Getting a custom add-in in Outlook by providing the manifest file's URL
+
+#. Outlook warns you that Microsoft hasn’t verified the add-in. Click on *Install* to complete the
+   installation.
+
+.. note::
+   The *Odoo for Outlook* add-in is not listed yet on Outlook's add-ins list. This is why it is
+   currently necessary to install it as a *custom add-in*.
+
+.. _outlook_extension/connection:
+
+Add a shortcut to open the extension
+------------------------------------
+
+By default, you can open the **Odoo for Outlook** extension from the *More actions* menu. This
+section explains how to move the launcher next to the other default actions.
+
+.. image:: media/outlook-extension-default-actions.png
+   :align: center
+   :alt: Odoo for Outlook extension as a default action in the mailbox
+
+#. In your Outlook mailbox, click on *Settings*, then on *View all Outlook settings*.
+#. Go to :menuselection:`Settings --> Mail --> Customize actions --> Message surface`, select
+   *Odoo for Outlook*, and click on *Save*.
+
+   .. image:: media/outlook-extension-customize-actions.png
+      :align: center
+      :alt: add Odoo for Outlook extension as a default action in the message surface
+
+
+Connect to your database
+------------------------
+
+#. Open **Odoo for Outlook** from any email. This opens the extension as a panel on the right side of
+   your screen.
+#. Click on *login* at the bottom of the extension.
+#. Insert your database's URL then click on *Login*.
+
+   .. image:: media/outlook-extension-database-url.png
+      :align: center
+      :alt: Connection to an Odoo database from the Outlook extension
+
+#. Log into your database by entering your credentials. Skip this step if you are already logged in
+   with this browser.
+#. A message asks you if you want to let Outlook access your Odoo database. Click on *Allow* to
+   complete the connection.
+
+   .. important::
+      Make sure first to :ref:`enable the feature on your database
+      <outlook_extension/enable-feature>`. Failing to do so would result in an *error 404 message*.
+
+.. note::
+   The extension displays some information, even if you do not connect it to any Odoo database.
+   Note that only a limited amount of contact enrichment requests are available as a trial, as this
+   feature requires prepaid credits. See the :ref:`Pricing section <outlook_extension/pricing>`
+   below for more information.
+
+.. _outlook_extension/pricing:
+
+Pricing
+=======
+
+The extension is **free** and doesn't require any purchase to be installed and used.
+
+However, this extension provides you with *Lead Enrichment* in the **Company Insights** section.
+This service is part of a paid service known as **Lead Generation**.
+
+The extension allows you to test this service for free, whether you connect the extension to a
+database or not. After a while, the extension asks you to buy credits to keep using this additional
+service.
+
+.. image:: media/outlook-extension-credits-message.png
+   :align: center
+   :alt: "Could not auto-complete the company: not enough credits!" warning message in the Outlook
+         extension
+
+.. tip::
+   You can buy more *Lead Generation* credits to keep using this service or disregard this message
+   and keep using the extension for free without *Lead Enrichment*.
+
+In-App Purchase
+---------------
+
+| *Lead Generation* is an *In-App Purchase (IAP)* service, which requires prepaid credits to be
+  used. Each request consumes one credit.
+| To buy credits, go to :menuselection:`Settings --> Contacts --> Partner Autocomplete or Odoo IAP -->
+  View My Services` and select a package.
+
+.. note::
+   - If you run out of credits, the only information populated when clicking on the suggested
+     company is the website link and logo.
+   - If you are on Odoo Online (SAAS) and have the Enterprise version, you benefit from free
+     trial credits to test the feature.
+   - Learn about our *Privacy Policy* `here <https://iap.odoo.com/privacy#header_2>`_.
+
+.. seealso::
+   - :doc:`../../../general/in_app_purchase`
+   - `Odoo Tutorials: Lead Enrichment <https://www.odoo.com/r/p73>`_

content/applications/sales/sales/amazon_connector/manage.rst

@@ -37,9 +37,12 @@ When a picking related to the order is confirmed, a notification is sent to Amaz
 turn, notify the customer that the order (or a part of it) is on its way.
 
 .. important::
-   Amazon requires to provide a tracking reference with each delivery. You'll need to assign a
-   carrier. If the carrier doesn't automatically provide a tracking reference, you'll need to set
-   one manually. This concerns all marketplaces.
+   Starting from July 2021, Amazon requires that deliveries be provided with a tracking
+   reference. This concerns all marketplaces.
+   
+   If this is not already done, you need to :ref:`install <general/install>` the **Delivery Costs**
+   module in order to provide the tracking reference. There is unfortunately no workaround to comply
+   with this new Amazon policy.
 
 .. seealso::
    - :doc:`../../../inventory_and_mrp/inventory/shipping/setup/third_party_shipper`

content/applications/sales/sales/ebay_connector/setup.rst

@@ -36,73 +36,6 @@ on **Sync countries and currencies**, then you can fill in all the other fields.
 When all the fields are filled in, you can synchronize the categories and the
 policies by clicking on the adequate buttons.
 
-Accept account deletion notifications
-=====================================
-
-Since September 2021, **eBay requires supporting customer account deletion/closure notifications**.
-As such, when eBay receives an account request for deletion, all eBay partners must confirm the
-reception of the request and take further action if necessary.
-
-Odoo has a notification endpoint to receive those notifications, confirm the reception of the
-request, and handle the first set of actions to anonymize the account details in **Contacts** and
-remove the customer's access to the portal.
-
-.. important::
-   Make sure to correctly :ref:`set up your subscription to the marketplace account deletion
-   notifications <ebay/subscribe-account-deletion-notifications>` as eBay may temporarily disable
-   the related eBay account until the subscription is completed.
-
-.. _ebay/retrieve-endpoint-details:
-
-Retrieve endpoint details from Odoo
------------------------------------
-
-The endpoint details can be found in :menuselection:`Sales --> Configuration --> Settings --> eBay`.
-Click on *Generate Token* to retrieve your **Verification Token**.
-
-.. image:: media/verification-token.png
-   :align: center
-   :alt: Button to generate an eBay verification token in Odoo
-
-.. _ebay/subscribe-account-deletion-notifications:
-
-Subscribe to account deletion notifications
--------------------------------------------
-
-Log in on the `developer portal of eBay <https://go.developer.ebay.com/>`_ and go to **Alerts &
-Notifications**.
-
-.. image:: media/ebay-your-account.png
-   :align: center
-   :alt: Overview of the Alerts & Notifications dashboard of eBay
-
-To subscribe to deletion/closure notifications, eBay needs a few details:
-
-- An **email address** to send notifications to if the endpoint is unreachable.
-- The **endpoint details**:
-
-  - The URL to Odoo's account deletion notification endpoint
-  - A verification token
-
-.. image:: media/ebay-notification-endpoint.png
-   :align: center
-   :alt: Dedicated fields to enter the endpoint details
-
-.. tip::
-   You can edit the last two fields once the email address field is filled out.
-
-Verify the connectivity with the endpoint
------------------------------------------
-
-After setting the retrieved endpoint details in eBay's dashboard, consider testing the connectivity
-with the **Send Test Notification** button.
-
-You should get the following confirmation message: "A test notification was sent successfully!"
-
-.. image:: media/test-notification.png
-   :align: center
-   :alt: Button to send test notification
-
 Using the updated synchronisation method
 ========================================
 
@@ -118,9 +51,7 @@ To switch to the new synchronization mechanism:
 #. Activate the :ref:`developer mode <developer-mode>`.
 #. Go to :menuselection:`Settings --> Technical --> Scheduled Actions`
 #. Archive the old synchronization actions (both are named *Ebay: update product status*)
-#. Activate the new synchronization actions (*Ebay: get new orders* which runs every 15min by
-   default and *Ebay: synchronise stock (for 'get new orders' synchronisation)* which runs once a
-   day per default)
+#. Activate the new synchronization actions (*Ebay: get new orders* which runs every 15min by default and *Ebay: synchronise stock (for 'get new orders' synchronisation)* which runs once a day per default)
 #. Ensure that the **Next Execution Date** for both these actions are in the near future
 
 Starting with the next execution date, the new method will be used instead of the old one.

content/applications/sales/subscriptions.rst

@@ -12,7 +12,7 @@ keep the churn under control and have reporting on the main KPIs: MRR, ARR, rete
 upselling, etc.
 
 .. seealso::
-   - `Odoo Tutorials: Subscriptions <https://www.odoo.com/slides/subscription-20>`_
+   - `Odoo Tutorials: Subscriptions <https://www.odoo.com/slides/subscription-28>`_
 
 .. toctree::
    :titlesonly:

content/contributing/documentation.rst

@@ -70,8 +70,12 @@ Use the GitHub interface
 #. Verify that you are browsing the documentation in the version that you intend to change. The
    version can be selected from the dropdown in the top menu.
 
+   .. image:: documentation/version-selector.png
+
 #. Head over to the page that you want to change and click on the **Edit on GitHub** button in the
-   top right corner of the page.
+   bottom of the left menu.
+
+   .. image:: documentation/edit-on-github.png
 
 #. If you do not have edit rights on the repository (`odoo/documentation
    <https://github.com/odoo/documentation>`_), you need to fork it by clicking on the appropriate
@@ -220,7 +224,7 @@ Python comes with its own package manager: `pip
 a single command.
 
 #. Download and install the recommended release (`see README file
-   <https://github.com/odoo/documentation/tree/15.0/README.md>`_) of **Python 3** on your machine.
+   <https://github.com/odoo/documentation/tree/14.0/README.md>`_) of **Python 3** on your machine.
 #. Make sure to have **pip** installed on your machine (on Windows, you can install pip alongside
    Python).
 #. Execute the following commands in a terminal to verify that both installations finished

content/contributing/documentation/rst_guidelines.rst

@@ -36,8 +36,8 @@ A reference to the rendered :file:`prices.html` and :file:`variants.html` could
 
 #. Absolute:
 
-   - ``https://odoo.com/documentation/15.0/applications/sales/sales/products_prices/prices.html``
-   - ``https://odoo.com/documentation/15.0/applications/sales/sales/products_prices/products/variants.html``
+   - ``https://odoo.com/documentation/14.0/applications/sales/sales/products_prices/prices.html``
+   - ``https://odoo.com/documentation/14.0/applications/sales/sales/products_prices/products/variants.html``
 
 #. Relative:
 

content/developer/howtos/rdtraining/01_architecture.rst

@@ -29,12 +29,6 @@ on your background.
 
 For reference this is the official `Python tutorial`_.
 
-.. note::
-  Since version 15.0, Odoo is actively transitioning to using its own in-house developed `OWL
-  framework <https://odoo.github.io/owl/>`_ as part of its presentation tier. The legacy JavaScript
-  framework is still supported but will be depreciated over time. This will be discussed further in
-  advanced topics.
-
 Odoo modules
 ============
 

content/developer/howtos/rdtraining/02_setup.rst

@@ -337,18 +337,6 @@ For Python, we use PEP8 with these options ignored:
 
 For JavaScript, we use ESLint and you can find a `configuration file example here`_.
 
-If you do not know how to set up a linter:
-
-- `Here is an explanation of how to set up a Python linter in VSCode <https://code.visualstudio.com/docs/python/linting>`_. There are multiple
-  linter options you are free to choose from, but `Flake8 <https://pypi.org/project/flake8/>`_ is a popular choice.
-- To setup ESLint in VSCode, you must download the `ESLint extension`_ and follow its instructions
-  for installing ESLint. Don't forget to create and set up the `.eslintrc` file to follow the
-  configuration file mentioned above.
-- Another useful VSCode plugin is `Trailing Spaces`_ to quickly notice trailing spaces while
-  you're working.
-
-.. _Trailing Spaces: https://marketplace.visualstudio.com/items?itemName=shardulm94.trailing-spaces
-.. _ESLint extension: https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint
 .. _configuration file example here: https://github.com/odoo/odoo/wiki/Javascript-coding-guidelines#use-a-linter
 .. _VSCode: https://code.visualstudio.com/
 .. _VSCodium: https://vscodium.com/

content/developer/howtos/rdtraining/13_inheritance.rst

@@ -71,12 +71,6 @@ The decorator :func:`~odoo.api.model` is necessary for the :meth:`~odoo.models.M
 method because the content of the recordset ``self`` is not relevant in the context of creation,
 but it is not necessary for the other CRUD methods.
 
-It is also important to note that even though we can directly override the
-:meth:`~odoo.models.Model.unlink` method, you will almost always want to write a new method with
-the decorator :func:`~odoo.api.ondelete` instead. Methods marked with this decorator will be
-called during :meth:`~odoo.models.Model.unlink` and avoids some issues that can occur during
-uninstalling the model's module when :meth:`~odoo.models.Model.unlink` is directly overridden.
-
 In Python 3, ``super()`` is equivalent to ``super(TestModel, self)``. The latter may be necessary
 when you need to call the parent method with a modified recordset.
 
@@ -91,8 +85,8 @@ when you need to call the parent method with a modified recordset.
 
     - Prevent deletion of a property if its state is not 'New' or 'Canceled'
 
-    Tip: create a new method with the :func:`~odoo.api.ondelete` decorator and remember that
-    ``self`` can be a recordset with more than one record.
+    Tip: override :meth:`~odoo.models.Model.unlink` and remember that ``self`` can be a recordset
+    with more than one record.
 
     - At offer creation, set the property state to 'Offer Received'. Also raise an error if the user
       tries to create an offer with a lower amount than an existing offer.

content/developer/howtos/rdtraining/14_other_module.rst

@@ -133,24 +133,24 @@ information:
 Moreover, an invoice line needs to be linked to an invoice. The easiest and most efficient way
 to link a line to an invoice is to include all lines at invoice creation. To do this, the
 ``invoice_line_ids`` field is included in the ``account.move`` creation, which is a
-:class:`~odoo.fields.One2many`. One2many and Many2many use special 'commands' which have been
-made human readable with the :class:`~odoo.fields.Command` namespace. This namespace represents
-a triplet command to execute on a set of records. The triplet was originally the only option to
-do these commands, but it is now standard to use the namespace instead. The format is to place
-them in a list which is executed sequentially. Here is a simple example to include a One2many
-field ``line_ids`` at creation of a ``test.model``::
-
-    from odoo import Command
+:class:`~odoo.fields.One2many`. One2many and Many2many use special 'commands' described in
+:ref:`reference/orm/models/crud`. This format is a list of triplets executed sequentially, where
+each triplet is a command to execute on the set of records. Here is a simple example to include
+a One2many field ``line_ids`` at creation of a ``test.model``:: 
 
     def inherited_action(self):
         self.env["test.model"].create(
             {
                 "name": "Test",
                 "line_ids": [
-                    Command.create({
-                        "field_1": "value_1",
-                        "field_2": "value_2",
-                    })
+                    (
+                        0,
+                        0,
+                        {
+                            "field_1": "value_1",
+                            "field_2": "value_2",
+                        },
+                    )
                 ],
             }
         )

content/developer/howtos/rdtraining/16_guidelines_pr.rst

@@ -18,9 +18,9 @@ to improve the quality of the Odoo Apps code.
 
 .. exercise:: Polish your code.
 
-    Refactor your code to respect the coding guidelines. Don't forget to run your linter and
-    respect the module structure, the variable names, the method name convention, the model
-    attribute order and the xml ids.
+    Refactor your code to respect the coding guidelines. Don't forget to respect the module
+    structure, the variable names, the method name convention, the model attribute order and the
+    xml ids.
 
 Your first Pull Request (PR)
 ============================