[MERGE] Forward-port of 13.0 to 13.2

2020-04-07 12:29:01 +02:00 · 2020-04-07 12:29:01 +02:00 · d2ef4232fb
commit d2ef4232fb
parent 06bd4b173a ae9bf567eb
355 changed files with 2651 additions and 1602 deletions
--- a/.tx/config
+++ b/.tx/config
@ -32,6 +32,11 @@ file_filter = locale/<lang>/LC_MESSAGES/ecommerce.po
 source_file = locale/sources/ecommerce.pot
 source_lang = en

+[odoo-13-doc.email_marketing]
+file_filter = locale/<lang>/LC_MESSAGES/email_marketing.po
+source_file = locale/sources/email_marketing.pot
+source_lang = en
+
 [odoo-13-doc.expense]
 file_filter = locale/<lang>/LC_MESSAGES/expense.po
 source_file = locale/sources/expense.pot
@ -82,6 +87,11 @@ file_filter = locale/<lang>/LC_MESSAGES/mobile.po
 source_file = locale/sources/mobile.pot
 source_lang = en

+[odoo-13-doc.marketing_automation]
+file_filter = locale/<lang>/LC_MESSAGES/marketing_automation.po
+source_file = locale/sources/marketing_automation.pot
+source_lang = en
+
 [odoo-13-doc.manufacturing]
 file_filter = locale/<lang>/LC_MESSAGES/manufacturing.po
 source_file = locale/sources/manufacturing.pot
--- a/_extensions/redirects.py
+++ b/_extensions/redirects.py
@ -0,0 +1,64 @@
+# Adapted from https://github.com/sphinx-contrib/redirects
+
+import os
+import re
+from pathlib import Path
+
+from sphinx.builders import html as builders
+from sphinx.util import logging as logging
+
+TEMPLATE = '<html><head><meta http-equiv="refresh" content="0; url=%s"/></head></html>'
+
+logger = logging.getLogger(__name__)
+
+def generate_redirects(app):
+    path = os.path.join(app.srcdir, app.config.redirects_file)
+    if not os.path.exists(path):
+        logger.debug("Could not find redirects file at '%s'", path)
+        return
+
+    source_suffix = next(iter(app.config.source_suffix))
+
+    if not type(app.builder) == builders.StandaloneHTMLBuilder:
+        logger.info("Redirects are only supported by the 'html' builder. Skipping...")
+        return
+
+    with open(path) as redirects:
+        escaped_source_suffix = source_suffix.replace('.', '\.')
+        pattern = re.compile(
+            r'^[ \t]*([\w\-/]+{0})[ \t]+([\w\-/]+{0})[ \t]*(#.*)?$'.format(escaped_source_suffix)
+        )
+        for line in redirects.readlines():
+            # Exclude comment or empty lines
+            if not line.rstrip() or line.startswith('#'):
+                continue
+
+            match_result = pattern.match(line)
+
+            # Log malformed rules
+            if not match_result:
+                logger.error(
+                    "Ignoring malformed redirection: {0}"
+                    "Please use this format: old_page{1} new_page{1}  # optional comment".format(
+                        line, source_suffix)
+                )
+                continue
+
+            # Parse the rule
+            from_file, to_file, _ = match_result.groups()
+            logger.debug("Redirecting '%s' to '%s'", from_file, to_file)
+
+            # Prepare source and destination paths
+            to_path_prefix = '../' * from_file.count('/')
+            from_html_file = from_file.replace(source_suffix, '.html')
+            to_html_file = to_path_prefix + to_file.replace(source_suffix, '.html')
+            absolute_from_path = Path(app.builder.outdir) / from_html_file
+
+            # Create the redirection
+            absolute_from_path.parent.mkdir(parents=True, exist_ok=True)
+            absolute_from_path.write_text(TEMPLATE % to_html_file)
+
+
+def setup(app):
+    app.add_config_value('redirects_file', 'redirects', 'env')
+    app.connect('builder-inited', generate_redirects)
--- a/_static/banners/events.png
+++ b/_static/banners/events.png
--- a/_static/banners/survey.png
+++ b/_static/banners/survey.png
--- a/accounting/bank/feeds.rst
+++ b/accounting/bank/feeds.rst
@ -5,9 +5,7 @@ Bank Feeds
 .. toctree::
   :titlesonly:

+   feeds/bank_statements
   feeds/bank_synchronization
-   feeds/ofx
-   feeds/qif
-   feeds/coda
-   feeds/paypal
-   feeds/manual
+   feeds/ponto
+   feeds/paypal
--- a/accounting/bank/feeds/bank_statements.rst
+++ b/accounting/bank/feeds/bank_statements.rst
@ -0,0 +1,68 @@
+===============
+Bank Statements
+===============
+Importing your bank statements in Odoo Accounting allows you to keep track of the financial
+movements that occur on your bank accounts and reconcile them with the transactions recorded in your
+accounting.
+
+The easiest way to do so is by synchronizing. To do so, please read the related documentation:
+:doc:`bank_synchronization`.
+
+However, if your bank account is not synchronized with Odoo, you still have two options:
+
+#. Import the bank statement files delivered by your bank
+#. Register the bank statements manually
+
+Import bank statements files
+============================
+Odoo supports multiple file formats to import bank statements:
+
+- SEPA recommended Cash Management format (CAMT.053)
+- Comma-separated values (.CSV)
+- Open Financial Exchange (.OFX)
+- Quicken Interchange Format (.QIF)
+- Belgium Coded Statement of Account (.CODA)
+
+To import them, go to :menuselection:`Accounting --> Overview --> Bank`, click on *Import
+Statements*, or on the three dots, and then on *Import Statement*.
+
+.. image:: media/bank_statements01.png
+   :align: center
+   :alt: Import a bank statement file in Odoo Accounting
+
+Next, select the file you want to import and click on *Import*.
+
+Odoo opens an **import tool** with which you can set the **Formatting Options** and **map** the
+different columns you want to import.
+
+.. image:: media/bank_statements02.png
+   :align: center
+   :alt: Register bank statements manually in Odoo Accounting
+
+.. note::
+   Quicken Interchange Format (.QIF) is an older file format that is not supported since 2005. If
+   possible, prefer OFX files over QIF.
+
+Register bank statements manually
+=================================
+If needed, you can also record your bank statements manually.
+
+To do so, go to :menuselection:`Accounting --> Overview --> Bank`, click on *Create Statements*, or
+on the three dots, and then on *New Statement*.
+
+Add a new line for each transaction written on the original bank statement.
+
+To ease the reconciliation process, make sure to fill out the *Partner* field. You can also write
+the payments’ references in the *Label* field.
+
+.. image:: media/bank_statements03.png
+   :align: center
+   :alt: Register bank statements manually in Odoo Accounting
+
+.. note::
+   The *Ending Balance* and the *Computed Balance* should have the same amount. If it is not the
+   case, make sure that there is no mistake in the transactions’ amounts.
+
+.. seealso::
+   * :doc:`bank_synchronization`
+.. todo:: add doc link to new documentation about reconciliation
--- a/accounting/bank/feeds/bank_synchronization.rst
+++ b/accounting/bank/feeds/bank_synchronization.rst
@ -22,7 +22,7 @@ To connect to the banks, Odoo uses multiple web-services:

 - **Plaid**: Mainly for the U.S
 - **Yodlee**: Worldwide
- **Ponto**: For a growing number of European Banks
+- **Ponto**: For a growing number of European Banks. (:doc:`Click here for more information <ponto>`)

 Configuration
 =============
