[MERGE] Forward-port of 13.0 in 13.2

.github/CODEOWNERS

@@ -0,0 +1,3 @@
+# All changes to legal material have to be approved
+/legal/     @odoo/legal
+/legal.rst  @odoo/legal

accounting.rst

@@ -1,8 +1,8 @@
 :banner: banners/accounting.png
 
-==========
+========================
-Accounting
+Invoicing and Accounting
-==========
+========================
 
 .. toctree::
    :titlesonly:
@@ -12,6 +12,6 @@ Accounting
    accounting/payables
    accounting/bank
    accounting/fiscality
+   accounting/reporting
    accounting/others
-   accounting/localizations
+   accounting/fiscal_localizations
-

accounting/bank/feeds/ponto.rst

@@ -12,7 +12,7 @@ continuously expanding the number of bank institutions that can be synchronized
 
 **Odoo Accounting** can synchronize directly with your bank to get all bank statements imported
 automatically into your database. This allows for easier **bank reconciliation**. When :doc:`adding
-a bank account on Odoo <../setup/create_bank_account>`, you can see if your bank requires a
+a bank account on Odoo <../setup/bank_accounts>`, you can see if your bank requires a
 connection through Ponto by searching for your bank institution, and clicking on it.
 
 .. image:: media/ponto_add_bank.png
@@ -112,5 +112,5 @@ token instead of the current synchronization system with a *Client ID* and a *Se
 .. seealso::
 
    * :doc:`bank_synchronization`
-   * :doc:`../setup/create_bank_account`
+   * :doc:`../setup/bank_accounts`
    * :doc:`bank_statements`

accounting/bank/reconciliation.rst

@@ -6,4 +6,4 @@ Bank Reconciliation
    :titlesonly:
 
    reconciliation/use_cases
-   reconciliation/configure
+   reconciliation/reconciliation_models

accounting/bank/reconciliation/configure.rst

@@ -1,63 +0,0 @@
-==========================
-Configure model of entries
-==========================
-
-Overview
-========
-
-In Odoo you have the possibility to pre-fill some accounting entries in
-order to easily reconcile recurrent entries such as bank fees.
-
-We will take the following example to illustrate the concept : Every
-month my company receives a bank fee cost, which depends of our bank
-account current balance. This fee is thus variable.
-
-Create Reconciliation Models
-============================
-
-First, we need to configure two model reconciliation entries. To do so,
-go to the accounting application dashboard. On your bank journal, click
-on :menuselection:`More --> Reconciliation Models`.
-
-.. image:: media/configure01.png
-   :align: center
-
-We want to be able to book our bank fees easily. Our bank deducts fees
-depending on our balance, meaning that it can vary every month.
-
-We create a button Label called Bank fees, select the correct account to
-book those fees. Moreover we also need to specify that the amount type
-is "Percentage of balance" with an Amount of 100%. This parameter will
-tell Odoo to take the entire fee into account.
-
-.. image:: media/configure02.png
-   :align: center
-
-Save your changes when you are done.
-
-.. note::
-   If the amount of your bank fee is fixed, you can as well select **Fixed**
-   under amount type and specify the amount in the amount tap.
-
-.. seealso::
-   You can also use this functionality to handle discounts. Please refer to
-   :doc:`../../receivables/customer_invoices/cash_discounts`
-
-Register your payments based on a reconciliation model
-======================================================
-
-Register your payment by importing your bank statements that will be
-impacted by the payment of the bank fee.
-
-When doing the reconciliation, you can select an open balance and click
-the **Reconciliation Model** button (in this case, **Bank Fees**) to get all
-the relevant data instantly.
-
-.. image:: media/configure03.png
-   :align: center
-
-Finally, click on **Reconcile** to finish the process.
-
-.. seealso::
-   * :doc:`../feeds/bank_synchronization`
-   * :doc:`use_cases`

accounting/bank/reconciliation/reconciliation_models.rst

@@ -0,0 +1,129 @@
+=====================
+Reconciliation Models
+=====================
+
+Once the bank statements are correctly imported, it is essential to *reconcile* the records properly
+and ensure all *Journal Entries* are balanced and in agreement. To ease and speed up the
+reconciliation process, you can configure **Reconciliation Models**, which are particularly useful
+with recurrent entries such as bank fees.
+
+.. todo:: Add a link to the Reconciliation process in the paragraph above, once the doc will have
+   been updated.
+
+.. note::
+   Reconciliation Models are also useful to handle *Cash Discounts*. Please refer to
+   :doc:`this documentation <../../receivables/customer_invoices/cash_discounts>` for more
+   information.
+
+.. _reconciliation_models_types:
+
+Types of Reconciliation Models
+==============================
+
+There are three types of Reconciliation Models:
+
+#. :ref:`Write-off Button <reconciliation_models_button>`
+#. :ref:`Suggestion of counterpart values <reconciliation_models_suggestion>`
+#. :ref:`Match existing invoices/bills <reconciliation_models_match>`
+
+.. _reconciliation_models_button:
+
+Manually create a write-off on clicked button
+---------------------------------------------
+
+When you are reconciling an entry with an *Open Balance*, you can use the buttons available under
+the *Manual Operations* tab to pre-fill all the values automatically, before validating the
+reconciliation. Each button is a different Reconciliation Model.
+
+.. image:: media/reconciliation_models_button.png
+   :align: center
+   :alt: Example of a Reconciliation Model with a write-off button in Odoo Accounting
+
+.. _reconciliation_models_suggestion:
+
+Suggest counterpart values
+--------------------------
+
+This type of Reconciliation Model suggests immediately counterpart values that only need to be
+validated. This automation is based on a set of rules defined in the reconciliation model.
+
+.. image:: media/reconciliation_models_suggestion.png
+   :align: center
+   :alt: Example of a Reconciliation Model that suggests counterpart values in Odoo Accounting
+
+.. _reconciliation_models_match:
+
+Match existing invoices/bills
+-----------------------------
+
+This type of Reconciliation Model automatically selects the right Customer Invoice or Vendor Bill
+that matches the payment. All that is left to do is to validate the entry. This automation is based
+on a set of rules defined in the reconciliation model.
+
+.. image:: media/reconciliation_models_match.png
+   :align: center
+   :alt: Example of a Reconciliation Model that matches existing invoices and bills automatically
+         in Odoo Accounting
+
+Configuration
+=============
+
+To manage or create new **Reconciliation Models**, go to :menuselection:`Accounting -->
+Reconciliation --> Reconciliation Models`. Alternatively, you can also open this menu from the
+Accounting Overview, by going to your Bank Journal card, clicking on the three little dots, and then
+on *Reconciliation Models*.
+
+.. image:: media/reconciliation_models_overview.png
+   :align: center
+   :alt: Open the Reconciliation Model menu from the overview dashboard in Odoo Accounting
+
+.. important::
+   The first entry, named *Invoices Matching Rule*, is the one responsible for the current matching
+   of invoices and bills. Therefore, it is advised to leave it at the top of the list and not to
+   delete it.
+
+Open the model you want to modify, or click on *Create* to create a new one, then fill out the form.
+
+Type
+----
+
+See :ref:`above <reconciliation_models_types>` for an explanation about the different types of
+Reconciliation Models.
+
+.. note::
+   If the *Documents* application is installed on your database, an additional **Activity type**
+   field appears when *To check* is ticked. Selecting the value *Reconciliation request* implies
+   that, whenever you use this model, a *Request Document* window pops up to request a document from
+   a user.
+
+Conditions on Bank Statement Line
+---------------------------------
+
+Define here all the conditions that are required for a Reconciliation Model to be applied.
+
+.. important::
+   If a record matches with several Reconciliation Models, the first one in the *sequence* of models
+   will be applied. The sequence is simply the order of the models in the *list view*. They can be
+   rearranged by dragging-and-dropping the handle next to the name.
+
+.. image:: media/reconciliation_models_conditions.png
+   :align: center
+   :alt: Conditions for the Reconciliation Model to be applied in Odoo Accounting
+
+Counterpart Values
+------------------
+
+This section comprises the values that are applied by the Reconciliation Model.
+
+If the value to reconcile needs to be written-off in two separate accounts, click on *Add a second
+line*.
+
+.. image:: media/reconciliation_models_counterparts.png
+   :align: center
+   :alt: Counterparts values of a Reconciliation Model in Odoo Accounting
+
+.. seealso::
+
+   - :doc:`use_cases`
+   - :doc:`../feeds/bank_synchronization`
+   - :doc:`../../receivables/customer_invoices/cash_discounts`

accounting/bank/setup.rst

@@ -5,6 +5,6 @@ Setup
 .. toctree::
    :titlesonly:
 
-   setup/create_bank_account
+   setup/bank_accounts
    setup/manage_cash_register
    setup/foreign_currency

accounting/bank/setup/bank_accounts.rst

@@ -0,0 +1,95 @@
+=============
+Bank Accounts
+=============
+
+You can manage as many **Bank Accounts** as needed on your database. Configuring them well allows
+you to make sure that all your banking data is up to date and ready for the reconciliation with your
+*Journal Entries*.
+
+In Odoo Accounting, each Bank Account is configured to have a dedicated *Journal* which is
+configured to post all entries in a dedicated *Account*.
+
+.. note:: Whenever you add a Bank Account, a dedicated journal and a dedicated account are
+   automatically created and configured.
+
+Every **Bank Journal** is displayed by default on the **Accounting Overview** in the form of a
+convenient card. It includes action buttons that are displayed when appropriate.
+
+.. image:: media/bank_accounts_card.png
+   :align: center
+   :alt: Bank Journals Cards are displayed on the Accounting Overview in Odoo Accounting
+
+.. _bank_accounts_add:
+
+Add a new Bank Account
+======================
+
+You can either connect your bank account to your Odoo database, or configure your bank account
+manually and :doc:`upload the bank statements manually <../feeds/bank_statements>`.
+
+Bank Synchronization
+--------------------
+
+Connect your bank account to your database and have your bank statements synced automatically.
+
+To synchronize a new bank account, go to :menuselection:`Accounting --> Configuration`, click on
+*Add a Bank Account*, then find your bank in the list, click on *Connect*, and follow the
+instructions on-screen.
+
+.. note::
+   :doc:`Click here <../../bank/feeds/bank_synchronization>` for more information about this bank
+   synchronization.
+
+.. image:: media/bank_accounts_connect.png
+   :align: center
+   :alt: Select a bank institution in the list and connect it to Odoo Accounting
+
+Manual configuration
+--------------------
+
+If your Bank Institution can’t be synchronized automatically, or if you prefer not to sync it with
+your database, you may also configure your bank account manually.
+
+To add a new bank account manually, go to :menuselection:`Accounting --> Configuration`, click on
+*Add a Bank Account*, then on *Create it*, and fill out the form.
+
+- **Name**: the bank account's name, as displayed on Odoo.
+- **Account Number**: your bank account number (IBAN in Europe).
+- **Bank**: click on *Create and Edit* to configure the bank's details. Add the bank institution's
+  name and its Identifier Code (BIC or SWIFT).
+- **Code**: this code is your Journal's *Short Code*, as displayed on Odoo. By default, Odoo creates
+  a new Journal with this Short Code.
+- **Journal**: This field is displayed if you have an existing Bank Journal that is not linked yet
+  to a bank account. If so, then select the *Journal* you want to use to record the financial
+  transactions linked to this bank account or create a new one by clicking on *Create and Edit*.
+
+.. note::
+   Odoo detects the bank account type (e.g., IBAN) and enables some features accordingly.
+
+.. image:: media/bank_accounts_manual.png
+   :align: center
+   :alt: Add manually a new bank account in Odoo Accounting
+.. _bank_accounts_configuration:
+
+Advanced configuration
+======================
+
+To edit an existing bank account, go to :menuselection:`Accounting --> Configuration --> Bank
+Accounts`, and open the bank account you want to modify.
+
+If you need to edit the bank account details, go to the *Bank Account* field and click on the
+*External Link* button next to the list arrow. There, you can edit the bank account's number,
+Account Holder, Account Holder Name, and your Bank Institution's details by clicking on the
+*External Link* next to the *Bank* field. These details are used to register some payments.
+
+You can configure which types of payments are enabled in the **Payment Method Types** section and
+how the bank statements are recorded and posted in the **Bank Statements** section.
+
+.. image:: media/bank_accounts_configuration.png
+   :align: center
+   :alt: Advanced configuration of a bank account in Odoo Accounting
+
+.. seealso::
+   * :doc:`../../bank/feeds/bank_synchronization`
+   * :doc:`../feeds/bank_statements`
+   * `Odoo Learn: Accounting Basics <https://www.odoo.com/r/lsZ>`_

