[ADD] payment_acquirers: add documentation for Mercado Pago

Task - 2704764

conf.py

@@ -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(

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.rst

@@ -15,7 +15,6 @@ Localizations
    localizations/egypt
    localizations/france
    localizations/germany
-   localizations/india
    localizations/indonesia
    localizations/italy
    localizations/italy_IT

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

@@ -13,17 +13,17 @@ Below you can find videos with a general description of the localization, and ho
 Introduction
 ============
 
-The Chilean localization has been improved and extended in Odoo v13. In this version, the next
+The Chilean localization has been improved and extended in Odoo v13. In this version, the next 
 modules are available:
 
-- **l10n_cl:** Adds accounting features for the Chilean localization, which represent the minimal
-  configuration required for a company to operate in Chile and under the SII (Servicio de Impuestos
-  Internos) regulations and guidelines.
+- **l10n_cl:** Adds accounting features for the Chilean localization, which represent the minimal 
+  configuration required for a company to operate in Chile and under the SII 
+  (Servicio de Impuestos Internos) regulations and guidelines.
+  
+- **l10n_cl_edi:** Includes all technical and functional requirements to generate and receive 
+  Electronic Invoice via web service, based on the SII regulations. 
 
-- **l10n_cl_edi:** Includes all technical and functional requirements to generate and receive
-  Electronic Invoice via web service, based on the SII regulations.
-
-- **l10n_cl_reports:** Adds the reports Propuesta F29 y Balance Tributario (8 columnas).
+- **l10n_cl_reports:** Adds the reports Propuesta F29 y  Balance Tributario (8 columnas). 
 
 Configuration
 =============
@@ -31,7 +31,7 @@ Configuration
 Install the Chilean localization modules
 ----------------------------------------
 
-For this, go to *Apps* and search for Chile. Then click *Install* in the module **Chile
+For this, go to *Apps* and search for Chile. Then click *Install* in the module **Chile 
 E-invoicing**. This module has a dependency with **Chile - Accounting**. In case this last
 one is not installed, Odoo installs it automatically with E-invoicing.
 
@@ -42,24 +42,24 @@ one is not installed, Odoo installs it automatically with E-invoicing.
 .. note::
    When you install a database from scratch selecting Chile as country, Odoo will automatically
    install the base module: Chile - Accounting.
-
-
+   
+   
 Company Settings
 ----------------
 
 Once the modules are installed, the first step is to set up your company data. Additional
-to the basic information, you need to add all the data and elements required for Electronic
-Invoice, the easiest way to configure it is in
+to the basic information, you need to add all the data and elements required for Electronic 
+Invoice, the easiest way to configure it is in 
 :menuselection:`Accounting --> Settings --> Chilean Localization`.
 
 .. important::
-   All the following configuration and functionality is only available in Odoo if your
+   All the following configuration and functionality is only available in Odoo if your 
    company already passed the `Certification process <https://www.sii.cl/factura_electronica/
-   factura_mercado/proceso_certificacion.htm>`_
-   in the SII - Sistema de Facturación de Mercado, this certification enables you to
-   generate electronic invoices from your ERP and send them automatically to the SII.
-   If your company has not passed this certification yet, make sure you communicate this
-   to your Account Manager as a special process outside Odoo is required in order to complete
+   factura_mercado/proceso_certificacion.htm>`_ 
+   in the SII - Sistema de Facturación de Mercado, this certification enables you to 
+   generate electronic invoices from your ERP and send them automatically to the SII. 
+   If your company has not passed this certification yet, make sure you communicate this 
+   to your Account Manager as a special process outside Odoo is required in order to complete 
    this certification.
 
 Fiscal Information
@@ -71,7 +71,7 @@ instructions on each section.
 .. image:: chile/Chile02.png
    :align: center
    :alt: Chilean company fiscal data.
-
+   
 Electronic Invoice Data
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -87,7 +87,7 @@ Configure DTE Incoming email server
 ***********************************
 
 In order to receive you the claim and acceptance emails from your customers, it is
-crucial to define the DTE incoming email server, considering this configuration:
+crucial to define the DTE incoming email server, considering this configuration: 
 
 .. image:: chile/Chile03_2.png
    :align: center
@@ -95,13 +95,13 @@ crucial to define the DTE incoming email server, considering this configuration:
 
 .. tip::
    For your Go-live make sure you archive/remove from your inbox all the emails
-   related to vendor bills that are not required to be processed in Odoo.
-
+   related to vendor bills that are not required to be processed in Odoo. 
+   
 Certificate
 ~~~~~~~~~~~
 
-In order to generate the electronic invoice signature, a digital certificate with the extension
-``pfx`` is required, proceed to this section and load your file and password.
+In order to generate the electronic invoice signature, a digital certificate with the extension ``.pfx``
+is required, proceed to this section and load your file and password. 
 
 .. image:: chile/Chile03_3.png
    :align: center
@@ -109,22 +109,22 @@ In order to generate the electronic invoice signature, a digital certificate wit
 
 .. image:: chile/Chile04.png
    :align: center
-   :alt: Digital certificate configuration.
+   :alt: Digital certificate configuration.   
 
 A certificate can be shared between several users. If this is the case leave the user field empty,
-so all your billing users can use the same one. On the other hand, if you need to restrict the
+so all your billing users can use the same one. On the other hand,  if you need to restrict the
 certificate for a particular user, just define the users in the certificate.
 
 .. note::
    In some cases, depending on the certificate format, it is possible that the field Subject Serial
    Number is not loaded automatically. If this is the case, you can manually edit this field by
-   filling it with the Certificate's legal representative RUT.
+   filling it with the Certificate’s legal representative RUT.
 
 Financial Reports
 ~~~~~~~~~~~~~~~~~
 
 The report Propuesta F29 requires two values that need to be defined as part of the company
-configuration:
+configuration: 
 
 .. image:: chile/Chile05.png
    :align: center
@@ -134,18 +134,18 @@ Multicurrency
 ~~~~~~~~~~~~~
 
 The official currency rate in Chile is provided by the Chilean service `mindicador.cl
-<https://mindicador.cl>`_. You can find this service in the currency rate configuration, and you
-can set a predefined interval for the rate updates.
+<https://mindicador.cl>`_. You can find this service in the currency rate configuration, and you can
+set a predefined interval for the rate updates.
 
 .. image:: chile/Chile05_2.png
    :align: center
    :alt: Currency reate service for Chile.
-
+   
 Chart of accounts
 ~~~~~~~~~~~~~~~~~
 
 The chart of accounts is installed by default as part of the set of data included in
-the localization module. The accounts are mapped automatically in:
+the localization module. The accounts are mapped automatically in: 
 
 - Taxes.
 - Default Account Payable.
@@ -169,7 +169,7 @@ are now available on the Partner form. This information is essential for most tr
 .. image:: chile/Chile06.png
    :align: center
    :alt: Chilean identification types for partners.
-
+ 
 TaxpayerType
 ************
 
@@ -179,20 +179,20 @@ a customer is important you make sure this value is set:
 
 .. image:: chile/Chile07.png
    :align: center
-   :alt: Chilean taxpayer types for partners.
-
+   :alt: Chilean taxpayer types for partners.   
+ 
 
 Electronic Invoice Data
 ***********************
 
 As part of the information that is sent in the electronic Invoice, you need to define the
 email that is going to appear as the sender of the electronic invoice to your customer, and
-the Industry description.
+the Industry description. 
 
 .. image:: chile/Chile07_2.png
    :align: center
    :alt: Chilean electronic invoice data for partners.
-
+   
 
 Taxes
 ~~~~~
@@ -209,7 +209,7 @@ Taxes Types
 
 Chile has several tax types, the most common ones are:
 
-- VAT. Is the regular VAT and it can have several rates.
+- VAT. Is the regular VAT and it can have several rates. 
 - ILA (Impuesto a la Ley de Alcholes). Taxes for alcoholic drinks. It has a different rate.
 
 
@@ -217,7 +217,7 @@ Fiscal Positions
 ~~~~~~~~~~~~~~~~
 
 Based on the purchase transactions, the VAT can have different affections. This will be done
-in Odoo using the default purchase fiscal positions.
+in Odoo using the default purchase fiscal positions. 
 
 
 Document Types
@@ -230,7 +230,7 @@ Chile case: SII).
 The document type is essential information that needs to be displayed in the printed reports and
 that needs to be easily identified within the set of invoices as well of account moves.
 