@ -121,8 +121,11 @@ database, please `submit a support ticket <https://www.odoo.com/help>`_.

 How can I update my bank credentials?
 -------------------------------------
-You can update your credentials on
+You can update your credentials in
 :doc:`Developer mode <../../../general/developer_mode/activate>`.

 Then go to :menuselection:`Accounting --> Configuration --> Online Synchronization`, and open the
-Institution you want to edit, and click on *Update Credentials*.
+Institution you want to edit, and click on *Update Credentials*.
+
+.. seealso::
+   * :doc:`bank_statements`
--- a/accounting/bank/feeds/coda.rst
+++ b/accounting/bank/feeds/coda.rst
@ -1,82 +0,0 @@
-==========================================
-Import Coda statement files (Belgium only)
-==========================================
-
-CODA is a file format for bank statements in Belgium. Most Belgian
-banks, as well as the Isabel software, allows to download a CODA file
-with all your bank statements.
-
-With Odoo, you can download an CODA file from your bank or accounting
-software and import it directly in Odoo. This will create all bank
-statements.
-
-.. tip::
-   Test now the feature :download:`with this sample CODA file
-   <../../../_static/example_files/Ontvangen_CODA.2013-01-11-18.59.15.txt>`
-
-Configuration
-=============
-
-Install the CODA feature
------------------------
-
-If you have installed the Belgian Chart of Account provided with Odoo,
-the CODA import feature is already installed by default. In such a case,
-you can move directly to the next section :ref:`Import your first coda
-file <accounting/InstallCoda>`
-
-If CODA is not activated yet, you need to do it first. In the Accounting
-application, go to the menu :menuselection:`Configuration --> Settings`. From the
-accounting settings, check the option **Import of Bank Statements in
-.CODA Format** and apply.
-
-Import your first CODA file
---------------------------
-
-Once you have installed this feature, you can setup your bank account to
-allow importing bank statement files. To do this, go to the accounting
-**Dashboard**, and click on the button **More** on the bank account card. Then, click
-on **Import Statement** to load your first CODA file.
-
-.. image:: media/coda01.png
-   :align: center
-
-Load your CODA file in the following screen and click **Import** to
-create all your bank statements.
-
-.. image:: media/coda02.png
-   :align: center
-
-If the file is successfully loaded, you will get redirected to the bank
-reconciliation screen with all the transactions to reconcile.
-
-.. _accounting/InstallCoda:
-
-Importing CODA files
-====================
-
-After having imported your first file, the Odoo accounting dashboard
-will automatically propose you to import more files for your bank. For
-the next import, you don't need to go to the **More** button anymore, 
-you can directly click on the link **Import Statement**.
-
-.. image:: media/coda03.png
-   :align: center
-
-Every time you get a statement related to a new customer / supplier,
-Odoo will ask you to select the right contact to reconcile the
-transaction. Odoo learns from that operation and will automatically
-complete the next payments you get or make to these contacts. This will
-speed up a lot the reconciliation process.
-
-.. note::
-    Odoo is able to automatically detect if some files or transactions 
-    have already been imported. So, you should not worry about avoiding 
-    to import two times the same file: Odoo will check everything for you 
-    before creating new bank statements.
-
-.. seealso::
-    * :doc:`ofx`
-    * :doc:`qif`
-    * :doc:`bank_synchronization`
-    * :doc:`manual`
--- a/accounting/bank/feeds/manual.rst
+++ b/accounting/bank/feeds/manual.rst
@ -1,99 +0,0 @@
-=================================
-Register bank statements manually
-=================================
-
-Overview
-========
-
-With Odoo, you can import your bank statements, synchronize with your
-bank but also register your bank statements manually.
-
-Configuration
-=============
-
-No special configuration is necessary to register invoices. All you need
-to do is install the accounting app.
-
-.. image:: media/manual01.png
-   :align: center
-
-Register bank statements manually
-=================================
-
-Create your Bank Statements
---------------------------
-
-In the Dashboard, click on the button **New Statement** related to the
-bank journal. If some reconciliations need to be done, the New Statement
-link will be found underneath.
-
-.. image:: media/manual02.png
-   :align: center
-
-Just fill in the fields according the the information written on your
-bank statement. The reference can be filled in manually or you can leave
-it empty. We recommend to fill in the partner to ease the reconciliation
-process.
-
-The difference between the starting balance and the ending balance
-should be equal to the computed balance.
-
-.. image:: media/manual03.png
-   :align: center
-
-When you are done, click on **Save**.
-
-Reconcile your Bank Statements
------------------------------
-
-You can choose to directly reconcile the statement by clicking on the
-button |manual04|
-
-.. |manual04| image:: media/manual04.png
-
-You can also start the reconciliation process from the dashboard by
-clicking on **Reconcile # Items**.
-
-.. image:: media/manual05.png
-   :align: center
-
-Click on **Validate** to reconcile your bank statement. If the partner
-is missing, Odoo will ask you to **select a partner**.
-
-.. image:: media/manual06.png
-   :align: center
-
-.. tip::
-   Hit CTRL-Enter to reconcile all the balanced items on the sheets.
-
-Close Bank Statements from the reconciliation
---------------------------------------------
-
-If the balance is correct, you can directly close the statement from the
-reconciliation by clicking on |manual07|.
-
-.. |manual07| image:: media/manual07.png
-
-Otherwise, click on |manual08| to open the statement and correct the
-issue.
-
-.. |manual08| image:: media/manual08.png
-
-Close Bank Statements
---------------------
-
-On the accounting dashboard, click on the More button of your bank
-journal, then click on Bank Statements.
-
-.. image:: media/manual09.png
-   :align: center
-
-To close the bank statement, just click on **Validate**.
-
-.. image:: media/manual10.png
-   :align: center
-
-.. seealso::
-
-   * :doc:`../reconciliation/use_cases`
-   * :doc:`../feeds/bank_synchronization`
--- a/accounting/bank/feeds/media/bank_statements01.png
+++ b/accounting/bank/feeds/media/bank_statements01.png
--- a/accounting/bank/feeds/media/bank_statements02.png
+++ b/accounting/bank/feeds/media/bank_statements02.png
--- a/accounting/bank/feeds/media/bank_statements03.png
+++ b/accounting/bank/feeds/media/bank_statements03.png
--- a/accounting/bank/feeds/media/coda01.png
+++ b/accounting/bank/feeds/media/coda01.png
--- a/accounting/bank/feeds/media/coda02.png
+++ b/accounting/bank/feeds/media/coda02.png
--- a/accounting/bank/feeds/media/coda03.png
+++ b/accounting/bank/feeds/media/coda03.png
--- a/accounting/bank/feeds/media/manual01.png
+++ b/accounting/bank/feeds/media/manual01.png
--- a/accounting/bank/feeds/media/manual02.png
+++ b/accounting/bank/feeds/media/manual02.png
--- a/accounting/bank/feeds/media/manual03.png
+++ b/accounting/bank/feeds/media/manual03.png
--- a/accounting/bank/feeds/media/manual04.png
+++ b/accounting/bank/feeds/media/manual04.png
--- a/accounting/bank/feeds/media/manual05.png
+++ b/accounting/bank/feeds/media/manual05.png
--- a/accounting/bank/feeds/media/manual06.png
+++ b/accounting/bank/feeds/media/manual06.png
--- a/accounting/bank/feeds/media/manual07.png
+++ b/accounting/bank/feeds/media/manual07.png
--- a/accounting/bank/feeds/media/manual08.png
+++ b/accounting/bank/feeds/media/manual08.png
--- a/accounting/bank/feeds/media/manual09.png
+++ b/accounting/bank/feeds/media/manual09.png
--- a/accounting/bank/feeds/media/manual10.png
+++ b/accounting/bank/feeds/media/manual10.png
--- a/accounting/bank/feeds/media/ofx01.png
+++ b/accounting/bank/feeds/media/ofx01.png
--- a/accounting/bank/feeds/media/ofx02.png
+++ b/accounting/bank/feeds/media/ofx02.png
--- a/accounting/bank/feeds/media/ofx03.png
+++ b/accounting/bank/feeds/media/ofx03.png
--- a/accounting/bank/feeds/media/ofx04.png
+++ b/accounting/bank/feeds/media/ofx04.png
--- a/accounting/bank/feeds/media/ponto_add_bank.png
+++ b/accounting/bank/feeds/media/ponto_add_bank.png
--- a/accounting/bank/feeds/media/ponto_link_odoo.png
+++ b/accounting/bank/feeds/media/ponto_link_odoo.png
--- a/accounting/bank/feeds/media/ponto_logo.png
+++ b/accounting/bank/feeds/media/ponto_logo.png
--- a/accounting/bank/feeds/media/ponto_organization.png
+++ b/accounting/bank/feeds/media/ponto_organization.png
--- a/accounting/bank/feeds/media/ponto_synchronization.png
+++ b/accounting/bank/feeds/media/ponto_synchronization.png
--- a/accounting/bank/feeds/media/qif01.png
+++ b/accounting/bank/feeds/media/qif01.png
--- a/accounting/bank/feeds/media/qif02.png
+++ b/accounting/bank/feeds/media/qif02.png
--- a/accounting/bank/feeds/media/qif03.png
+++ b/accounting/bank/feeds/media/qif03.png
--- a/accounting/bank/feeds/media/qif04.png
+++ b/accounting/bank/feeds/media/qif04.png
--- a/accounting/bank/feeds/ofx.rst
+++ b/accounting/bank/feeds/ofx.rst
@ -1,66 +0,0 @@
-==========================
-Import OFX statement files
-==========================
-
-Open Financial Exchange (OFX) is a unified specification for the
-electronic exchange of financial data between financial institutions,
-businesses and consumers via the Internet.
-
-With Odoo, you can download an OFX file from your bank or accounting
-software and import it directly in your Odoo instance. This will create
-all bank statements.
-
-.. tip::
-   Test now the feature :download:`with this sample OFX file
-   <../../../_static/example_files/test_ofx.ofx>`
-
-Configuration
-=============
-
-In order to import OFX statements, you need to activate the feature in
-Odoo. In the Accounting application, go to the menu :menuselection:`Configuration -->
-Settings`. From the accounting settings, check the bank statements option
-**Import in .OFX Format** and apply.
-
-.. image:: media/ofx01.png
-   :align: center
-
-Once you have installed this feature, you can setup your bank account to
-allow importing bank statement files. To do this, go to the accounting
-Dashboard, and click on the **More** button of the bank account.
-Then, click on **Import Statement** to load your first OFX file.
-
-.. image:: media/ofx02.png
-   :align: center
-
-Load your OFX file in the following screen and click **Import** to
-create all your bank statements.
-
-.. image:: media/ofx03.png
-   :align: center
-
-If the file is successfully loaded, you will get redirected to the bank
-reconciliation screen with all the transactions to reconcile.
-
-Importing OFX files
-===================
-
-After having imported your first file, the Odoo accounting dashboard
-will automatically propose you to import more files for your bank. For
-the next import, you don't need to go to the **More** menu anymore,
-you can directly click on the link **Import Statement**.
-
-.. image:: media/ofx04.png
-   :align: center
-
-Every time you get a statement related to a new customer / supplier,
-Odoo will ask you to select the right contact to reconcile the
-transaction. Odoo learns from that operation and will automatically
-complete the next payments you get or do to these contacts. This will
-speed up a lot the reconciliation process.
-
-.. seealso::
-   * :doc:`qif`
-   * :doc:`coda`
-   * :doc:`bank_synchronization`
-   * :doc:`manual`
--- a/accounting/bank/feeds/paypal.rst
+++ b/accounting/bank/feeds/paypal.rst
@ -1,6 +1,6 @@
-=================================================
-How to synchronize your PayPal account with Odoo?
-=================================================
+=========================================
+Synchronize your PayPal account with Odoo
+=========================================

 With Odoo, you can synchronize your PayPal account. That way, you don't
 have to record all your PayPal transaction in your favorite accounting
