[MERGE] Forward-port of 13.0 to 13.1

.tx/config

@@ -32,9 +32,14 @@ file_filter = locale/<lang>/LC_MESSAGES/ecommerce.po
 source_file = locale/sources/ecommerce.pot
 source_lang = en
 
-[odoo-13-doc.expenses]
+[odoo-13-doc.expense]
-file_filter = locale/<lang>/LC_MESSAGES/expenses.po
+file_filter = locale/<lang>/LC_MESSAGES/expense.po
-source_file = locale/sources/expenses.pot
+source_file = locale/sources/expense.pot
+source_lang = en
+
+[odoo-13-doc.fsm]
+file_filter = locale/<lang>/LC_MESSAGES/fsm.po
+source_file = locale/sources/fsm.pot
 source_lang = en
 
 [odoo-13-doc.general]
@@ -82,6 +87,11 @@ file_filter = locale/<lang>/LC_MESSAGES/manufacturing.po
 source_file = locale/sources/manufacturing.pot
 source_lang = en
 
+[odoo-13-doc.planning]
+file_filter = locale/<lang>/LC_MESSAGES/planning.po
+source_file = locale/sources/planning.pot
+source_lang = en
+
 [odoo-13-doc.point_of_sale]
 file_filter = locale/<lang>/LC_MESSAGES/point_of_sale.po
 source_file = locale/sources/point_of_sale.pot
@@ -112,11 +122,6 @@ file_filter = locale/<lang>/LC_MESSAGES/quality.po
 source_file = locale/sources/quality.pot
 source_lang = en
 
-[odoo-13-doc.recruitment]
-file_filter = locale/<lang>/LC_MESSAGES/recruitment.po
-source_file = locale/sources/recruitment.pot
-source_lang = en
-
 [odoo-13-doc.sales]
 file_filter = locale/<lang>/LC_MESSAGES/sales.po
 source_file = locale/sources/sales.pot
@@ -132,6 +137,11 @@ file_filter = locale/<lang>/LC_MESSAGES/social_marketing.po
 source_file = locale/sources/social_marketing.pot
 source_lang = en
 
+[odoo-13-doc.support]
+file_filter = locale/<lang>/LC_MESSAGES/support.po
+source_file = locale/sources/support.pot
+source_lang = en
+
 [odoo-13-doc.website]
 file_filter = locale/<lang>/LC_MESSAGES/website.po
 source_file = locale/sources/website.pot

README.rst

@@ -125,3 +125,10 @@ will convert ``path/to/document.docx`` to ``new_doc.rst`` and export
 all images to ``./media`` (and link them from the document). While
 there are issues with the exported document, it's much more convenient
 than manually re-typing the original.
+
+
+Learn More
+==========
+
+To learn more about Odoo, in addition to the documentation, have a look at the official
+`eLearning <https://odoo.com/slides>`_ and `Scale-up, The Business Game <https://www.odoo.com/page/scale-up-business-game>`_

_extensions/odoo/layout.html

@@ -80,8 +80,8 @@
                     <li><a href="https://www.odoo.com/page/e-commerce">eCommerce</a></li>
                     <li><a href="https://www.odoo.com/page/blog-engine">Blogs</a></li>
                     <li><a href="https://www.odoo.com/page/community-builder">Forums</a></li>
-                    <li><a href="https://www.odoo.com/page/slides">Slides</a></li>
+                    <li><a href="https://www.odoo.com/page/learning-management-system">eLearning</a></li>
-                    <li><a href="https://adspike.odoo.com">SEA</a></li>
+                    <li><a href="https://www.odoo.com/page/live-chat">Live Chat</a></li>
                   </ul>
                 </div>
                 <div class="col-sm-3 o_sale_apps">
@@ -98,10 +98,12 @@
                       <ul>
                         <li><a href="https://www.odoo.com/page/point-of-sale">Shops</a></li>
                         <li><a href="https://www.odoo.com/page/pos-restaurant">Restaurants</a></li>
+                        <li><a href="https://www.odoo.com/page/point-of-sale-hardware">Hardware</a></li>
                       </ul>
                     </li>
                     <li><a href="https://www.odoo.com/page/subscriptions">Subscriptions</a></li>
                     <li><a href="https://www.odoo.com/page/sign">Sign</a></li>
+                    <li><a href="https://www.odoo.com/page/rental">Rental</a></li>
                   </ul>
                 </div>
                 <div class="col-sm-3 o_operation_apps">
@@ -115,12 +117,12 @@
                     <li class="dropdown">
                       <a href="#0" class="dropdown-toggle">Human Resources</a>
                       <ul>
-                        <li><a href="https://www.odoo.com/page/recruitment">Recruitment</a></li>
+                        <li><a href="https://www.odoo.com/page/referral">Referral</a></li>
                         <li><a href="https://www.odoo.com/page/employees">Employees</a></li>
                         <li><a href="https://www.odoo.com/page/expenses">Expenses</a></li>
                         <li><a href="https://www.odoo.com/page/appraisal">Appraisal</a></li>
                         <li><a href="https://www.odoo.com/page/fleet">Fleet</a></li>
-                        <li><a href="https://www.odoo.com/page/leaves">Leaves</a></li>
+                        <li><a href="https://www.odoo.com/page/leaves">Time Off</a></li>
                       </ul>
                     </li>
                     <li><a href="https://www.odoo.com/page/warehouse">Inventory</a></li>
@@ -134,6 +136,8 @@
                         <li><a href="https://www.odoo.com/page/quality">Quality</a></li>
                       </ul>
                     </li>
+                    <li><a href="https://www.odoo.com/page/helpdesk">Helpdesk</a></li>
+                    <li><a href="https://www.odoo.com/page/field-service-management">Field Service</a></li>
                   </ul>
                 </div>
                 <div class="col-sm-3 o_productivity_apps">
@@ -148,15 +152,23 @@
                         <li><a href="https://www.odoo.com/page/discuss">Discuss</a></li>
                         <li><a href="https://www.odoo.com/page/discuss-groups">Mailing Lists</a></li>
                         <li><a href="https://www.odoo.com/page/notes">Notes</a></li>
-                        <li><a href="#">Help desk</a></li>
-                        <li><a href="#">Appointment</a></li>
                       </ul>
                     </li>
                     <li><a href="https://www.odoo.com/page/timesheet">Timesheet</a></li>
-                    <li><a href="https://www.odoo.com/page/email-marketing">Email Marketing</a></li>
                     <li><a href="https://www.odoo.com/page/events">Events</a></li>
+                    <li class="dropdown">
+                      <a href="#0" class="dropdown-toggle">Marketing</a>
+                      <ul>
+                        <li><a href="https://www.odoo.com/page/marketing-automation">Automation</a></li>
+                        <li><a href="https://www.odoo.com/page/email-marketing">Email</a></li>
+                        <li><a href="https://www.odoo.com/page/social-marketing">Social</a></li>
+                        <li><a href="https://www.odoo.com/page/sms-marketing">SMS</a></li>
+                      </ul>
+                    </li>
                     <li><a href="https://www.odoo.com/page/survey">Survey</a></li>
-                    <li><a href="https://www.odoo.com/page/live-chat">Live Chat</a></li>
+                    <li><a href="https://www.odoo.com/page/approval-workflow">Approvals</a></li>
+                    <li><a href="https://www.odoo.com/page/appointments">Appointments</a></li>
+                    <li><a href="https://www.odoo.com/page/documents">Documents</a></li>
                   </ul>
                 </div>
               </div>

_extensions/odoo/static/style.css