-Each document type can have a unique sequence per company. As part of the localization,
+Each document type can have a unique sequence per company.  As part of the localization,
 the Document Type includes the country on which the document is applicable and the data
 is created automatically when the localization module is installed.
 
@@ -239,7 +239,7 @@ fill anything on this view:
 
 .. image:: chile/Chile09.png
    :align: center
-   :alt: Chilean fiscal document types list.
+   :alt: Chilean fiscal document types list. 
 
 .. note::
    There are several document types that are inactive by default but can be activated if needed.
@@ -253,7 +253,7 @@ The document type on each transaction will be determined by:
 - The Journal related to the Invoice, identifying if the journal uses documents.
 - Condition applied based on the type of Issues and Receiver (ex. Type of fiscal
   regimen of the buyer and type of fiscal regimen of the vendor).
-
+  
 
 Journals
 --------
@@ -269,7 +269,7 @@ Sales Journals in Odoo usually represent a business unit or location, example:
 - Ventas Santiago.
 - Ventas Valparaiso.
 
-For the retail stores is common to have one journal per POS:
+For the retail stores is common to have one journal per POS: 
 
 - Cashier 1.
 - Cashier 2.
@@ -289,51 +289,50 @@ bills but can be easily registered using this model, for example:
 Configuration
 ~~~~~~~~~~~~~
 