--- a/accounting/bank/feeds/ponto.rst
+++ b/accounting/bank/feeds/ponto.rst
@ -0,0 +1,116 @@
+======================================
+Ponto as Bank Synchronization provider
+======================================
+
+**Ponto** is a service that allows companies and professionals to aggregate their accounts in one
+place and directly see all their transactions within one app. It is a third-party solution that is
+continuously expanding the number of bank institutions that can be synchronized with Odoo.
+
+.. image:: media/ponto_logo.png
+   :align: center
+   :alt: Logo of the Ponto brand
+
+**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
+connection through Ponto by searching for your bank institution, and clicking on it.
+
+.. image:: media/ponto_add_bank.png
+   :align: center
+   :alt: Click on a bank institution to see which third party service is required to synchronize
+         your bank with Odoo Accounting
+
+.. note::
+   You can find more information about bank synchronization :doc:`on this page
+   <bank_synchronization>`.
+
+Configuration
+=============
+
+Link your bank accounts with Ponto
+----------------------------------
+
+#. Go to `Ponto's website (https://myponto.com) <https://myponto.com>`_.
+#. Create an account if you don’t have one yet.
+#. Once you are logged in, create an *organization*.
+
+   .. image:: media/ponto_organization.png
+      :alt: Fill out the form to add an organization in Ponto
+
+#. | Go to :menuselection:`Accounts --> Live`, and click on *Add account*.
+   | You might have to add your **Billing Information** first.
+#. Select your bank institution and follow the steps on-screen to link your bank account with your
+   Ponto account.
+#. Make sure to add  all the bank accounts you want to synchronize with your Odoo database before
+   moving on to the next steps.
+
+.. _ponto-link-odoo:
+
+Link your Ponto account with your Odoo database
+-----------------------------------------------
+
+Odoo requires you to insert your Ponto's **Client ID** and **Secret ID** to synchronize both
+platforms.
+
+.. image:: media/ponto_link_odoo.png
+   :align: center
+   :alt: Logo of the Ponto brand
+
+#. To generate these IDs, go to :menuselection:`Ponto Dashboard --> Integration --> Live`, click on
+   *Add Integration*, fill out the form, and select which accounts you want to synchronize.
+#. Copy the Client ID and Secret ID generated and paste them in Odoo.
+#. Configure the synchronization options:
+
+   - **Action**: define if Odoo must create a new *Journal* for this bank account, link to an
+     existing Journal, or create no link.
+   - **Journal**: select the appropriate *Journal*.
+   - **Synchronization Frequency**: define how often Odoo should fetch the bank statements.
+
+.. image:: media/ponto_synchronization.png
+   :align: center
+   :alt: Configure the bank synchronization through Ponto on your Odoo database
+
+.. tip::
+   It is good practice to have one Journal per bank account. If you synchronize a single bank
+   account, link it to the existing *Bank* journal. If you have multiple accounts, it is recommended
+   to pick the *Create new journal* option for all additional accounts.
+
+.. _ponto-update-credentials:
+
+Update your synchronization credentials
+---------------------------------------
+
+You might have to update your Ponto credentials or modify the synchronization settings.
+
+To do so, activate the :doc:`Developer Mode <../../../general/developer_mode/activate>`, and go to
+:menuselection:`Accounting --> Configuration --> Online Synchronization`.
+
+Click on *Update Accounts* to enter your new Client ID and Secret ID, or click on *Edit* to modify
+the synchronization settings.
+
+Deprecated API tokens
+=====================
+
+Ponto's previous synchronization system using API tokens is now deprecated.
+
+This section is only relevant for users who had previously linked Ponto with Odoo using a single API
+token instead of the current synchronization system with a *Client ID* and a *Secret ID*.
+
+#. **Update** your database.
+
+   - | *SaaS* and *Odoo.sh* users:
+     | you can skip this step, as your database is automatically updated.
+   - | *Community* and *Enterprise* users:
+     | download the latest Odoo source code for your version (you can download it from `this link
+       <https://odoo.com/download>`_ or from GitHub), install it, and restart your server.
+
+#. | Do a **hard refresh** of your Odoo page by pressing *CTRL + F5*.
+   | A hard refresh clears the cache and the javascript code for the current page.
+#. To **generate your access key**, follow :ref:`the steps above <ponto-link-odoo>`.
+#. To **update your credentials**, follow :ref:`the steps above <ponto-update-credentials>`.
+
+.. seealso::
+
+   * :doc:`bank_synchronization`
+   * :doc:`../setup/create_bank_account`
+   * :doc:`bank_statements`
--- a/accounting/bank/feeds/qif.rst
+++ b/accounting/bank/feeds/qif.rst
@ -1,67 +0,0 @@
-==========================
-Import QIF statement files
-==========================
-
-Quicken Interchange Format (QIF) is an open specification for reading
-and writing financial data to media (i.e. files). Although still widely
-used, QIF is an older format than Open Financial Exchange (OFX) and you
-should use the OFX version if you can export to both file formats.
-
-With Odoo, you can download a QIF file from your bank or accounting
-software and import it directly in your Odoo instance. This will create
-all bank statements.
-
-.. tip::
-   Test now the feature :download:`with this sample QIF file
-   <../../../_static/example_files/test_qif.qif>`
-
-Configuration
-=============
-
-In order to import QIF statements, you need to activate the feature in
-Odoo. In the Accounting application, go to the menu :menuselection:`Configuration -->
-Settings`. From the accounting settings, check the bank statements option
-**Import in .QIF Format** and apply.
-
-.. image:: media/qif01.png
-   :align: center
-
-Once you have installed this feature, you can setup your bank account to
-allow importing bank statement files. To do this, go to the accounting
-Dashboard, and click on the **More** button of the bank account.
-Then, click on **Import Statement** to load your first QIF file.
-
-.. image:: media/qif02.png
-   :align: center
-
-Load your QIF file in the following screen and click **Import** to
-create all your bank statements.
-
-.. image:: media/qif03.png
-   :align: center
-
-If the file is successfully loaded, you will get redirected to the bank
-reconciliation screen with all the transactions to reconcile.
-
-Importing QIF files
-===================
-
-After having imported your first file, the Odoo accounting dashboard
-will automatically propose you to import more files for your bank. For
-the next import, you don't need to go to the **More** menu anymore,
-you can directly click on the link **Import Statement**.
-
-.. image:: media/qif04.png
-   :align: center
-
-Every time you get a statement related to a new customer / supplier,
-Odoo will ask you to select the right contact to reconcile the
-transaction. Odoo learns from that operation and will automatically
-complete the next payments you get or do to these contacts. This will
-speed up a lot the reconciliation process.
-
-.. seealso::
-   * :doc:`ofx`
-   * :doc:`coda`
-   * :doc:`bank_synchronization`
-   * :doc:`manual`
--- a/accounting/bank/misc/batch.rst
+++ b/accounting/bank/misc/batch.rst
@ -1,6 +1,6 @@
-=======================================
-How to manage batch deposits of checks?
-=======================================
+===============================
+Manage batch deposits of checks
+===============================

 When your company's collections group receives checks from customers
 they will often place this money into their bank account in batches. As