accounting/bank/setup/create_bank_account.rst

@@ -1,63 +0,0 @@
-========================
-Setup a new bank account
-========================
-
-In Odoo, you can manage multiple bank accounts. In this page, you will
-be guided in the creation, modification or deletion of a bank or a
-credit card account.
-
-Edit a bank account
---------------------
-
-To ease the process, a bank account is already there. We suggest you to 
-edit it first before filling your own bank information. 
-
-Go to :menuselection:`Accounting --> Configuration --> Bank
-Accounts` and click on the **Bank** item. Edit it. 
-
-.. image:: media/image04.png
-   :align: center
-
-.. note::
-
-    Odoo will detect the bank account type (e.g. IBAN) to allow some payment 
-    method like SEPA
-
-
-Create a bank account
----------------------
-
-Go to :menuselection:`Accounting --> Configuration --> Bank
-Accounts`. Click on **create** and fill in the form. You can 
-decide to show the bank account number in you intend to send documents 
-like sales orders or invoices. Select the payments methods you 
-support with this bank account. 
-
-.. image:: media/image06.png
-   :align: center
-
-.. note::
-
-    If you are working in a multi-company environnement, you'll have to switch 
-    the company on your user preferences in order to add, edit or delete bank 
-    accounts from another company.
-
-.. todo:: add inherited field tooltip
-
-    **Display on reports :** Display this bank account on the documents that
-    will be printed or send to the customers
-
-    **Bank Identifier Code** = BIC : SWIFT Address assigned to a bank in
-    order to send automated payments quickly and accurately to the banks
-    concerned
-
-The initial balance of a bank statement will be set to the closing balance of the previous one within the same journal automatically.
-
-Delete a bank account or credit card account
---------------------------------------------
-
-From the list of bank accounts, select items to delete and delete them from the action menu or go to the form and delete a single item from the action menu
-
-.. |image5| image:: media/image05.png
-   :class: btn-group
-