-When creating sales journals the next information must be filled in:
+When creating sales journals the next information must be filled in: 
 
 **Point of sale type**: If the Sales journal will be used for electronic documents, the option
 Online must be selected. Otherwise, if the journal is used for invoices imported from a previous
-system or if you are using the SII portal “Facturación MiPyme“ you can use the option Manual.
+system or if you are using the SII portal “Facturación MiPyme“ you can use the option Manual. 
 
 **Use Documents**: This field is used to define if the journal will use Document Types. It is only
-applicable to Purchase and Sales journals that can be related to the different sets of document
-types available in Chile. By default, all the sales journals created will use documents.
-
+applicable to Purchase and Sales journals that can be related to the
+different sets of document types available in Chile. By default, all the sales journals created will
+use documents. 
+  
 .. image:: chile/Chile41.png
    :align: center
    :alt: Document type configuration on Journal.
-
+   
 .. important::
    For the Chilean localization, it is important to define the default Debit and Credit accounts
    as they are required for one of the debit notes use cases.
-
-.. _chile/caf-documentation:
-
+   
 CAF
 ---
 
 A CAF (Folio Authorization Code) is required, for each document type that is issued to your
-customers, the CAF is a file the SII provides to the Emisor with the folio/sequence authorized
+customers, the CAF is a file the SII provides to the Emisor with the folio/sequence authorized 
 for the electronic invoice documents.
 
 Your company can make several requests for folios and obtain several CAFs, each one associated
 with different ranges of folios. The CAFs are shared within all the journals, this means
 that you only need one active CAF per document type and it will be applied on all journals.
 
-Please refer to the `SII documentation <https://palena.sii.cl/dte/mn_timbraje.html>`_ to check the
-detail on how to acquire the CAF.
+Please refer to the SII documentation to check the detail on how to acquire the CAF:
+`SII Timbraje <https://palena.sii.cl/dte/mn_timbraje.html>`_.
 
 .. important::
    The CAFs required by the SII are different from Production to Test (Certification mode). Make
    sure you have the correct CAF set depending on your environment.
 
-
+	
 Configuration
 ~~~~~~~~~~~~~
 
 Once you have the CAF files you need to associate them with a document type in Odoo,
 in order to add a CAF, just follow these steps:
-
+ 
 1. Access to :menuselection:`Accounting --> Settings --> CAF`
 2. Upload the file.
 3. Save the CAF.
@@ -343,11 +342,11 @@ in order to add a CAF, just follow these steps:
    :alt: Steps to add a new CAF.
 
 Once loaded, the status changes to *In Use*. At this moment, when a transaction is used
-for this document type, the invoice number takes the first folio in the sequence.
+for this document type, the invoice number takes the first folio in the sequence. 
 
 .. important::
    In case you have used some folios in your previous system, make sure you set the next valid
-   folio when the first transaction is created.
+   folio when the first transaction is created. 
 
 
 
@@ -357,42 +356,40 @@ Usage and Testing
 Electronic Invoice Workflow
 ---------------------------
 
-In the Chilean localization the electronic Invoice workflow covers the Emission of Customer
-Invoices and the reception of Vendor Bills, in the next diagram we explain how the information
-transmitted to the SII and between the customers and Vendors.
+In the Chilean localization the electronic Invoice workflow covers the Emission of
+Customer Invoices and the reception of Vendor Bills, in the next diagram we explain how
+the information transmitted to the SII and between the customers and Vendors. 
 
 .. image:: chile/Chile14.png
    :align: center
    :alt: Diagram with Electronic invoice transactions.
-
+   
 
 Customer invoice Emission
 -------------------------
 
-After the partners and journals are created and configured, the invoices are created in the
-standard way, for Chile one of the differentiators is the document type which is selected
-automatically based on the Taxpayer.
+After the partners and journals are created and configured, the invoices are created in
+the standard way, for Chile one of the differentiators is the document type which is selected
+automatically based on the Taxpayer. 
 
-You can manually change the document type if needed.
+You can manually change the document type if needed. 
 
 .. image:: chile/Chile15.png
    :align: center
    :alt: Document type selection on invoices.