--- a/accounting/bank/misc/interbank.rst
+++ b/accounting/bank/misc/interbank.rst
@ -1,6 +1,6 @@
-========================================================
-How to do a bank wire transfer from one bank to another?
-========================================================
+================================================
+Do a bank wire transfer from one bank to another
+================================================

 A company might have several bank accounts or cash registers. Within
 odoo it is possible to handle internal transfers of money with only a
--- a/accounting/bank/reconciliation/configure.rst
+++ b/accounting/bank/reconciliation/configure.rst
@ -59,6 +59,5 @@ the relevant data instantly.
 Finally, click on **Reconcile** to finish the process.

 .. seealso::
-   * :doc:`../feeds/manual`
-   * :doc:`../feeds/ofx`
+   * :doc:`../feeds/bank_synchronization`
   * :doc:`use_cases`
--- a/accounting/bank/reconciliation/use_cases.rst
+++ b/accounting/bank/reconciliation/use_cases.rst
@ -1,6 +1,6 @@
-=============================================
-Use cases in the bank reconciliation process?
-=============================================
+=======================================
+Bank reconciliation process - use cases
+=======================================

 Overview
 ========
@ -105,6 +105,4 @@ right and validate all related payments :
   Hit CTRL-Enter to reconcile all the balanced items in the sheet.

 .. seealso::
-   * :doc:`../feeds/ofx`
-   * :doc:`../feeds/bank_synchronization`
-   * :doc:`../feeds/manual`
+   * :doc:`../feeds/bank_synchronization`
--- a/accounting/bank/setup/create_bank_account.rst
+++ b/accounting/bank/setup/create_bank_account.rst
@ -1,6 +1,6 @@
-================================
-How to setup a new bank account?
-================================
+========================
+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
--- a/accounting/bank/setup/foreign_currency.rst
+++ b/accounting/bank/setup/foreign_currency.rst
@ -1,6 +1,6 @@
-===========================================
-How to manage a bank in a foreign currency?
-===========================================
+===================================
+Manage a bank in a foreign currency
+===================================

 In Odoo, every transaction is recorded in the default currency of the
 company. Reports are all based on the currency of the company. But for
--- a/accounting/bank/setup/manage_cash_register.rst
+++ b/accounting/bank/setup/manage_cash_register.rst
@ -1,6 +1,6 @@
-==============================
-How to manage a cash register?
-==============================
+======================
+Manage a cash register
+======================

 The cash register is a journal to register receivings and payments transactions.
 It calculates the total money in and out, computing the total balance.
--- a/accounting/fiscality/fiscal_year/close_fiscal_year.rst
+++ b/accounting/fiscality/fiscal_year/close_fiscal_year.rst
@ -1,6 +1,6 @@
-=====================================================
-How to do a year end in Odoo? (close a fiscal year)
-=====================================================
+===========================================
+Do a year end in Odoo (close a fiscal year)
+===========================================

 Before going ahead with closing a fiscal year, there are a few steps one
 should typically take to ensure that your accounting is correct, up to
--- a/accounting/fiscality/taxes.rst
+++ b/accounting/fiscality/taxes.rst
@ -1,6 +1,6 @@
-===========
+=====
 Taxes
-===========
+=====

 .. toctree::
   :titlesonly:
@ -12,4 +12,5 @@ Taxes
   taxes/tax_included
   taxes/retention
   taxes/B2B_B2C
