[IMP] crm: grammar on google_spreadsheets

X-original-commit: f39a43f697

Makefile

@@ -26,7 +26,7 @@ SOURCE_DIR     = content
 
 HTML_BUILD_DIR = $(BUILD_DIR)/html
 ifdef VERSIONS
-  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/16.0
+  HTML_BUILD_DIR := $(HTML_BUILD_DIR)/saas-15.3
 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/16.0/contributing/documentation.html#install-git)
-- [Python 3.7 or 3.8](https://www.odoo.com/documentation/16.0/contributing/documentation.html#python)
-- Python dependencies listed in the file [`requirements.txt`](https://github.com/odoo/documentation/tree/16.0/requirements.txt).
-- [Make](https://www.odoo.com/documentation/16.0/contributing/documentation.html#make)
-- A local copy of the [odoo/odoo repository in 16.0](https://github.com/odoo/odoo/tree/16.0) (Optional)
+- [Git](https://www.odoo.com/documentation/saas-15.3/contributing/documentation.html#install-git)
+- [Python 3.7 or 3.8](https://www.odoo.com/documentation/saas-15.3/contributing/documentation.html#python)
+- Python dependencies listed in the file [`requirements.txt`](https://github.com/odoo/documentation/tree/saas-15.3/requirements.txt).
+- [Make](https://www.odoo.com/documentation/saas-15.3/contributing/documentation.html#make)
+- A local copy of the [odoo/odoo repository in saas-15.3](https://github.com/odoo/odoo/tree/saas-15.3) (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/16.0/contributing/documentation.html#preview-your-changes)
+3. See [this guide](https://www.odoo.com/documentation/saas-15.3/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/16.0/contributing/documentation.html).
+[Introduction Guide](https://www.odoo.com/documentation/saas-15.3/contributing/documentation.html).
 
 To **report a content issue**, **request new content** or **ask a question**, use the
 [repository's issue tracker](https://github.com/odoo/documentation-user/issues) as usual.
@@ -43,4 +43,4 @@ To **report a content issue**, **request new content** or **ask a question**, us
 
 To learn more about Odoo, in addition to the documentation, have a look at
 [the official eLearning](https://odoo.com/slides) and
-[Scale-up, The Business Game](https://www.odoo.com/page/scale-up-business-game).
+[Scale-up, The Business Game](https://www.odoo.com/page/scale-up-business-game).

conf.py

@@ -22,7 +22,7 @@ copyright = 'Odoo S.A.'
 # `version` if the version info for the project being documented, acts as replacement for |version|,
 # also used in various other places throughout the built documents.
 # `release` is the full version, including alpha/beta/rc tags. Acts as replacement for |release|.
-version = release = '16.0'
+version = release = 'saas-15.3'
 
 # The minimal Sphinx version required to build the documentation.
 needs_sphinx = '3.0.0'
@@ -95,7 +95,7 @@ else:
     import odoo.addons
     odoo.addons.__path__.append(str(odoo_dir) + '/addons')
     from odoo import release as odoo_release  # Don't collide with Sphinx's 'release' config option
-    odoo_version = '.'.join(str(s) for s in odoo_release.version_info[:2]).replace('~', '-')  # Change saas~XX.Y to saas-XX.Y
+    odoo_version = odoo_release.version.replace('~', '-')  # Change saas~XX.Y to saas-XX.Y
     odoo_version = 'master' if 'alpha' in odoo_release.version else odoo_version
     if release != odoo_version:
         _logger.warning(
@@ -186,8 +186,8 @@ sphinx.transforms.i18n.docname_to_domain = (
 # The version names that should be shown in the version switcher, if the config option `versions`
 # is populated. If a version is passed to `versions` but is not listed here, it will not be shown.
 versions_names = {
-    '16.0': "Odoo 16",
     'master': "Master",
+    'saas-15.3': "Odoo Online",
     'saas-15.2': "Odoo Online",
     '15.0': "Odoo 15",
     '14.0': "Odoo 14",

content/administration/install/deploy.rst

@@ -215,11 +215,11 @@ LiveChat
 --------
 
 In multiprocessing, a dedicated LiveChat worker is automatically started and
-listening on :option:`the gevent port <odoo-bin --gevent-port>` but
+listening on :option:`the longpolling port <odoo-bin --longpolling-port>` but
 the client will not connect to it.
 
 Instead you must have a proxy redirecting requests whose URL starts with
-``/websocket/`` to the gevent port. Other request should be proxied to
+``/longpolling/`` to the longpolling port. Other request should be proxied to
 the :option:`normal HTTP port <odoo-bin --http-port>`
 
 To achieve such a thing, you'll need to deploy a reverse proxy in front of Odoo,
@@ -323,15 +323,9 @@ in ``/etc/nginx/sites-enabled/odoo.conf`` set:
     access_log /var/log/nginx/odoo.access.log;
     error_log /var/log/nginx/odoo.error.log;
 
-    # Redirect websocket requests to odoo gevent port
-    location /websocket {
+    # Redirect longpoll requests to odoo longpolling port
+    location /longpolling {
       proxy_pass http://odoochat;
-      proxy_set_header Upgrade $http_upgrade;
-      proxy_set_header Connection $connection_upgrade;
-      proxy_set_header X-Forwarded-Host $host;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header X-Forwarded-Proto $scheme;
-      proxy_set_header X-Real-IP $remote_addr;
     }
 
     # Redirect requests to odoo backend server
@@ -387,119 +381,27 @@ notifications.
 The solutions to support livechat/motifications in a WSGI application are:
 
 * Deploy a threaded version of Odoo (instead of a process-based preforking
-  one) and redirect only requests to URLs starting with ``/websocket/`` to
-  that Odoo, this is the simplest and the websocket URL can double up as the cron 
-  instance.
+  one) and redirect only requests to URLs starting with ``/longpolling/`` to
+  that Odoo, this is the simplest and the longpolling URL can double up as
+  the cron instance.
 * Deploy an evented Odoo via ``odoo-gevent`` and proxy requests starting
-  with ``/websocket/`` to
-  :option:`the gevent port <odoo-bin --gevent-port>`.
+  with ``/longpolling/`` to
+  :option:`the longpolling port <odoo-bin --longpolling-port>`.
 
-.. _deploy/streaming:
+Serving Static Files
+====================
 
-Serving static files and attachments
-====================================
+For development convenience, Odoo directly serves all static files in its
+modules. This may not be ideal when it comes to performances, and static
+files should generally be served by a static HTTP server.
 
-For development convenience, Odoo directly serves all static files and attachments in its modules.
-This may not be ideal when it comes to performances, and static files should generally be served by
-a static HTTP server.
-
-Serving static files
---------------------
-
-Odoo static files are located in each module's :file:`static/` folder, so static files can be served 
-by intercepting all requests to :samp:`/{MODULE}/static/{FILE}`, and looking up the right module
-(and file) in the various addons paths.
-
-.. example::
-   Say Odoo has been installed via the **debian packages** for Community and Enterprise, the addons
-   paths is :file:`/usr/lib/python3/dist-packages/odoo/addons`. Using the above NGINX (https)
-   configuration, the following location block should be added to serve static files via NGINX.
-   
-   .. code-block:: nginx
-   
-       location @odoo {
-           # copy-paste the content of the / location block
-       }
-   
-       # Serve static files right away
-       location ~ ^/[^/]+/static/.+$ {
-           root /usr/lib/python3/dist-packages/odoo/addons;
-           try_files $uri @odoo;
-           expires 24h;
-       }
-
-.. example::
-   Say Odoo has been installed via the **source**, and the two git repositories for Community and
-   Enterprise has been cloned in :file:`/opt/odoo` and :file:`/opt/odoo-enterprise` respectively. 
-   The addons paths is ``/opt/odoo/odoo,/opt/odoo/addons,/opt/odoo-enterprise``. Using the above
-   NGINX (https) configuragion, the following location block should be added to serve static files
-   via NGINX.
-
-   .. code-block:: nginx
-   
-       location @odoo {
-           # copy-paste the content of the / location block
-       }
-   
-       # Serve static files right away
-       location ~ ^/[^/]+/static/.+$ {
-           try_files /static-base$uri /static-addons$uri /static-enterprise$uri @odoo$uri;
-           expires 24h;
-       }
-   
-       location /static-base {
-           internal;
-           alias /opt/odoo/odoo/addons;
-       }
-   
-       location /static-addons {
-           internal;
-           alias /opt/odoo/addons;
-       }
-   
-       location /static-enterprise {
-           internal;
-           alias /opt/odoo-enterprise;
-       }
-
-.. warning::
-   The actual NGINX configuration you need is highly dependent on your own installation. The two
-   above snippets only highlight two possible configurations and may not be used as-is.
-
-Serving attachments
--------------------
-
-Attachments are files stored in the filestore which access is regulated by Odoo. They cannot be
-directly accessed via a static web server as accessing them requires multiple lookups in the
-database to determine where the files are stored and whether the current user can access them or
-not.
-
-Nevertheless, once the file has been located and the access rights verified by Odoo, it is a good
-idea to serve the file using the static web server instead of Odoo. For Odoo to delegate serving
-files to the static web server, the `X-Sendfile <https://tn123.org/mod_xsendfile/>`_ (apache) or
-`X-Accel <https://www.nginx.com/resources/wiki/start/topics/examples/x-accel/>`_ (nginx) extensions
-must be enabled and configured on the static web server. Once it is set up, start Odoo with the
-:option:`--x-sendfile <odoo-bin --x-sendfile>` CLI flag (this unique flag is used for both
-X-Sendfile and X-Accel).
-
-
-.. note::
-   - The X-Sendfile extension for apache (and compatible web servers) does not require any
-     supplementary configuration.
-   - The X-Accel extension for NGINX **does** require the following additionnal configuration:
-
-     .. code-block:: nginx
- 
-         location /web/filestore {
-             internal;
-             alias /path/to/odoo/data-dir/filestore;
-         }
-
-     In case you don't know what is the path to your filestore, start Odoo with the
-     :option:`--x-sendfile <odoo-bin --x-sendfile>` option and navigate to the ``/web/filestore`` URL
-     directly via Odoo (don't navigate to the URL via NGINX). This logs a warnings, the message
-     contains the configuration you need.
+Odoo static files live in each module's ``static/`` folder, so static files
+can be served by intercepting all requests to :samp:`/{MODULE}/static/{FILE}`,
+and looking up the right module (and file) in the various addons paths.
 
+.. todo:: test whether it would be interesting to serve filestored attachments
+          via this, and how (e.g. possibility of mapping ir.attachment id to
+          filestore hash in the database?)
 
 .. _security:
 

content/administration/install/install.rst

@@ -547,7 +547,7 @@ Dependencies
          .. tab:: Debian/Ubuntu
 
             For Debian-based systems, the packages are listed in the `debian/control
-            <https://github.com/odoo/odoo/blob/16.0/debian/control>`_ file of the Odoo sources.
+            <https://github.com/odoo/odoo/blob/master/debian/control>`_ file of the Odoo sources.
 
             On Debian/Ubuntu, the following commands should install the required packages:
 
@@ -700,6 +700,11 @@ A typical way to run the server would be:
       Where `CommunityPath` is the path of the Odoo Community installation, and `mydb` is the name
       of the PostgreSQL database.
 
+      .. warning::
+         Some versions of python on Mac might lead to the following error message: `current limit
+         exceeds maximum limit`. In that case, add the following parameter `--limit-memory-hard 0`
+         to avoid the problem.
+
 After the server has started (the INFO log `odoo.modules.loading: Modules loaded.` is printed), open
 http://localhost:8069 in your web browser and log in with the base administrator account: Use
 `admin` for the :guilabel:`Email` and, again, `admin` for the :guilabel:`Password`. That's it, you

content/administration/maintain/domain_names.rst

@@ -59,14 +59,12 @@ database manager.
      registrar.
    - You are the owner of the domain name and can use it for other purposes.
    - Odoo manages payment and technical support for you.
-   - This offer doesn't include any mailbox. However, you can :ref:`configure your MX records
-     <domain-name/odoo-manage>` to use your own email server or solution such as Google Workspace.
 
-To do so, go to :menuselection:`Website --> Domain Name`. Alternatively, open your `database manager
-<https://www.odoo.com/my/databases>`_, click on the :guilabel:`settings` button next to your
-database, then on :guilabel:`Domain names`.
+To do so, go to :menuselection:`Website --> Go to website --> Promote --> Domain Name`.
+Alternatively, open your `database manager <https://www.odoo.com/my/databases>`_, click on the
+:guilabel:`settings` button next to your database, then on :guilabel:`Domain names`.
 
-.. image:: domain_names/register-menu.png
+.. image:: domain_names/register-promote.png
    :align: center
    :alt: Clicking on Domain Names from an Odoo website
 

content/administration/odoo_sh/getting_started/branches.rst

@@ -71,7 +71,7 @@ The neutralization includes:
 * Disabling outgoing emails by intercepting them with a mailcatcher. An
   :ref:`interface to view <odoosh-gettingstarted-branches-tabs-mails>` the emails sent by your
   database is provided. That way, you do not have to worry about sending test emails to your contacts.
-* Setting payment providers and shipping providers in test mode.
+* Setting payment acquirers and shipping providers in test mode.
 * Disabling IAP services
 
 The latest database will be kept alive indefinitely, older ones from the same branch may get garbage collected

content/applications/finance.rst

@@ -11,4 +11,4 @@ Finance
     finance/expenses
     finance/documents
     finance/sign
-    finance/payment_providers
+    finance/payment_acquirers

content/applications/finance/accounting/bank/feeds/ponto.rst

@@ -64,8 +64,8 @@ Link your Ponto account with your Odoo database
 #. Finish the flow.
 
 .. note::
-   You have to authorize all the accounts you want to access in Odoo, but Odoo will filter the
-   accounts based on the institution you selected in the second step.
+   You have to authorize all the accounts you want to access in Odoo but, Odoo will filter the
+   accounts based on the institution you selected at the second step.
 
 Update your synchronization credentials
 ---------------------------------------

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

@@ -8,21 +8,9 @@ Configuration
 :ref:`Install <general/install>` the following modules to get all the features of the Luxembourgish
 localization:
 
-.. list-table::
-   :header-rows: 1
-
-   * - Name
-     - Technical name
-     - Description
-   * - :guilabel:`Luxembourg - Accounting`
-     - `l10n_lu`
-     - Default :doc:`fiscal localization package <../overview/fiscal_localization_packages>`
-   * - :guilabel:`Luxembourg - Accounting Reports`
-     - `l10n_lu_reports`
-     - Country-specific reports
-   * - :guilabel:`Luxembourg - Annual VAT Report`
-     - `l10n_lu_reports_annual_vat`
-     - Country-specific reports
+- :guilabel:`Luxembourg - Accounting` (module's technical name: ``l10n_lu``).
+- :guilabel:`Luxembourg - Accounting Reports` (module's technical name: ``l10n_lu_reports``).
+- :guilabel:`Luxembourg - Annual VAT Report` (module's technical name: ``l10n_lu_reports_annual_vat``).
 
 .. image:: luxembourg/modules.png
    :align: center

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

@@ -31,8 +31,8 @@ localization in Odoo, it is necessary to meet the following requirements:
 #. Be registered with the SAT and have an RFC.
 #. Have a `Certificate of Digital Seal
    <https://www.gob.mx/sat/acciones-y-programas/certificado-de-sello-digital>`_ (CSD).
-#. Choose a PAC and purchase stamps. Currently the Mexican location in Odoo works with the following
-   PACs: `Solución Factible <https://solucionfactible.com/>`_, `Quadrum (formerly Finkok)
+#. Choose a PAC and purchase stamps. Currently the Mexican location in Odoo works with two PACs:
+   `Solución Factible <https://solucionfactible.com/>`_, `Quadrum (formerly Finkok)
    <https://cfdiquadrum.com.mx/index.html>`_ and `SW Sapien - Smarter Web <https://sw.com.mx/>`_.
 #. Have knowledge and experience with billing, sales and accounting in Odoo. This documentation
    contains only the information necessary to enable the use of Odoo in a company based in Mexico.

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

@@ -232,8 +232,9 @@ directly to its services and get the currency rate either automatically or manua
    :align: center
    :alt: Bank of Peru is displayed in Multicurrency Service option
    
-Please refer to the next section in our documentation for more information about
-:doc:`multicurrencies <../../others/multi_currency>`.
+Please refer to the next section in our documentation for more information about :doc:`multicurrency
+<../../others/multicurrencies/how_it_works>`.
+
 
 Configure Master data
 ---------------------

content/applications/finance/accounting/getting_started/initial_configuration/setup.rst

@@ -176,7 +176,7 @@ Payment Method
 This menu helps you configure the payment methods with which your customers can pay you.
 
 .. important::
-   Configuring a *Payment Provider* with this tool also activates the *Invoice Online Payment*
+   Configuring a *Payment Acquirer* with this tool also activates the *Invoice Online Payment*
    option automatically. With this, users can directly pay online, from their Customer Portal.
 
 .. _invoicing-setup-sample:

content/applications/finance/accounting/others.rst

@@ -7,7 +7,7 @@ Others
 .. toctree::
    :titlesonly:
 
-   others/multi_currency
    others/analytic
    others/adviser
+   others/multicurrencies
    others/inventory

content/applications/finance/accounting/others/multi_currency.rst

@@ -1,167 +0,0 @@
-=====================
-Multi-currency system
-=====================
-
-Odoo allows you to issue invoices, receive bills, and record transactions in currencies other than
-the main currency configured for your company. You can also set up bank accounts in other currencies
-and run reports on your foreign currency activities.
-
-.. seealso::
-   - :doc:`../bank/setup/foreign_currency`
-
-.. _multi-currency/config:
-
-Configuration
-=============
-
-.. _multi-currency/config-main-currency:
-
-Main currency
--------------
-
-The **main currency** is defined by default according to the company's country. You can change it by
-going to :menuselection:`Accounting --> Configuration --> Settings --> Currencies` and changing the
-currency in the :guilabel:`Main Currency` setting.
-
-.. _multi-currency/config-enable:
-
-Enable foreign currencies
--------------------------
-
-Go to :menuselection:`Accounting --> Configuration --> Currencies`, and enable the currencies you
-wish to use by toggling the :guilabel:`Active` button.
-
-.. image:: multi_currency/enable-foreign-currencies.png
-   :align: center
-   :alt: Enable the currencies you wish to use.
-
-.. _multi-currency/config-rates:
-
-Currency rates
---------------
-
-Manual update
-~~~~~~~~~~~~~
-
-To manually create and set a currency rate, go to :menuselection:`Accounting --> Configuration -->
-Currencies`, click on the currency you wish to change the rate of, and under the :guilabel:`Rates`
-tab, click :guilabel:`Add a line` to create a new rate.
-
-.. image:: multi_currency/manual-rate-update.png
-  :align: center
-  :alt: Create or modify the currency rate.
-
-Automatic update
-~~~~~~~~~~~~~~~~
-
-When you activate a second currency for the first time, :guilabel:`Automatic Currency Rates` appears
-under :menuselection:`Accounting Dashboard --> Configuration --> Settings --> Currencies`. By
-default, you have to click on the **Update now** button (:guilabel:`🗘`) to update the rates.
-
-Odoo can update the rates at regular intervals. To do so, change the :guilabel:`Interval` from
-:guilabel:`Manually` to :guilabel:`Daily`, :guilabel:`Weekly`, or :guilabel:`Monthly`. You can also
-select the web service from which you want to retrieve the latest currency rates by clicking on the
-:guilabel:`Service` field.
-
-.. _multi-currency/config-exch-diff:
-
-Exchange difference entries
----------------------------
-
-Odoo automatically records exchange differences entries on dedicated accounts, in a dedicated
-journal.
-
-You can define which journal and accounts to use to **post exchange difference entries** by
-going to :menuselection:`Accounting --> Configuration --> Settings --> Default Accounts` and editing
-the :guilabel:`Journal`, :guilabel:`Gain Account`, and :guilabel:`Loss Account`.
-
-.. example::
-   If you receive a payment for a customer invoice one month after it was issued, the exchange rate
-   has likely changed since. Therefore, this fluctuation implies some profit or loss due to the
-   exchange difference, which Odoo automatically records in the default **Exchange Difference**
-   journal.
-
-.. _multi-currency/config-coa:
-
-Chart of accounts
------------------
-
-Each account can have a set currency. By doing so, all moves relevant to the account are forced to
-have that account's currency.
-
-To do so, go to :menuselection:`Accounting --> Configuration --> Charts of Accounts` and select a
-currency in the field :guilabel:`Account Currency`. If left empty, all active currencies are handled
-instead of just one.
-
-.. _multi-currency/config-journals:
-
-Journals
---------
-
-If a currency is set on a **journal**, that journal only handles transactions in that currency.
-
-To do so, go to :menuselection:`Accounting --> Configuration --> Journals`, open the journal you
-want to edit, and select a currency in the field :guilabel:`Currency`. If left empty, all active
-currencies are handled instead of just one.
-
-.. image:: multi_currency/journal-currency.png
-   :align: center
-   :alt: Select the currency for the journal to handle.
-
-.. _multi-currency/mca:
-
-Multi-currency accounting
-=========================
-
-.. _multi-currency/mca-documents:
-
-Invoices, bills, and other documents
-------------------------------------
-
-For all documents, you can select the currency and journal to use for the transaction.
-
-.. image:: multi_currency/currency-field.png
-   :align: center
-   :alt: Select the currency and journal to use.
-
-.. _multi-currency/mca-payment:
-
-Payment registration
---------------------
-
-To register a payment in a currency other than your company's main currency, click on the
-:guilabel:`Register Payment` payment button of your document and, in the pop-up window, select a
-**currency** in the :guilabel:`Amount` field.
-
-.. image:: multi_currency/register-payment.png
-  :align: center
-  :alt: Select the currency and journal to use before registering the payment.
-
-.. _multi-currency/mca-statements:
-
-Bank statements
----------------
-
-When creating or importing bank statements, the amount is in the company's main currency. To see
-additional fields related to foreign currencies, click on the **columns dropdown button**
-(:guilabel:`⋮`) next to :guilabel:`Amount`, and check :guilabel:`Amount Currency` and
-:guilabel:`Foreign Currency`.
-
-.. image:: multi_currency/foreign-fields.png
-  :align: center
-  :alt: The extra fields related to foreign currencies.
-
-When reconciling, Odoo displays both the foreign currency amount and the equivalent amount in your
-company's main currency.
-
-.. _multi-currency/mca-exch-entries:
-
-Exchange rate journal entries
------------------------------
-
-To see **exchange difference journal entries**, go to :menuselection:`Accounting Dashboard -->
-Accounting --> Journals: Miscellaneous`.
-
-.. image:: multi_currency/exchange-journal-currency.png
-   :align: center
-   :alt: Exchange rate journal entry.

content/applications/finance/accounting/others/multicurrencies.rst

@@ -0,0 +1,12 @@
+:nosearch:
+
+=============
+Multicurrency
+=============
+
+.. toctree::
+   :titlesonly:
+
+   multicurrencies/how_it_works
+   multicurrencies/invoices_payments
+   multicurrencies/exchange

content/applications/finance/accounting/others/multicurrencies/exchange.rst

@@ -0,0 +1,112 @@
+=================================
+Record exchange rates at payments
+=================================
+
+Overview
+========
+
+Any company doing international trade faces the case where the payments
+are in a different currency.
+
+After receiving their payments, you have the option to convert the
+amount into your company currency. Multi currency payment implies rates
+fluctuations. The rate differences are automatically recorded by Odoo.
+
+Configuration
+=============
+
+Enable multi-currencies
+-----------------------
+
+In the accounting module, Go to :menuselection:`Configuration --> Settings` 
+and flag **Allow multi currencies**, then click on **apply**.
+
+.. image:: exchange/exchange_rate03.png
+   :align: center
+
+Configure the currency rates in :menuselection:`Configuration --> Currencies`.
+Write down the rate and make sure the currency is active.
+
+.. image:: exchange/exchange_rate02.png
+   :align: center
+
+In this document, the base currency is **Euro** and we will record payments
+in **Dollars**.
+
+.. image:: exchange/exchange_rate08.png
+   :align: center
+
+.. tip:: 
+    You can automatically fetch the currency rates from the **European
+    Central Bank** or from **Yahoo**. Please read the document : 
+    :doc:`how_it_works`.
+
+Configure your journal
+----------------------
+
+In order to register payments in other currencies, you have to **remove
+the currency constraint** on the journal. Go to the accounting
+application, Click on **More** on the journal and **Settings**.
+
+.. image:: exchange/exchange_rate06.png
+   :align: center
+
+Check if the **Currency** field is empty or in the foreign currency in which
+you will register the payments. If a currency is filled in, it means
+that you can register payments only in this currency.
+
+.. image:: exchange/exchange_rate10.png
+   :align: center
+
+Record a payment in a different currency
+========================================
+
+In the **Accounting** application, go to :menuselection:`Sales --> Payments`. 
+Register the payment and indicate that it was done in the foreign currency. Then
+click on **confirm**.
+
+.. image:: exchange/exchange_rate05.png
+   :align: center
+
+The journal entry has been posted but not allocated.
+
+Go back to your invoice (:menuselection:`Sales --> Customer Invoices`) and click on
+**Add** to allocate the payment.
+
+.. image:: exchange/exchange_rate04.png
+   :align: center
+
+Record a bank statement in a different currency
+===============================================
+
+Create or import the bank statement of your payment. The **Amount** is in
+the company currency. There are two complementary fields, the **Amount currency**, 
+which is the amount that was actually paid and the **Currency** in which it was paid.
+
+.. image:: exchange/exchange_rate07.png
+   :align: center
+
+When reconciling it, Odoo will directly match the payment with the right
+**Invoice**. You will get the invoice price in the invoice currency and the
+amount in your company currency.
+
+.. image:: exchange/exchange_rate09.png
+   :align: center
+
+Check the exchange rate differences
+===================================
+
+Go to :menuselection:`Adviser --> Journal Entries` and look for the **Exchange difference**
+journal entries. All the exchange rates differences are recorded in it.
+
+.. image:: exchange/exchange_rate01.png
+   :align: center
+
+.. tip::
+    The Exchange difference journal can be changed in your accounting settings.
+
+.. include:: exchange/full_reconcile_warning.rst
+
+.. seealso::
+    * :doc:`../../bank/reconciliation/reconciliation_models`
+    * :doc:`../../bank/reconciliation/use_cases`

content/applications/finance/accounting/others/multicurrencies/exchange/full_reconcile_warning.rst

@@ -0,0 +1,7 @@
+.. warning::
+    In order for an exchange difference entry to be created automatically, the
+    corresponding invoices and payments need to be fully reconciled. This means
+    the invoices are fully paid and the payments are fully spent on invoices.
+    If you partially pay 3 invoices from 2 payments, and the last invoice still
+    has an amount due, there will be no exchange difference entry for any of
+    them until that final amount is paid.

content/applications/finance/accounting/others/multicurrencies/how_it_works.rst

@@ -0,0 +1,171 @@
+============================
+Odoo's multi-currency system
+============================
+
+Overview
+========
+
+Choosing to use the multi-currency option in Odoo will allow you to send
+sales invoices, quotes and purchase orders or receive bills and payments
+in currencies other than your own. With multi-currency, you can also set
+up bank accounts in other currencies and run reports on your foreign
+currency activities.
+
+Configuration
+=============
+
+Turn on multi-currency
+----------------------
+
+In the accounting module, Go to :menuselection:`Configuration --> Settings` and flag
+**Allow multi currencies**, then click on **Apply**.
+
+.. image:: how_it_works/works01.png
+   :align: center
+
+Exchange Rate Journal
+---------------------
+
+The **Rate Difference Journal** records the differences between the payment
+registration and the expected amount. For example, if a payment is paid
+1 month after the invoice was issued, the exchange rate has probably
+changed. The fluctuation implies some loss or profit that are recorded
+by Odoo.
+
+You can change it in the settings:
+
+.. image:: how_it_works/works02.png
+   :align: center
+
+View or edit rate being used
+----------------------------
+
+You can manually configure the currency rates in :menuselection:`Configuration -->
+Currencies`. Open the currencies you want to use in Odoo and edit it.
+Make sure the currency is active.
+
+.. image:: how_it_works/works03.png
+   :align: center
+
+Click on **View Rates** to edit it and to see the history :
+
+.. image:: how_it_works/works04.png
+   :align: center
+
+Click on **Create** to add the rate. Fill in the date and the rate.
+Click on **Save** when you are done.
+
+.. image:: how_it_works/works05.png
+   :align: center
+
+Live Currency Rate
+------------------
+
+By default, the currencies need to be updated manually. But you can
+synchronize it with `Yahoo <https://finance.yahoo.com/currency-converter/>`__ or
+the `European Central Bank <http://www.ecb.europa.eu>`__. In 
+:menuselection:`Configuration --> Settings`, go to the **Live Currency Rate** section.
+
+Choose the interval : Manually, Daily, Weekly or Monthly. You can always
+force the update by clicking on **Update Now**. Select the provider, and you
+are set !
+
+.. image:: how_it_works/works06.png
+   :align: center
+
+.. note::
+   Only the **active** currencies are updated
+
+Configure your charts of account
+--------------------------------
+
+In the accounting application, go to :menuselection:`Adviser --> Charts of Accounts`.
+On each account, you can set a currency. It will force all moves for
+this account to have the account currency.
+
+If you leave it empty, it means that it can handle all currencies that
+are Active.
+
+.. image:: how_it_works/works07.png
+   :align: center
+
+Configure your journals
+-----------------------
+
+In order to register payments in other currencies, you have to remove
+the currency constraint on the journal. Go to the accounting
+application, Click on **More** on the journal and **Settings**.
+
+.. image:: how_it_works/works08.png
+   :align: center
+
+Check if the currency field is empty or in the foreign currency in which
+you will register the payments. If a currency is filled in, it means
+that you can register payments only in this currency.
+
+.. image:: how_it_works/works09.png
+   :align: center
+
+How is Odoo's multi-currency working?
+=====================================
+
+Now that you are working in a multi-currency environment, all
+accountable items will be linked to a currency, domestic or foreign.
+
+Sales Orders and Invoices
+-------------------------
+
+You are now able to set a different currency than the company one on
+your sale orders and on your invoices. The currency is set for the whole
+document.
+
+.. image:: how_it_works/works10.png
+   :align: center
+
+Purchases orders and Vendor Bills
+---------------------------------
+
+You are now able to set a different currency than the company one on
+your purchase orders and on your vendor bills. The currency is set for
+the whole document.
+
+.. image:: how_it_works/works11.png
+   :align: center
+
+Payment Registrations
+---------------------
+
+In the accounting application, go to :menuselection:`Sales --> Payments`. Register the payment and
+set the currency.
+
+.. image:: how_it_works/works12.png
+   :align: center
+
+Bank Statements
+---------------
+
+When creating or importing bank statements, the amount is in the company
+currency. But there are now two complementary fields, the amount that
+was actually paid and the currency in which it was paid.
+
+.. image:: how_it_works/works13.png
+   :align: center
+
+When reconciling it, Odoo will directly match the payment with the right
+Invoice. You will get the invoice price in the invoice currency and the
+amount in your company currency.
+
+Exchange Rate Journal
+---------------------
+
+Go to :menuselection:`Adviser --> Journal Entries` and look for the Exchange difference
+journal entries. All the exchange rates differences are recorded in it.
+
+.. image:: how_it_works/works14.png
+   :align: center
+
+.. include:: exchange/full_reconcile_warning.rst
+
+.. seealso::
+   * :doc:`invoices_payments`
+   * :doc:`exchange`

content/applications/finance/accounting/others/multicurrencies/invoices_payments.rst

@@ -0,0 +1,121 @@
+==================================================
+Manage invoices and payment in multiple currencies
+==================================================
+
+Overview
+========
+
+Odoo provides multi-currency support with automatic currency gross or
+loss entry adjustment. There are a few things Odoo has been to ease the
+user's life.
+
+All the account transactions will be done using the company currency.
+However you can see two extra fields with the journal entry where
+secondary currency and amount will visible. You can create
+multi-currency journals of force a specific currency.
+
+When creating an invoice, the currency can be changed very easily;
+however Odoo takes the company currency as a default assignment. It will
+convert all the amounts automatically using that currency.
+
+Configuration
+=============
+
+Enable Multi-Currency
+---------------------
+
+For information about enabling Multi-Currency, please read the document:
+:doc:`how_it_works`
+
+Configure your journal
+----------------------
+
+In order to register payments in other currencies, you have to remove
+the currency constraint on the journal. Go to the accounting
+application, on the journal, click on :menuselection:`More --> Settings`.
+
+.. image:: invoices_payments/invoice01.png
+   :align: center
+
+Check if the currency field is empty or in the foreign currency in which
+you will register the payments. If a currency is filled in, it means
+that you can register payments only in this currency.
+
+.. image:: invoices_payments/invoice02.png
+   :align: center
+
+Multi-currency invoices & Vendor Bills
+======================================
+
+Now that you are working in a multi-currency environment, all
+accountable items will be linked to a currency, domestic or foreign.
+
+Invoices
+--------
+
+You are now able to set a different currency than the company one on
+your sale orders and on your invoices. The currency is set for the whole
+document.
+
+.. image:: invoices_payments/invoice03.png
+   :align: center
+
+Vendor Bills
+------------
+
+You are now able to set a different currency than the company one on
+your purchase orders and on your vendor bills. The currency is set for
+the whole document.
+
+.. image:: invoices_payments/invoice04.png
+   :align: center
+
+Multi-currency Payments
+=======================
+
+In the accounting application, go to :menuselection:`Sales --> Payments`. Register the
+payment and indicate that it was done in the foreign currency. Then
+click on **Confirm**.
+
+.. image:: invoices_payments/invoice05.png
+   :align: center
+
+The journal entry has been posted but not allocated.
+
+Go back to your invoice (:menuselection:`Sales --> Customer Invoices`) and click on
+**Add** to allocate the payment.
+
+.. image:: invoices_payments/invoice06.png
+   :align: center
+
+Multi- Currency Bank Statements
+===============================
+
+When creating or importing bank statements, the amount is in the company
+currency. But there are now two complementary fields, the amount that
+was actually paid and the currency in which it was paid.
+
+.. image:: invoices_payments/invoice07.png
+   :align: center
+
+When reconciling it, Odoo will directly match the payment with the right
+invoice. You will get the invoice price in the invoice currency and the
+amount in your company currency.
+
+.. image:: invoices_payments/invoice08.png
+   :align: center
+
+Exchange Rate Journal
+=====================
+
+Go to :menuselection:`Adviser --> Journal Entries` and look for the **Exchange
+Difference** journal entries. All the exchange rates differences are recorded in it.
+
+.. image:: invoices_payments/invoice09.png
+   :align: center
+
+.. include:: exchange/full_reconcile_warning.rst
+
+.. seealso::
+   * :doc:`how_it_works`
+   * :doc:`exchange`

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

@@ -56,10 +56,10 @@ SEPA Direct Debit as a Payment Method
 -------------------------------------
 
 SEPA Direct Debit can be used as a payment method both on your **eCommerce** or on the **Customer
-Portal** by activating SDD as a **Payment Provider**. With this method, your customers can create
+Portal** by activating SDD as a **Payment Acquirer**. With this method, your customers can create
 and sign their mandates themselves.
 
-To do so, go to :menuselection:`Accounting --> Configuration --> Payment Providers`, click on *SEPA
+To do so, go to :menuselection:`Accounting --> Configuration --> Payment Acquirers`, click on *SEPA
 Direct Debit*, and set it up according to your needs.
 
 .. important::
@@ -70,7 +70,7 @@ Customers using SDD as payment method get prompted to add their IBAN, email addr
 their SEPA Direct Debit mandate.
 
 .. todo::
-   Add link to future **Payment Provider** documentation.
+   Add link to future **Payment Acquirer** documentation.
 
 Close or revoke a mandate 
 -------------------------

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

@@ -7,18 +7,18 @@ To make it more convenient for your customers to pay the invoices you issue, you
 allows your customers to see their invoices online and pay directly with their favorite payment
 method, making the payment process much easier.
 
-.. image:: online_payment/online-payment-providers.png
+.. image:: online_payment/online-payment-acquirers.png
    :align: center
-   :alt: Payment provider choice after having clicked on "Pay Now"
+   :alt: Payment acquirer choice after having clicked on "Pay Now"
 
 Configuration
 =============
 
-Make sure your :ref:`Payment Providers are correctly configured <payment_providers/configuration>`.
+Make sure your :ref:`Payment Acquirers are correctly configured <payment_acquirers/configuration>`.
 
 .. note::
-   By default, ":doc:`Wire Transfer </applications/finance/payment_providers/wire_transfer>`" is the only
-   Payment Provider activated, but you still have to fill out the payment details.
+   By default, ":doc:`Wire Transfer </applications/finance/payment_acquirers/wire_transfer>`" is the only
+   Payment Acquirer activated, but you still have to fill out the payment details.
 
 To activate the Invoice Online Payment, go to :menuselection:`Accounting --> Configuration --> 
 Settings --> Customer Payments`, enable **Invoice Online Payment**, and click on *Save*.
@@ -34,7 +34,7 @@ Portal**.
    :align: center
    :alt: Email with a link to view the invoice online on the Customer Portal.
 
-They can choose which Payment Provider to use by clicking on *Pay Now*.
+They can choose which Payment Acquirer to use by clicking on *Pay Now*.
 
 .. image:: online_payment/online-payment-pay-now.png
    :align: center
@@ -42,4 +42,4 @@ They can choose which Payment Provider to use by clicking on *Pay Now*.
 
 .. seealso::
 
-   - :doc:`/applications/finance/payment_providers`
+   - :doc:`/applications/finance/payment_acquirers`

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

@@ -2,120 +2,125 @@
 Different ways to record a payment
 ==================================
 
-In Odoo, payments can either be linked automatically to an invoice or bill or be stand-alone records
-for use at a later date.
+In Odoo, a payment can either be linked directly to an invoice or be a
+stand alone record for use on a later date:
 
-If a payment is **linked to an invoice or bill**, it reduces the amount due of the invoice. You can
-have multiple payments related to the same invoice.
+- If a payment is linked to an invoice, it reduces the amount due of
+  the invoice. You can have multiple payments linked to the same
+  invoice.
 
-If a payment is **not linked to an invoice or bill**, the customer has an outstanding credit with
-your company, or your company has an outstanding debit with a vendor. You can use those outstanding
-amounts to reduce unpaid invoices/bills.
+- If a payment is not linked to an invoice, the customer has an
+  outstanding credit with your company, or your company as an
+  outstanding balance with a vendor. You can use this outstanding
+  credit/debit to pay future invoices or bills.
 
-Registering payment from an invoice or bill
-===========================================
+Paying an invoice
+=================
 
-When you click on :guilabel:`Register payment` in a customer invoice or vendor bill, it generates a
-new journal entry and changes the amount due according to the amount of the payment. The counterpart
-is reflected in an outstanding receipts or payments account. At this point, the customer invoice or
-vendor bill is marked as :guilabel:`In payment`. Then, when the outstanding account is reconciled
-with a bank statement line, the invoice or vendor bill changes to the :guilabel:`Paid` status.
+If you register a payment on a customer invoice or a vendor bill, the
+payment is automatically reconciled with the invoice reducing the amount
+due.
 
-The information icon near the payment line displays more information about the payment. You can
-access additional information, such as the related journal, by clicking on :guilabel:`View`.
+.. image:: recording/recording01.png
+  :align: center
 
-.. image:: recording/information-icon.png
-   :align: center
-   :alt: See detailed information of a payment
+The green icon near the payment line will display more information about
+the payment. From there you can choose to open the journal entry or
+reconcile the payment.
 
 .. note::
-   - The customer invoice or vendor bill should be in the status :guilabel:`Posted` to register the
-     payment.
-   - When clicking on :guilabel:`Register payment`, you can select the amount to pay and make a
-     partial or full payment.
-   - If your main bank account is set as :doc:`oustanding account
-     <../../bank/setup/outstanding_accounts>`, and the payment is made in Odoo (not related to a
-     bank statement), invoices and bills are directly registered in the status :guilabel:`Paid`.
-   - If you unreconciled a payment, it still appears in your books but is no longer linked to the
-     invoice.
-   - If you (un)reconcile a payment in a different currency, a journal entry is automatically
-     created to post the currency exchange gains/losses (reversal) amount.
-   - If you (un)reconcile a payment and an invoice having cash basis taxes, a journal entry is
-     automatically created to post the cash basis tax (reversal) amount.
+   If you unreconcile a payment, it is still registered in your books but not
+   linked to the specific invoice any longer. If you unreconcile a payment in a
+   different currency, Odoo will create a journal entry to reverse the Currency
+   Exchange Loss/Gain posted at the time of reconciliation.
 
-.. seealso::
-   - :doc:`../../bank/reconciliation/use_cases`
+Payments not tied to an invoice
+===============================
 
-Registering payments not tied to an invoice or bill
+Registering a payment
+---------------------
+
+In the Accounting application, you can create a new payment from the
+Sales menu (register a customer payment) or the Purchases menu (pay a
+vendor). If you use these menus, the payment is not linked to an
+invoice, but can easily be reconciled on an invoice later on.
+
+.. image:: recording/recording02.png
+  :align: center
+
+When registering a new payment, you must select a customer or vendor,
+the payment method, and the amount of the payment. The currency of the
+transaction is defined by the payment method. If the payment refers to a
+document (sale order, purchase order or invoice), set the reference of
+this document in the memo field.
+
+Once confirmed, a journal entry will be posted reflecting the
+transaction just made in the accounting application.
+
+Reconciling invoice payments
+----------------------------
+
+The easiest way of reconciling a payment with an invoice is to do so on
+the invoice directly.
+
+When validating a new invoice, Odoo will warn you that an outstanding
+payment for this customer or vendor is available. In this case, you can
+reconcile this payment to the invoice near the totals at the bottom,
+under "Outstanding Payments".
+
+.. image:: recording/recording03.png
+  :align: center
+
+Reconciling all your outstanding payments and invoices
+------------------------------------------------------
+
+If you want to reconcile all outstanding payments and invoices at once
+(instead of doing so one by one), you can use the batch reconciliation
+feature within Odoo.
+
+The batch reconciliation feature is available from the dashboard on the
+Customer Invoices card and the Vendor Bills card for reconciling
+Accounts Receivable and Payable, respectively.
+
+.. image:: recording/recording04.png
+  :align: center
+
+The payments matching tool will open all unreconciled customers or
+vendors and will give you the opportunity to process them all one by
+one, doing the matching of all their payments and invoices at once.
+
+.. image:: recording/recording05.png
+  :align: center
+
+During the reconciliation, if the sum of the debits and credits do not
+match, it means there is still a remaining balance that either needs to
+be reconciled at a later date, or needs to be written off directly.
+
+Transferring money from one bank account to another
 ===================================================
 
-When a new payment is registered via the menu :menuselection:`Customers / Vendors --> Payments`, it
-is not directly linked to an invoice or bill. Instead, the account receivable or the account payable
-are matched with the outstanding account until they are manually matched with their related invoice
-or bill.
+Just like making a customer or vendor payment, you transfer cash
+internally between your bank accounts from the dashboard or from the
+menus up top.
 
-Matching invoices and bills with payments
------------------------------------------
+.. image:: recording/recording06.png
+  :align: center
 
-A blue banner appears when you validate a new invoice or bill and there is an outstanding payment
-for this specific customer or vendor. It can easily be matched from the invoice or the bill by
-clicking on :guilabel:`ADD` under :guilabel:`Outstanding Credits` or :guilabel:`Outstanding Debits`.
+This will take you to the same screen you have for receiving and making
+payments.
 
-.. image:: recording/add-option.png
-   :align: center
-   :alt: Shows the ADD option to reconcile an invoice or a bill with a payment
-
-The invoice or bill is now marked as :guilabel:`In payment` until it is reconciled with the bank
-statement.
-
-.. seealso::
-   - :doc:`../../bank/reconciliation/use_cases`
-
-Batch payment
--------------
-
-Batch payments allow you to group different payments to ease reconciliation. They are also useful
-when you deposit checks to the bank or for SEPA Payments.
-Go to :menuselection:`Accounting --> Customers --> Batch Payments` or :menuselection:`Accounting -->
-Vendors --> Batch Payments`. In the list view of payments, you can select several payments and group
-them in a batch clicking on :menuselection:`Action > Create Batch Payment`.
-
-.. seealso::
-  - :doc:`../../receivables/customer_payments/batch`
-  - :doc:`../../receivables/customer_payments/batch_sdd`
-
-Payments matching
------------------
-
-The :guilabel:`Payments matching` tool opens all unreconciled customer invoices or vendor bills and
-gives you the opportunity to process them all one by one, doing the matching of all their payments
-and invoices at once. You can reach this tool from the :menuselection:`Accounting Dashboard -->
-Customer Invoices / Vendor Bills`, and click on :guilabel:`⋮` and select :guilabel:`Payments
-Matching`, or by going to :menuselection:`Accounting --> Reconciliation`.
+.. image:: recording/recording07.png
+  :align: center
 
 .. note::
-   During the reconciliation, if the sum of the debits and credits does not match, it means there is
-   a remaining balance that either needs to be reconciled at a later date or needs to be written off
-   directly.
+   When making an internal transfer from one bank account to another, select
+   the bank you want to apply the transfer from in the dashboard, and in the
+   register payments screen, you select the transfer to account. Do not go
+   through this process again in the other bank account or else you will end up
+   with two journal entries for the same transaction.
 
-Batch payments matching
------------------------
-
-To reconcile several outstanding payments or invoices at once, for a specific customer or vendor,
-the batch reconciliation feature can be used. Go to :menuselection:`Accounting --> Reporting -->
-Aged Receivable / Aged Payable`. You now see all transactions that have not been reconciled yet, and
-when you select a customer or vendor, the :guilabel:`Reconcile` option is displayed.
-
-.. image:: recording/reconcile-option.png
-   :align: center
-   :alt: See the reconcile option
-
-Reconciling payments with bank statements
-=========================================
-
-Once a payment has been registered, the status of the invoice or bill is :guilabel:`In payment`. The
-next step is to reconcile it with the related bank statement line to have the transaction finalized
-and the invoice or bill marked as :guilabel:`Paid`.
 
 .. seealso::
-   - :doc:`../../bank/reconciliation/use_cases`
+   - :doc:`online_payment`
+   - :doc:`check`
+   - :doc:`followup`

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

@@ -8,5 +8,4 @@ Overview
    :titlesonly:
 
    overview/main_reports
-   overview/customize
-   overview/data_inalterability
+   overview/customize

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

@@ -1,63 +0,0 @@
-================================
-Data inalterability check report
-================================
-
-Tax authorities in some countries require companies to **prove their posted accounting entries are
-inalterable**, meaning that once an entry has been posted, it can no longer be changed.
-
-To do so, Odoo can use the **SHA-256 algorithm** to create a unique fingerprint for each posted
-entry. This fingerprint is called a hash. The hash is generated by taking an entry's essential data
-(the values of the `date`, `journal_id`, `company_id`, `debit`, `credit`, `account_id`, and
-`partner_id` fields), concatenating it, and inputting it to the SHA-256 hash function, which then
-outputs a fixed size (256-bit) string of characters. The hash function is deterministic (:dfn:`the
-same input always creates the same output`): any minor modification to the original data would
-completely change the resulting hash. Consequently, the SHA-256 algorithm is often used, among
-others, for data integrity verification purposes.
-
-In addition, the previous entry's hash is always added to the next entry to form a **hash chain**.
-This is used to ensure a new entry is not added afterward between two posted entries, as doing so
-would break the hash chain.
-
-.. note::
-   Hashes generated by the SHA-256 algorithm are theoretically not unique, as there is a finite
-   number of possible values. However, this number is exceptionally high: 2²⁵⁶, which is a lot
-   bigger than the number of atoms in the known universe. This is why hashes are considered unique
-   in practice.
-
-.. _data-inalterability/lock:
-
-Lock posted entries with hash
-=============================
-
-To start using the hashing function, go to :menuselection:`Accounting --> Configuration > Journals`.
-Open the journal for which you want to activate the feature, go to the :guilabel:`Advanced Settings`
-tab, and enable :guilabel:`Lock Posted Entries with Hash`.
-
-.. warning::
-   Once you post an entry on a locked journal, you cannot disable the feature anymore, nor edit any
-   posted entry.
-
-.. _data-inalterability/report:
-
-Report download
-===============
-
-To download the data inalterability check report, go to :menuselection:`Accounting --> Configuration
---> Settings --> Reporting` and click on :guilabel:`Download the Data Inalterability Check Report`.
-
-The report's first section is an overview of all your journals and their configuration. Under the
-inalterability check column, you can see whether or not a journal's posted entries are locked with
-a hash (V) or not (X). The coverage column tells you when a journal's posted entries started being
-locked.
-
-.. image:: data_inalterability/journal-overview.png
-   :align: center
-   :alt: Configuration report for two journals
-
-The second section gives you the result of the data consistency check for each hashed journal. You
-can view the first hashed entry and its corresponding hash and the last hashed entry and its
-corresponding hash.
-
-.. image:: data_inalterability/data-consistency-check.png
-   :align: center
-   :alt: Data consistency check report for a journal

content/applications/finance/payment_acquirers.rst

@@ -0,0 +1,325 @@
+:show-content:
+
+=================================================
+Payment acquirers (credit cards, online payments)
+=================================================
+
+.. 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
+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,
+as you make it more convenient for your customers to pay with the payment method they prefer and
+trust.
+
+.. image:: payment_acquirers/online-payment.png
+   :align: center
+   :alt: Pay online in the customer portal and select which payment acquirer to use.
+
+.. note::
+   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.
+
+.. _payment_acquirers/supported_acquirers:
+
+Supported payment acquirers
+===========================
+
+From an accounting perspective, we can distinguish two types of payment acquirers: the payment
+acquirers that are third-party services and require you to follow another accounting workflow, and
+the payments that go directly on the bank account and follow the usual reconciliation workflow.
+
+.. _payment_acquirers/online_acquirers:
+
+Online payment acquirers
+------------------------
+
+.. list-table::
+   :header-rows: 1
+   :stub-columns: 1
+   :widths: auto
+
+   * -
+     - Payment flow
+     - :ref:`Save cards for later <payment_acquirers/features/tokenization>`
+     - :ref:`Manual capture <payment_acquirers/features/manual_capture>`
+     - :ref:`Refunds <payment_acquirers/features/refund>`
+   * - :doc:`Adyen <payment_acquirers/adyen>`
+     - Payment from Odoo
+     - |V|
+     - Full only
+     - Full and partial
+   * - :doc:`Alipay <payment_acquirers/alipay>`
+     - Payment from the acquirer website
+     -
+     -
+     -
+   * - :doc:`Authorize.Net <payment_acquirers/authorize>`
+     - Payment from Odoo
+     - |V|
+     - Full only
+     -
+   * - :doc:`Buckaroo <payment_acquirers/buckaroo>`
+     - Payment from the acquirer website
+     -
+     -
+     -
+   * - :doc:`Mollie <payment_acquirers/mollie>`
+     - Payment from the acquirer website
+     -
+     -
+     -
+   * - :doc:`Ogone <payment_acquirers/ogone>`
+     - Payment from the acquirer website
+     - |V|
+     -
+     -
+   * - :doc:`PayPal <payment_acquirers/paypal>`
+     - Payment from the acquirer website
+     -
+     -
+     -
+   * - PayU Latam
+     - Payment from the acquirer website
+     -
+     -
+     -
+   * - PayUMoney
+     - Payment from the acquirer website
+     -
+     -
+     -
+   * - :doc:`SIPS <payment_acquirers/sips>`
+     - Payment from the acquirer website
+     -
+     -
+     -
+   * - :doc:`Stripe <payment_acquirers/stripe>`
+     - Payment from the acquirer website
+     - |V|
+     - Full only
+     -
+
+.. |V| replace:: ✔
+
+.. 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
+   added and configured on your Accounting app to do a bank reconciliation, which is an accounting
+   control process.
+
+.. _payment_acquirers/bank_payments:
+
+Bank payments
+-------------
+
+- | :doc:`Wire Transfer <payment_acquirers/wire_transfer>`
+  | When selected, Odoo displays your payment information with a payment reference. You have to
+    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.
+
+.. _payment_acquirers/features:
+
+Additional features
+===================
+
+Some payment acquirers support additional features for the payment flow. Refer to the :ref:`table
+above <payment_acquirers/online_acquirers>` to check if your payment acquirer supports these
+features.
+
+.. _payment_acquirers/features/tokenization:
+
+Save cards for later
+--------------------
+
+If your payment acquirer supports this feature, customers can choose to save their card details as a
+**payment token** in Odoo. When they do, they will not have to enter their card details again when
+making a subsequent payment. This is particularly useful for the eCommerce conversion rate and for
+subscriptions that use recurring payments.
+
+Enable this feature by navigating to the :guilabel:`Configuration` tab from your payment acquirer
+and by ticking the :guilabel:`Allow Saving Payment Methods` checkbox.
+
+.. note::
+   You remain fully PCI-compliant when you enable this feature because Odoo does not store the card
+   details directly. Instead, it creates a payment token that only holds a reference to the card
+   details stored on the payment acquirer's server.
+
+.. _payment_acquirers/features/manual_capture:
+
+Manual capture
+--------------
+
+If your payment acquirer supports this feature, you can authorize and capture payments in two steps
+instead of one. When you authorize a payment, the funds are reserved on the customer's payment
+method but they are not immediately charged. The charge is only made when you manually capture the
+payment later on. You can also void the authorization to release the reserved funds; this is
+equivalent to a regular cancellation. Capturing payments manually can prove itself useful in many
+situations:
+
+  - 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 processing fees for cancelled payments: payment acquirers will not charge
+    you for voiding an authorization.
+  - Hold a security deposit to return later, minus any deductions (e.g., after a damage).
+
+Enable this feature by navigating to the :guilabel:`Configuration` tab from your payment acquirer
+and by ticking the :guilabel:`Capture Amount Manually` checkbox.
+
+To capture the payment after it was authorized, go to the related sales order or invoice and click
+on the :guilabel:`CAPTURE TRANSACTION` button. To release the funds, click on the :guilabel:`VOID
+TRANSACTION` button.
+
+.. note::
+   - Some payment acquirers support capturing only part of the authorized amount. The remaining
+     amount can then be either captured or voided. These acquirers have the value **Full and
+     partial** in the :ref:`table above <payment_acquirers/online_acquirers>`. The acquirers that
+     only support capturing or voiding the full amount have the value **Full only**.
+   - The funds are likely not reserved forever. After a certain time, they may be automatically
+     released back to the customer's payment method. Refer to your payment acquirer's documentation
+     for the exact reservation duration.
+   - Odoo does not support this feature for all payment acquirers but some allow the manual capture
+     from their website interface.
+
+.. _payment_acquirers/features/refund:
+
+Refunds
+-------
+
+If your payment acquirer supports this feature, you can refund payments directly from Odoo. It does
+not need to be enabled first. To refund a customer payment, navigate to it and click on the
+:guilabel:`REFUND` button.
+
+.. note::
+   - Some payment acquirers support refunding only part of the amount. The remaining amount can then
+     optionally be refunded too. These acquirers have the value **Full and partial** in the
+     :ref:`table above <payment_acquirers/online_acquirers>`. The acquirers that only support
+     refunding the full amount have the value **Full only**.
+   - Odoo does not support this feature for all payment acquirers but some allow to refund payments
+     from their website interface.
+
+.. _payment_acquirers/configuration:
+
+Configuration
+=============
+
+.. note::
+   Each acquirer has its specific configuration flow, depending on :ref:`which feature is available
+   <payment_acquirers/online_acquirers>`.
+
+.. _payment_acquirers/add_new:
+
+Add a new payment acquirer
+--------------------------
+
+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*.
+
+.. image:: payment_acquirers/activation.png
+   :align: center
+   :alt: Click on install, then on activate to make the payment acquirer available on Odoo.
+
+.. warning::
+   We recommend using the *Test Mode* on a duplicated database or a test database. The Test Mode is
+   meant to be used with your test/sandbox credentials, but Odoo generates Sales Orders and Invoices
+   as usual. It isn't always possible to cancel an invoice, and this could create some issues with
+   your invoices numbering if you were to test your payment acquirers on your main database.
+
+.. _payment_acquirers/credentials_tab:
+
+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.
+
+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:
+
+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.
+
+.. _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.
+
+.. _payment_acquirers/journal:
+
+Payment journal
+***************
+
+The **Payment journal** selected for your payment acquirer must be a *Bank* journal.
+
+.. _payment_acquirers/accounting:
+
+Accounting perspective
+======================
+
+The **Bank Payments** that go directly to one of your bank accounts follow their usual
+reconciliation workflows. However, payments recorded with **Online Payment Providers** require you
+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*.
+
+You can use a single journal for many payment methods. And for each payment method, you can either:
+
+- 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.
+
+.. image:: payment_acquirers/bank_journal.png
+   :align: center
+   :alt: A bank journal in the "Incoming Payments Tab".
+
+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.
+
+.. seealso::
+   - :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`

content/applications/finance/payment_acquirers/adyen.rst

@@ -9,7 +9,7 @@ Configuration
 =============
 
 .. seealso::
-   :ref:`payment_providers/add_new`
+   :ref:`payment_acquirers/add_new`
 
 Credentials tab
 ---------------
@@ -28,7 +28,7 @@ the **Credentials** tab.
 
 .. important::
    If you are trying Adyen as a test, with an Adyen *test account*, head to
-   :menuselection:`Accounting --> Configuration --> Payment Providers`. There, click on
+   :menuselection:`Accounting --> Configuration --> Payment Acquirers`. There, click on
    :guilabel:`Adyen`, enable :guilabel:`Test Mode` and enter your credentials in the
    :guilabel:`Credentials` tab.
 
@@ -114,7 +114,7 @@ Place a hold on a card
 Adyen allows you to capture an amount manually instead of having an immediate capture.
 
 To set it up, enable the **Capture Amount Manually** option on Odoo, as explained in the
-:ref:`payment providers documentation <payment_providers/features/manual_capture>`.
+:ref:`payment acquirers documentation <payment_acquirers/features/manual_capture>`.
 
 Then, open your Adyen Merchant Account, go to :menuselection:`Account --> Settings`, and set the
 **Capture Delay** to **manual**.
@@ -135,4 +135,4 @@ Then, open your Adyen Merchant Account, go to :menuselection:`Account --> Settin
    **revoke** it.
 
 .. seealso::
-   :doc:`../payment_providers`
+   :doc:`../payment_acquirers`

content/applications/finance/payment_acquirers/alipay.rst

@@ -5,14 +5,11 @@ Alipay
 `Alipay <https://www.alipay.com/>`_ is an online payments platform established in China by Alibaba
 Group.
 
-.. warning::
-   The provider Alipay is deprecated. It is recommended to use :doc:`asiapay` instead.
-
 Configuration
 =============
 
 .. seealso::
-   - :ref:`payment_providers/add_new`
+   - :ref:`payment_acquirers/add_new`
 
 Credentials tab
 ---------------
@@ -36,4 +33,4 @@ To retrieve them, log into your Alipay account, they are on the front page.
    recommend doing this on a test Odoo database, rather than on your main database.
 
 .. seealso::
-   - :doc:`../payment_providers`
+   - :doc:`../payment_acquirers`

content/applications/finance/payment_acquirers/authorize.rst

@@ -9,7 +9,7 @@ Configuration
 =============
 
 .. seealso::
-   - :ref:`payment_providers/add_new`
+   - :ref:`payment_acquirers/add_new`
 
 Credentials tab
 ---------------
@@ -43,11 +43,11 @@ Place a hold on a card
 ~~~~~~~~~~~~~~~~~~~~~~
 
 With Authorize.net, you can enable the :ref:`manual capture
-<payment_providers/features/manual_capture>`. If enabled, the funds are reserved for 30 days on the
+<payment_acquirers/features/manual_capture>`. If enabled, the funds are reserved for 30 days on the
 customer's card, but not charged yet.
 
 .. warning::
    After **30 days**, the transaction is **voided automatically** by Authorize.net.
 
 .. seealso::
-   - :doc:`../payment_providers`
+   - :doc:`../payment_acquirers`

content/applications/finance/payment_acquirers/buckaroo.rst

@@ -25,7 +25,7 @@ Configuration on Odoo
 =====================
 
 .. seealso::
-   - :ref:`payment_providers/add_new`
+   - :ref:`payment_acquirers/add_new`
 
 Credentials tab
 ---------------
@@ -60,4 +60,4 @@ In order to retrieve the Website Key, log into Buckaroo Plaza, go to
    recommend doing this on a test Odoo database, rather than on your main database.
 
 .. seealso::
-   - :doc:`../payment_providers`
+   - :doc:`../payment_acquirers`

content/applications/finance/payment_acquirers/mollie.rst

@@ -8,14 +8,14 @@ Configuration
 =============
 
 .. seealso::
-   - :ref:`payment_providers/add_new`
+   - :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 provider.
+- **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.
@@ -28,4 +28,4 @@ To retrieve your API key, log into your Mollie account, go to
    We recommend doing this on a test Odoo database, rather than on your main database.
 
 .. seealso::
-   - :doc:`../payment_providers`
+   - :doc:`../payment_acquirers`

content/applications/finance/payment_acquirers/ogone.rst

@@ -6,12 +6,9 @@ Ogone
 company that provides the technology involved in secure electronic transactions.
 
 .. seealso::
-   - :ref:`payment_providers/add_new`
+   - :ref:`payment_acquirers/add_new`
    - `Ogone's documentation <https://epayments-support.ingenico.com/get-started/>`_.
 
-.. warning::
-   The provider Ogone is deprecated. It is recommended to use :doc:`stripe` instead.
-
 Settings in Ogone
 =================
 
@@ -46,17 +43,16 @@ Set up Ogone for Odoo
 ---------------------
 
 Ogone must now be configured to accept payments from Odoo. Head to :menuselection:`Configuration -->
-Technical Information --> Global Security Parameters`, select :guilabel:`SHA-512` as
+Technical Information --> Global Security Parameters`, select :guilabel:`SHA-1` as
 :guilabel:`Hash Algorithm` and :guilabel:`UTF-8` as :guilabel:`character encoding`. Then, go to the
 :guilabel:`Data and Origin verification` tab of the same page and leave the URL field of the
 :guilabel:`e-Commerce and Alias Gateway` section blank.
 
 .. tip::
-   If you need to use another algorithm, such as `sha-1` or `sha-256`, within Odoo, activate the
-   :ref:`developer mode <developer-mode>` and go to the **Payment Providers** page in
-   :menuselection:`Accounting --> Configuration --> Payment Providers`. Click on :guilabel:`Ogone`,
-   and in the :guilabel:`Credentials` tab, select the algorithm you wish to use in the
-   :guilabel:`Hash function` field.
+   If you need to use another algorithm, such as `sha-256` or `sha-512`, within Odoo, activate the
+   :ref:`developer mode <developer-mode>` and go to :menuselection:`General Settings -->
+   Technical --> System Parameters`. From here, search for `payment_ogone.hash.function` and change
+   the value line to the desired algorithm (`sha-256` or `sha-512`).
 
 You are now required to generate **SHA-IN** passphrases. **SHA-IN** and **SHA-OUT** passphrases are
 used to digitally sign the transaction requests and responses between Odoo and Ogone. By using these
@@ -102,6 +98,12 @@ to save the card information should be displayed, etc.
 Settings in Odoo
 ================
 
-To set up Ogone in Odoo, head to :menuselection:`Accounting --> Configuration --> Payment Providers`
-and open the Ogone provider. In the :guilabel:`Credentials` tab, enter the **PSPID** of your Ogone
+To set up Ogone in Odoo, head to :menuselection:`Accounting --> Configuration --> Payment Acquirers`
+and open the Ogone acquirer. In the :guilabel:`Credentials` tab, enter the **PSPID** of your Ogone
 account, and fill out the other fields as configured in your :ref:`Ogone portal <ogone/ogone>`.
+
+.. important::
+   If you wish to run tests with Ogone, within the accounting app, go to
+   :menuselection:`Configuration --> Payment Acquirers`. Click on :guilabel:`Ogone`, enable
+   :guilabel:`Test Mode` and enter your credentials in the :guilabel:`Credentials` tab. We recommend
+   doing this on an Odoo test database, rather than on your main database.

content/applications/finance/payment_acquirers/paypal.rst

@@ -11,7 +11,7 @@ Settings in Odoo
 ================
 
 .. seealso::
-   - :ref:`payment_providers/add_new`
+   - :ref:`payment_acquirers/add_new`
 
 Credentials tab
 ---------------
@@ -141,4 +141,4 @@ this on a test Odoo database rather than your main database.
 Run a test transaction from Odoo using the sandbox personal account.
 
 .. seealso::
-   - :doc:`../payment_providers`
+   - :doc:`../payment_acquirers`

content/applications/finance/payment_acquirers/sips.rst

@@ -9,7 +9,7 @@ Configuration
 =============
 
 .. seealso::
-   - :ref:`payment_providers/add_new`
+   - :ref:`payment_acquirers/add_new`
 
 Credentials tab
 ---------------
@@ -29,4 +29,4 @@ You can copy your credentials from your SIPS environment info documentation, in
    Mode*. We recommend doing this on a test Odoo database, rather than on your main database.
 
 .. seealso::
-   - :doc:`../payment_providers`
+   - :doc:`../payment_acquirers`