@@ -10124,7 +10124,7 @@ article.doc-toc .toctree-wrapper > ul > li > span {
 }
 @media (min-width: 768px) {
   .o_main_header > .o_main_header_main > .o_primary_nav .o_secondary_nav > .container > .row > div {
-    height: 340px;
+    height: 355px;
     padding-top: 10px;
   }
   .o_main_header > .o_main_header_main > .o_primary_nav .o_secondary_nav > .container > .row > div + div {

_extensions/odoo/translator.py

@@ -377,7 +377,11 @@ class BootstrapTranslator(nodes.NodeVisitor, object):
                     "Unsupported alignment value \"%s\"" % node['align'],
                     location=doc
                 )
-        # todo: explicit width/height/scale?
+        attrs['style'] = '; '.join(
+            '%s:%s' % (name, node[name] + ('px' if re.match(r'^[0-9]+$', node[name]) else ''))
+            for name in ['width', 'height']
+            if name in node
+        )
         self.body.append(self.starttag(node, 'img', **attrs))
     def depart_image(self, node): pass
     def visit_figure(self, node):

_static/coa-valuation-anglo-saxon.js

@@ -126,7 +126,7 @@
     data.addWatch('chart', function (k, m, prev, next) {
         React.render(
             React.createElement(Controls, {p: next}),
-            document.getElementById('chart-controls'));
+            document.getElementById('chart-controls-anglo-saxon'));
         React.render(
             React.createElement(Chart, {p: next}),
             document.querySelector('.valuation-chart-anglo-saxon'));
@@ -137,7 +137,7 @@
         if (!chart) { return; }
 
         var controls = document.createElement('div');
-        controls.setAttribute('id', 'chart-controls');
+        controls.setAttribute('id', 'chart-controls-anglo-saxon');
         chart.parentNode.insertBefore(controls, chart);
 
         data.reset(Immutable.Map({

_static/coa-valuation-continental.js

@@ -126,7 +126,7 @@
     data.addWatch('chart', function (k, m, prev, next) {
         React.render(
             React.createElement(Controls, {p: next}),
-            document.getElementById('chart-controls'));
+            document.getElementById('chart-controls-continental'));
         React.render(
             React.createElement(Chart, {p: next}),
             document.querySelector('.valuation-chart-continental'));
@@ -137,7 +137,7 @@
         if (!chart) { return; }
 
         var controls = document.createElement('div');
-        controls.setAttribute('id', 'chart-controls');
+        controls.setAttribute('id', 'chart-controls-continental');
         chart.parentNode.insertBefore(controls, chart);
 
         data.reset(Immutable.Map({

_static/example_files/Ontvangen_CODA.2013-01-11-18.59.15.txt

@@ -0,0 +1,24 @@
+0000011011172505        00178299  DE MEYER LUC              KREDBEBB   00820512013 00000                                       2
+12135BE33737018595246                  EUR0000000011812700270710NOVIAT NV                 KBC-Business Comfortrekening       003
+2100010000OL44483FW SCTOFBIONLO1000000000435000110111001010000MEDEDELING                                           11011113501 0
+2200010000                                                                                        GKCCBEBB                   1 0
+2300010000BE41063012345610                     PARTNER 1                                                                     0 1
+3100010001OL44483FW SCTOFBIONLO001010001001PARTNER 1                                                                         0 0
+2100020000OL4414AC8BOVSOVSOVERS0000000003044450110111001500001101240283842818                                      11011113501 0
+2200020000                                                                                        BBRUBEBB                   1 0
+2300020000BE61310126985517                     PARTNER 2                                                                     0 1
+3100020001OL4414AC8BOVSOVSOVERS001500001001PARTNER 2                                                                         1 0
+3200020001MOLENSTRAAT 60                     9340    LEDE                                                                    0 0
+2100030000AFECA0BIS IKLINNINBIS1000000000479040110111313410000              KBC-INVESTERINGSKREDIET 737-6543210-21 11011113510 0
+2100030001AFECA0BIS IKLINNINBIS1000000000419920110111813410660                                                     11011113500 0
+2100030002AFECA0BIS IKLINNINBIS1000000000059120110111813410020                                                     11011113510 0
+2100040000AFECA0CVA IKLINNINNIG1000000000479040110111313410000              KBC-INVESTERINGSKREDIET 737-6543210-21 11011113510 0
+2100040001AFECA0CVA IKLINNINNIG1000000000419920110111813410660                                                     11011113500 0
+2100040002AFECA0CVA IKLINNINNIG1000000000059120110111813410020                                                     11011113510 0
+2100050000AOGM00160BSCTOBOGOVER0000000000063740110111001500000TERUGGAVE 37232481 8400083296 .                      11011113501 0
+2200050000                                                     362/363                            KREDBEBB                   1 0
+2300050000BE43730004200601                     KBC VERZEKERINGEN NV                                                          0 1
+3100050001AOGM00160BSCTOBOGOVER001500001001KBC VERZEKERINGEN NV                                                              1 0
+3200050001VAN OVERSTRAETENPLEIN 2            3000    LEUVEN                                                                  0 0
+8135BE44734024486445                  EUR0000000013646050110111                                                                0
+9               000022000000001393080000000003108190                                                                           2

_static/example_files/test_ofx.ofx

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="ASCII"?>
+<?OFX OFXHEADER="200" VERSION="211" SECURITY="NONE" OLDFILEUID="NONE" NEWFILEUID="NONE"?>
+<OFX>
+  <SIGNONMSGSRSV1>
+    <SONRS>
+      <STATUS>
+        <CODE>0</CODE>
+        <SEVERITY>INFO</SEVERITY>
+      </STATUS>
+      <DTSERVER>20130831165153.000[-8:PST]</DTSERVER>
+      <LANGUAGE>ENG</LANGUAGE>
+    </SONRS>
+  </SIGNONMSGSRSV1>
+  <BANKMSGSRSV1>
+    <STMTTRNRS>
+      <TRNUID>0</TRNUID>
+      <STATUS>
+        <CODE>0</CODE>
+        <SEVERITY>INFO</SEVERITY>
+      </STATUS>
+      <STMTRS>
+        <CURDEF>USD</CURDEF>
+        <BANKACCTFROM>
+          <BANKID>000000123</BANKID>
+          <ACCTID>123456</ACCTID>
+          <ACCTTYPE>CHECKING</ACCTTYPE>
+        </BANKACCTFROM>
+        <BANKTRANLIST>
+          <DTSTART>20130801</DTSTART>
+          <DTEND>20130831165153.000[-8:PST]</DTEND>
+          <STMTTRN>
+            <TRNTYPE>POS</TRNTYPE>
+            <DTPOSTED>20130824080000</DTPOSTED>
+            <TRNAMT>-80</TRNAMT>
+            <FITID>219378</FITID>
+            <NAME>Agrolait</NAME>
+          </STMTTRN>
+        </BANKTRANLIST>
+        <BANKTRANLIST>
+          <DTSTART>20130801</DTSTART>
+          <DTEND>20130831165153.000[-8:PST]</DTEND>
+          <STMTTRN>
+            <TRNTYPE>POS</TRNTYPE>
+            <DTPOSTED>20130824080000</DTPOSTED>
+            <TRNAMT>-90</TRNAMT>
+            <FITID>219379</FITID>
+            <NAME>China Export</NAME>
+          </STMTTRN>
+        </BANKTRANLIST>
+        <BANKTRANLIST>
+          <DTSTART>20130801</DTSTART>
+          <DTEND>20130831165153.000[-8:PST]</DTEND>
+          <STMTTRN>
+            <TRNTYPE>POS</TRNTYPE>
+            <DTPOSTED>20130824080000</DTPOSTED>
+            <TRNAMT>-100</TRNAMT>
+            <FITID>219380</FITID>
+            <NAME>Axelor Scuba</NAME>
+          </STMTTRN>
+        </BANKTRANLIST>
+        <BANKTRANLIST>
+          <DTSTART>20130801</DTSTART>
+          <DTEND>20130831165153.000[-8:PST]</DTEND>
+          <STMTTRN>
+            <TRNTYPE>POS</TRNTYPE>
+            <DTPOSTED>20130824080000</DTPOSTED>
+            <TRNAMT>-90</TRNAMT>
+            <FITID>219381</FITID>
+            <NAME>China Scuba</NAME>
+          </STMTTRN>
+        </BANKTRANLIST>
+        <LEDGERBAL>
+          <BALAMT>2156.56</BALAMT>
+          <DTASOF>20130831165153</DTASOF>
+        </LEDGERBAL>
+      </STMTRS>
+    </STMTTRNRS>
+  </BANKMSGSRSV1>
+  <CREDITCARDMSGSRSV1>
+    <CCSTMTTRNRS>
+      <TRNUID>0</TRNUID>
+      <STATUS>
+        <CODE>0</CODE>
+        <SEVERITY>INFO</SEVERITY>
+      </STATUS>
+      <CCSTMTRS>
+        <CURDEF>USD</CURDEF>
+        <CCACCTFROM>
+          <ACCTID>123412341234</ACCTID>
+        </CCACCTFROM>
+        <BANKTRANLIST>
+        </BANKTRANLIST>
+        <LEDGERBAL>
+          <BALAMT>-562.00</BALAMT>
+          <DTASOF>20130831165153</DTASOF>
+        </LEDGERBAL>
+      </CCSTMTRS>
+    </CCSTMTTRNRS>
+  </CREDITCARDMSGSRSV1>
+</OFX>

_static/example_files/test_qif.qif

@@ -0,0 +1,21 @@
+!Type:Bank
+D8/12/13
+T-1,000.00
+PDelta PC
+^
+D8/15/13
+T-75.46
+PWalts Drugs
+^
+D3/3/13
+T-379.00
+PEpic Technologies
+^
+D3/4/13
+T-20.28
+PYOUR LOCAL SUPERMARKET
+^
+D3/3/13
+T-421.35
+PSPRINGFIELD WATER UTILITY
+^

_static/example_files/vendor_pricelists_template.csv

@@ -0,0 +1,8 @@
+Vendor,Product Template,Vendor Product Name,Vendor Product Code,Price,Minimal Quantity,Start Date,End Date,Delivery Lead Time
+ASUSTeK,iMac,"Apple iMac 27""",ART439872,1299,5,,,2
+Camptocamp,iMac,"Apple iMac 27""",IT98764,1399,1,,,4
+ASUSTeK,"Switch, 24 ports",Bluetek Switch,ART439456,66,,,,4
+ASUSTeK,Datacard,LS DC02,ART672098,35,,,,5
+ASUSTeK,Laptop Customized,Asus ROG CS,ART439870,3300,,01/01/2018,12/31/2018,10
+ASUSTeK,"Mouse, Wireless",Logitech G950,ART859562,12.5,,,,3
+ASUSTeK,iPad Mini,Apple iPad Mini 32GB,ART547892,750,,01/01/2018,05/05/2018,3

accounting/bank/feeds/coda.rst

@@ -11,7 +11,8 @@ software and import it directly in Odoo. This will create all bank
 statements.
 
 .. tip::
-    Test now the feature `with this sample CODA file <https://drive.google.com/file/d/0B5BDHVRYo-q5UVVMbGRxUmtpVDg/view?usp=sharing>`__
+   Test now the feature :download:`with this sample CODA file
+   <../../../_static/example_files/Ontvangen_CODA.2013-01-11-18.59.15.txt>`
 
 Configuration
 =============
@@ -21,8 +22,8 @@ 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 `Import your first coda
+you can move directly to the next section :ref:`Import your first coda
-file <InstallCoda_>`_
+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
@@ -49,7 +50,7 @@ create all your bank statements.
 If the file is successfully loaded, you will get redirected to the bank
 reconciliation screen with all the transactions to reconcile.
 
-.. _InstallCoda:
+.. _accounting/InstallCoda:
 
 Importing CODA files
 ====================

accounting/bank/feeds/manual.rst

@@ -64,7 +64,6 @@ is missing, Odoo will ask you to **select a partner**.
    :align: center
 
 .. tip::
-
    Hit CTRL-Enter to reconcile all the balanced items on the sheets.
 
 Close Bank Statements from the reconciliation

accounting/bank/feeds/ofx.rst

@@ -11,8 +11,8 @@ 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
-	Test now the feature `with this sample OFX file <https://drive.google.com/file/d/0B5BDHVRYo-q5Mmg4T3oxTWszeEk/view>`__
+   <../../../_static/example_files/test_ofx.ofx>`
 
 Configuration
 =============
@@ -60,7 +60,6 @@ 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:`synchronize`

accounting/bank/feeds/paypal.rst

@@ -45,7 +45,6 @@ the online institution and click on the configure button.
 Then, you will have to provide your credentials to connect to PayPal.
 
 .. note::
-
    Your Paypal **must be in English** (if it is not the case you must change
    the langage of your Paypal account) and if you use a Paypal business account
    you must switch back to the old interface in order for it to work with

accounting/bank/feeds/qif.rst

@@ -12,8 +12,8 @@ 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
-	Test now the feature `with this sample QIF file <https://drive.google.com/file/d/0B5BDHVRYo-q5X1ZkUWYzWmtCX0E/view>`__
+   <../../../_static/example_files/test_qif.qif>`
 
 Configuration
 =============
@@ -61,7 +61,6 @@ 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:`synchronize`

accounting/bank/misc/interbank.rst

@@ -73,7 +73,8 @@ internal transfer. Select the **Bank** you want to transfer to, specify the
 **Amount** and add a **Memo** if you wish.
 
 .. note::
-    The memo is important if you wish to automatically reconcile (`see <Reconcile_>`_).
+   The memo is important if you wish to automatically reconcile (see `Import bank statements and
+   reconcile`_).
 
 .. image:: media/interbank02.png
    :align: center
@@ -84,8 +85,6 @@ In terms of accounting the money is now booked in the transfer account.
 We'll need to import bank statements to book the money in the final
 accounts.
 
-.. _Reconcile:
-
 Import bank statements and reconcile
 ------------------------------------
 

accounting/bank/reconciliation/configure.rst

@@ -36,12 +36,10 @@ tell Odoo to take the entire fee into account.
 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`
 
@@ -61,7 +59,6 @@ the relevant data instantly.
 Finally, click on **Reconcile** to finish the process.
 
 .. seealso::
-
    * :doc:`../feeds/manual`
    * :doc:`../feeds/ofx`
    * :doc:`use_cases`

accounting/bank/reconciliation/use_cases.rst

@@ -102,11 +102,9 @@ right and validate all related payments :
    :align: center
 
 .. tip::
-
    Hit CTRL-Enter to reconcile all the balanced items in the sheet.
 
 .. seealso::
-
    * :doc:`../feeds/ofx`
    * :doc:`../feeds/synchronize`
    * :doc:`../feeds/manual`

accounting/localizations.rst

@@ -5,12 +5,13 @@ Localizations
 .. toctree::
    :titlesonly:
 
-   localizations/france
+   localizations/argentina
-   localizations/germany
-   localizations/mexico
-   localizations/nederlands
-   localizations/spain
-   localizations/switzerland
    localizations/colombia
    localizations/colombia_ES
+   localizations/france
+   localizations/germany
    localizations/italy_IT
+   localizations/mexico
+   localizations/netherlands
+   localizations/spain
+   localizations/switzerland

accounting/localizations/argentina.rst

@@ -0,0 +1,323 @@
+=========
+Argentina
+=========
+
+Introduction
+============
+
+The Argentinean localization has been improved and extended in Odoo v13, in this version the next
+modules are available:
+
+- **l10n_ar**: This module add accounting features for the Argentinian localization, which represent
+  the minimal configuration needed for a company  to operate in Argentina and under the AFIP
+  (Administración Federal de Ingresos Públicos) regulations and guidelines.
+
+- **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
+
+Configuration
+=============
+
+Install the Argentinean localization modules
+--------------------------------------------
+
+For this, go to *Apps* and search for Argentina. Then click *Install* for the first two modules.
+
+.. image:: media/argentina01.png
+   :align: center
+
+Configure your company
+~~~~~~~~~~~~~~~~~~~~~~
+
+Once that the modules are installed, the first step is to set up your company data. Additional to
+the basic information, a key field to fill in the AFIP Responsibility Type, that represent the
+fiscal obligation and structure of the company:
+
+.. image:: media/argentina02.png
+   :align: center
+
+Chart of Account
+~~~~~~~~~~~~~~~~
+
+In Accounting settings there are three available packages of Chart of accounts, which are related to
+the AFIP responsibility type of the Company, considering that if the base companies don't require as
+many accounts as the companies that gave more complex fiscal requirements:
+
+- Monotributista  (149 accounts).
+- IVA Exempto   (159 accounts).
+- Responsables Inscriptos  (166 Accounts).
+
+.. image:: media/argentina03.png
+   :align: center
+
+Configure Master data
+---------------------
+
+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
+types available by default:
+
+.. image:: media/argentina04.png
+   :align: center
+
+.. note::
+   The complete list of Identification types defined by the AFIP is included in Odoo but only the
+   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:
+
+.. image:: media/argentina05.png
+   :align: center
+
+Taxes
+~~~~~
+
+As part of the localization module,  the taxes are created automatically with their related
+financial account and configuration.
+
+.. image:: media/argentina06.png
+   :align: center
+
+Taxes Types
+^^^^^^^^^^^
+
+Argentina has several tax types, the most common ones are:
+
+- VAT. Is the regular VAT and it can have several percentages.
+- Perception. Advance payment of a tax that is applied on Invoices.
+- Retention. Advance payment of a tax that is applied on payments
+- 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
+already included in the Inactive taxes:
+
+.. image:: media/argentina07.png
+   :align: center
+
+Document Types
+~~~~~~~~~~~~~~
+
+In some Latin America countries, including Argentina, some accounting transactions like invoices and
+vendor bills are classified by  document types defined by the government fiscal authorities (In
+Argentina case: AFIP).
+
+The document type is an 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 journal where it is assigned. As part of the
+localization, the Document Type include the country on which the document is applicable and the data
+is created automatically when the localization module is installed.
+
+The information required for the document types is included by default so the user doesn't need to
+fill anything on this view:
+
+.. image:: media/argentina08.png
+   :align: center
+
+.. note::
+   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:
+
+- When an invoice is related to a B2B transaction, a document type "A" must be used.
+- When an invoice is related to a B2C transaction, a document type "B" must be used.
+- When an invoice is related to exportation transaction, a document type "E" must be used.
+
+The documents included in the localization have the proper letter associated, the user doesn't need
+to configure anything additional.
+
+.. image:: media/argentina09.png
+   :align: center
+
+Use on Invoices
+^^^^^^^^^^^^^^^
+
+The document type on each transaction will be determined by:
+
+- The Journal related to the Invoice, identifying if the journal use 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
+--------
+
+In the Argentinean localization the Journal can have a different approach depending on its usage and
+internal type, to configure you journals go to :menuselection:`Accounting --> Configuration -->
+Journals`:
+
+For Sales and Purchase Journals it’s possible to enable the option *Use Documents*, this indicates
+the Journal enables a list of document types that can be related to the Invoices and vendor Bills,
+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)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. image:: media/argentina10.png
+   :align: center
+
+**AFIP POS System**: This field is only visible for the Sales journals and defined the type of AFIP
+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 structure and data of the electronic invoice file.
+
+**AFIP POS Number**: This is the number configured in the AFIP to identify the operations related to
+this AFIP POS.
+
+**AFIP POS Address**: This field is related to commercial address registered for the POS, which is
+usually the same address than the Company. For example: has multiple stores (fiscal locations) then
+AFIP will require that you have one AFIP POS per location: this location will be printed in the
+invoice report.
+
+**Unified Book**: When AFIP POS System is Preimpresa the document types (applicable to the journal)
+with the same letter will share the same sequence.  For example:
+
+- Invoice: FA-A 0001-00000002.
+- Credit Note: NC-A 0001-00000003.
+- Debit Note: ND-A 0001-00000004.
+
+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:
+
+**Invoice for a customer IVA Responsable Inscripto, prefix A**.
+
+.. image:: media/argentina11.png
+   :align: center
+
+**Invoice for an end customer, prefix B**.
+
+.. image:: media/argentina12.png
+   :align: center
+
+**Exportation Invoice, prefix E**.
+
+.. image:: media/argentina13.png
+   :align: center
+
+As it is shown in the invoices, all of them use the same journal but the prefix and sequence is
+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.
+
+Invoice Taxes
+~~~~~~~~~~~~~~~~~
+
+Based on the  AFIP Responsibility type,  the VAT tax can have a different behavior on the pdf
+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
+
+.. image:: media/argentina14.png
+   :align: center
+
+**B. Tax amount included:** This means that the taxed amount is included as part of the product
+price, subtotal and totals. This condition applies when the customer has the following AFIP
+Responsibility types:
+
+- IVA Sujeto Exento.
+- Consumidor Final.
+- Responsable Monotributo.
+- IVA liberado.
+
+.. image:: media/argentina15.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.
+
+.. image:: media/argentina16.png
+   :align: center
+
+The document number needs to be registered manually and the format is validated automatically, in
+case that the format is invalid a user error will be displayed indicating the correct format that is
+expected.
+
+.. image:: media/argentina17.png
+   :align: center
+
+Reports
+=======
+
+As part of the localization the next Financial reports were added:
+
+.. image:: media/argentina18.png
+   :align: center
+
+VAT Reports
+-----------
+
+Libro de IVA Ventas
+~~~~~~~~~~~~~~~~~~~
+
+.. image:: media/argentina19.png
+   :align: center
+
+Libro de IVA Compras
+~~~~~~~~~~~~~~~~~~~~
+
+.. image:: media/argentina20.png
+   :align: center
+
+Resumen de IVA
+~~~~~~~~~~~~~~
+
+.. image:: media/argentina21.png
+   :align: center
+
+IIBB - Reports
+--------------
+
+IIBB - Ventas por Jurisdicción
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. image:: media/argentina22.png
+   :align: center
+
+IIBB - Compras  por Jurisdicción
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. image:: media/argentina23.png
+   :align: center

accounting/localizations/colombia.rst

@@ -3,29 +3,31 @@ Colombia
 ========
 
 Introduction
-~~~~~~~~~~~~
+============
 
 Electronic invoicing for Colombia is available from Odoo 12 and
 requires the next modules:
 
-#. **l11n_co**: All the basic data to manage the accounting module,
+#. **l10n_co**: All the basic data to manage the accounting module,
    contains the default setup for: chart of accounts, taxes,
    retentions, identification document types
 #. **l10n_co_edi**: This module includes all the extra fields that are
    required for the Integration with Carvajal T&S and generate the
    electronic invoice, based on the DIAN legal requirements.
 
+
 Workflow
-~~~~~~~~
+========
 
 .. image:: media/colombia01.png
    :align: center
 
-Configuration
-~~~~~~~~~~~~~
 
-1. Install the Colombian localization modules
+Configuration
----------------------------------------------
+=============
+
+Install the Colombian localization modules
+------------------------------------------
 
 For this, go in Apps and search for Colombia. Then click Install for
 the first two modules.
@@ -33,8 +35,9 @@ the first two modules.
 .. image:: media/colombia02.png
    :align: center
 
-2. Configure credentials for Carvajal T&S web service
+
------------------------------------------------------
+Configure credentials for Carvajal T&S web service
+--------------------------------------------------
 
 Once that the modules are installed, in order to be able to connect
 with Carvajal T&S Web Service, it's necessary to configure the user
@@ -54,8 +57,9 @@ here: https://cenfinancierolab.cen.biz
 Once that Odoo and Carvajal T&S is fully configured and ready for
 production the testing environment can be disabled.
 
-3. Configure your report data
+
------------------------------
+Configure your report data
+--------------------------
 
 As part of the configurable information that is sent in the XML, you
 can define the data for the fiscal section and the bank information in
@@ -67,14 +71,15 @@ look for the *Colombian Electronic Invoice* section.
 .. image:: media/colombia04.png
    :align: center
 
-4. Configure data required in the XML
--------------------------------------
 
-4.1 Partner
+Configure data required in the XML
-+++++++++++
+----------------------------------
 
-4.1.1 Identification
+Partner
-^^^^^^^^^^^^^^^^^^^^
+~~~~~~~
+
+Identification
+^^^^^^^^^^^^^^
 
 As part of the Colombian Localization, the document types defined by
 the DIAN are now available on the Partner form. Colombian partners
@@ -88,8 +93,9 @@ have to have their identification number and document type set:
    will split this number when the data to the third party vendor is
    sent.
 
-4.1.2 Fiscal structure (RUT)
+
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Fiscal structure (RUT)
+^^^^^^^^^^^^^^^^^^^^^^
 
 The partner's responsibility codes (section 53 in the RUT document)
 are included as part of the electronic invoice module given that is
@@ -104,8 +110,9 @@ Purchase Tab --> Fiscal Information`
 Additionally two booleans fields were added in order to specify the
 fiscal regimen of the partner.
 
-4.2 Taxes
+
-+++++++++
+Taxes
+~~~~~
 
 If your sales transactions include products with taxes, it's important
 to consider that an extra field *Value Type* needs to be configured
@@ -121,8 +128,9 @@ to correctly display taxes in the invoice PDF.
 .. image:: media/colombia08.png
    :align: center
 
-4.3 Journals
+
-++++++++++++
+Journals
+~~~~~~~~
 
 Once the DIAN has assigned the official sequence and prefix for the
 electronic invoice resolution, the Sales journals related to your
@@ -139,8 +147,9 @@ should be configured and synchronized with the CEN Financiero.
 .. image:: media/colombia10.png
    :align: center
 
-4.4 Users
+
-+++++++++
+Users
+~~~~~
 
 The default template that is used by Odoo on the invoice PDF includes
 the job position of the salesperson, so these fields should be
@@ -149,17 +158,19 @@ configured:
 .. image:: media/colombia11.png
    :align: center
 
-Usage and testing
-~~~~~~~~~~~~~~~~~
 
-1. Invoice
+Usage and testing
-----------
+=================
+
+Invoice
+-------
 
 When all your master data and credentials has been configured, it's
 possible to start testing the electronic invoice workflow.
 
-1.1 Invoice creation
+
-++++++++++++++++++++
+Invoice creation
+~~~~~~~~~~~~~~~~
 
 The functional workflow that takes place before an invoice validation
 doesn't change. The main changes that are introduced with the
@@ -180,8 +191,9 @@ There are three types of documents:
   this invoice is added to the ERP, this invoice type should be
   selected.
 
-1.2 Invoice validation
+
-++++++++++++++++++++++
+Invoice validation
+~~~~~~~~~~~~~~~~~~
 
 After the invoice is validated an XML file is created and sent
 automatically to Carvajal, this file is displayed in the chatter.
@@ -197,8 +209,9 @@ displayed with the Electronic Invoice status, with the initial value
 .. image:: media/colombia14.png
    :align: center
 
-1.3 Reception of legal XML and PDF
+
-++++++++++++++++++++++++++++++++++
+Reception of legal XML and PDF
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The electronic invoice vendor receives the XML file and proceeds to
 validate the structure and the information in it, if everything is
@@ -214,15 +227,14 @@ After this:
   displayed in the invoice chatter:
 
   .. image:: media/colombia15.png
-   :align: center
 
   .. image:: media/colombia16.png
-   :align: center
 
 - The Electronic Invoice status changes to "Accepted"
 
-1.4 Common errors
+
-+++++++++++++++++
+Common errors
+~~~~~~~~~~~~~
 
 During the XML validation the most common errors are usually related
 to missing master data. In such cases, error messages are shown in the
@@ -241,8 +253,9 @@ button:
 .. image:: media/colombia19.png
    :align: center
 
-2. Additional use cases
+
------------------------
+Additional use cases
+--------------------
 
 The process for credit and debit notes is exactly the same as the
 invoice, the functional workflow remains the same as well.

accounting/localizations/colombia_ES.rst

@@ -2,85 +2,90 @@
 Colombia (ES)
 =============
 
-**Facturación Electrónica para Colombia**
-
 Introducción
 ============
 
-La Facturación Electrónica para Colombia está disponible en Odoo V12 y
+La Facturación Electrónica para Colombia está disponible en Odoo 12 y
 requiere los siguientes Módulos:
 
-1. **l11n_co**:** Contiene los datos básicos para manejar el
+#. **l10n_co**: Contiene los datos básicos para manejar el módulo de
-       módulo de contabilidad, incluyendo la configuración por defecto
+   contabilidad, incluyendo la configuración por defecto de los siguientes
-       de los siguientes puntos:
+   puntos:
 
-    | a. Plan Contable
+   - Plan Contable
-    | b. Impuestos
+   - Impuestos
-    | c. Retenciones
+   - Retenciones
-    | d. Tipos de Documentos de Identificación
+   - Tipos de Documentos de Identificación
+
+#. **l10n_co_edi**: Este módulo incluye todos los campos adicionales que son
+   requeridos para la Integración entre Carvajal T&S y la generación de la
+   Factura Electrónica, basado en los requisitos legales de la DIAN.
 
-1. **l10n_co_edi**: Este módulo incluye todos los campos
-       adicionales que son requeridos para la Integración entre Carvajal
-       T&S y la generación de la Factura Electrónica, basado en los
-       requisitos legales de la DIAN.
 
 Flujo General
--------------
+=============
+
+.. image:: media/colombia01.png
+   :align: center
+
 
 Configuración
 =============
 
-1. Instalación de los módulos de Localización Colombiana
+Instalación de los módulos de Localización Colombiana
---------------------------------------------------------
+-----------------------------------------------------
 
 Para esto ve a las aplicaciones y busca “Colombia”, luego da click en
 Instalar a los primeros dos módulos:
 
-cz
+.. image:: media/colombia02.png
+   :align: center
 
-2. Configuración de las credenciales del Servicio Web de Carvajal T&S
+
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Configuración de las credenciales del Servicio Web de Carvajal T&S
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 | Una vez que los módulos están instalados, para poderte conectar con el
   Servicio Web de Carvajal T&S, es necesario configurar el Usuario y las
   Credenciales. Esta información será provista por Carvajal T&S.
-| Ve a Facturación –> Configuración –> Configuración y busca la sección
+| Ve a :menuselection:`Facturación --> Configuración --> Configuración` y busca la sección
   **Facturación Electrónica Colombiana**
 
 .. image:: media/colombia_ES02.png
   :align: center
 
-| La funcionalidad de pruebas le permite conectarse e interactuar con el
+La funcionalidad de pruebas le permite conectarse e interactuar con el
 ambiente piloto de Carvajal T&S, esto permite a los usuarios probar el
 flujo completo y la integración con el Portal Financiero CEN, al cual
-  se accede a través de la siguiente liga: `Cenfinanciero <https://cenfinancierolab.cen.biz>`__, 
+se accede a través de la siguiente liga: `Cenfinanciero <https://cenfinancierolab.cen.biz>`_.
 
 Una vez que el ambiente de producción está listo en Odoo y en Carvajal
 T&S el ambiente de pruebas debe ser deshabilitado para poder enviar la
 información al ambiente de producción de Carvajal, para el cual es
-utilizada la siguiente URL: `Cenfinanciero <https://cenfinancierolab.cen.biz>`__, 
+utilizada la siguiente URL: `Cenfinanciero <https://cenfinancierolab.cen.biz>`_.
 
-3. Configuración de Información para PDF
+
-----------------------------------------
+Configuración de Información para PDF
+-------------------------------------
 
 | Como parte de la información configurable que es enviada en el XML,
   puedes definir los datos de la sección fiscal del PDF, así como de la
   información Bancaria.
-| Ve a Contabilidad – Configuración – Ajustes y busca la sección
+| Ve a :menuselection:`Contabilidad --> Configuración --> Ajustes` y busca la sección
   **Facturación Electrónica Colombiana**.
 
 .. image:: media/colombia_ES03.png
   :align: center
 
-4. Configuración de los Datos Principales Requeridos en el XML
---------------------------------------------------------------
 
-4.1 Contacto (Tercero)
+Configuración de los Datos Principales Requeridos en el XML
-~~~~~~~~~~~~~~~~~~~~~~
+-----------------------------------------------------------
 
-4.1.1 Identificación
+Contacto (Tercero)
-~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~
 
+Identificación
+^^^^^^^^^^^^^^
 
 Como parte de la Localización Colombiana, los tipos de documentos
 definidos por la DIAN ahora están disponibles en el formulario de
@@ -95,15 +100,16 @@ ingresada en Odoo incluyendo el Dígito de Verificación. Odoo separará
 este número cuando la información sea enviada a los proveedores
 terceros.
 
-4.1.2 Estructura Fiscal (RUT)
+
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Estructura Fiscal (RUT)
+^^^^^^^^^^^^^^^^^^^^^^^
 
 Los Códigos de tipo de Obligación aplicables a los terceros (sección 53
 en el documento de RUT), son incluidos como parte del módulo de
 Facturación Electrónica, dado que es información requerida por la DIAN.
 
-Estos campos se encuentran en Contactos –> Pestaña de Ventas y Compras
+Estos campos se encuentran en :menuselection:`Contactos --> Pestaña de Ventas y Compras
-–> Información Fiscal
+--> Información Fiscal`
 
 .. image:: media/colombia_ES05.png
   :align: center
@@ -114,14 +120,13 @@ electrónica de Carvajal, únicamente se hace distinción de entre Grandes
 Contribuyentes y Régimen simplificado, por lo se muestran solo estas dos
 opciones.
 
-4.2 Impuestos
+Impuestos
--------------
+~~~~~~~~~
 
-| Si tus transacciones de ventas incluyen productos con impuestos, es
+Si tus transacciones de ventas incluyen productos con impuestos, es
 importante considerar que un campo adicional llamado *Tipo de Valor*
-  necesita ser configurado en la siguiente ruta:
+necesita ser configurado en la siguiente ruta: :menuselection:`Contabilidad
-| Contabilidad – > Configuración –> Impuestos: –> Opciones Avanzadas
+--> Configuración --> Impuestos: --> Opciones Avanzadas --> Tipo de Valor`
-  –>Tipo de Valor
 
 .. image:: media/colombia_ES06.png
   :align: center
@@ -134,8 +139,9 @@ en la representación gráfica de la Factura. (PDF)
 .. image:: media/colombia_ES07.png
   :align: center
 
-4.3 Diarios
+
------------
+Diarios
+~~~~~~~
 
 Una vez que la DIAN ha asignado la secuencia y prefijo oficiales para la
 resolución de la Facturación Electrónica, los Diarios de Ventas
@@ -143,9 +149,8 @@ relacionados con tus documentos de facturación necesitan ser
 actualizados en Odoo.
 
 La secuencia es configurada usando el modo de desarrollador en la
-siguiente ruta:
+siguiente ruta: :menuselection:`Contabilidad --> Configuración --> Diarios
-
+--> Liga de Secuencia`
-Contabilidad –> Configuración –> Diarios –> Liga de Secuencia
 
 .. image:: media/colombia_ES08.png
   :align: center
@@ -156,8 +161,9 @@ Número deben ser configurados y sincronizados con el CEN Financiero.
 .. image:: media/colombia_ES09.png
   :align: center
 
-4.4 Usuarios
+
-------------
+Usuarios
+~~~~~~~~
 
 La plantilla por defecto que es usada por Odoo en la representación
 gráfica incluye el nombre del Vendedor, así que estos campos deben ser
@@ -166,6 +172,7 @@ considerados:
 .. image:: media/colombia_ES10.png
   :align: center
 
+
 Uso y Pruebas
 =============
 
@@ -176,8 +183,9 @@ Una vez que toda la información principal y las credenciales han sido
 configuradas, es posible empezar a probar el flujo de la Facturación
 Electrónica siguiendo las instrucciones que se detallan a continuación:
 
-1. Invoice Creation
+
-~~~~~~~~~~~~~~~~~~~
+Invoice Creation
+~~~~~~~~~~~~~~~~
 
 El flujo de trabajo funcional que lleva lugar antes de la validación de
 una factura continua siendo igual con Facturación Electrónica,
@@ -202,10 +210,10 @@ Hay tres tipos de documentos
   seleccionar este tipo.
 
   .. image:: media/colombia_ES11.png
-  :align: center
 
-1. Invoice Validation
+
-~~~~~~~~~~~~~~~~~~~~~
+Invoice Validation
+~~~~~~~~~~~~~~~~~~
 
 Después que la factura fue validada, un archivo XML es creado y enviado
 automáticamente al proveedor de la factura electrónica. Este archivo es
@@ -222,8 +230,9 @@ Electrónica, con el valor inicial **En Proceso**.
 .. image:: media/colombia_ES13.png
   :align: center
 
-1. Recepción del XML y PDF Legal
+
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Recepción del XML y PDF Legal
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 | El proveedor de la Factura Electrónica recibe el archivo XML y procede
   a validar la información y la estructura contenida. Si todo es
@@ -234,28 +243,28 @@ Electrónica, con el valor inicial **En Proceso**.
 
 | Odoo envía una petición de actualización automáticamente para
   verificar que el XML fue creado. Si este es el caso, las siguientes
-  acciones son hechas automáticamente.
+  acciones son hechas automáticamente:
 
 - El XML Legal y el PDF son incluidos en un archivo ZIP y desplegados
   en el historial de la Factura.
 
   .. image:: media/colombia_ES14.png
-  :align: center
 
 - El estatus de la Factura Electrónica es cambiado a “Aceptado”.
 
   .. image:: media/colombia_ES15.png
-  :align: center
 
-Nota: En caso que el PDF y el XML sean requeridos inmediatamente, es
+.. tip::
+   En caso que el PDF y el XML sean requeridos inmediatamente, es
    posible mandar manualmente la petición del estatus usando el siguiente
    botón:
 
    .. image:: media/colombia_ES16.png
       :align: center
 
-1. Errores Frecuentes
+
-~~~~~~~~~~~~~~~~~~~~~
+Errores Frecuentes
+~~~~~~~~~~~~~~~~~~
 
 Durante la validación del XML los errores más comunes usualmente están
 relacionados con información principal faltante. En estos casos, los
@@ -275,6 +284,7 @@ siguiente botón:
 .. image:: media/colombia_ES19.png
   :align: center
 
+
 Casos de Uso adicionales
 ------------------------
 

accounting/localizations/france.rst

@@ -50,9 +50,9 @@ Getting compliant with Odoo is very easy.
 Your company is requested by the tax administration to deliver a certificate 
 of conformity testifying that your software complies with the anti-fraud 
 legislation. This certificate is granted by Odoo SA to Odoo Enterprise users 
-`here <https://www.odoo.com/my/contract/french-certification/>`__. 
+`here <https://www.odoo.com/my/contract/french-certification/>`_.
 If you use Odoo Community, you should 
-`upgrade to Odoo Enterprise <https://www.odoo.com/documentation/online/setup/enterprise.html>`__
+`upgrade to Odoo Enterprise <https://www.odoo.com/documentation/13.0/setup/enterprise.html>`_
 or contact your Odoo service provider.
 
 In case of non-conformity, your company risks a fine of €7,500.
@@ -63,15 +63,16 @@ To get the certification just follow the following steps:
   *Apps* menu:
 
   * if you use Odoo Point of Sale: *l10n_fr_pos_cert*: France - VAT Anti-Fraud Certification for Point of Sale (CGI 286 I-3 bis)
-
   * in any other case: *l10n_fr_certification*: France - VAT Anti-Fraud Certification (CGI 286 I-3 bis)
+
 * Make sure a country is set on your company, otherwise your entries won’t be 
   encrypted for the inalterability check. To edit your company’s data, 
   go to :menuselection:`Settings --> Users & Companies --> Companies`. 
   Select a country from the list; Do not create a new country.
 * Download the mandatory certificate of conformity delivered by Odoo SA `here <https://www.odoo.com/my/contract/french-certification/>`__.
 
-.. note:: * To install the module in any system created before 
+.. note::
+   * To install the module in any system created before
      December 18th 2017, you should update the modules list.
      To do so, activate the developer mode from the *Settings* menu.
      Then go to the *Apps* menu and press *Update Modules List* in the top-menu.
@@ -179,17 +180,6 @@ More Information
 
 You will find more information about this legislation in the official documents:
 
-* `Frequently Asked Questions <https://www.economie.gouv.fr/files/files/directions_services/dgfip/controle_fiscal/actualites_reponses/logiciels_de_caisse.pdf>`__
+* `Frequently Asked Questions <https://www.economie.gouv.fr/files/files/directions_services/dgfip/controle_fiscal/actualites_reponses/logiciels_de_caisse.pdf>`_
-* `Official Statement <http://bofip.impots.gouv.fr/bofip/10691-PGP.html?identifiant=BOI-TVA-DECLA-30-10-30-20160803>`__
+* `Official Statement <http://bofip.impots.gouv.fr/bofip/10691-PGP.html?identifiant=BOI-TVA-DECLA-30-10-30-20160803>`_
-* `Item 88 of Finance Law 2016 <https://www.legifrance.gouv.fr/affichTexteArticle.do?idArticle=JORFARTI000031732968&categorieLien=id&cidTexte=JORFTEXT000031732865>`__
+* `Item 88 of Finance Law 2016 <https://www.legifrance.gouv.fr/affichTexteArticle.do?idArticle=JORFARTI000031732968&categorieLien=id&cidTexte=JORFTEXT000031732865>`_
-
-
-
-
-
-
-
-
-
-
-

accounting/localizations/italy_IT.rst

@@ -8,6 +8,7 @@ contabilità. Per testare la fattura elettronica i dati devono essere
 reali e non inventati, altrimenti il sistema dell’agenzia delle entrate
 non riconoscerà l’interscambio di informazioni.
 
+
 Configurare le informazioni sulla tua Azienda
 =============================================
 
@@ -24,8 +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
+   puo’ consultare la relativa :doc:`guida <../../discuss/email_servers>`.
-   `guida <https://www.odoo.com/documentation/user/13.0/discuss/email_servers.html>`__.
 
 -  Indirizzo PEC dell’ Azienda, tale indirizzo deve essere lo stesso
    registrato presso l’Agenzia delle Entrate per l’utilizzo dei servizi
@@ -50,8 +50,8 @@ elettronica sono i seguenti:
   :align: center
 
 
-1. Configurare le impostazioni per la Fatturazione Elettronica
+Configurare le impostazioni per la Fatturazione Elettronica
---------------------------------------------------------------
+-----------------------------------------------------------
 
 -  Numero di iscrizione nel registro Imprese tenuto presso la Camera di
    Commercio.
@@ -66,8 +66,8 @@ elettronica sono i seguenti:
   :align: center
 
 
-1. Configurare il profilo dei clienti
+Configurare il profilo dei clienti
--------------------------------------
+----------------------------------
 
 Per un corretto utilizzo dell’applicazione, il profilo di clienti e
 fornitori, nell’applicazione contatti, deve essere configurato con le
@@ -101,22 +101,22 @@ schermata della fattura.
 
 I messaggi che possono apparire sono i seguenti:
 
-1. Fattura invitata. In attesa di accettazione
+#. Fattura invitata. In attesa di accettazione
 
-2. Invio fallito. Puoi modificare la fattura ed inviarla di nuovo
+#. Invio fallito. Puoi modificare la fattura ed inviarla di nuovo
 
-3. La fattura è stata correttamente inviata ed accettata dal
+#. La fattura è stata correttamente inviata ed accettata dal
    destinatario.
 
 I vari stadi di spedizione e recezione della fattura sono visibili anche
 dall’elenco delle Fatture nella forma di icone, accanto alla colonna
 “Stato” dall’applicazione contabilità.
 
-*Icona Rossa:* Invio fallito
+*Icona Rossa*: Invio fallito
 
-*Icona Gialla:* Fattura invitata. In attesa di accettazione
+*Icona Gialla*: Fattura invitata. In attesa di accettazione
 
-*Icona Verde:* Fattura inviata e accettata dal destinatario
+*Icona Verde*: Fattura inviata e accettata dal destinatario
 
 Per inviare la fattura tramite PEC e generare il file XML, basterà
 cliccare su invia. Il documento verrà poi mostrato tra gli allegati.

accounting/localizations/mexico.rst

@@ -10,8 +10,9 @@ Mexico
    information necessary to allow you use odoo in a Company with the country
    "Mexico" set.
 
+
 Introduction
-~~~~~~~~~~~~
+============
 
 The mexican localization is a group of 3 modules:
 
@@ -29,16 +30,18 @@ accounting and invoicing system due to all the set of normal requirements for
 this market, becoming your Odoo in the perfect solution to administer your
 company in Mexico.
 
+
 Configuration
-~~~~~~~~~~~~~
+=============
 
 .. tip::
    After the configuration we will give you the process to test everything,
    try to follow step by step in order to allow you to avoid expend time on
    fix debugging problems. In any step you can recall the step and try again.
 
-1. Install the Mexican Accounting Localization
+
-----------------------------------------------
+Install the Mexican Accounting Localization
+-------------------------------------------
 
 For this, go in Apps and search for Mexico. Then click on *Install*.
 
@@ -50,8 +53,9 @@ For this, go in Apps and search for Mexico. Then click on *Install*.
    as country when creating your account, the mexican localization will be
    automatically installed.
 
-2. Electronic Invoices (CDFI 3.2 and 3.3 format)
+
-------------------------------------------------
+Electronic Invoices (CDFI 3.2 and 3.3 format)
+---------------------------------------------
 
 To enable this requirement in Mexico go to configuration in accounting Go in
 :menuselection:`Accounting --> Settings` and enable the option on the image
@@ -64,8 +68,9 @@ integrate with the normal invoicing flow in Odoo.
 
 .. _mx-legal-info:
 
-3. Set you legal information in the company
+
--------------------------------------------
+Set you legal information in the company
+----------------------------------------
 
 First, make sure that your company is configured with the correct data.
 Go in :menuselection:`Settings --> Users --> Companies`
@@ -81,8 +86,9 @@ company’s contact.
 .. image:: media/mexico03.png
    :align: center
 
-4. Set the proper "Fiscal Position" on the partner that represent the company
+
------------------------------------------------------------------------------
+Set the proper "Fiscal Position" on the partner that represent the company
+--------------------------------------------------------------------------
 
 Go In the same form where you are editing the company save the record in
 order to set this form as a readonly and on readonly view click on the partner
@@ -90,13 +96,14 @@ link, then edit it and set in the *Invoicing* tab the proper Fiscal Information
 (for the **Test Environment** this must be *601 - General de Ley Personas
 Morales*, just search it as a normal Odoo field if you can't see the option).
 
-5. Enabling CFDI Version 3.3
+
-----------------------------
+Enabling CFDI Version 3.3
+-------------------------
 
 .. warning::
    This steps are only necessary when you will enable the CFDI 3.3 (only available
    for V11.0 and above) if you do not have Version 11.0 or above on your
-   SaaS instance please ask for an upgrade sending a ticket to support in
+   SaaS instance please ask for an upgrade by submitting a ticket to support in
    https://www.odoo.com/help.
 
 Enable debug mode:
@@ -118,8 +125,9 @@ the entry with this name does not exist).
 .. image:: media/mexico11.png
    :align: center
 
+
 Important considerations when yo enable the CFDI 3.3
-====================================================
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Your tax which represent the VAT 16% and 0% must have the "Factor Type" field
 set to "Tasa".
@@ -142,8 +150,9 @@ properly set, you can export them and re import them to do it faster.
 .. image:: media/mexico15.png
    :align: center
 
-6. Configure the PAC in order to sign properly the invoices
+
------------------------------------------------------------
+Configure the PAC in order to sign properly the invoices
+--------------------------------------------------------
 
 To configure the EDI with the **PACs**, you can go in
 :menuselection:`Accounting --> Settings --> Electronic Invoicing (MX)`.
@@ -179,7 +188,8 @@ and then enter your PAC username and PAC password.
    - `Certificate Key`_
    - **Password:** 12345678a
 
-7. Configure the tag in sales taxes
+
+Configure the tag in sales taxes
 -----------------------------------
 
 This tag is used to set the tax type code, transferred or withhold, applicable
@@ -192,8 +202,9 @@ So, if the tax is a sale tax the "Tag" field should be "IVA", "ISR" or "IEPS".
 Note that the default taxes already has a tag assigned, but when you create a
 new tax you should choose a tag.
 
+
 Usage and testing
-~~~~~~~~~~~~~~~~~
+=================
 
 Invoicing
 ---------
@@ -221,6 +232,7 @@ like.
 .. image:: media/mexico09.png
    :align: center
 
+
 Cancelling invoices
 -------------------
 
@@ -228,23 +240,19 @@ The cancellation process is completely linked to the normal cancellation in Odoo
 
 If the invoice is not paid.
 
-- Go to to the customer invoice journal where the invoice belong to
+- Go to to the customer invoice journal where the invoice belong to.
 
   .. image:: media/mexico28.png
-   :align: center
 
   .. image:: media/mexico29.png
-   :align: center
 
-- Check the "Allow cancelling entries" field
+- Check the "Allow cancelling entries" field.
 
   .. image:: media/mexico29.png
-   :align: center
 
-- Go back to your invoice and click on the button "Cancel Invoice"
+- Go back to your invoice and click on the button "Cancel Invoice".
 
   .. image:: media/mexico30.png
-   :align: center
 
 - For security reasons it is recommendable return the check on the to allow
   cancelling to false again, then go to the journal and un check such field.
@@ -259,13 +267,14 @@ If the invoice is not paid.
   cancel such document, this payments must be cancelled to following the same
   approach but setting the "Allow Cancel Entries" in the payment itself.
 
+
 Payments (Just available for CFDI 3.3)
 --------------------------------------
 
 To generate the payment complement you only need to follow the normal payment
 process in Odoo, this considerations to understand the behavior are important.
 
-1. To generate payment complement the payment term in the invoice must be
+#. To generate payment complement the payment term in the invoice must be
    PPD, because It is the expected behavior legally required for
    "Cash payment".
 
@@ -297,26 +306,27 @@ process in Odoo, this considerations to understand the behavior are important.
      ``30% Advance End of Following Month``, this is an installments term,
      then the attribute ``MetodoPago`` will be ``PPD``.
 
-2. To test a normal signed payment just create an invoice with payment term
+#. To test a normal signed payment just create an invoice with payment term
    ``30% Advance End of Following Month`` and then register a payment to it.
-3. You must print the payment in order to retrieve the PDF properly.
+#. You must print the payment in order to retrieve the PDF properly.
-4. Regarding the "Payments in Advance" you must create a proper invoice with
+#. Regarding the "Payments in Advance" you must create a proper invoice with
    the payment in advance itself as a product line setting the proper SAT code
    following the procedure on the official documentation `given by the SAT`_
    in the section **Apéndice 2 Procedimiento para la emisión de los CFDI en el
    caso de anticipos recibidos**.
-5. Related to topic 4 it is blocked the possibility to create a Customer
+#. Related to topic 4 it is blocked the possibility to create a Customer
    Payment without a proper invoice.
 
+
 Accounting
 ----------
 The accounting for Mexico in odoo is composed by 3 reports:
 
-1. Chart of Account (Called and shown as COA).
+#. Chart of Account (Called and shown as COA).
-2. Electronic Trial Balance.
+#. Electronic Trial Balance.
-3. DIOT report.
+#. DIOT report.
 
-1 and 2 are considered as the electronic accounting, and the DIOT is a report
+1. and 2. are considered as the electronic accounting, and the DIOT is a report
 only available on the context of the accounting.
 
 You can find all those reports in the original report menu on Accounting app.
@@ -324,8 +334,9 @@ You can find all those reports in the original report menu on Accounting app.
 .. image:: media/mexico16.png
    :align: center
 
+
 Electronic Accounting (Requires Accounting App)
-===============================================
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Electronic Chart of account CoA
 -------------------------------
@@ -337,7 +348,8 @@ button **Export for SAT (XML)**
 .. image:: media/mexico19.png
    :align: center
 
-**How to add new accounts?**
+How to add new accounts ?
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If you add an account with the coding convention NNN.YY.ZZ where NNN.YY is a
 SAT coding group then your account will be automatically configured.
@@ -352,7 +364,8 @@ xml.
 .. image:: media/mexico20.png
    :align: center
 
-**What is the meaning of the tag?**
+What is the meaning of the tag ?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 To know all possible tags you can read the `Anexo 24`_ in the SAT
 website on the section called **Código agrupador de cuentas del SAT**.
@@ -363,6 +376,7 @@ website on the section called **Código agrupador de cuentas del SAT**.
    your database) then you will have the more common tags if the tag you need
    is not created you can create one on the fly.
 
+
 Electronic Trial Balance
 ------------------------
 
@@ -378,10 +392,12 @@ period you want to export.
 All the normal auditory and analysis features are available here also as any
 regular Odoo Report.
 
-DIOT Report (Requires Accounting App)
-=====================================
 
-**What is the DIOT and the importance of presenting it SAT**
+DIOT Report (Requires Accounting App)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+What is the DIOT and the importance of presenting it SAT
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 When it comes to procedures with the SAT Administration Service we know that
 we should not neglect what we present. So that things should not happen in Odoo.
@@ -395,7 +411,8 @@ This applies both to individuals and to the moral as well, so if we have VAT
 for submitting to the SAT and also dealing with suppliers it is necessary to.
 submit the DIOT:
 
-**When to file the DIOT and in what format?**
+When to file the DIOT and in what format ?
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 It is simple to present the DIOT, since like all format this you can obtain
 it in the page of the SAT, it is the electronic format A-29 that you can find
@@ -406,7 +423,8 @@ present the DIOT, just as we do with VAT, so that if in January we have deals
 with suppliers, by February we must present the information pertinent to
 said data.
 
-**Where the DIOT is presented?**
+Where the DIOT is presented ?
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 You can present DIOT in different ways, it is up to you which one you will
 choose and which will be more comfortable for you than you will present every
@@ -421,7 +439,8 @@ address, these records can be presented in a digital storage medium such as a
 CD or USB, which once validated you will be returned, so do not doubt that you
 will still have these records and of course, your CD or USB.
 
-**One more fact to know: the Batch load?**
+One more fact to know: the Batch load ?
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 When reviewing the official SAT documents on DIOT, you will find the Batch
 load, and of course the first thing we think is what is that ?, and according
@@ -441,29 +460,28 @@ Third Parties.
 
 You can find the `official information here`_.
 
-**How Generate this report in odoo?**
+How Generate this report in Odoo ?
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-- Go to  :menuselection:`Accounting --> Reports --> Mexico --> Transactions with third partied (DIOT)`.
+#. Go to :menuselection:`Accounting --> Reports --> Mexico --> Transactions with third partied (DIOT)`.
 
    .. image:: media/mexico23.png
-   :align: center
 
-- A report view is shown, select last month to report the immediate before
+#. A report view is shown, select last month to report the immediate before
    month you are or left the current month if it suits to you.
 
    .. image:: media/mexico25.png
-   :align: center
 
-- Click on "Export (TXT).
+#. Click on "Export (TXT).
 
    .. image:: media/mexico24.png
-   :align: center
 
-- Save in a secure place the downloaded file and go to SAT website and follow
+#. Save in a secure place the downloaded file and go to SAT website and follow
    the necessary steps to declare it.
 
-Important considerations on your Supplier and Invice data for the DIOT
+
-======================================================================
+Important considerations on your Supplier and Invoice data for the DIOT
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 - All suppliers must have set the fields on the accounting tab called "DIOT
   Information", the *L10N Mx Nationality* field is filled with just select the
@@ -471,7 +489,6 @@ Important considerations on your Supplier and Invice data for the DIOT
   the *L10N Mx Type Of Operation* must be filled by you in all your suppliers.
 
   .. image:: media/mexico22.png
-   :align: center
 
 - There are 3 options of VAT for this report, 16%, 0% and exempt, an invoice
   line in odoo is considered exempt if no tax on it, the other 2 taxes are
@@ -494,8 +511,9 @@ partners are correctly set.
 .. image:: media/mexico26.png
    :align: center
 
+
 Extra Recommended features
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+==========================
 
 Contact Module (Free)
 ---------------------
@@ -504,6 +522,7 @@ If you want to administer properly your customers, suppliers and addresses
 this module even if it is not a technical need, it is highly recommended to
 install.
 
+
 Multi currency (Requires Accounting App)
 ----------------------------------------
 
@@ -519,6 +538,7 @@ Go to settings and enable the multi currency feature.
 .. image:: media/mexico17.png
    :align: center
 
+
 Enabling Explicit errors on the CFDI using the XSD local validator (CFDI 3.3)
 -----------------------------------------------------------------------------
 
@@ -550,7 +570,7 @@ generic one with no explanation.
       '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_TipoRelacion' does
       not resolve to a(n) simple type definition., line 36
 
-   This can be caused because of a database backup restored in anothe server,
+   This can be caused by a database backup restored in anothe server,
    or when the XSD files are not correctly downloaded. Follow the same steps
    as above but:
 
@@ -559,26 +579,34 @@ generic one with no explanation.
 
 
 FAQ
-~~~
+===
 
-- **Error message** (Only applicable on CFDI 3.3):
+- **Error messages** (Only applicable on CFDI 3.3):
 
-:9:0:ERROR:SCHEMASV:SCHEMAV_CVC_MINLENGTH_VALID: Element '{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': [facet 'minLength'] The value '' has a length of '0'; this underruns the allowed minimum length of '1'.
+  - 9:0:ERROR:SCHEMASV:SCHEMAV_CVC_MINLENGTH_VALID: Element
+    '{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion':
+    [facet 'minLength'] The value '' has a length of '0'; this underruns
+    the allowed minimum length of '1'.
 
-:9:0:ERROR:SCHEMASV:SCHEMAV_CVC_PATTERN_VALID: Element '{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion': [facet 'pattern'] The value '' is not accepted by the pattern '[^|]{1,100}'.
+  - 9:0:ERROR:SCHEMASV:SCHEMAV_CVC_PATTERN_VALID: Element
+    '{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion':
+    [facet 'pattern'] The value '' is not accepted by the pattern '[^|]{1,100}'.
 
-.. tip::
+  **Solution**:
-   **Solution:** You forget to set the proper "Reference" field in the product,
+  You forgot to set the proper "Reference" field in the product,
   please go to the product form and set your internal reference properly.
 
-- **Error message**:
+- **Error messages**:
 
-:6:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}RegimenFiscal': The attribute 'Regimen' is required but missing.
+  - 6:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element
+    '{http://www.sat.gob.mx/cfd/3}RegimenFiscal': The attribute 'Regimen' is
+    required but missing.
 
-:5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'RegimenFiscal' is required but missing.
+  - 5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element
+    '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'RegimenFiscal' is required but missing.
 
-.. tip::
+  **Solution**:
-   **Solution:** You forget to set the proper "Fiscal Position" on the
+  You forget to set the proper "Fiscal Position" on the
   partner of the company, go to customers, remove the customer filter and
   look for the partner called as your company and set the proper fiscal
   position which is the kind of business you company does related to SAT
@@ -590,30 +618,37 @@ FAQ
   601, it will look like the image.
 
   .. image:: media/mexico27.png
-   :align: center
 
   .. tip::
-   For testing purposes this value must be *601 - General de Ley Personas Morales*
+     For testing purposes this value must be set to ``601 - General de Ley
-   which is the one required for the demo VAT.
+     Personas Morales`` which is the one required for the demo VAT.
 
 - **Error message**:
 
-:2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'FormaPago': [facet 'enumeration'] The value '' is not an element of the set {'01', '02', '03', '04', '05', '06', '08', '12', '13', '14', '15', '17', '23', '24', '25', '26', '27', '28', '29', '30', '99'}
+  - 2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element
+    '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'FormaPago':
+    [facet 'enumeration'] The value '' is not an element of the set
+    {'01', '02', '03', '04', '05', '06', '08', '12', '13', '14', '15', '17',
+    '23', '24', '25', '26', '27', '28', '29', '30', '99'}
 
-.. tip::
+  **Solution**:
-   **Solution:** The payment method is required on your invoice.
+  The payment method is required on your invoice.
 
   .. image:: media/mexico31.png
-   :align: center
 
-- **Error message**:
+- **Error messages**:
 
-:2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': [facet 'enumeration'] The value '' is not an element of the set {'00
+  - 2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element
-:2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': '' is not a valid value of the atomic type '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'.
+    '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion':
-:5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'Rfc' is required but missing.
+    [facet 'enumeration'] The value '' is not an element of the set {'00
+  - 2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element
+    '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion':
+    '' is not a valid value of the atomic type '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'.
+  - 5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element
+    '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'Rfc' is required but missing.
 
-.. tip::
+  **Solution**:
-   **Solution:** You must set the address on your company properly, this is a
+  You must set the address on your company properly, this is a
   mandatory group of fields, you can go to your company configuration on
   :menuselection:`Settings --> Users & Companies --> Companies` and fill
   all the required fields for your address following the step
@@ -621,31 +656,36 @@ FAQ
 
 - **Error message**:
 
-:2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': '' is not a valid value of the atomic type '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'.
+  - 2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element
+    '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion':
+    '' is not a valid value of the atomic type
+    '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'.
 
-.. tip::
+  **Solution**:
-   **Solution:** The postal code on your company address is not a valid one
+  The postal code on your company address is not a valid one
   for Mexico, fix it.
 
   .. image:: media/mexico32.png
-   :align: center
 
-- **Error message**:
+- **Error messages**:
 
-:18:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is required but missing.
+  - 18:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element
-:34:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element '{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is required but missing.", '')
+    '{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is
+    required but missing.
+  - 34:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element
+    '{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is
+    required but missing.", '')
 
-.. tip::
+  **Solution**:
-   **Solution:** Set the mexican name for the tax 0% and 16% in your system
+  Set the mexican name for the tax 0% and 16% in your system
   and used on the invoice.
 
   Your tax which represent the VAT 16% and 0% must have the "Factor Type" field
   set to "Tasa".
 
   .. image:: media/mexico12.png
-   :align: center
+
   .. image:: media/mexico13.png
-   :align: center
 
 .. _SAT: http://www.sat.gob.mx/fichas_tematicas/buzon_tributario/Documents/Anexo24_05012015.pdf
 .. _Finkok: https://www.finkok.com/contacto.html

accounting/localizations/switzerland.rst

@@ -3,7 +3,7 @@ Switzerland
 ===========
 
 ISR (In-payment Slip with Reference number)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+===========================================
 
 The ISRs are payment slips used in Switzerland. You can print them
 directly from Odoo. On the customer invoices, there is a new button
@@ -35,7 +35,7 @@ and tick this box :
     :align: center
 
 Currency Rate Live Update
-~~~~~~~~~~~~~~~~~~~~~~~~~
+=========================
 
 You can update automatically your currencies rates based on the Federal
 Tax Administration from Switzerland. For this, go in
@@ -46,7 +46,7 @@ you want.
     :align: center
 
 Updated VAT for January 2018
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+============================
 
 Starting from the 1st January 2018, new reduced VAT rates will be
 applied in Switzerland. The normal 8.0% rate will switch to 7.7% and the

accounting/others/adviser/assets.rst

@@ -79,13 +79,6 @@ before confirming the asset.
    depreciation journal entries, not those related to the supplier
    bill.
 
-Explanation of the fields:
-
-.. demo:fields:: account_asset.action_account_asset_asset_form
-
-.. demo:action:: account_asset.action_account_asset_asset_form
-
-   Try creating an *Asset* in our online demonstration
 
 Create assets automatically from a supplier bill
 ================================================

accounting/others/adviser/budget.rst

@@ -133,14 +133,12 @@ You can check your budget at any time. To see the evolution, let's book
 some Invoices and Vendors Bills.
 
 .. tip::
-	
+   If you use analytical accounts remember that you need to specify the account in the invoice
-	if you use analytical accounts remember that you need to specify the account in the invoice and / or purchase line.
+   and/or purchase line.
 
 .. seealso::
-
+   For more information about booking invoices and purchase orders see
-	for more information about booking invoices and purchase orders see:
+   :doc:`../../receivables/customer_invoices/overview`
-
-	* :doc:`../../receivables/customer_invoices/overview`
 
 Go back in the budget list and find the Smith Project.
 
@@ -152,7 +150,6 @@ purchase lines booked in the accounts and will display them in the
    :align: center
 
 .. note::
-
    The theoretical amount represents the amount of money you theoretically could
    have spend / should have received in function of the date. When your budget
    is 1200 for 12 months (january to december), and today is 31 of january, the

accounting/others/analytic/purchases_expenses.rst

@@ -123,7 +123,6 @@ correct analytical account. We simply need to create the correct vendors
 product.
 
 .. note::
-
    You can also track cost with timesheets, see: :doc:`timesheets`
 
 Track costs in accounting
@@ -142,7 +141,6 @@ button to have an overview of all cost linked to the account.
    :align: center
 
 .. note::
-
    If you would like to have the revenue as well you should
    invoice the Consulting Pack in the Invoice menu and link the invoice
    line to this same analytical account.

accounting/others/analytic/timesheets.rst

@@ -73,11 +73,7 @@ of measures.
    :align: center
 
 For more information on how to create a sales order based on time and
-material please see: *How to invoice based on time and material* (Work in Progress).
+material please see :doc:`../../../sales/invoicing/time_materials`.
-
-.. todo::
-    Add a link, and the document is under 
-    Sales --> Invoicing Methods --> Services --> How to invoices blabla
 
 We save a Sales Order with the service product **External Consulting**. An
 analytical account will automatically be generated once the **Sales Order**

accounting/others/configuration/account_type.rst

@@ -68,9 +68,7 @@ It will install generic accounts. But if it does not cover all your
 cases, you can create your own accounts too.
 
 .. note::
-
+   If you are a Saas User, your country chart of account is automatically installed.
-	If you are a Saas User, your country chart of account is
-	automatically installed.
 
 To create a new accounts, go to the Accounting application. Open the
 menu :menuselection:`Adviser --> Chart of Accounts`, the click on the

accounting/others/inventory.rst

@@ -6,6 +6,5 @@ Inventory
    :titlesonly:
 
    inventory/avg_price_valuation
-   ../../../inventory/management/reporting/valuation_methods_continental
+   ../../../inventory/management/reporting/inventory_valuation_config
-   ../../../inventory/management/reporting/valuation_methods_anglo_saxon
 

accounting/others/multicurrencies/how_it_works.rst

@@ -74,7 +74,6 @@ are set !
    :align: center
 
 .. note::
-
    Only the **active** currencies are updated
 
 Configure your charts of account
@@ -136,8 +135,8 @@ the whole document.
 Payment Registrations
 ---------------------
 
-In the accounting application, go to **Sales > Payments**. Register the
+In the accounting application, go to :menuselection:`Sales --> Payments`. Register the payment and
-payment and set the currency.
+set the currency.
 
 .. image:: media/works12.png
    :align: center
@@ -166,6 +165,5 @@ journal entries. All the exchange rates differences are recorded in it.
    :align: center
 
 .. seealso::
-
    * :doc:`invoices_payments`
    * :doc:`exchange`

accounting/others/multicurrencies/invoices_payments.rst

@@ -115,6 +115,5 @@ Difference** journal entries. All the exchange rates differences are recorded in
    :align: center
 
 .. seealso::
-	
    * :doc:`how_it_works`
    * :doc:`exchange`

accounting/overview/main_concepts/in_odoo.rst

@@ -16,8 +16,8 @@ Odoo uses the rules of double-entry bookkeeping system: all journal
 entries are automatically balanced (sum of debits = sum of credits).
 
 .. seealso::
-
+   - `Understand Odoo's accounting transactions per document
-	`Understand Odoo's accounting transactions per document <https://odoo.com/documentation/functional/accounting.html>`__
+     <https://odoo.com/documentation/functional/accounting.html>`_
 
 Accrual and Cash Basis Methods
 ==============================
@@ -65,8 +65,6 @@ In particular, Odoo's core accounting engine supports:
   sold/delivered.
 * European accounting where expenses are accounted at the supplier
   bill.
-* Storno accounting (Italy) where refund invoices have negative
-  credit/debit instead of a reverting the original journal items.
 
 Odoo also have modules to comply with IFRS rules.
 
@@ -130,8 +128,8 @@ inventory valuations. The available methods are standard price,
 average price, LIFO (for countries allowing it) and FIFO.
 
 .. seealso::
-
+   - `View impact of the valuation method on your transactions
-	`View impact of the valuation method on your transactions <https://odoo.com/documentation/functional/valuation.html>`__
+     <https://odoo.com/documentation/functional/valuation.html>`_
 
 Easy retained earnings
 ======================

accounting/payables/misc/employee_expense.rst

@@ -166,11 +166,8 @@ order. (or it will be done automatically at the end of the week/month if
 you invoice all your orders in batch)
 
 
-.. todo::
+.. seealso::
-
+   - :doc:`../../../sales/invoicing/expense`
-	tip
-	If you want to learn more; check the documentation page :doc: ../../../sale/invoicing/service/expense
-	`*How to re-invoice expenses to your customers* <https://docs.google.com/document/d/1_6VclRWfESHfvNPZI32q5ANFi2C7cCTwkLXpbGTz6B8/edit?usp=sharing>`__
 
 Reimburse the employee
 ----------------------
@@ -204,5 +201,4 @@ options:
    account for this invoice.
 
 .. seealso::
-
+   - :doc:`forecast`
-	* :doc:`forecast`

accounting/payables/pay/check.rst

@@ -20,7 +20,6 @@ country. As an example, the **U.S. Check Printing** module is required to
 print U.S. checks.
 
 .. note::
-
    According to your country and the chart of account you use, those
    modules may be installed by default. (example: United States users have
    nothing to install, it's configured by default).
@@ -79,8 +78,6 @@ Explanation of the fields of the payment screen:
 
    Try paying a supplier bill with a check
 
-.. _PrintChecks:
-
 Print checks
 ------------
 
@@ -101,9 +98,7 @@ Print Check from the top "print" menu.
 .. image:: ./media/check03.png
   :align: center
 
-.. _ReconicleBankStatements:
+Reconcile bank statements
-
-Reconcile Bank Statements
 -------------------------
 
 Once you process your bank statement, when the check is credited from
@@ -111,8 +106,7 @@ your bank account, Odoo will propose you automatically to match it with
 the payment. This will mark the payment as **Reconciled**.
 
 .. tip::
-
+   To review checks that have not been credited, open the list of
-	to review checks that have not been credited, open the list of
    payments and filter on the Sent state. Review those payments that have a
    date more than 2 weeks ago.
 
@@ -133,6 +127,5 @@ Once your payment by check is registered, don't forget to **Confirm** it.
 Once confirmed, you can use **Print Check** directly or follow the preceding
 flow to print checks in batch:
 
--  `Print checks <PrintChecks_>`_
+-  `Print checks`_
-
+-  `Reconcile bank statements`_
--  `Reconcile bank statements <ReconicleBankStatements_>`_

accounting/payables/pay/multiple.rst

@@ -97,10 +97,7 @@ can reconcile the transaction from the Dashboard. It will automatically
 map the transaction amount.
 
 .. seealso::
-	
+   - :doc:`../../bank/reconciliation/use_cases`
-	For more detail on the bank reconciliation process, please read:
-
-	* :doc:`../../bank/reconciliation/use_cases`
 
 Partial payments of several supplier bills
 ==========================================
@@ -147,8 +144,5 @@ model for cash discount.
 Now we are going back to bank statement and opening reconcile view.
 
 .. seealso::
-
+   - :doc:`../../bank/reconciliation/configure`
-	For bank statement reconciliation with model option, see
-
-	* :doc:`../../bank/reconciliation/configure`
 

accounting/payables/pay/sepa.rst

@@ -33,7 +33,6 @@ module. This module handle the process of generating SEPA files based on
 Odoo payments.
 
 .. note::
-
    According to your country and the chart of account you use, this module may
    be installed by default.
 
@@ -54,7 +53,6 @@ won't work with SEPA) and the BIC (bank identifier code) on your bank
 journal.
 
 .. note::
-
    By default, the payments you send using SEPA will use your company name as
    initiating party name. This is what appears on the recipient's bank statement
    in the **payment from** field. You can customize it in your company settings,
@@ -128,8 +126,6 @@ account for the partner you are paying but forgot to fill in the BIC
 field.
 
 .. seealso::
-
+   - :doc:`check`
-	* :doc:`check`
+   - :doc:`../../bank/setup/create_bank_account`
-
+   - :doc:`../../bank/reconciliation/use_cases`
-	.. todo:: How to define a new bank?
-	.. todo:: How to reconcile bank statements?

accounting/payables/supplier_bills.rst

@@ -7,3 +7,4 @@ Vendor Bills
 
    supplier_bills/manage
    supplier_bills/bills_or_receipts
+   supplier_bills/deferred_expenses

accounting/payables/supplier_bills/deferred_expenses.rst

@@ -0,0 +1,193 @@
+=================================
+Deferred Expenses and Prepayments
+=================================
+
+**Deferred expenses** and **prepayments** (also known as **prepaid expense**), are both costs that
+have already occurred for unconsumed products or services yet to receive.
+
+Such costs are **assets** for the company that pays them since it already paid for products and
+services still to receive or that are yet to be used. The company cannot report them on the current
+**Profit and Loss statement**, or *Income Statement*, since the payments will be effectively
+expensed in the future.
+
+These future expenses must be deferred on the company's balance sheet until the moment in time they
+can be **recognized**, at once or over a defined period, on the Profit and Loss statement.
+
+For example, let's say we pay $ 1200 at once for one year of insurance. We already pay the cost now
+but haven't used the service yet. Therefore, we post this new expense in a *prepayment account* and
+decide to recognize it on a monthly basis. Each month, for the next 12 months, $ 100 will be
+recognized as an expense.
+
+Odoo Accounting handles deferred expenses and prepayments by spreading them in multiple entries that
+are automatically created in *draft mode* and then posted periodically.
+
+.. note::
+   The server checks once a day if an entry must be posted. It might then take up to 24 hours before
+   you see a change from *draft* to *posted*.
+
+Prerequisites
+=============
+
+Such transactions must be posted on a **Deferred Expense Account** rather than on the default
+expense account.
+
+Configure a Deferred Expense Account
+------------------------------------
+
+To configure your account in the **Chart of Accounts**, go to :menuselection:`Accounting -->
+Configuration --> Chart of Accounts`, click on *Create*, and fill out the form.
+
+.. image:: media/deferred_expenses01.png
+   :align: center
+   :alt: Configuration of a Deferred Expense Account in Odoo Accounting
+
+.. note::
+   This account's type must be either *Current Assets* or *Prepayments*
+
+Post an expense to the right account
+------------------------------------
+
+Select the account on a draft bill
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+On a draft bill, select the right account for all the products of which the expenses must be
+deferred.
+
+.. image:: media/deferred_expenses02.png
+   :align: center
+   :alt: Selection of a Deferred Expense Account on a draft bill in Odoo Accounting
+
+Choose a different Expense Account for specific products
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Start editing the product, go to the *Accounting* tab, select the right **Expense Account**, and
+save.
+
+.. image:: media/deferred_expenses03.png
+   :align: center
+   :alt: Change of the Expense Account for a product in Odoo
+
+.. tip::
+   It is possible to automate the creation of expense entries for these products (see:
+   `Automate the Deferred Expenses`_).
+
+Change the account of a posted journal item
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To do so, open your Purchases Journal by going to :menuselection:`Accounting --> Accounting -->
+Purchases`, select the journal item you want to modify, click on the account, and select the right
+one.
+
+.. image:: media/deferred_expenses04.png
+   :align: center
+   :alt: Modification of a posted journal item's account in Odoo Accounting
+
+Deferred Expenses entries
+=========================
+
+Create a new entry
+------------------
+
+A **Deferred Expense entry** automatically generates all journal entries in *draft mode*. They are
+then posted one by one at the right time until the full amount of the expense is recognized.
+
+To create a new entry, go to :menuselection:`Accounting --> Accounting --> Deferred Expense`, click
+on *Create*, and fill out the form.
+
+Click on **select related purchases** to link an existing journal item to this new entry. Some
+fields are then automatically filled out, and the journal item is now listed under the **Related
+Expenses** tab.
+
+.. image:: media/deferred_expenses05.png
+   :align: center
+   :alt: Deferred Expense entry in Odoo Accounting
+
+Once done, you can click on *Compute Deferral* (next to the *Confirm* button) to generate all the
+values of the **Expense Board**. This board shows you all the entries that Odoo will post to
+recognize your expense, and at which date.
+
+.. image:: media/deferred_expenses06.png
+   :align: center
+   :alt: Expense Board in Odoo Accounting
+
+What does "Prorata Temporis" mean?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The **Prorata Temporis** feature is useful to recognize your expense the most accurately possible.
+
+With this feature, the first entry on the Expense Board is computed based on the time left between
+the *Prorata Date* and the *First Recognition Date* rather than the default amount of time between
+recognitions.
+
+For example, the Expense Board above has its first expense with an amount of $ 70.97 rather than
+$ 100.00. Consequently, the last entry is also lower and has an amount of $ 29.03.
+
+Deferred Entry from the Purchases Journal
+-----------------------------------------
+
+You can create a deferred entry from a specific journal item in your **Purchases Journal**.
+
+To do so, open your Purchases Journal by going to :menuselection:`Accounting --> Accounting -->
+Purchases`, and select the journal item you want to defer. Make sure that it is posted in the right
+account (see: `Change the account of a posted journal item`_).
+
+Then, click on *Action*, select **Create Deferred Entry**, and fill out the form the same way you
+would do to `create a new entry`_.
+
+.. image:: media/deferred_expenses07.png
+   :align: center
+   :alt: Create Deferred Entry from a journal item in Odoo Accounting
+
+Deferred Expense Models
+=======================
+
+You can create **Deferred Expense Models** to create your Deferred Expense entries faster.
+
+To create a model, go to :menuselection:`Accounting → Configuration --> Deferred Expense Models`,
+click on *Create*, and fill out the form the same way you would do to create a new entry.
+
+.. tip::
+   You can also convert a *confirmed Deferred Expense entry* into a model by opening it from
+   :menuselection:`Accounting --> Accounting --> Deferred Expenses` and then, by clicking on the
+   button *Save Model*.
+
+Apply a Deferred Expense Model to a new entry
+---------------------------------------------
+
+When you create a new Deferred Expense entry,  fill out the **Deferred Expense Account** with the
+right recognition account.
+
+New buttons with all the models linked to that account appear at the top of the form. Clicking on a
+model button fills out the form according to that model.
+
+.. image:: media/deferred_expenses08.png
+   :align: center
+   :alt: Deferred Expense model button in Odoo Accounting
+
+Automate the Deferred Expenses
+==============================
+
+When you create or edit an account of which the type is either *Current Assets* or *Prepayments*,
+you can configure it to defer the expenses that are credited on it automatically.
+
+You have three choices for the **Automate Deferred Expense** field:
+
+#. **No:** this is the default value. Nothing happens.
+#. **Create in draft:** whenever a transaction is posted on the account, a draft *Deferred Expenses
+   entry* is created, but not validated. You must first fill out the form in
+   :menuselection:`Accounting --> Accounting --> Deferred Expenses`.
+#. **Create and validate:** you must also select a Deferred Expense Model (see: `Deferred Expense
+   Models`_). Whenever a transaction is posted on the account, a *Deferred Expenses entry* is
+   created and immediately validated.
+
+.. image:: media/deferred_expenses09.png
+   :align: center
+   :alt: Automate Deferred Expense on an account in Odoo Accounting
+
+.. tip::
+   You can, for example, select this account as the default **Expense Account** of a product to
+   fully automate its sale completely. (see: `Choose a different Expense Account for specific
+   products`_).
+
+.. seealso::
+   * :doc:`../../others/configuration/account_type`

accounting/payables/supplier_bills/manage.rst

@@ -61,7 +61,6 @@ since it is important:
   products under either of these designations.
 
 .. tip::
-
    It is recommended that you create a **Miscellaneous** product for all purchases
    that occur infrequently and do not require inventory valuation or management.
    If you create such a product, it is recommended to set the product type to **Service**.
@@ -146,11 +145,10 @@ need (i.e. remove or add product lines, modify quantities, and change
 prices).
 
 .. note::
-
    Your vendor may send you several bills for the same Purchase Order if:
 
-	1. Your vendor is in back-order and is sending you invoices as they ship the products.
+   #. Your vendor is in back-order and is sending you invoices as they ship the products.
-	2. Your vendor is sending you a partial bill or asking for a deposit.
+   #. Your vendor is sending you a partial bill or asking for a deposit.
 
 Every time you record a new vendor bill, Odoo will automatically
 populate the product quantities based on what has been received from the

accounting/receivables/customer_invoices/deferred_revenues.rst

@@ -1,54 +1,56 @@
 =================
 Deferred Revenues
 =================
-**Deferred revenues**, or **unearned revenue**, are payments made in advance
-by  customers for products yet to deliver or services yet to render.
 
-Such payments are a **liability** for the company that receives 
+**Deferred revenues**, or **unearned revenue**, are payments made in advance by customers for
-them since it still owes its customers these products or services.
+products yet to deliver or services yet to render.
-The company cannot report them on the current **Profit and Loss statement**, 
-or *Income Statement*, since the payments will be effectively 
-earned in the future.
 
-These future revenues must be deferred on the company's balance sheet
+Such payments are a **liability** for the company that receives them since it still owes its
-until the moment in time they can be **recognized**, at once or over a
+customers these products or services. The company cannot report them on the current **Profit and
-defined period, on the Profit and Loss statement. 
+Loss statement**, or *Income Statement*, since the payments will be effectively earned in the future.
 
-For example, let's say we sell a five-year extended warranty for $ 350.
+These future revenues must be deferred on the company's balance sheet until the moment in time they
-We already receive the money now but haven't earned it yet. Therefore, 
+can be **recognized**, at once or over a defined period, on the Profit and Loss statement.
-we post this new income in a deferred revenue account and decide to
-recognize it on a yearly basis. Each year, for the next 5 years, $ 70 
-will be recognized as revenue.
 
-Odoo Accounting handles deferred revenues by spreading them in multiple
+For example, let's say we sell a five-year extended warranty for $ 350. We already receive the money
-entries that are automatically created periodically.
+now but haven't earned it yet. Therefore, we post this new income in a deferred revenue account and
+decide to recognize it on a yearly basis. Each year, for the next 5 years, $ 70 will be recognized
+as revenue.
 
+Odoo Accounting handles deferred revenues by spreading them in multiple entries that are
+automatically created in *draft mode* and then posted periodically.
+
+.. note::
+   The server checks once a day if an entry must be posted. It might then take up to 24 hours before
+   you see a change from *draft* to *posted*.
 
 Prerequisites
 =============
-Such transactions must be posted on a **Deferred Revenue Account** rather than
+
-on the default income account.
+Such transactions must be posted on a **Deferred Revenue Account** rather than on the default income
+account.
 
 Configure a Deferred Revenue Account
 ------------------------------------
-To configure your account in the **Chart of Accounts**,
+
-go to :menuselection:`Accounting --> Configuration --> Chart of Accounts`,
+To configure your account in the **Chart of Accounts**, go to :menuselection:`Accounting -->
-click on *Create*, and fill out the form.
+Configuration --> Chart of Accounts`, click on *Create*, and fill out the form.
 
 .. image:: media/deferred_revenues01.png
    :align: center
    :alt: Configuration of a Deferred Revenue Account in Odoo Accounting
 
 .. note::
-   This account's type must be either *Current Liabilities* or *Non-current
+   This account's type must be either *Current Liabilities* or *Non-current Liabilities*
-   Liabilities*
    
 Post an income to the right account
 -----------------------------------
+
 Select the account on a draft invoice
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-On a draft invoice, select the right account for all the products of which the 
+
-incomes must be deferred.
+On a draft invoice, select the right account for all the products of which the incomes must be
+deferred.
 
 .. image:: media/deferred_revenues02.png
    :align: center
@@ -56,19 +58,21 @@ incomes must be deferred.
 
 Choose a different Income Account for specific products
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Start editing the product, go to the *Accounting* tab, select the right
+
-**Income Account**, and save. 
+Start editing the product, go to the *Accounting* tab, select the right **Income Account**, and
+save.
 
 .. image:: media/deferred_revenues03.png
    :align: center
    :alt: Change of the Income Account for a product in Odoo 
 
 .. tip::
-   It is possible to automate the creation of revenue entries for these products
+   It is possible to automate the creation of revenue entries for these products (see:
-   (see: `Automate the Deferred Revenues`_).
+   `Automate the Deferred Revenues`_).
 
 Change the account of a posted journal item
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 To do so, open your Sales Journal by going to
 :menuselection:`Accounting --> Accounting --> Sales`, select the journal item you
 want to modify, click on the account, and select the right one. 
@@ -77,29 +81,29 @@ want to modify, click on the account, and select the right one.
    :align: center
    :alt: Modification of a posted journal item's account in Odoo Accounting 
 
-
 Deferred Revenues entries
 =========================
+
 Create a new entry
 ------------------
-A **Deferred Revenues entry** automatically generates journal entries at 
-the right time until the full amount of the income is recognized.
 
-To create a new entry, go to :menuselection:`Accounting --> Accounting --> Deferred
+A **Deferred Revenues entry** automatically generates all journal entries in *draft mode*. They are
-Revenues`, click on *Create*, and fill out the form.
+then posted one by one at the right time until the full amount of the income is recognized.
 
-Click on **select related purchases** to link an existing journal item to
+To create a new entry, go to :menuselection:`Accounting --> Accounting --> Deferred Revenues`, click
-this new entry. Some fields are then automatically filled out, and the 
+on *Create*, and fill out the form.
-journal item is now listed under the **Related Sales** tab.
+
+Click on **select related purchases** to link an existing journal item to this new entry. Some
+fields are then automatically filled out, and the journal item is now listed under the **Related
+Sales** tab.
 
 .. image:: media/deferred_revenues05.png
    :align: center
    :alt: Deferred Revenue entry in Odoo Accounting
 
-Once done, you can click on *Compute Revenue* (next to the *Confirm*
+Once done, you can click on *Compute Revenue* (next to the *Confirm* button) to generate all the
-button) to generate all the values of the **Revenue Board**. This board
+values of the **Revenue Board**. This board shows you all the entries that Odoo will post to
-shows you all the entries that Odoo will post to recognize your
+recognize your revenue, and at which date.
-revenue, and at which date.
 
 .. image:: media/deferred_revenues06.png
    :align: center
@@ -107,56 +111,54 @@ revenue, and at which date.
    
 What does "Prorata Temporis" mean?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The **Prorata Temporis** feature is useful to recognize your revenue
-the most accurately possible. 
 
-With this feature, the first entry on the Revenue Board is computed based 
+The **Prorata Temporis** feature is useful to recognize your revenue the most accurately possible.
-on the time left between the *Prorata Date* and the *First Recognition Date* 
-rather than the default amount of time between recognitions.
 
-For example, the Revenue Board above has its first revenue with an amount of 
+With this feature, the first entry on the Revenue Board is computed based on the time left between
-$ 4.22 rather than $ 70.00. Consequently, the last entry is also lower and
+the *Prorata Date* and the *First Recognition Date* rather than the default amount of time between
-has an amount of $ 65.78.
+recognitions.
 
+For example, the Revenue Board above has its first revenue with an amount of $ 4.22 rather than
+$ 70.00. Consequently, the last entry is also lower and has an amount of $ 65.78.
 
 Deferred Entry from the Sales Journal
 -------------------------------------
+
 You can create a deferred entry from a specific journal item in your **Sales Journal**.
 
 To do so, open your Sales Journal by going to 
-:menuselection:`Accounting --> Accounting --> Sales`, and select the journal item you
+:menuselection:`Accounting --> Accounting --> Sales`, and select the journal item you want to defer.
-want to defer. Make sure that it is posted in the right account (see: `Change the
+Make sure that it is posted in the right account (see:
-account of a posted journal item`_).  
+`Change the account of a posted journal item`_).
 
-Then, click on *Action*, select **Create Deferred Entry**, and fill out the form the
+Then, click on *Action*, select **Create Deferred Entry**, and fill out the form the same way you
-same way you would do to `create a new entry`_.
+would do to `create a new entry`_.
 
 .. image:: media/deferred_revenues07.png
    :align: center
    :alt: Create Deferred Entry from a journal item in Odoo Accounting
 
-
 Deferred Revenue Models
 =======================
-You can create **Deferred Revenue Models** to create your Deferred Revenue
-entries faster.
 
-To create a model, go to :menuselection:`Accounting --> Configuration --> Deferred
+You can create **Deferred Revenue Models** to create your Deferred Revenue entries faster.
-Revenue Models`, click on *Create*, and fill out the form the same way you would
+
-do to create a new entry.
+To create a model, go to :menuselection:`Accounting --> Configuration --> Deferred Revenue Models`,
+click on *Create*, and fill out the form the same way you would do to create a new entry.
 
 .. tip::
    You can also convert a *confirmed Deferred Revenue entry* into a model by
    opening it from :menuselection:`Accounting --> Accounting --> Deferred
-   Revenues` and then, by clicking on the button **Save Model**.
+   Revenues` and then, by clicking on the button *Save Model*.
 
 Apply a Deferred Revenue Model to a new entry
 ---------------------------------------------
-When you create a new Deferred Revenue entry,  fill out the **Deferred Revenue
-Account** with the right recognition account.
 
-New buttons with all the models linked to that account appear at the top of the form.
+When you create a new Deferred Revenue entry,  fill out the **Deferred Revenue Account** with the
-Clicking on a model button fills out the form according to that model.
+right recognition account.
+
+New buttons with all the models linked to that account appear at the top of the form. Clicking on a
+model button fills out the form according to that model.
 
 .. image:: media/deferred_revenues08.png
    :align: center
@@ -164,29 +166,27 @@ Clicking on a model button fills out the form according to that model.
 
 Automate the Deferred Revenues
 ==============================
-When you create or edit an account of which the type is either *Current Liabilities*
+
-or *Non-current Liabilities*, you can configure it to defer the revenues that
+When you create or edit an account of which the type is either *Current Liabilities* or *Non-current
-are credited on it automatically.
+Liabilities*, you can configure it to defer the revenues that are credited on it automatically.
 
 You have three choices for the **Automate Deferred Revenue** field:
 
 #. **No:** this is the default value. Nothing happens.
-#. **Create in draft:** whenever a transaction is posted on the account, a draft
+#. **Create in draft:** whenever a transaction is posted on the account, a draft *Deferred Revenues
-   *Deferred Revenues entry* is created, but not validated. You must first
+   entry* is created, but not validated. You must first fill out the form in
-   fill out the form in :menuselection:`Accounting --> Accounting --> Deferred Revenues`.
+   :menuselection:`Accounting --> Accounting --> Deferred Revenues`.
-#. **Create and validate:** you must also select a Deferred Revenue Model
+#. **Create and validate:** you must also select a Deferred Revenue Model (see:
-   (see: `Deferred Revenue Models`_). Whenever a transaction is posted on
+   `Deferred Revenue Models`_). Whenever a transaction is posted on the account, a *Deferred
-   the account, a *Deferred Revenues entry* is created and immediately
+   Revenues entry* is created and immediately validated.
-   validated.
 
 .. image:: media/deferred_revenues09.png
    :align: center
    :alt: Automate Deferred Revenue on an account in Odoo Accounting
 
 .. tip::
-   You can, for example, select this account as the default **Income Account** 
+   You can, for example, select this account as the default **Income Account** of a product to fully
-   of a product to fully automate its sale completely. (see: `Choose a different
+   automate its sale completely. (see: `Choose a different Income Account for specific products`_).
-   Income Account for specific products`_).
 
 .. seealso::
    * :doc:`../../others/configuration/account_type`

accounting/receivables/customer_invoices/installment_plans.rst

@@ -11,8 +11,7 @@ Example, for a specific invoice:
 -  Pay the remaining balance within 30 days
 
 .. note::
-
+   Payment terms are not to be confused with a payment in several parts. If,
-	payment terms are not to be confused with a payment in several parts. If,
    for a specific order, you invoice the customer in two parts, that's not a
    payment term but an invoice policy.
 
@@ -20,7 +19,7 @@ Configuration
 =============
 
 Configure your usual installment plans from the application :menuselection:`Accounting -->
-Configuration > Payment Terms`.
+Configuration --> Payment Terms`.
 
 A payment term may have one line (eg: 21 days) or several lines (10%
 within 3 days and the balance within 21 days). If you create a payment
@@ -32,7 +31,6 @@ may not compute exactly 100%)
   :align: center
 
 .. tip::
-
    The description of the payment term will appear on the invoice or the sale order.
 
 Payment terms for customers
@@ -77,11 +75,9 @@ journal entry:
 | Income               |            |         | 100      |
 +----------------------+------------+---------+----------+
 
-On the customer statement, you will see two lines with different due
+On the customer statement, you will see two lines with different du dates. To get the customer
-dates. To get the customer statement, use the menu Sales > Customers
+statement, use the menu :menuselection:`Sales --> Customers Statement`.
-Statement.
 
 .. seealso::
-
+   - :doc:`overview`
-	* :doc:`overview`
+   - :doc:`payment_terms`
-	* :doc:`payment_terms`

accounting/receivables/customer_invoices/overview.rst

@@ -41,7 +41,8 @@ lines, invoice a fixed advance.
 
 This process is good for both services and physical products.
 
-.. todo:: Read more: *Invoice based on sales orders.*
+.. seealso::
+   - :doc:`../../../sales/invoicing/proforma`
 
 Sales Order ‣ Delivery Order ‣ Invoice
 --------------------------------------
@@ -56,7 +57,8 @@ really delivered. If you do back orders (deliver partially and the rest
 later), the customer will receive two invoices, one for each delivery
 order.
 
-.. todo:: Read more: *Invoice based on delivery orders.*
+.. seealso::
+   - :doc:`../../../sales/invoicing/invoicing_policy`
 
 eCommerce Order ‣ Invoice
 -------------------------
@@ -79,11 +81,8 @@ salesperson will trigger invoice based on activities on the contract.
 Activities can be:
 
 -  fixed products/services, coming from a sale order linked to this contract
-
+-  materials purchased (that you will re-invoice)
--  materials purchased (that you will re-invoiced)
-
 -  time and material based on timesheets or purchases (subcontracting)
-
 -  expenses like travel and accommodation that you re-invoice to the customer
 
 You can invoice at the end of the contract or trigger intermediate
@@ -91,9 +90,10 @@ invoices. This approach is used by services companies that invoice
 mostly based on time and material. For services companies that invoice
 on fix price, they use a regular sales order.
 
-.. todo:: Read more:
+.. seealso::
-	-  *How to invoice based on time and material?*
+   - :doc:`../../../sales/invoicing/time_materials`
-	-  *How to manage contracts and invoicing plans?*
+   - :doc:`../../../sales/invoicing/expense`
+   - :doc:`../../../sales/invoicing/milestone`
 
 Recurring Contracts ‣ Invoices
 ------------------------------
@@ -102,7 +102,8 @@ For subscriptions, an invoice is triggered periodically, automatically.
 The frequency of the invoicing and the services/products invoiced are
 defined on the contract.
 
-.. todo:: Read more: *Subscription based invoicing.*
+.. seealso::
+   - :doc:`../../../sales/invoicing/subscriptions`
 
 Others
 ======

accounting/receivables/customer_payments/batch_sdd.rst

@@ -12,7 +12,7 @@ files containing pending payments made with an SDD mandate.
 
 .. note::
    | SDD is supported by all SEPA countries, which includes the 28 member states of the European Union as well as additional countries. 
-   | `List of all SEPA countries. <https://www.europeanpaymentscouncil.eu/document-library/other/epc-list-sepa-scheme-countries>`_
+   | `List of all SEPA countries <https://www.europeanpaymentscouncil.eu/document-library/other/epc-list-sepa-scheme-countries>`_.
 
 Configuration
 =============
@@ -120,7 +120,7 @@ Finally, upload this file to your bank to process the payments.
 .. seealso::
    * :doc:`../../bank/setup/create_bank_account`
    * `Odoo Academy: SEPA Direct Debit Mandates (SDD) <https://www.odoo.com/r/Zxs>`_
-   * `List of all SEPA countries. <https://www.europeanpaymentscouncil.eu/document-library/other/epc-list-sepa-scheme-countries>`_
+   * `List of all SEPA countries <https://www.europeanpaymentscouncil.eu/document-library/other/epc-list-sepa-scheme-countries>`_.