accounting/fiscal_localizations.rst

@@ -0,0 +1,9 @@
+====================
+Fiscal Localizations
+====================
+
+.. toctree::
+   :titlesonly:
+
+   fiscal_localizations/overview
+   fiscal_localizations/localizations

accounting/fiscal_localizations/localizations/argentina.rst

@@ -268,7 +268,7 @@ Sequences
 ~~~~~~~~~
 In case that you want to synchronize the next number in the sequence in Odoo based on the next
 number in the AFIP POS, the next button that is visible under :doc:`developer mode
-<../../general/developer_mode/activate>` can be used: 
+<../../../general/developer_mode/activate>` can be used:
 
 .. image:: media/argentina_edi_05.png
    :align: center

accounting/fiscal_localizations/localizations/colombia.rst

@@ -135,7 +135,7 @@ Journals
 Once the DIAN has assigned the official sequence and prefix for the
 electronic invoice resolution, the Sales journals related to your
 invoice documents need to be updated in Odoo.  The sequence can be
-accessed using the :doc:`Developer mode <../../general/developer_mode/activate>`: :menuselection:`Accounting -->
+accessed using the :doc:`Developer mode <../../../general/developer_mode/activate>`: :menuselection:`Accounting -->
 Settings --> Configuration Setting --> Journals`.
 
 .. image:: media/colombia09.png