-   taxes/cash_basis_taxes
+   taxes/cash_basis_taxes
+   taxes/tax_returns
--- a/accounting/fiscality/taxes/B2B_B2C.rst
+++ b/accounting/fiscality/taxes/B2B_B2C.rst
@ -1,6 +1,6 @@
-===================================================================
-How to manage prices for B2B (tax excluded) and B2C (tax included)?
-===================================================================
+===========================================================
+Manage prices for B2B (tax excluded) and B2C (tax included)
+===========================================================

 When working with consumers, prices are usually expressed with taxes
 included in the price (e.g., in most eCommerce). But, when you work in a
--- a/accounting/fiscality/taxes/application.rst
+++ b/accounting/fiscality/taxes/application.rst
@ -1,6 +1,6 @@
-==========================================================
-How to adapt taxes to my customer status or localization
-==========================================================
+=================================================
+Adapt taxes to my customer status or localization
+=================================================

 Most often sales tax rates depend on your customer status or localization.
 To map taxes, Odoo brings the so-called *Fiscal Positions*. 
--- a/accounting/fiscality/taxes/cash_basis_taxes.rst
+++ b/accounting/fiscality/taxes/cash_basis_taxes.rst
@ -1,6 +1,6 @@
-==============================
-How to manage cash basis taxes
-==============================
+=======================
+Manage cash basis taxes
+=======================

 The cash basis taxes are due when the payment has been done and not at
 the validation of the invoice (as it is the case with standard taxes).
--- a/accounting/fiscality/taxes/create.rst
+++ b/accounting/fiscality/taxes/create.rst
@ -1,6 +1,6 @@
-========================
-How to create new taxes
-========================
+================
+Create new taxes
+================

 Odoo's tax engine is very flexible and support many different type of
 taxes: value added taxes (VAT), eco-taxes, federal/states/city taxes, retention,
--- a/accounting/fiscality/taxes/default_taxes.rst
+++ b/accounting/fiscality/taxes/default_taxes.rst
@ -1,6 +1,6 @@
-========================
-How to set default taxes
-========================
+=================
+Set default taxes
+=================

 Taxes applied in your country are installed automatically for most localizations.

--- a/accounting/fiscality/taxes/media/tax_return_closing.png
+++ b/accounting/fiscality/taxes/media/tax_return_closing.png
--- a/accounting/fiscality/taxes/media/tax_return_grids.png
+++ b/accounting/fiscality/taxes/media/tax_return_grids.png
--- a/accounting/fiscality/taxes/media/tax_return_lock.png
+++ b/accounting/fiscality/taxes/media/tax_return_lock.png
--- a/accounting/fiscality/taxes/media/tax_return_overview.png
+++ b/accounting/fiscality/taxes/media/tax_return_overview.png
--- a/accounting/fiscality/taxes/media/tax_return_periodicity.png
+++ b/accounting/fiscality/taxes/media/tax_return_periodicity.png
--- a/accounting/fiscality/taxes/media/tax_return_report.png
+++ b/accounting/fiscality/taxes/media/tax_return_report.png
--- a/accounting/fiscality/taxes/media/tax_return_taxes.png
+++ b/accounting/fiscality/taxes/media/tax_return_taxes.png
--- a/accounting/fiscality/taxes/retention.rst
+++ b/accounting/fiscality/taxes/retention.rst
@ -1,6 +1,6 @@
-================================
-How to manage withholding taxes?
-================================
+========================
+Manage withholding taxes
+========================

 A withholding tax, also called a retention tax, is a government
 requirement for the payer of a customer invoice to withhold or deduct
--- a/accounting/fiscality/taxes/tax_included.rst
+++ b/accounting/fiscality/taxes/tax_included.rst
@ -1,6 +1,6 @@
-==============================
-How to set tax-included prices
-==============================
+=======================
+Set tax-included prices
+=======================

 In most countries, B2C prices are tax-included. To do that in Odoo, check
 *Included in Price* for each of your sales taxes in
--- a/accounting/fiscality/taxes/tax_returns.rst
+++ b/accounting/fiscality/taxes/tax_returns.rst
@ -0,0 +1,122 @@
+============================
+Tax Return (VAT Declaration)
+============================
+
+Companies that are registered for **VAT (Value Added Tax)** must file a **Tax return** on a monthly
+or quarterly basis, depending on their turnover and the regulation of the country in which they are
+registered. A Tax return - or VAT return - gives the tax authorities information about the taxable
+transactions made by the company, the *output tax* it has charged its customers, and the *input tax*
+its vendors have charged it. Based on these values, the company can calculate the tax amount they
+have to pay or be refunded.
+
+.. note::
+   You can find information about VAT and its mechanism on `this page from the European Commission
+   <https://ec.europa.eu/taxation_customs/business/vat/what-is-vat_en>`_.
+
+.. todo:: add doc about intracom listing
+
+Prerequisites
+=============
+
+Tax Return Periodicity
+----------------------
+
+The configuration of the **Tax Return Periodicity** allows Odoo Accounting to compute your Tax
+Return correctly and also to send you a reminder to never miss a tax return deadline.
+
+To do so, go to :menuselection:`Accounting --> Configuration --> Settings --> Fiscal Periods`,
+and go to the **Tax Return Periodicity** section.
+
+- **Periodicity**: define here whether you file your tax return each month or every three months.
+- **Reminder**: define when Odoo should remind you to file your tax return.
+- **Journal**: select the journal in which to record the tax return.
+
+.. image:: media/tax_return_periodicity.png
+   :align: center
+   :alt: Configure how often tax returns have to be made in Odoo Accounting
+
+.. note::
+   This is usually configured during the :doc:`app's initial set up
+   <../../overview/getting_started/setup>`.
+
+Tax Grids
+---------
+
+Odoo generates Tax Reports based on the **Tax Grids** settings that are configured on your taxes.
+Therefore, it is crucial to make sure that all the recorded transactions use the right taxes. You
+can see on each Journal Item which Tax Grid is used for that transaction.
+
+.. image:: media/tax_return_grids.png
+   :align: center
+   :alt: see which tax grids are used to record transactions in Odoo Accounting
+
+To configure your taxes' Tax Grids, go to :menuselection:`Accounting --> Configuration --> Taxes`,
+and open the tax you want to modify. There, you can edit your tax settings, along with the tax
+grids that are used to record invoices or credit notes.
+
+.. image:: media/tax_return_taxes.png
+   :align: center
+   :alt: Configure taxes and their tax grids in Odoo Accounting
+
+.. note::
+   Taxes and reports are usually already pre-configured: a *Fiscal Localization Package* is
+   installed according to the country you select at the creation of your database.
+
+.. _tax_return_lock:
+
+Close a tax period
+==================
+
+Tax Lock Date
+-------------
+
+Any new transaction which accounting date is prior to the **Tax Lock Date** has its tax values moved
+to the next open tax period. This is useful to make sure that no change can be made to a report once
+its period is closed.
+
+Therefore, we recommend locking your tax date before working on your *Closing Journal Entry*. This
+way, other users can't modify or add transactions that would have an impact on the Closing Journal
+Entry, which helps you avoid some tax declaration errors.
+
+To check the current **Tax Lock Date**, or to edit it, go to :menuselection:`Accounting -->
+Accounting --> Lock Dates`.
+
+.. image:: media/tax_return_lock.png
+   :align: center
+   :alt: Lock your tax for a specific period in Odoo Acounting
+
+Tax Report
+----------
+
+Once all the transactions involving taxes have been posted for the period you want to report, open
+your **Tax Report**.
+
+To do so, go to :menuselection:`Accounting --> Reporting --> Tax Report`. You can also click
+on *TAX Report* from your *Accounting Overview*.
+
+Make sure to select the right period you want to declare by using the date filter. You can see an
+overview of your tax report. Then, click on the button *Closing Journal Entry*.
+
+.. image:: media/tax_return_closing.png
+   :align: center
+   :alt: Select the period for the tax return and create a closing journal entry in Odoo Accounting
+
+After having reviewed the generated Journal Entry, click on *Post*. In addition to posting the entry,
+Odoo automatically creates a PDF file with the **Tax Report** that you can download from the chatter
+and preview on the right column. It includes all the values to report to the tax authorities, along
+with the amount you have to pay or be refunded.
+
+.. image:: media/tax_return_report.png
+   :align: center
+   :alt: download the PDF with your Tax Report in Odoo Accounting
+
+.. note::
+   If you forgot to :ref:`lock your tax date <tax_return_lock>` before clicking on *Closing Journal
+   Entry*, then Odoo automatically locks your fiscal period on the same date as the Accounting Date
+   of your entry. This automatic lock happens when you click on *Post*. This safety mechanism can
+   prevent some fiscal errors, but it is advised to lock your tax date manually before, as described
+   above.
+
+.. seealso::
+   * :doc:`create`
+   * :doc:`../../overview/getting_started/setup`
--- a/accounting/fiscality/taxes/taxcloud.rst
+++ b/accounting/fiscality/taxes/taxcloud.rst
@ -1,6 +1,6 @@
-================================================================
-How to get correct tax rates in the United States using TaxCloud
-================================================================
+=========================================================
+Get correct tax rates in the United States using TaxCloud
+=========================================================

 The **TaxCloud** integration allows you to correctly calculate the sales
 tax for every address in the United States and keeps track of which products