-
+   
 .. important::
    Documents type 33: Electronic Invoice must have at least one item with tax, otherwise the SII
    rejects the document validation.
 
-.. _chile/electronic-invoice-validation:
-
 Validation and DTE Status
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-When all the invoice information is filled, either manually or automatically when it's created
-from a sales order, proceed to validate the invoice. After the invoice is posted:
+When all the invoice information is filled, either manually or automatically when it’s created
+from a sales order, proceed to validate the invoice.  After the invoice is posted:
 
 - The DTE File (Electronic Tax Document) is created automatically and added in the chatter.
-- The DTE SII status is set as: Pending to be sent.
+- The DTE SII status is set as: Pending to be sent. 
 
   .. image:: chile/Chile16.png
      :align: center
@@ -400,59 +397,60 @@ from a sales order, proceed to validate the invoice. After the invoice is posted
 
 The DTE Status is updated automatically by Odoo with a scheduled action that runs every day
 at night, if you need to get the response from the SII immediately you can do it manually as well.
-The DTE status workflow is as follows:
+The DTE status workflow is as follows: 
 
 .. image:: chile/Chile17.png
    :align: center
    :alt: Transition of DTE statuses.
-
+   
 
 1. In the first step the DTE is sent to the SII, you can manually send it using the button: Enviar
-   Ahora, a SII Tack number is generated and assigned to the invoice, you can use this number to
+   Ahora, a SII Tack number is generated and assigned to the invoice, you can use this number to 
    check the details the SII sent back by email. The DTE status is updated to Ask for Status.
 
 
-2. Once the SII response is received Odoo updates the DTE Status, in case you want to do it
-   manually just click on the button: Verify on SII. The result can either be Accepted, Accepted
+2. Once the SII response is received Odoo updates the DTE Status, in case you want to do it 
+   manually just click on the button: Verify on SII. The result can either be Accepted, Accepted 
    With Objection or Rejected.
-
+   
    .. image:: chile/Chile18.png
       :align: center
       :alt: Identification transaction for invoice and Status update.
 
 
-   There are several internal status in the SII before you get Acceptance or Rejection, in case you
-   click continuously the Button Verify in SII, you will receive in the chatter the detail of
-   those intermediate statuses:
-
+   There are several internal status in the SII before you get Acceptance or Rejection, in
+   case you click continuously  the Button Verify in SII, you will receive in the chatter the
+   detail of those intermediate statuses:
+   
    .. image:: chile/Chile18_2.png
       :align: center
       :alt: Descprtion of each DTE status in the chatter.
 
 3. The final response from the SII, can take on of these values:
 
-   **Accepted:** Indicates the invoice information is correct, our document is now fiscally valid
-   and it's automatically sent to the customer.
 
-   **Accepted with objections:** Indicates the invoice information is correct but a minor issue was
-   identified, nevertheless our document is now fiscally valid and it's automatically sent to the
-   customer.
+   **Accepted:** Indicates the invoice information is correct, our document is now fiscally valid
+   and it’s automatically sent to the customer. 
+
+   **Accepted with objections:** Indicates the invoice information is correct but a minor issue
+   was identified, nevertheless our document is now fiscally valid and it’s automatically
+   sent to the customer.
 
    .. image:: chile/Chile19.png
       :align: center
       :alt: Email track once it is sent to the customer.
 
-   **Rejected:** Indicates the information in the invoice is incorrect and needs to be corrected,
-   the detail of the issue is received in the emails you registered in the SII, if it is properly
-   configured in Odoo, the details are also retrieved in the chatter once the email server is
-   processed.
-
+   **Rejected:** Indicates the information in the invoice is incorrect and needs to be
+   corrected, the detail of the issue is received in the emails you registered in the
+   SII, if it is properly configured in Odoo, the details are also retrieved
+   in the chatter once the email server is processed.
+	 
    If the invoice is Rejected please follow this steps:
-
+	 
    * Change the document to draft.
    * Make the required corrections based on the message received from the SII.
    * Post the invoice again.
-
+	 
    .. image:: chile/Chile20.png
       :align: center
       :alt: Message when an invoice is rejected.
@@ -462,9 +460,9 @@ Crossed references
 ~~~~~~~~~~~~~~~~~~
 
 When the Invoice is created as a result of another fiscal document, the information related to the
-originator document must be registered in the Tab Cross Reference, which is commonly used for
-credit or debit notes, but in some cases can be used on Customer Invoices as well. In the case of
-the credit and debit notes, they are set automatically by Odoo:
+originator document must be registered in the Tab Cross Reference, which is commonly used for 
+credit or debit notes, but in some cases can be used on Customer Invoices as well. In the case of the
+credit and debit notes, they are set automatically by Odoo:
 
 .. image:: chile/Chile21.png
    :align: center