accounting/fiscal_localizations/localizations/france.rst

@@ -74,7 +74,7 @@ To get the certification just follow the following steps:
 .. note::
    * To install the module in any system created before
      December 18th 2017, you should update the modules list.
-     To do so, activate the :doc:`Developer mode <../../general/developer_mode/activate>`.
+     To do so, activate the :doc:`Developer mode <../../../general/developer_mode/activate>`.
      Then go to the *Apps* menu and press *Update Modules List* in the top-menu.
    * In case you run Odoo on-premise, you need to update your installation
      and restart your server beforehand.
@@ -156,7 +156,7 @@ Invoicing and Accounting apps.
    it will be counted in the very next closing.
 
 .. tip:: For test & audit purposes such closings can be manually generated in the
-   :doc:`Developer mode <../../general/developer_mode/activate>`. Then go to
+   :doc:`Developer mode <../../../general/developer_mode/activate>`. Then go to
    :menuselection:`Settings --> Technical --> Automation --> Scheduled Actions`.
 
 

accounting/fiscal_localizations/localizations/italy_IT.rst

@@ -25,7 +25,7 @@ elettronica sono i seguenti:
    di posta elettronica certificata sono fornite dal tuo fornitore o dal
    Ministero. Lo stesso server deve essere configurato come server che
    gestisce tutta la corrispondenza mail in Odoo, per saperne di più si
-   puo’ consultare la relativa :doc:`guida <../../discuss/email_servers>`.
+   puo’ consultare la relativa :doc:`guida <../../../discuss/email_servers>`.
 
 -  Indirizzo PEC dell’ Azienda, tale indirizzo deve essere lo stesso
    registrato presso l’Agenzia delle Entrate per l’utilizzo dei servizi