--- a/accounting/localizations/argentina.rst
+++ b/accounting/localizations/argentina.rst
@ -15,6 +15,10 @@ modules are available:
 - **l10n_ar_reports**: Add VAT Book report which is a legal requirement in Argentine and that holds
  the VAT detail info of sales or purchases recorded on the journal entries. This module includes as
  well the VAT summary report that is used to analyze the invoice
+  
+- **l10n_ar_edi**: This module includes all technical and functional requirements to generate 
+  Electronic Invoice via web service, based on the AFIP regulations. 
+

 Configuration
 =============
@ -36,6 +40,7 @@ fiscal obligation and structure of the company:

 .. image:: media/argentina02.png
   :align: center
+   

 Chart of Account
 ~~~~~~~~~~~~~~~~
@ -54,11 +59,57 @@ many accounts as the companies that gave more complex fiscal requirements:
 Configure Master data
 ---------------------

+Electronic Invoice Credentials
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Environment
+***********
+
+The AFIP infrastructure is replicated in two separate environments, Testing and Production.
+
+Testing is provided so that the Companies can test their developments until they are ready to move 
+into the Production environment. As these two environments are completely isolated from each other, 
+the digital certificates of one instance are not valid in the other one. 
+
+Go to :menuselection:`Accounting --> Settings --> Argentinian Localization` to select the environment:
+
+.. image:: media/argentina_edi_01.png
+   :align: center
+
+
+AFIP Certificates
+*****************
+The electronic invoice and other afip services work with WebServices (WS) provided by the AFIP. 
+
+In order to enable communication with the AFIP, the first step is to request a Digital Certificate
+if you don’t have one already.   
+
+#. Generate certificate Sign Request (Odoo). When this option is selected a file with extension
+   ``.csr`` (certificate signing request) is generated to be used the AFIP portal to request the
+   certificate.
+
+   .. image:: media/argentina_edi_02.png
+
+#. Generate Certificate (AFIP). Access the AFIP portal and follow the instructions described in the
+   next document in order to get a certificate. `Get AFIP Certificate
+   <http://www.afip.gob.ar/ws/WSAA/wsaa_obtener_certificado_produccion.pdf>`_.
+   
+#. Upload Certificate and Private Key (Odoo). Once the certificate has been generated, it needs to
+   be uploaded in Odoo, using the pencil next in the field “Certificado” and selecting the
+   corresponding file.
+
+   .. image:: media/argentina_edi_03.png
+
+.. tip::
+   In case you need to configure the Homologation Certificate, please refer to the AFIP official 
+   documentation: `Homologation Certificate
+   <http://www.afip.gob.ar/ws/documentacion/certificados.asp>`_.
+
 Partner
 ~~~~~~~

 Identification Type and VAT
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+***************************

 As part of the Argentinean localization, the document types defined by the AFIP are now available on
 the Partner form, this information is essential for most transactions. There are six identification
@ -72,7 +123,7 @@ types available by default:
   common ones are active.

 AFIP Responsibility Type
-^^^^^^^^^^^^^^^^^^^^^^^^^
+************************

 In Argentina the document type associated with customers and vendors transactions is defined based
 on the AFIP Responsibility type, this field should be defined in the partner form:
@ -90,7 +141,7 @@ financial account and configuration.
   :align: center

 Taxes Types
-^^^^^^^^^^^
+***********

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

@ -100,7 +151,7 @@ Argentina has several tax types, the most common ones are:
 - Otros.

 Special Taxes
-^^^^^^^^^^^^^
+*************

 Some argentine taxes are not commonly used  for all companies, these type of taxes are included as
 inactive by default, it's important that before creating a new tax you confirm if they are not
@ -133,7 +184,7 @@ fill anything on this view:
   There are several document types that are inactive by default but can be activated if needed.

 Letters
-^^^^^^^
+*******

 For Argentina, the document types include a letter that helps that indicates the
 transaction/operation, example:
@ -149,7 +200,7 @@ to configure anything additional.
   :align: center

 Use on Invoices
-^^^^^^^^^^^^^^^
+***************

 The document type on each transaction will be determined by:

@ -171,8 +222,8 @@ for more detail of the invoices, please refer to the section 2.3 Document Types.
 If the Sales/Purchase journal are used without the option *Use Documents* it because they won’t be
 used to generate fiscal invoices, but mostly for account moves related to internal control process.

-AFIP Information (better known as AFIP Point of Sale)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+AFIP Information (also known as AFIP Point of Sale)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 .. image:: media/argentina10.png
   :align: center
@ -181,9 +232,23 @@ AFIP Information (better known as AFIP Point of Sale)
 POS that will be used to manage the transactions for which the journal is created. The AFIP POS
 defines as well:

-#. The sequences of document types related to the WS.
+#. The sequences of document types related to the Web service.
 #. The structure and data of the electronic invoice file.

+Web Services
+************      
+- ``wsfev1: Electronic Invoice.`` This is the most common service, 
+  is used to generated invoices for document types A, B, C, M  with no detail per item. 
+- ``wsbfev1: Electronic Fiscal Bond.``  For those who invoice capital goods and wish 
+  to access the benefit of the Electronic Tax Bonds granted by the Ministry of Economy. For more 
+  detail you can refer to the next link: `Fiscal Bond
+  <https://www.argentina.gob.ar/acceder-un-bono-por-fabricar-bienes-de-capital>`_.
+- ``wsfexv1: Electronic Exportation Invoice.`` Used to generate invoices for international customers
+  and transactions that involve exportation process, the document type related is type “E”.
+
+.. image:: media/argentina_edi_04.png
+   :align: center
+
 **AFIP POS Number**: This is the number configured in the AFIP to identify the operations related to
 this AFIP POS.

@ -199,17 +264,32 @@ with the same letter will share the same sequence.  For example:
 - Credit Note: NC-A 0001-00000003.
 - Debit Note: ND-A 0001-00000004.