@@ -498,14 +496,14 @@ Once the invoice has been sent to the customer:
 .. image:: chile/Chile23.png
    :align: center
    :alt: Message with the commercial acceptance from the customer.
-
+   
 
 Processed for Claimed invoices
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Once the invoice has been Accepted by the SII **it can not be cancelled in Odoo**. In case you get
-a Claim for your customer the correct way to proceed is with a Credit Note to either cancel the
-Invoice or correct it. Please refer to the :ref:`chile/credit-notes` section for more details.
+Once the invoice has been Accepted by the SII **it can not be cancelled in Odoo**.  In case you
+get a Claim for your customer the correct way to proceed is with a Credit Note to either cancel
+the Invoice or correct it. Please refer to the Credit Notes section for more details. 
 
 .. image:: chile/Chile24.png
    :align: center
@@ -515,56 +513,55 @@ Common Errors
 ~~~~~~~~~~~~~
 
 There are multiple reasons behind a rejection from the SII, but these are some of the common errors
-you might have and which is the related solution.
+you might have and which is the related solution. 
 
 - Error: ``RECHAZO- DTE Sin Comuna Origen.``
-
-  *Hint:* Make sure the Company Address is properly filled including the State and City.
+  
+  *Hint:* Make sure the Company Address is properly filled including the State and City. 
 
 - Error en Monto: ``- IVA debe declararse.``
-
-  *Hint:* The invoice lines should include one VAT tax, make sure you add one on each invoice line.
+  
+  *Hint:* The invoice lines should include one VAT tax, make sure you add one on each invoice line. 
 
 - Error: ``Rut No Autorizado a Firmar.``
-
-  *Hint:* The invoice lines should include one VAT tax, make sure you add one on each invoice line.
+  
+  *Hint:* The invoice lines should include one VAT tax, make sure you add one on each invoice line. 
 
 - Error: ``Fecha/Número Resolucion Invalido RECHAZO- CAF Vencido : (Firma_DTE[AAAA-MM-DD] -
   CAF[AAAA-MM-DD]) &gt; 6 meses.``
-
-  *Hint:* Try to add a new CAF related to this document as the one you're using is expired.
-
+  
+  *Hint:* Try to add a new CAF related to this document as the one you’re using is expired.
+  
 - Error: ``Element '{http://www.sii.cl/SiiDte%7DRutReceptor': This element is not expected. Expected
   is ( {http://www.sii.cl/SiiDte%7DRutEnvia ).``
-
+  
   *Hint:* Make sure the field Document Type and VAT are set either in the Customer and in the main
   company.
-
+   
 - GLOSA: ``Usuario sin permiso de envio.``
-
+  
   *Hint:* This error indicates that most likely, your company has not passed the `Certification
-  process <https://www.sii.cl/factura_electronica/factura_mercado/proceso_certificacion.htm>`_ in
-  the SII - Sistema de Facturación de Mercado. If this is the case, please contact your Account
-  Manager or Customer Support as this certification is not part of the the Odoo services, but we
-  can give you some alternatives.
+  process <https://www.sii.cl/factura_electronica/factura_mercado/proceso_certificacion.htm>`_ in 
+  the SII - Sistema de Facturación de Mercado. If this is the case, please contact your Account 
+  Manager or Customer Support as this certification is not part of the the Odoo services,
+  but we can give you some alternatives.
+
 
-.. _chile/credit-notes:
 
 Credit Notes
 ------------
 
 When a cancellation or correction is needed over a validated invoice, a credit note must be
 generated. It is important to consider that a CAF file is required for the Credit Note,
-which is identified as document 64 in the SII.
+which is identified as document 64 in the SII.  
 
 .. image:: chile/Chile40.png
    :align: center
    :alt: Creation of CAF for Credit notes.
 
 
-.. tip::
-   Refer to the :ref:`CAF section <chile/caf-documentation>` where we described the process to load
-   the CAF on each document type.
+.. tip:: Refer to the CAF section where we described the process to load the CAF on each 
+   document type.
 
 Use Cases
 ~~~~~~~~~
@@ -572,24 +569,24 @@ Use Cases
 Cancel Referenced document
 **************************
 
-In case you need to cancel or invalid an Invoice, use the button Add Credit note and select Full
+In case you need  to cancel or invalid an Invoice, use the button Add Credit note and select Full
 Refund, in this case the SII reference Code is automatically set to: Anula Documento de referencia.
 
 .. image:: chile/Chile26.png
-   :align: center
-   :alt: Full invoice refund with SII reference code 1.
+   :align: center 
+   :alt: Full invoice refund with SII reference code 1. 
 
 Corrects Referenced Document Text
 *********************************
 
 If a correction in the invoice information is required, for example the Street Name, use the button
 Add Credit note,select Partial Refund and select the option “Solo corregir Texto”. In this case
-the SII reference Code is automatically set to: Corrige el monto del Documento de Referencia.
+the SII reference Code is automatically set to: Corrige el monto del Documento de Referencia. 
 
 .. image:: chile/Chile27.png
    :align: center
    :alt: Partial refund to correct text including the corrected value.
-
+   
 Odoo creates a Credit Note with the corrected text in an invoice and price 0.
 
 .. image:: chile/Chile28.png
@@ -597,15 +594,15 @@ Odoo creates a Credit Note with the corrected text in an invoice and price 0.
    :alt: Credit note with the corrected value on the invoice lines.
 
 .. important::
-   It's important to define the default credit account in the Sales journal as it
-   is taken for this use case in specific.
+   It’s important to define the default credit account in the Sales journal as it
+   is taken for this use case in specific. 
 
 Corrects Referenced Document Amount
 ***********************************
 
-When a correction on the amounts is required, use the button Add Credit note and select Partial
-Refund. In this case the SII reference Code is automatically set to: Corrige el monto del Documento
-de Referencia.
+When a correction on the amounts is required, use the button Add Credit note
+and select Partial Refund. In this case the SII reference Code is automatically
+set to: Corrige el monto del Documento de Referencia.
 
 .. image:: chile/Chile30.png
    :align: center
@@ -615,8 +612,8 @@ Debit Notes
 -----------
 
 As part of the Chilean localization, besides creating credit notes from an existing document you
-can also create debit Notes. For this just use the button “Add Debit Note”. The two main use cases
-for debit notes are detailed below.
+can also create debit Notes. For this just use the button “Add Debit Note”.  The two main use
+cases for debit notes are detailed below. 
 
 Use Cases
 ~~~~~~~~~
@@ -630,8 +627,8 @@ need to select option 3 in the field Reference code SII:
 .. image:: chile/Chile31.png
    :align: center
    :alt: Debit note for partial refund to crrect amounts, using the SII reference code 3.
-
-
+   
+   
 In this case Odoo automatically includes the source invoice in the cross reference section:
 
 .. image:: chile/Chile32.png
@@ -642,230 +639,64 @@ Cancel Credit Notes
 *******************
 
 In Chile the debits notes are used to cancel a validated Credit Note, in this case just
-select the button Add debit note and select the first option in the wizard: *1: Anula
+select the button Add debit note and select the first option in the wizard: *1: Anula 
 Documentos de referencia.*
 
 .. image:: chile/Chile33.png
    :align: center
    :alt: Creating a debit note to cancel a credit note with the SII code reference 1.
 
+
 Vendor Bills
 ------------
 
 As part of the Chilean localization, you can configure your Incoming email server as the same you
 have register in the SII in order to:
 
-- Automatically receive the vendor bills DTE and create the vendor bill based on this information.
-- Automatically Send the reception acknowledgement to your vendor.
-- Accept or Claim the document and send this status to your vendor.
+- Automatically receive the vendor bills DTE and create the vendor bill based on this information. 
+- Automatically Send the reception acknowledgement to your vendor. 
+- Accept or Claim the document and send this status to your vendor. 
+
 
 Reception
 ~~~~~~~~~
 
 As soon as the vendor email with the attached DTE is received:
 1. The vendor Bill mapping all the information included in the xml.
-2. An email is sent to the vendor with the Reception acknowledgement.
-3. The DTE status is set as: Acuse de Recibido Enviado
+2. An email is sent to the vendor with the Reception acknowledgement. 
+3. The DTE status is set as:  Acuse de Recibido Enviado
 
 .. image:: chile/Chile34.png
    :align: center
-   :alt: Messages recorded in the chatter with the reception notification for the vendor.
+   :alt: Messages recorded in the chatter with the reception notification for the vendor. 
 
 Acceptation
 ~~~~~~~~~~~
 
-If all the commercial information is correct on your vendor bill then you can accept the document
-using the :guilabel:`Aceptar Documento` button. Once this is done the DTE Acceptation Status
-changes to :guilabel:`Accepted`` and an email of acceptance is sent to the vendor.
+If all the commercial information is correct on your vendor bill, you can accept the document using
+the button: Aceptar Documento, once this is done the DTE Acceptation Status  changes to: Accepted and
+an email of acceptance is sent to the vendor. 
 
 .. image:: chile/Chile35.png
    :align: center
-   :alt: Acceptance button in vendor bills to inform vendor the document is comercially accepted.
+   :alt: Acceptance button in vendor bills to inform the vendor all the document is comercially accepted.
+   
 
 Claim
 ~~~~~
 
 In case there is a commercial issue or the information is not correct on your vendor bill, you can
-Claim the document before validating it, using the button: Claim, once this is done the DTE
-Acceptation Status change to: Claim and an email of acceptance is sent to the vendor.
+Claim the document before validating it,  using the button: Claim, once this is done the DTE
+Acceptation Status  change to: Claim  and an email of acceptance is sent to the vendor. 
 
 .. image:: chile/Chile36.png
    :align: center
    :alt: Claim button in vendor bills to inform the vendor all the document is comercially rejected.
-
+   
 If you claim a vendor bill, the status changes from draft to cancel automatically. Considering this
-as best practice, all the Claim documents should be canceled as they won't be valid for your
-accounting records.
+as best practice, all the Claim documents should be canceled as they won’t be valid for your
+accounting records. 
 
-Delivery Guide
---------------
-
-To install the Delivery Guide module, go to :menuselection:`Apps` and search for :guilabel:`Chile
-(l10n_cl)`. Then click :guilabel:`Install` on the module :guilabel:`Chile - E-Invoicing Delivery
-Guide`.
-
-.. note::
-   *Chile - E-Invoicing Delivery Guide* has a dependency with *Chile - Facturación Electrónica*.
-   Odoo will install the dependency automatically when the Delivery Guide module is installed.
-
-The Delivery Guide module includes sending the DTE to SII and the stamp in PDF reports for
-deliveries.
-
-.. image:: chile/chile42.png
-   :align: center
-   :alt: Install Delivery Guide Module
-
-Once all configurations have been made for electronic invoices (e.g., uploading a valid company
-certificate, setting up master data, etc.), Delivery Guides need their own CAFs. Please refer to the
-:ref:`CAF documentation <chile/caf-documentation>` to check the details on how to acquire the CAFs
-for electronic Delivery Guides.
-
-Verify the following important information in the *Price for the Delivery Guide* configuration:
-
-- :guilabel:`From Sales Order`: Delivery Guide takes the product price from the Sales Order and
-  shows it on the document.
-- :guilabel:`From Product Template`: Odoo takes the price configured in the product template and
-  shows it on the document.
-- :guilabel:`No show price`: no price is shown in the Delivery Guide.
-
-Electronic delivery guides are used to move stock from one place to another and they can represent
-sales, sampling, consignment, internal transfers, and basically any product move.
-
-Delivery Guide from a Sales Process
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-When a Sales Order is created and confirmed, a Delivery Order is generated. After validating the
-Delivery Order, the option to create a Delivery Guide is activated.
-
-.. image:: chile/chile43.png
-   :align: center
-   :alt: Create Delivery Guide Button
-
-When clicking on :guilabel:`Create Delivery Guide` for the first time, a warning message pops up,
-showing the following:
-
-.. image:: chile/chile44.png
-   :align: center
-   :alt: An example sequence error when creating a Delivery Guide in Odoo
-
-This warning message means the user needs to indicate the next sequence number Odoo has to take to
-generate the Delivery Guide, and only only happens the *first time* a Delivery Guide is created in
-Odoo. After the first document has been correctly generated, Odoo takes the CAFs next available
-number to generate the following Delivery Guide and so on.
-
-After the Delivery Guide is created:
-
-- The DTE file (Electronic Tax Document) is automatically created and added to the chatter.
-- The DTE SII status is set as: Pending to be sent.
-
-.. image:: chile/chile45.png
-   :align: center
-   :alt: DTE Status in SII and creation of DTE/XML
-
-The DTE Status is automatically updated by Odoo with a scheduled action that runs every day at
-night. To get a response from the SII immediately, press the :guilabel:`Send now to SII` button.
-
-Once the Delivery Guide is sent, it may then be printed by clicking on the :guilabel:`Print
-Delivery Guide` button.
-
-.. image:: chile/chile46.png
-   :align: center
-   :alt: Printing Delivery Guide PDF
-
-Electronic Receipt
-------------------
-
-To install the Electronic Receipt module, go to :menuselection:`Apps` and search for
-:guilabel:`Chile (l10n_cl)`. Then click :guilabel:`Install` on the module :guilabel:`Chile -
-Electronic Receipt`.
-
-.. note::
-   *Chile - Electronic Receipt* has a dependency with *Chile - Facturación Electrónica*. Odoo will
-   install the dependency automatically when the E-invoicing Delivery Guide module is installed.
-
-This module contains the electronic receipt and daily sales report, which are automatically sent to
-SII.
-
-.. image:: chile/chile47.png
-   :align: center
-   :alt: Install Electronic Receipt module
-
-Once all configurations have been made for Electronic Invoices (e.g., uploading a valid company
-certificate, setting up master data, etc.), Electronic Receipts need their own CAFs. Please refer
-to the :ref:`CAF documentation <chile/caf-documentation>` to check the details on how to acquire the
-CAFs for Electronic Receipts.
-
-Electronic Receipts are useful when clients do not need an Electronic Invoice. By default, there is
-a partner in the database called *Anonymous Final Consumer* with a generic RUT 66666666-6 and
-taxpayer type of *Final Consumer*. This partner can be used for Electronic Receipts or a new record
-may be created for the same purpose.
-
-Although Electronic Receipts should be used for final consumers with a generic RUT, it can also be
-used for specific partners. After the partners and journals are created and configured, the
-Electronic Receipts are created in the standard way as Electronic Invoice, but the type of document
-:guilabel:`(39) Electronic Receipt` should be selected, like so:
-
-.. image:: chile/chile48.png
-   :align: center
-   :alt: Select type of Document: (39) Boleta Electrónica
-
-Validation and DTE Status
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-When all of the Electronic Receipt information is filled, either manually or automatically from a
-Sales Order, proceed to validate the receipt. By default, Electronic Invoice is selected as the
-Document Type, however in order to validate the receipt correctly, make sure to edit the Document
-Type and change to Electronic Receipt.
-
-After the receipt is posted:
-
-- The DTE file (Electronic Tax Document) is created automatically and added to the chatter.
-- The DTE SII status is set as: Pending to be sent.
-
-.. image:: chile/chile49.png
-   :align: center
-   :alt: DTE status in SII and creation of DTE/XML
-
-The DTE Status is automatically updated by Odoo with a scheduled action that runs every day at
-night. To get a response from the SII immediately, press the :guilabel:`Send now to SII` button.
-
-Please refer to the :ref:`DTE Workflow <chile/electronic-invoice-validation>` for Electronic
-Invoices as the workflow for Electronic Receipt follows the same process.
-
-Daily Sales Report
-~~~~~~~~~~~~~~~~~~
-
-Once Electronic Receipts have been created, the system creates a daily sales report containing all
-Electronic Receipts per day. This report is electronically stamped and sent to the SII overnight in
-XML format. These daily reports can be found in :menuselection:`Reports --> Daily Sales Reports`.
-
-.. image:: chile/chile50.png
-   :align: center
-   :alt: Find Electronic Receipts in the Reports menu, under Daily Sales Reports
-
-A list of daily reports is displayed with all daily DTE sent to SII.
-
-.. image:: chile/chile51.png
-   :align: center
-   :alt: List of Daily Reports
-
-If no Electronic Receipt was made on a particular day, the report is sent but it will not have any
-receipts in it. The report will also have an answer from the SII if it was accepted or rejected
-(depending on the company's certificate and validated receipts).
-
-.. image:: chile/chile52.png
-   :align: center
-   :alt: Daily Sales Book example
-
-.. important::
-   For Chilean localization, note that the feature tax included in the price is *not* supported for
-   the Electronic Receipt.
-
-   If a Daily Sales Report has already been created for a specific day in another system, the daily
-   report in Odoo will be rejected due to the sequence number used. If that is the case, the user
-   has to manually click on :guilabel:`Retry` in order for a new sequence number to be generated
-   (this action is automatically done by Odoo). Afterwards, users can manually verify report status
-   with SII or wait for Odoo to update status later at night.
 
 Financial Reports
 =================
@@ -875,7 +706,7 @@ Balance Tributario de 8 Columnas
 
 This report presents the accounts in detail (with their respective balances), classifying them
 according to their origin and determining the level of profit or loss that the business had within
-the evaluated period of time, so that a real and complete knowledge of the status of a company.
+the evaluated period of time, so that a real and complete knowledge of the status of a company. 
 
 You can find this report in :menuselection:`Accounting --> Accounting --> Reports`
 
@@ -888,9 +719,9 @@ Propuesta F29
 
 The form F29 is a new system that the SII enabled to taxpayers, and that replaces the Purchase and
 Sales Books. This report is integrated by Purchase Register (CR) and the Sales Register (RV).
-Its purpose is to support the transactions related to VAT, improving its control and declaration.
+Its purpose is to support the transactions related to VAT, improving its control and declaration. 
 
-This record is supplied by the electronic tax documents (DTE's) that have been received by the
+This record is supplied by the electronic tax documents (DTE’s) that have been received by the
 SII.
 
 You can find this report in :menuselection:`Accounting --> Accounting --> Reports`

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

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

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