+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: 
+
+.. image:: media/argentina_edi_05.png
+   :align: center
+
+.. note::
+  When creating the Purchase journals, it's possible to define if they can be related to document 
+  types or not.  In case that the option to use documents is selected, there is no need to manually 
+  associate the document type sequences as the document number is provided by the vendor.
+
+
 Usage and testing
 =================

 Invoice
----------
+-------

 After the partners and journals are created and configured, when the invoices are created the will
 have the next behaviour:

 Document type assignation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~

 Once the partner is selected the document type will filled automatically, based on the AFIP document
 type:
@ -235,8 +315,30 @@ given by the document type.
 The most common document type will be defined automatically for the different combinations of AFIP
 responsibility type but it can be updated manually by the user.

+
+Electronic Invoice elements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+When using electronic invoice, if all the information is correct the Invoice is posted in the 
+standard way, in case that something needs to be addressed (check the section common errors for more 
+detail), an error message is raised indicating the issue/proposed solution and the invoice remains 
+in draft until the related data is corrected. 
+
+Once the invoice is posted, the information related to the AFIP validation and status is displayed 
+in the AFIP Tab, including: 
+
+- AFIP Autorisation:  CAE number.
+- Expiration date: Deadline to deliver the invoice to the customers. Normally 10 days after the 
+  CAE is generated. 
+- Result:
+
+  - Aceptado en AFIP.
+  - Aceptado con Observaciones. 
+  
+.. image:: media/argentina_edi_15.png
+   :align: center
+
 Invoice Taxes
-~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~

 Based on the  AFIP Responsibility type,  the VAT tax can have a different behavior on the pdf
 report:
@ -244,7 +346,7 @@ report:
 **A. Tax excluded:** In this case the taxed amount needs to be clearly identified in the report.
 This condition applies when the customer has the following AFIP Responsibility type:

- Responsable Inscripto
+- Responsable Inscripto.

 .. image:: media/argentina14.png
   :align: center
@ -261,12 +363,152 @@ Responsibility types:
 .. image:: media/argentina15.png
   :align: center

+
+Special Use Cases
+~~~~~~~~~~~~~~~~~
+
+Invoices for Services
+*********************
+For electronic invoices that include Services, the AFIP requires to report the  service starting
+and ending date, this information can be filled in the tab “Other Info”: 
+
+.. image:: media/argentina_edi_06.png
+   :align: center
+
+If  the dates are not selected manually before the invoice is validated, the values will be
+filled automatically considering the beginning and day of the invoice month:
+
+
+.. image:: media/argentina_edi_07.png
+   :align: center
+
+Exportation Invoices
+********************
+The invoices related to Exportation transactions required a Journal that used the AFIP POS 
+System “Expo Voucher - Web Service” so the proper document type be associated:
+
+.. image:: media/argentina_edi_08.png
+   :align: center
+
+When the customer selected in the Invoice has set the AFIP responsibility type as “Cliente / 
+Proveedor del Exterior” or “IVA Liberado – Ley Nº 19.640”, Odoo automatically assigned:
+
+- Journal related to the exportation Web Service.
+- Exportation document type .
+- Fiscal position: Compras/Ventas al exterior.
+- Concepto AFIP:  Products / Definitive export of goods.
+- Exempt Taxes. 
+
+.. image:: media/argentina_edi_09.png
+   :align: center
+
+.. note::
+   The Exportation Documents required the Incoterm in :menuselection:`Other Info --> Accounting`:
+   
+.. image:: media/argentina_edi_13.png
+   :align: center
+   
+   
+Fiscal Bond
+***********
+The Electronic Fiscal bond is used for those who invoice capital goods and wish to access 
+the benefit of the Electronic Tax Bonds granted by the Ministry of Economy.
+
+For these transactions it’s important to have into consideration the next requirements:
+
+- Currency (according to parameter table) and invoice quotation.
+- Taxes.
+- Zone.
+- Detail each item.
+
+  - Code according to the Common Nomenclator of Mercosur (NCM).
+  - Complete description.
+  - Unit Net Price.
+  - Quantity.
+  - Unit of measurement.
+  - Bonus.
+  - VAT rate. 
+
+
+Electronic Credit Invoice MiPyme (FCE) 
+**************************************
+
+**Invoices:** There are several document types classified as Mipyme also known as
+Electronic Credit Invoice (FCE in spanish), which is used to impulse the SME, its purpose is 
+to develop a mechanism that improves the financing conditions of these companies and allows 
+them to increase their productivity, through the early collection of credits and receivables 
+issued to their clients and / or vendors. 
+
+For these transactions it’s important to have into consideration the next requirements:
+
+- Specific document types (201, 202, 206, etc).
+- The emisor should be eligible by the AFIP to MiPyme transactions. 
+- The amount should be bigger than 100,000 ARS. 
+- A bank account type CBU must be related to the emisor, otherwise the invoice can’t 
+  be validated, having these errors messages for example:  
+  
+.. image:: media/argentina_edi_10.png
+   :align: center
+
+**Credit& Debit Notes:** When creating a Credit/Debit note related to a FCE document, it is 
+important take the next points into consideration:
+
+- Use the Credit and Debit Note buttons, so the correct reference of the originator 
+  document passed to the note. 
+
+.. image:: media/argentina_edi_11.png
+   :align: center
+   
+- The document letter should be the same than the originator document (either A or B).
+- The same currency as the source document must be used.  When using a secondary currency 
+  there is an exchange difference  if the currency rate is different between the emission day 
+  and the payment date, it’s possible to create a credit/debit note to decrease/increase the 
+  amount to pay in ARS. 
+
+In the workflow we can have two scenarios:
+
+#. The FCE is rejected so the Credit Note should have the field “FCE, is Cancellation?” as True. 
+#. The Credit Note, is created with the negative amount to annulate the FCE document, 
+   in this case the field “FCE, is Cancellation?” must be empty (false). 
+
+.. image:: media/argentina_edi_12.png
+   :align: center
+   
+Invoice printed report
+~~~~~~~~~~~~~~~~~~~~~~
+The PDF report related to electronic invoices that have been validated by the AFIP includes 
+a barcode at the bottom of the format which represent the CAE number, the Expiration Date is 
+also displayed as it’s legal requirement: 
+   
+.. image:: media/argentina_edi_14.png
+   :align: center
+
+
+Troubleshooting and Auditing
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+For auditing and troubleshooting purposes you can get the detailed information of an 
+invoice number that has been  previously sent to the AFIP,  
+
+.. image:: media/argentina_edi_23.png
+   :align: center
+     
+.. image:: media/argentina_edi_24.png
+   :align: center  
+
+
+You can also get the last number used in AFIP for a specific Document Type and POS Number 
+as support for any possible  issues on the sequence synchronization between Odoo and AFIP. 
+
+.. image:: media/argentina_edi_22.png
+   :align: center
+
+
 Vendor Bills
 ------------

-Based on the sales journal selected for the invoice, the document type is now a required field. This
-value is auto populated based on the AFIP Responsibility type of Issuer and Customer, but the value
-can be switched if necessary.
+Based on the purchase journal selected for the vendor bill, the document type is now a required field. 
+This value is auto populated based on the AFIP Responsibility type of Issuer and Customer, but the 
+value can be switched if necessary.

 .. image:: media/argentina16.png
   :align: center
@ -278,6 +520,72 @@ expected.
 .. image:: media/argentina17.png
   :align: center

+The vendor bill number is structured in the same way that the invoices with the difference 
+that the document sequence is input by the user: “Document Prefix - Letter -  Document number".
+
+
+Validate Vendor Bill number in AFIP
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+As most companies have internal controls to verify that the vendor bill is related to an AFIP
+valid document,  an automatic validation can be set in :menuselection:`Accounting --> Settings --> 
+Argentinian Localization --> Validate document in the AFIP`, considering the following levels: 
+
+- **Not available:** The verification is not done (this is the default value).
+- **Available:**  The verification  is done, in case the number is not valid 
+  it only raises a warning but it allows you to post the vendor bill. 
+- **Required:** The verification  is done and it doesn't allow the user to 
+  post the vendor bill if the document number is not valid.
+
+.. image:: media/argentina_edi_16.png
+   :align: center
+
+How to use it in Odoo
+*********************
+This tool incorporates in the vendor bill a new "Verify on AFIP" button located 
+next to the AFIP Authorization code. 
+
+.. image:: media/argentina_edi_17.png
+   :align: center
+
+In case it’s not a valid AFIP authorization the value “Rejected” will be 
+displayed and the details of the validation will be added to the chatter.
+
+.. image:: media/argentina_edi_18.png
+   :align: center
+
+
+Special Use cases
+~~~~~~~~~~~~~~~~~
+Untaxed Concepts
+****************
+There are some transactions that include items that are not part of the VAT base amount, 
+this is commonly used in fuel and gasoline invoices. 
+
+The vendor bill will be registered using 1 item for each product that is part of the VAT
+base amount and an additional item to register the amount of  the Exempt concept:
+
+.. image:: media/argentina_edi_19.png
+   :align: center
+
+Perception Taxes
+****************
+The vendor bill will be registered using 1 item for each product that is part of the 
+VAT base amount, the perception tax can be added in any of the product lines, as result 
+we will have one tax group for the VAT and one for the perception, the perception default 
+value is always 1.00. 
+
+.. image:: media/argentina_edi_20.png
+   :align: center
+
+You should use the pencil that is the next to the Perception amount to edit it 
+and set the correct amount. 
+
+.. image:: media/argentina_edi_21.png
+   :align: center
+   
+After this is done the invoice can be validated. 
+   
+   
 Reports
 =======

--- a/accounting/localizations/media/argentina01.png
+++ b/accounting/localizations/media/argentina01.png
--- a/accounting/localizations/media/argentina_edi_01.png
+++ b/accounting/localizations/media/argentina_edi_01.png
--- a/accounting/localizations/media/argentina_edi_02.png
+++ b/accounting/localizations/media/argentina_edi_02.png
--- a/accounting/localizations/media/argentina_edi_03.png
+++ b/accounting/localizations/media/argentina_edi_03.png
--- a/accounting/localizations/media/argentina_edi_04.png
+++ b/accounting/localizations/media/argentina_edi_04.png
--- a/accounting/localizations/media/argentina_edi_05.png
+++ b/accounting/localizations/media/argentina_edi_05.png
--- a/accounting/localizations/media/argentina_edi_06.png
+++ b/accounting/localizations/media/argentina_edi_06.png
--- a/accounting/localizations/media/argentina_edi_07.png
+++ b/accounting/localizations/media/argentina_edi_07.png
--- a/accounting/localizations/media/argentina_edi_08.png
+++ b/accounting/localizations/media/argentina_edi_08.png
--- a/accounting/localizations/media/argentina_edi_09.png
+++ b/accounting/localizations/media/argentina_edi_09.png
--- a/accounting/localizations/media/argentina_edi_10.png
+++ b/accounting/localizations/media/argentina_edi_10.png
--- a/accounting/localizations/media/argentina_edi_11.png
+++ b/accounting/localizations/media/argentina_edi_11.png
--- a/accounting/localizations/media/argentina_edi_12.png
+++ b/accounting/localizations/media/argentina_edi_12.png
--- a/accounting/localizations/media/argentina_edi_13.png
+++ b/accounting/localizations/media/argentina_edi_13.png
--- a/accounting/localizations/media/argentina_edi_14.png
+++ b/accounting/localizations/media/argentina_edi_14.png
--- a/accounting/localizations/media/argentina_edi_15.png
+++ b/accounting/localizations/media/argentina_edi_15.png
--- a/accounting/localizations/media/argentina_edi_16.png
+++ b/accounting/localizations/media/argentina_edi_16.png
--- a/accounting/localizations/media/argentina_edi_17.png
+++ b/accounting/localizations/media/argentina_edi_17.png
--- a/accounting/localizations/media/argentina_edi_18.png
+++ b/accounting/localizations/media/argentina_edi_18.png
--- a/accounting/localizations/media/argentina_edi_19.png
+++ b/accounting/localizations/media/argentina_edi_19.png
--- a/accounting/localizations/media/argentina_edi_20.png
+++ b/accounting/localizations/media/argentina_edi_20.png
--- a/accounting/localizations/media/argentina_edi_21.png
+++ b/accounting/localizations/media/argentina_edi_21.png
--- a/accounting/localizations/media/argentina_edi_22.png
+++ b/accounting/localizations/media/argentina_edi_22.png
--- a/accounting/localizations/media/argentina_edi_23.png
+++ b/accounting/localizations/media/argentina_edi_23.png
--- a/accounting/localizations/media/argentina_edi_24.png
+++ b/accounting/localizations/media/argentina_edi_24.png
--- a/accounting/others.rst
+++ b/accounting/others.rst
@ -1,6 +1,6 @@
-===========
+======
 Others
-===========
+======

 .. toctree::
   :titlesonly:
--- a/accounting/others/adviser/budget.rst
+++ b/accounting/others/adviser/budget.rst
@ -1,6 +1,6 @@
-=================================
-How to manage a financial budget?
-=================================
+=========================
+Manage a financial budget
+=========================

 Overview
 ========
--- a/accounting/others/analytic/purchases_expenses.rst
+++ b/accounting/others/analytic/purchases_expenses.rst
@ -1,6 +1,6 @@
-==========================================================
-How to track costs of purchases, expenses, subcontracting?
-==========================================================
+==================================================
+Track costs of purchases, expenses, subcontracting
+==================================================

 Overview
 ========
--- a/accounting/others/analytic/timesheets.rst
+++ b/accounting/others/analytic/timesheets.rst
@ -1,6 +1,6 @@
-======================================================
-How to track costs of human resources with timesheets?
-======================================================
+==============================================
+Track costs of human resources with timesheets
+==============================================

 Human resource of course has a cost. It is interesting to see how much a
 particular contract costs the company in term of human power in relation
--- a/accounting/others/multicurrencies/how_it_works.rst
+++ b/accounting/others/multicurrencies/how_it_works.rst
@ -1,6 +1,6 @@
-=====================================
-How is Odoo's multi-currency working?
-=====================================
+============================
+Odoo's multi-currency system
+============================

 Overview
 ========
--- a/accounting/others/multicurrencies/invoices_payments.rst
+++ b/accounting/others/multicurrencies/invoices_payments.rst
@ -1,6 +1,6 @@
-========================================================
-How to manage invoices & payment in multiple currencies?
-========================================================
+==================================================
+Manage invoices and payment in multiple currencies
+==================================================

 Overview
 ========
--- a/accounting/others/reporting/customize.rst
+++ b/accounting/others/reporting/customize.rst
@ -1,6 +1,6 @@
-==========================================================
-How to create a customized reports with your own formulas?
-==========================================================
+==================================================
+Create a customized reports with your own formulas
+==================================================

 Overview
 ========
--- a/Show More
+++ b/Show More