[REF] l10n_ar, l10n_latam_base, l10n_latam_invoice_document: adjustments

l10n_latam_base:

* update translations
* extend manifest
* update manifest, delete new menus/fields/models from manifest

l10n_latam_invoice_document:

* update translations
* remove filter journals for recipts
* make method private
* extend manifest
* update manifest, delete new menus/fields/models from manifest
* misspelling error in ValidationError
* fixup missing change apply before merge/rebase

l10n_ar:

* make method private
* update translations
* catch error when stdnum.ar.format
* fiscal position with criteria diff from Responsibility
* Install AR CoA now set properly the company values.
* add meaning of CUIT when mentioned in code.
* unse a simplier elif and less conditions to evaluate
* only get concept for invoice lines that are not section/note
* remove TODO comments, this will be not implemented in this version
* update to sincular al the AFIP POS System options
* return match responsability type directly
* improve of manifest
* reference to tax group
* remove old not used file fot tax report
* update comments from spanish to english
* only set afip serive date when post the account.move
* unused file
* sum recordsets instead of union
* method name and remove log
* update manifest, delete new menus/fields/models from manifest
* Simply extra steps when loading AR COA: check directly
  get_ar_responsibility_match in order to apply the extra verifications
  and the extra configs in the company
* update demo refences to new demo for odoo
* return missing fix about _l10n_ar_create_document_sequences
* fixup missing change apply before merge/rebase
* set journal data as no update data.

closes odoo/odoo#36137

Signed-off-by: Josse Colpaert <jco@openerp.com>

28 files changed, 907 insertions, 1145 deletions

diff --git a/addons/l10n_ar/__manifest__.py b/addons/l10n_ar/__manifest__.py
index e8bae52db47..04eb946e6cd 100644
--- a/addons/l10n_ar/__manifest__.py
+++ b/addons/l10n_ar/__manifest__.py
@@ -4,34 +4,66 @@
     'name': 'Argentinian Accounting',
     'version': '13.0.1.0.0',
     'description': """
-Argentinian Accounting
-======================
+Functional
+----------
 
-* Activate ARS currency.
-* Create new model AFIP Responsibility to identify the partners fiscal responsibility.
-* Add the Identification Types valid in Argentina.
-* Define Argentinian chart of accounts:
+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.
 
-  * Responsable Inscripto (RI)
-  * Exento (EX)
-  * Monotributo (Mono)
+Follow the next configuration steps for Production:
+
+1. Go to your company and configure your VAT number and AFIP Responsibility Type
+2. Go to Accounting / Settings and set the Chart of Account that you will like to use.
+3. Create your Sale journals taking into account AFIP POS info.
+
+Demo data for testing:
+
+* 3 companies were created, one for each AFIP responsibility type with the respective Chart of Account installed. Choose the company that fix you in order to make tests:
+
+  * (AR) Responsable Inscripto
+  * (AR) Exento
+  * (AR) Monotributo
+
+* Journal sales configured to Pre printed and Expo invoices in all companies
+* Invoices and other documents examples already validated in “(AR) Responsable Inscripto” company
+* Partners example for the different responsibility types:
+
+  * ADHOC (IVA Responsable Inscripto)
+  * Consejo Municipal Rosario (IVA Sujeto Exento)
+  * Gritti (Monotributo)
+  * Cerro Castor. IVA Liberado in Zona Franca
+  * Expresso (Cliente del Exterior)
+  * Odoo (Proveedor del Exterior)
 
-* Define Argentinian Taxes
-* Define Fiscal Positions
-* Define AFIP Legal Documents
-* Add AFIP Codes for models:
+Highlights:
 
-    * Identification Type
-    * Currency
-    * Country (used to identify legal entities and natural persons of foreign countries)
-    * Product Unit of Measure
-    * Tax Group
+* Chart of account will not be automatically installed, each CoA Template depends on the AFIP Responsibility of the company, you will need to install the CoA for your needs.
+* No sales journals will be generated when installing a CoA, you will need to configure your journals manually.
+* The Document type will be properly pre selected when creating an invoice depending on the fiscal responsibility of the issuer and receiver of the document and the related journal.
+* A CBU account type has been added and also CBU Validation
 
-Follow the next Settings steps
 
-1. Go to your company and configure your VAT number and AFIP Responsibility
-2. Go to Invoicing / Settings and set the Chart of Account you will like to use.
-3. Create your sale journals taking into account AFIP Point of Sales info if needed.
+Technical
+---------
+
+This module adds both models and fields that will be eventually used for the electronic invoice module. Here is a summary of the main features:
+
+Master Data:
+
+* Chart of Account: one for each AFIP responsibility that is related to a legal entity:
+
+  * Responsable Inscripto (RI)
+  * Exento (EX)
+  * Monotributo (Mono)
+
+* Argentinian Taxes and Account Tax Groups (VAT taxes with the existing aliquots and other types)
+* AFIP Responsibility Types
+* Fiscal Positions (in order to map taxes)
+* Legal Documents Types in Argentina
+* Identification Types valid in Argentina.
+* Country AFIP codes and Country VAT codes for legal entities, natural persons and others
+* Currency AFIP codes
+* Unit of measures AFIP codes
+* Partners: Consumidor Final and AFIP
 """,
     'author': 'ADHOC SA',
     'category': 'Localization',
diff --git a/addons/l10n_ar/data/account_tax_data.xml b/addons/l10n_ar/data/account_tax_data.xml
deleted file mode 100644
index 89b17ab5280..00000000000
--- a/addons/l10n_ar/data/account_tax_data.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="ITAX_21" model="account.tax.template">
-        <field name="chart_template_id" ref="ar_chart_template"/>
-        <field name="name">IVA 21% Venta</field>
-        <field name="description">IVA 21%</field>
-        <field name="amount">21</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="tax_group_id" ref="tax_group_iva_21"/>
-        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'base',
-                'plus_report_line_ids': [ref('tax_report_base_imp_ventas_grav_iva')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('231'),
-                'plus_report_line_ids': [ref('tax_report_impuesto_gen_cobrado_iva')],
-            }),
-        ]"/>
-        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'base',
-                'minus_report_line_ids': [ref('tax_report_base_imp_ventas_grav_iva')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('231'),
-                'minus_report_line_ids': [ref('tax_report_impuesto_gen_cobrado_iva')],
-            }),
-        ]"/>
-    </record>
-
-    <record id="OTAX_21" model="account.tax.template">
-        <field name="chart_template_id" ref="ar_chart_template"/>
-        <field name="name">IVA 21% Compra</field>
-        <field name="description">IVA 21%</field>
-        <field name="amount">21</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="tax_group_id" ref="tax_group_iva_21"/>
-        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'base',
-                'plus_report_line_ids': [ref('tax_report_base_imp_compras_grav_iva')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('231'),
-                'plus_report_line_ids': [ref('tax_report_impuesto_gen_pagado_iva')],
-            }),
-        ]"/>
-        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'base',
-                'minus_report_line_ids': [ref('tax_report_base_imp_compras_grav_iva')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('231'),
-                'minus_report_line_ids': [ref('tax_report_impuesto_gen_pagado_iva')],
-            }),
-        ]"/>
-    </record>
-
-    <record id="ITAX_27" model="account.tax.template">
-        <field name="chart_template_id" ref="ar_chart_template"/>
-        <field name="name">IVA 27% Venta</field>
-        <field name="description">IVA 27%</field>
-        <field name="amount">27</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="tax_group_id" ref="tax_group_iva_27"/>
-        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'base',
-                'plus_report_line_ids': [ref('tax_report_base_imp_ventas_grav_iva')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('231'),
-                'plus_report_line_ids': [ref('tax_report_impuesto_gen_cobrado_iva')],
-            }),
-        ]"/>
-        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'base',
-                'minus_report_line_ids': [ref('tax_report_base_imp_ventas_grav_iva')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('231'),
-                'minus_report_line_ids': [ref('tax_report_impuesto_gen_cobrado_iva')],
-            }),
-        ]"/>
-    </record>
-
-    <record id="OTAX_27" model="account.tax.template">
-        <field name="chart_template_id" ref="ar_chart_template"/>
-        <field name="name">IVA 27% Compra</field>
-        <field name="description">IVA 27%</field>
-        <field name="amount">27</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="tax_group_id" ref="tax_group_iva_27"/>
-        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'base',
-                'plus_report_line_ids': [ref('tax_report_base_imp_compras_grav_iva')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('231'),
-                'plus_report_line_ids': [ref('tax_report_impuesto_gen_pagado_iva')],
-            }),
-        ]"/>
-        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'base',
-                'minus_report_line_ids': [ref('tax_report_base_imp_compras_grav_iva')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('231'),
-                'minus_report_line_ids': [ref('tax_report_impuesto_gen_pagado_iva')],
-            }),
-        ]"/>
-    </record>
-
-    <record id="ITAX_105" model="account.tax.template">
-        <field name="chart_template_id" ref="ar_chart_template"/>
-        <field name="name">IVA 10.5% Venta</field>
-        <field name="description">IVA 10.5%</field>
-        <field name="amount">10.5</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">sale</field>
-        <field name="tax_group_id" ref="tax_group_iva_105"/>
-        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'base',
-                'plus_report_line_ids': [ref('tax_report_base_imp_ventas_grav_iva')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('231'),
-                'plus_report_line_ids': [ref('tax_report_impuesto_gen_cobrado_iva')],
-            }),
-        ]"/>
-        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'base',
-                'minus_report_line_ids': [ref('tax_report_base_imp_ventas_grav_iva')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('231'),
-                'minus_report_line_ids': [ref('tax_report_impuesto_gen_cobrado_iva')],
-            }),
-        ]"/>
-    </record>
-
-    <record id="OTAX_105" model="account.tax.template">
-        <field name="chart_template_id" ref="ar_chart_template"/>
-        <field name="name">IVA 10.5% Compra</field>
-        <field name="description">IVA 10.5%</field>
-        <field name="amount">10.5</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="tax_group_id" ref="tax_group_iva_105"/>
-        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'base',
-                'plus_report_line_ids': [ref('tax_report_base_imp_compras_grav_iva')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('231'),
-                'plus_report_line_ids': [ref('tax_report_impuesto_gen_pagado_iva')],
-            }),
-        ]"/>
-        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'base',
-                'minus_report_line_ids': [ref('tax_report_base_imp_compras_grav_iva')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('231'),
-                'minus_report_line_ids': [ref('tax_report_impuesto_gen_pagado_iva')],
-            }),
-        ]"/>
-    </record>
-
-    <record id="OTAX_02" model="account.tax.template">
-        <field name="chart_template_id" ref="ar_chart_template"/>
-        <field name="name">Percepción IVA 2%</field>
-        <field name="description">Percepción IVA 2%</field>
-        <field name="amount">2.0</field>
-        <field name="amount_type">percent</field>
-        <field name="type_tax_use">purchase</field>
-        <field name="tax_group_id" ref="tax_group_iva_2"/>
-        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'base',
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('231'),
-                'plus_report_line_ids': [ref('tax_report_impuesto_gen_pagado_iva')],
-            }),
-        ]"/>
-        <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'base',
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('231'),
-                'minus_report_line_ids': [ref('tax_report_impuesto_gen_pagado_iva')],
-            }),
-        ]"/>
-    </record>
-
-</odoo>
diff --git a/addons/l10n_ar/data/account_tax_group.xml b/addons/l10n_ar/data/account_tax_group.xml
index b241671ca6e..a7f7fb60f8c 100644
--- a/addons/l10n_ar/data/account_tax_group.xml
+++ b/addons/l10n_ar/data/account_tax_group.xml
@@ -65,27 +65,27 @@
     <!-- Perceptions and Withholding -->
 
     <record model="account.tax.group" id="tax_group_percepcion_iva">
-        <field name="name">Percepción de IVA</field>
+        <field name="name">VAT Perception</field>
         <field name="l10n_ar_tribute_afip_code">06</field>
     </record>
 
     <record model="account.tax.group" id="tax_group_percepcion_iibb">
-        <field name="name">Percepción de IIBB</field>
+        <field name="name">IIBB Perceptions</field>
         <field name="l10n_ar_tribute_afip_code">07</field>
     </record>
 
     <record model="account.tax.group" id="tax_group_percepcion_municipal">
-        <field name="name">Percepciones por Impuestos Municipales</field>
+        <field name="name">Municipal Taxes Perceptions</field>
         <field name="l10n_ar_tribute_afip_code">08</field>
     </record>
 
     <record model="account.tax.group" id="tax_group_percepcion_ganancias">
-        <field name="name">Percepción de Ganancias</field>
+        <field name="name">Profit Perceptions</field>
         <field name="l10n_ar_tribute_afip_code">09</field>
     </record>
 
     <record model="account.tax.group" id="tax_group_otras_percepciones">
-        <field name="name">Otras Percepciones</field>
+        <field name="name">Other Perceptions</field>
         <field name="l10n_ar_tribute_afip_code">09</field>
     </record>
 
diff --git a/addons/l10n_ar/data/account_tax_report_data.xml b/addons/l10n_ar/data/account_tax_report_data.xml
deleted file mode 100644
index 3bf0fd7f410..00000000000
--- a/addons/l10n_ar/data/account_tax_report_data.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <record id="tax_report_base_imp" model="account.tax.report.line">
-        <field name="name">Base Imponible</field>
-        <field name="sequence" eval="1"/>
-        <field name="formula">base_ventas - base_compras</field>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_base_imp_ventas" model="account.tax.report.line">
-        <field name="name">Base Imponible - Ventas</field>
-        <field name="code">base_ventas</field>
-        <field name="parent_id" ref='tax_report_base_imp'/>
-        <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_base_imp_ventas_grav_iva" model="account.tax.report.line">
-        <field name="name">Ventas Gravadas con IVA</field>
-        <field name="tag_name">Ventas Gravadas con IVA</field>
-        <field name="parent_id" ref='tax_report_base_imp_ventas'/>
-        <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_base_imp_ventas_no_grav" model="account.tax.report.line">
-        <field name="name">Ventas NO Gravadas (Exoneradas)</field>
-        <field name="tag_name">Ventas NO Gravadas (Exoneradas)</field>
-        <field name="parent_id" ref='tax_report_base_imp_ventas'/>
-        <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_base_imp_ventas_grav_ambi" model="account.tax.report.line">
-        <field name="name">Ventas Gravadas Fuera de Ámbito</field>
-        <field name="tag_name">Ventas Gravadas Fuera de Ámbito</field>
-        <field name="parent_id" ref='tax_report_base_imp_ventas'/>
-        <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_base_imp_compras" model="account.tax.report.line">
-        <field name="name">Base Imponible - Compras</field>
-        <field name="code">base_compras</field>
-        <field name="parent_id" ref='tax_report_base_imp'/>
-        <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_base_imp_compras_grav_iva" model="account.tax.report.line">
-        <field name="name">Compras Gravadas con IVA</field>
-        <field name="tag_name">Compras Gravadas con IVA</field>
-        <field name="parent_id" ref='tax_report_base_imp_compras'/>
-        <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_base_imp_compras_no_grav" model="account.tax.report.line">
-        <field name="name">Compras NO Gravadas (Exoneradas)</field>
-        <field name="tag_name">Compras NO Gravadas (Exoneradas)</field>
-        <field name="parent_id" ref='tax_report_base_imp_compras'/>
-        <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_base_imp_compras_grav_ambi" model="account.tax.report.line">
-        <field name="name">Compras Gravadas Fuera de Ámbito</field>
-        <field name="tag_name">Compras Gravadas Fuera de Ámbito</field>
-        <field name="parent_id" ref='tax_report_base_imp_compras'/>
-        <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_impuesto_gen" model="account.tax.report.line">
-        <field name="name">Impuesto General a las Ventas (IVA) Total a Pagar</field>
-        <field name="formula">impuesto_pagado - impuesto_cobrado</field>
-        <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_impuesto_gen_pagado" model="account.tax.report.line">
-        <field name="name">Impuesto Pagado</field>
-        <field name="code">impuesto_pagado</field>
-        <field name="parent_id" ref="tax_report_impuesto_gen"/>
-        <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_impuesto_gen_pagado_iva" model="account.tax.report.line">
-        <field name="name">Impuesto Pagado IVA</field>
-        <field name="tag_name">Impuesto Pagado IVA</field>
-        <field name="parent_id" ref="tax_report_impuesto_gen_pagado"/>
-        <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_impuesto_gen_pagado_exo" model="account.tax.report.line">
-        <field name="name">Impuesto Pagado de Exonerados al IVA</field>
-        <field name="tag_name">Impuesto Pagado de Exonerados al IVA</field>
-        <field name="parent_id" ref="tax_report_impuesto_gen_pagado"/>
-        <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_impuesto_gen_pagado_ambi" model="account.tax.report.line">
-        <field name="name">Impuesto Pagado Fuera de Ámbito</field>
-        <field name="tag_name">Impuesto Pagado Fuera de Ámbito</field>
-        <field name="parent_id" ref="tax_report_impuesto_gen_pagado"/>
-        <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_impuesto_gen_cobrado" model="account.tax.report.line">
-        <field name="name">Impuesto Cobrado</field>
-        <field name="code">impuesto_cobrado</field>
-        <field name="parent_id" ref="tax_report_impuesto_gen"/>
-        <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-    <record id="tax_report_impuesto_gen_cobrado_iva" model="account.tax.report.line">
-        <field name="name">Impuesto Cobrado IVA</field>
-        <field name="tag_name">Impuesto Cobrado IVA</field>
-        <field name="parent_id" ref="tax_report_impuesto_gen_cobrado"/>
-        <field name="sequence" eval="1"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_impuesto_gen_cobrado_exo" model="account.tax.report.line">
-        <field name="name">Impuesto Cobrado de Exonerados al IVA</field>
-        <field name="tag_name">Impuesto Cobrado de Exonerados al IVA</field>
-        <field name="parent_id" ref="tax_report_impuesto_gen_cobrado"/>
-        <field name="sequence" eval="2"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_impuesto_gen_cobrado_ambi" model="account.tax.report.line">
-        <field name="name">Impuesto Cobrado Fuera de Ámbito</field>
-        <field name="tag_name">Impuesto Cobrado Fuera de Ámbito</field>
-        <field name="parent_id" ref="tax_report_impuesto_gen_cobrado"/>
-        <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_impuesto_nac" model="account.tax.report.line">
-        <field name="name">Impuesto Nacionales a Pagar</field>
-        <field name="sequence" eval="3"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_impuesto_nac_ganancias" model="account.tax.report.line">
-        <field name="name">Impuesto a las Ganancias a Pagar</field>
-        <field name="formula">0</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="tax_report_impuesto_nac"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_impuesto_nac_bienes_perso" model="account.tax.report.line">
-        <field name="name">Impuesto a los Bienes Personales a Pagar</field>
-        <field name="formula">0</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="tax_report_impuesto_nac"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_impuesto_nac_minima_pres" model="account.tax.report.line">
-        <field name="name">Impuesto a la Ganancia Mínima Presunta a Pagar</field>
-        <field name="formula">0</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="tax_report_impuesto_nac"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-    <record id="tax_report_impuesto_nac_monotributo" model="account.tax.report.line">
-        <field name="name">Monotributo a Pagar</field>
-        <field name="formula">0</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="tax_report_impuesto_nac"/>
-        <field name="country_id" ref="base.ar"/>
-    </record>
-
-</odoo>
\ No newline at end of file
diff --git a/addons/l10n_ar/demo/account_customer_invoice_demo.xml b/addons/l10n_ar/demo/account_customer_invoice_demo.xml
index 81dae24e840..034833cfc93 100644
--- a/addons/l10n_ar/demo/account_customer_invoice_demo.xml
+++ b/addons/l10n_ar/demo/account_customer_invoice_demo.xml
@@ -7,7 +7,7 @@
     <record id="demo_invoice_1" model="account.move">
         <field name="partner_id" ref="res_partner_gritti_agrimensura"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-01'"/>
         <field name="company_id" ref="company_ri"/>
@@ -20,7 +20,7 @@
     <record id="demo_invoice_2" model="account.move">
         <field name="partner_id" ref="res_partner_cmr"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-05'"/>
         <field name="company_id" ref="company_ri"/>
@@ -35,7 +35,7 @@
     <record id="demo_invoice_3" model="account.move">
         <field name="partner_id" ref="l10n_ar.res_partner_adhoc"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-12'"/>
         <field name="company_id" ref="company_ri"/>
@@ -49,7 +49,7 @@
     <record id="demo_invoice_4" model="account.move">
         <field name="partner_id" ref="l10n_ar.res_partner_adhoc"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-12'"/>
         <field name="company_id" ref="company_ri"/>
@@ -63,7 +63,7 @@
     <record id="demo_invoice_5" model="account.move">
         <field name="partner_id" ref="l10n_ar.res_partner_adhoc"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-13'"/>
         <field name="company_id" ref="company_ri"/>
@@ -82,7 +82,7 @@
         <field name="partner_id" ref="res_partner_cerrocastor"/>
         <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Operaciones exentas')], limit=1).id"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-03'"/>
         <field name="company_id" ref="company_ri"/>
@@ -102,7 +102,7 @@
         <field name="partner_id" ref="res_partner_expresso"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
         <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Compras / Ventas al exterior')], limit=1).id"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-03'"/>
         <field name="company_id" ref="company_ri"/>
@@ -121,7 +121,7 @@
     <record id="demo_invoice_8" model="account.move">
         <field name="partner_id" ref="l10n_ar.par_cfa"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-13'"/>
         <field name="company_id" ref="company_ri"/>
@@ -134,7 +134,7 @@
     <record id="demo_invoice_10" model="account.move">
         <field name="partner_id" ref="l10n_ar.res_partner_adhoc"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-13'"/>
         <field name="company_id" ref="company_ri"/>
@@ -148,7 +148,7 @@
     <record id="demo_invoice_11" model="account.move">
         <field name="partner_id" ref="l10n_ar.res_partner_adhoc"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-13'"/>
         <field name="company_id" ref="company_ri"/>
@@ -164,7 +164,7 @@
     <record id="demo_invoice_12" model="account.move">
         <field name="partner_id" ref="l10n_ar.res_partner_adhoc"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-13'"/>
         <field name="company_id" ref="company_ri"/>
@@ -180,7 +180,7 @@
     <record id="demo_invoice_13" model="account.move">
         <field name="partner_id" ref="l10n_ar.res_partner_adhoc"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-13'"/>
         <field name="company_id" ref="company_ri"/>
@@ -201,7 +201,7 @@
         <field name="partner_id" ref="res_partner_expresso"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
         <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Compras / Ventas al exterior')], limit=1).id"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-20'"/>
         <field name="company_id" ref="company_ri"/>
@@ -216,7 +216,7 @@
         <field name="partner_id" ref="res_partner_expresso"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
         <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Compras / Ventas al exterior')], limit=1).id"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-20'"/>
         <field name="company_id" ref="company_ri"/>
@@ -231,7 +231,7 @@
         <field name="partner_id" ref="res_partner_expresso"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
         <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Compras / Ventas al exterior')], limit=1).id"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-22'"/>
         <field name="company_id" ref="company_ri"/>
@@ -241,11 +241,11 @@
         ]"/>
     </record>
 
-    <!-- Invoice to ADHOC con 100% de descuento (para testear citi, citi needs to guess operation type) -->
+    <!-- Invoice to ADHOC with 100% of discount -->
     <record id="demo_invoice_17" model="account.move">
         <field name="partner_id" ref="l10n_ar.res_partner_adhoc"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-13'"/>
         <field name="company_id" ref="company_ri"/>
@@ -254,12 +254,11 @@
         ]"/>
     </record>
 
-    <!-- Invoice to ADHOC con 100% de descuento en ivas distintos (para testear citi)
-   y con linea de importe -->
+    <!-- Invoice to ADHOC with 100% of discount and with different VAT aliquots -->
     <record id="demo_invoice_18" model="account.move">
         <field name="partner_id" ref="l10n_ar.res_partner_adhoc"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-13'"/>
         <field name="company_id" ref="company_ri"/>
diff --git a/addons/l10n_ar/demo/account_supplier_invoice_demo.xml b/addons/l10n_ar/demo/account_supplier_invoice_demo.xml
index 6d0bf6f9986..a8b083e871b 100644
--- a/addons/l10n_ar/demo/account_supplier_invoice_demo.xml
+++ b/addons/l10n_ar/demo/account_supplier_invoice_demo.xml
@@ -3,12 +3,12 @@
 
     <!-- we add l10n_latam_document_number on on a separete line because we need l10n_latam_document_type_id to be auto assigned so that account.move.name can be computed with the _inverse_l10n_latam_document_number -->
 
-    <!-- Invoice from gritti support service, auto fiscal position set VAT not correspond -->
+    <!-- Invoice from gritti support service, auto fiscal position set VAT Not Applicable -->
     <record id="demo_sup_invoice_1" model="account.move">
         <field name="partner_id" ref="res_partner_gritti_agrimensura"/>
         <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Compras IVA no corresponde')], limit=1).id"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">in_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-01'"/>
         <field name="company_id" ref="company_ri"/>
@@ -26,7 +26,7 @@
     <record id="demo_sup_invoice_2" model="account.move">
         <field name="partner_id" ref="base.res_partner_1"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">in_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-01'"/>
         <field name="company_id" ref="company_ri"/>
@@ -37,11 +37,11 @@
         ]"/>
     </record>
 
-    <!-- Invoice from Asustek with vat cero and 21 -->
+    <!-- Invoice from Asustek with vat zero and 21 -->
     <record id="demo_sup_invoice_3" model="account.move">
         <field name="partner_id" ref="base.res_partner_1"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">in_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-11'"/>
         <field name="company_id" ref="company_ri"/>
@@ -55,7 +55,7 @@
     <record id="demo_sup_invoice_4" model="account.move">
         <field name="partner_id" ref="base.res_partner_1"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">in_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-15'"/>
         <field name="company_id" ref="company_ri"/>
@@ -69,7 +69,7 @@
     <record id="demo_sup_invoice_5" model="account.move">
         <field name="partner_id" ref="base.res_partner_1"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">in_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-18'"/>
         <field name="company_id" ref="company_ri"/>
@@ -88,7 +88,7 @@
         <field name="partner_id" ref="res_partner_odoo"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
         <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Compras / Ventas al exterior')], limit=1).id"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">in_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-26'"/>
         <field name="company_id" ref="company_ri"/>
@@ -102,7 +102,7 @@
         <field name="partner_id" ref="res_partner_odoo"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
         <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Compras / Ventas al exterior')], limit=1).id"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">in_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-27'"/>
         <field name="company_id" ref="company_ri"/>
@@ -116,7 +116,7 @@
     <record id="demo_despacho_1" model="account.move">
         <field name="partner_id" ref="l10n_ar.partner_afip"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="invoice_payment_term_id" ref="account.account_payment_term"/>
+        <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">in_invoice</field>
         <!-- as we create lines separatelly we need to set journal, if not, misc journal is selected -->
         <field name="journal_id" model="account.journal" search="[('type', '=', 'purchase'), ('company_id', '=', obj().env.company.id)]"/>
diff --git a/addons/l10n_ar/demo/exento_demo.xml b/addons/l10n_ar/demo/exento_demo.xml
index 764c7de9f4d..d60c819bcb1 100644
--- a/addons/l10n_ar/demo/exento_demo.xml
+++ b/addons/l10n_ar/demo/exento_demo.xml
@@ -35,27 +35,31 @@
         <value model="res.company" eval="obj().env.ref('l10n_ar.company_exento')"/>
     </function>
 
-    <record id="sale_journal_exento" model="account.journal">
-        <field name='name'>Sales Journal</field>
-        <field name='company_id' ref="l10n_ar.company_exento"/>
-        <field name='type'>sale</field>
-        <field name='code'>S0001</field>
-        <field name='l10n_latam_use_documents' eval="True"/>
-        <field name='l10n_ar_afip_pos_number'>1</field>
-        <field name='l10n_ar_afip_pos_partner_id' ref="l10n_ar.partner_exento"/>
-        <field name='l10n_ar_afip_pos_system'>II_IM</field>
-        <field name='l10n_ar_share_sequences' eval="True"/>
-    </record>
+    <data noupdate="1">
 
-   <record id="sale_expo_journal_exento" model="account.journal">
-        <field name='name'>Expo Sales Journal</field>
-        <field name='company_id' ref="l10n_ar.company_exento"/>
-        <field name='type'>sale</field>
-        <field name='code'>S0002</field>
-        <field name='l10n_latam_use_documents' eval="True"/>
-        <field name='l10n_ar_afip_pos_number'>2</field>
-        <field name='l10n_ar_afip_pos_partner_id' ref="l10n_ar.partner_exento"/>
-        <field name='l10n_ar_afip_pos_system'>FEERCEL</field>
-    </record>
+        <record id="sale_journal_exento" model="account.journal">
+            <field name='name'>Sales Journal</field>
+            <field name='company_id' ref="l10n_ar.company_exento"/>
+            <field name='type'>sale</field>
+            <field name='code'>S0001</field>
+            <field name='l10n_latam_use_documents' eval="True"/>
+            <field name='l10n_ar_afip_pos_number'>1</field>
+            <field name='l10n_ar_afip_pos_partner_id' ref="l10n_ar.partner_exento"/>
+            <field name='l10n_ar_afip_pos_system'>II_IM</field>
+            <field name='l10n_ar_share_sequences' eval="True"/>
+        </record>
+
+        <record id="sale_expo_journal_exento" model="account.journal">
+            <field name='name'>Expo Sales Journal</field>
+            <field name='company_id' ref="l10n_ar.company_exento"/>
+            <field name='type'>sale</field>
+            <field name='code'>S0002</field>
+            <field name='l10n_latam_use_documents' eval="True"/>
+            <field name='l10n_ar_afip_pos_number'>2</field>
+            <field name='l10n_ar_afip_pos_partner_id' ref="l10n_ar.partner_exento"/>
+            <field name='l10n_ar_afip_pos_system'>FEERCEL</field>
+        </record>
+
+    </data>
 
 </odoo>
diff --git a/addons/l10n_ar/demo/mono_demo.xml b/addons/l10n_ar/demo/mono_demo.xml
index 1b5afe82796..86635862ec5 100644
--- a/addons/l10n_ar/demo/mono_demo.xml
+++ b/addons/l10n_ar/demo/mono_demo.xml
@@ -35,27 +35,31 @@
         <value model="res.company" eval="obj().env.ref('l10n_ar.company_mono')"/>
     </function>
 
-    <record id="sale_journal_mono" model="account.journal">
-        <field name='name'>Sales Journal</field>
-        <field name='company_id' ref="l10n_ar.company_mono"/>
-        <field name='type'>sale</field>
-        <field name='code'>S0001</field>
-        <field name='l10n_latam_use_documents' eval="True"/>
-        <field name='l10n_ar_afip_pos_number'>1</field>
-        <field name='l10n_ar_afip_pos_partner_id' ref="l10n_ar.partner_mono"/>
-        <field name='l10n_ar_afip_pos_system'>II_IM</field>
-        <field name='l10n_ar_share_sequences' eval="True"/>
-    </record>
+    <data noupdate="1">
 
-   <record id="sale_expo_journal_mono" model="account.journal">
-        <field name='name'>Expo Sales Journal</field>
-        <field name='company_id' ref="l10n_ar.company_mono"/>
-        <field name='type'>sale</field>
-        <field name='code'>S0002</field>
-        <field name='l10n_latam_use_documents' eval="True"/>
-        <field name='l10n_ar_afip_pos_number'>2</field>
-        <field name='l10n_ar_afip_pos_partner_id' ref="l10n_ar.partner_mono"/>
-        <field name='l10n_ar_afip_pos_system'>FEERCEL</field>
-    </record>
+        <record id="sale_journal_mono" model="account.journal">
+            <field name='name'>Sales Journal</field>
+            <field name='company_id' ref="l10n_ar.company_mono"/>
+            <field name='type'>sale</field>
+            <field name='code'>S0001</field>
+            <field name='l10n_latam_use_documents' eval="True"/>
+            <field name='l10n_ar_afip_pos_number'>1</field>
+            <field name='l10n_ar_afip_pos_partner_id' ref="l10n_ar.partner_mono"/>
+            <field name='l10n_ar_afip_pos_system'>II_IM</field>
+            <field name='l10n_ar_share_sequences' eval="True"/>
+        </record>
+
+        <record id="sale_expo_journal_mono" model="account.journal">
+            <field name='name'>Expo Sales Journal</field>
+            <field name='company_id' ref="l10n_ar.company_mono"/>
+            <field name='type'>sale</field>
+            <field name='code'>S0002</field>
+            <field name='l10n_latam_use_documents' eval="True"/>
+            <field name='l10n_ar_afip_pos_number'>2</field>
+            <field name='l10n_ar_afip_pos_partner_id' ref="l10n_ar.partner_mono"/>
+            <field name='l10n_ar_afip_pos_system'>FEERCEL</field>
+        </record>
+
+    </data>
 
 </odoo>
diff --git a/addons/l10n_ar/demo/respinsc_demo.xml b/addons/l10n_ar/demo/respinsc_demo.xml
index ce2ab07bb4f..b6c31cc111a 100644
--- a/addons/l10n_ar/demo/respinsc_demo.xml
+++ b/addons/l10n_ar/demo/respinsc_demo.xml
@@ -35,27 +35,31 @@
         <value model="res.company" eval="obj().env.ref('l10n_ar.company_ri')"/>
     </function>
 
-    <record id="sale_journal_ri" model="account.journal">
-        <field name='name'>Sales Journal</field>
-        <field name='company_id' ref="l10n_ar.company_ri"/>
-        <field name='type'>sale</field>
-        <field name='code'>S0001</field>
-        <field name='l10n_latam_use_documents' eval="True"/>
-        <field name='l10n_ar_afip_pos_number'>1</field>
-        <field name='l10n_ar_afip_pos_partner_id' ref="l10n_ar.partner_ri"/>
-        <field name='l10n_ar_afip_pos_system'>II_IM</field>
-        <field name='l10n_ar_share_sequences' eval="True"/>
-    </record>
+    <data noupdate="1">
 
-   <record id="sale_expo_journal_ri" model="account.journal">
-        <field name='name'>Expo Sales Journal</field>
-        <field name='company_id' ref="l10n_ar.company_ri"/>
-        <field name='type'>sale</field>
-        <field name='code'>S0002</field>
-        <field name='l10n_latam_use_documents' eval="True"/>
-        <field name='l10n_ar_afip_pos_number'>2</field>
-        <field name='l10n_ar_afip_pos_partner_id' ref="l10n_ar.partner_ri"/>
-        <field name='l10n_ar_afip_pos_system'>FEERCEL</field>
-    </record>
+        <record id="sale_journal_ri" model="account.journal">
+            <field name='name'>Sales Journal</field>
+            <field name='company_id' ref="l10n_ar.company_ri"/>
+            <field name='type'>sale</field>
+            <field name='code'>S0001</field>
+            <field name='l10n_latam_use_documents' eval="True"/>
+            <field name='l10n_ar_afip_pos_number'>1</field>
+            <field name='l10n_ar_afip_pos_partner_id' ref="l10n_ar.partner_ri"/>
+            <field name='l10n_ar_afip_pos_system'>II_IM</field>
+            <field name='l10n_ar_share_sequences' eval="True"/>
+        </record>
+
+        <record id="sale_expo_journal_ri" model="account.journal">
+            <field name='name'>Expo Sales Journal</field>
+            <field name='company_id' ref="l10n_ar.company_ri"/>
+            <field name='type'>sale</field>
+            <field name='code'>S0002</field>
+            <field name='l10n_latam_use_documents' eval="True"/>
+            <field name='l10n_ar_afip_pos_number'>2</field>
+            <field name='l10n_ar_afip_pos_partner_id' ref="l10n_ar.partner_ri"/>
+            <field name='l10n_ar_afip_pos_system'>FEERCEL</field>
+        </record>
+
+    </data>
 
 </odoo>
diff --git a/addons/l10n_ar/i18n/es.po b/addons/l10n_ar/i18n/es.po
index 44b695a03ea..f9ec4579cae 100644
--- a/addons/l10n_ar/i18n/es.po
+++ b/addons/l10n_ar/i18n/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 13.0alpha1+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-03 16:16+0000\n"
-"PO-Revision-Date: 2019-08-03 16:16+0000\n"
+"POT-Creation-Date: 2019-08-22 12:59+0000\n"
+"PO-Revision-Date: 2019-08-22 12:59+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,14 +16,69 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: l10n_ar
-#: model_terms:ir.ui.view,arch_db:l10n_ar.report_invoice_document
-msgid "<br/><span>Incoterm: </span>"
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "01 - National Taxes"
+msgstr "01 - Impuestos nacionales"
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "02 - Provincial Taxes"
+msgstr "02 - Impuestos provinciales"
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "03 - Municipal Taxes"
+msgstr "03 - Impuestos Municipales"
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "04 - Internal Taxes"
+msgstr "04 - Impuestos internos"
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "06 - VAT perception"
+msgstr "06 - Percepción de IVA"
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "07 - IIBB perception"
+msgstr "07 - Percepción de IIBB"
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "08 - Municipal Taxes Perceptions"
+msgstr "08 - Percepciones por Impuestos Municipales"
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "09 - Other Perceptions"
+msgstr "09 - Otras Percepciones"
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_vat_afip_code:0
+msgid "10.5%"
+msgstr ""
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_vat_afip_code:0
+msgid "2,5%"
 msgstr ""
 
 #. module: l10n_ar
-#: model_terms:ir.ui.view,arch_db:l10n_ar.report_invoice_document
-msgid "<span>VAT Cond.: </span>"
-msgstr "<span>Condición de IVA.: </span>"
+#: selection:account.tax.group,l10n_ar_vat_afip_code:0
+msgid "21%"
+msgstr ""
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_vat_afip_code:0
+msgid "27%"
+msgstr ""
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "99 - Others"
+msgstr "99 - Otros"
 
 #. module: l10n_ar
 #: model:ir.model.fields,help:l10n_ar.field_account_move__l10n_ar_afip_concept
@@ -36,11 +91,11 @@ msgstr ""
 
 #. module: l10n_ar
 #: model:ir.ui.menu,name:l10n_ar.menu_afip_config
+#: model_terms:ir.ui.view,arch_db:l10n_ar.view_move_form
 msgid "AFIP"
 msgstr ""
 
 #. module: l10n_ar
-#: model:ir.model.fields,field_description:l10n_ar.field_account_tax_group__l10n_ar_afip_code
 #: model:ir.model.fields,field_description:l10n_ar.field_l10n_latam_identification_type__l10n_ar_afip_code
 #: model:ir.model.fields,field_description:l10n_ar.field_res_country__l10n_ar_afip_code
 #: model:ir.model.fields,field_description:l10n_ar.field_res_currency__l10n_ar_afip_code
@@ -144,16 +199,6 @@ msgid "Activities Start Date:"
 msgstr "Día de Inicio de Actividades:"
 
 #. module: l10n_ar
-#: model:ir.model.fields,field_description:l10n_ar.field_account_tax_group__l10n_ar_application_code
-msgid "Application Code"
-msgstr "Código de aplicación"
-
-#. module: l10n_ar
-#: model:ir.model.fields,field_description:l10n_ar.field_account_tax_group__l10n_ar_application
-msgid "Argentinian Application"
-msgstr "Aplicación Argentina"
-
-#. module: l10n_ar
 #: model_terms:ir.ui.view,arch_db:l10n_ar.view_document_type_filter
 msgid "Argentinian Documents"
 msgstr "Documentos Argentinos"
@@ -164,27 +209,23 @@ msgid "Argentinian Statements"
 msgstr "Informes Argentinos"
 
 #. module: l10n_ar
-#: model:ir.model.fields,field_description:l10n_ar.field_account_tax_group__l10n_ar_tax
-msgid "Argentinian Tax"
-msgstr "Impuesto Argentino"
-
-#. module: l10n_ar
-#: model:ir.model.fields,field_description:l10n_ar.field_account_tax_group__l10n_ar_type
-msgid "Argentinian Type"
-msgstr "Tipo Argentino"
-
-#. module: l10n_ar
 #: model:ir.model,name:l10n_ar.model_res_partner_bank
 msgid "Bank Accounts"
 msgstr "Cuentas bancarias"
 
 #. module: l10n_ar
+#: model:product.product,name:l10n_ar.product_product_exento
+#: model:product.template,name:l10n_ar.product_product_exento_product_template
+msgid "Book \"Development in Odoo\" (VAT Exempt)"
+msgstr "Libro \"Desarrollo en Odoo\" (IVA Exento)"
+
+#. module: l10n_ar
 #: model:l10n_latam.identification.type,name:l10n_ar.it_CBA
 msgid "CBA"
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/res_partner_bank.py:18
+#: code:addons/l10n_ar/models/res_partner_bank.py:0
 #, python-format
 msgid "CBU"
 msgstr ""
@@ -325,7 +366,7 @@ msgid "CUIT"
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_journal.py:65
+#: code:addons/l10n_ar/models/account_journal.py:0
 #, python-format
 msgid ""
 "Can not create chart of account until you configure your company AFIP "
@@ -340,11 +381,6 @@ msgid "CdM"
 msgstr ""
 
 #. module: l10n_ar
-#: model_terms:ir.ui.view,arch_db:l10n_ar.report_invoice_document
-msgid "Cod"
-msgstr ""
-
-#. module: l10n_ar
 #: model:ir.model.fields,field_description:l10n_ar.field_l10n_ar_afip_responsibility_type__code
 msgid "Code"
 msgstr "Código"
@@ -390,7 +426,7 @@ msgid "Contact"
 msgstr "Contacto"
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/res_company.py:51
+#: code:addons/l10n_ar/models/res_company.py:0
 #, python-format
 msgid ""
 "Could not change the AFIP Responsibility of this company because there are "
@@ -435,6 +471,21 @@ msgid "DNI"
 msgstr ""
 
 #. module: l10n_ar
+#: model:res.company,overdue_msg:l10n_ar.company_exento
+#: model:res.company,overdue_msg:l10n_ar.company_mono
+#: model:res.company,overdue_msg:l10n_ar.company_ri
+msgid ""
+"Dear Sir/Madam,\n"
+"\n"
+"Our records indicate that some payments on your account are still due. Please find details below.\n"
+"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
+"If you have any queries regarding your account, Please contact us.\n"
+"\n"
+"Thank you in advance for your cooperation.\n"
+"Best Regards,"
+msgstr ""
+
+#. module: l10n_ar
 #: model:ir.model.fields,help:l10n_ar.field_account_move__l10n_ar_afip_responsibility_type_id
 #: model:ir.model.fields,help:l10n_ar.field_res_company__l10n_ar_afip_responsibility_type_id
 #: model:ir.model.fields,help:l10n_ar.field_res_partner__l10n_ar_afip_responsibility_type_id
@@ -470,6 +521,7 @@ msgid "ET"
 msgstr ""
 
 #. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_vat_afip_code:0
 #: selection:res.partner,l10n_ar_gross_income_type:0
 msgid "Exempt"
 msgstr "Exento"
@@ -513,13 +565,12 @@ msgstr ""
 "este país que son personas físicas"
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_journal.py:66
+#: code:addons/l10n_ar/models/account_journal.py:0
 #, python-format
 msgid "Go to Companies"
 msgstr "Ir a Compañías"
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_tax:0
 #: model:ir.model.fields,field_description:l10n_ar.field_res_company__l10n_ar_gross_income_type
 #: model_terms:ir.ui.view,arch_db:l10n_ar.view_company_form
 #: model_terms:ir.ui.view,arch_db:l10n_ar.view_partner_property_form
@@ -545,6 +596,12 @@ msgid "Gross Income:"
 msgstr "Ingreso Bruto:"
 
 #. module: l10n_ar
+#: model:product.product,name:l10n_ar.product_product_servicio_de_guarda
+#: model:product.template,name:l10n_ar.product_product_servicio_de_guarda_product_template
+msgid "Guard Service"
+msgstr "Servicio de Guarda"
+
+#. module: l10n_ar
 #: model:ir.model.fields,field_description:l10n_ar.field_l10n_ar_afip_responsibility_type__id
 msgid "ID"
 msgstr ""
@@ -562,40 +619,43 @@ msgid "IIBB - Sales by jurisdiction"
 msgstr "IIBB - Ventas por Jurisdicción"
 
 #. module: l10n_ar
+#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_iibb
+msgid "IIBB Perceptions"
+msgstr "Percepción de IIBB"
+
+#. module: l10n_ar
 #: model:ir.model,name:l10n_ar.model_l10n_latam_identification_type
 msgid "Identification Types"
 msgstr "Tipos de Identificación"
 
 #. module: l10n_ar
+#: code:addons/l10n_ar/models/account_fiscal_position.py:0
+#, python-format
+msgid ""
+"If use AFIP Responsibility then the country / zip codes will be not take "
+"into account"
+msgstr ""
+"Si utiliza Responsabilidad AFIP entonces no se tomará en cuenta el pais / "
+"códigos zip "
+
+#. module: l10n_ar
 #: model:product.product,name:l10n_ar.product_product_quote_despacho
 #: model:product.template,name:l10n_ar.product_product_quote_despacho_product_template
 msgid "Import Clearance"
 msgstr "Despacho de importación"
 
 #. module: l10n_ar
-#: model:ir.model.fields,help:l10n_ar.field_l10n_latam_document_type__purchase_aliquots
-msgid "Indicates if this type of documents has VAT or Not"
-msgstr ""
-
-#. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_application:0
 #: model:account.tax.group,name:l10n_ar.tax_impuestos_internos
 msgid "Internal Taxes"
 msgstr "Impuestos Internos"
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/res_partner.py:97
+#: code:addons/l10n_ar/models/res_partner.py:0
 #, python-format
 msgid "Invalid length for \"%s\""
 msgstr "Longitud invalida para \"%s\""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_move.py:174
-#, python-format
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: l10n_ar
 #: model:ir.model,name:l10n_ar.model_account_invoice_report
 msgid "Invoices Statistics"
 msgstr "Estadísticas de facturas"
@@ -681,14 +741,20 @@ msgid "Local"
 msgstr ""
 
 #. module: l10n_ar
+#: code:addons/l10n_ar/models/account_move.py:0
+#, python-format
+msgid "Missing Partner Configuration"
+msgstr "Falta configuración del Contacto"
+
+#. module: l10n_ar
 #: selection:res.partner,l10n_ar_gross_income_type:0
 msgid "Multilateral"
 msgstr ""
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_application:0
-msgid "Municipal Taxes"
-msgstr "Impuestos Municipales"
+#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_municipal
+msgid "Municipal Taxes Perceptions"
+msgstr "Percepciones por Impuestos Municipales"
 
 #. module: l10n_ar
 #: model:ir.model.fields,field_description:l10n_ar.field_l10n_ar_afip_responsibility_type__name
@@ -701,11 +767,6 @@ msgid "Name must be unique!"
 msgstr "El nombre debe ser único!"
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_application:0
-msgid "National Taxes"
-msgstr "Impuesto Nacional"
-
-#. module: l10n_ar
 #: model:ir.model.fields,field_description:l10n_ar.field_res_country__l10n_ar_natural_vat
 msgid "Natural Person VAT"
 msgstr "IVA Persona Física"
@@ -716,12 +777,23 @@ msgid "Next Number"
 msgstr "Próximo número"
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/res_partner.py:77
+#: code:addons/l10n_ar/models/res_partner.py:0
 #, python-format
 msgid "No VAT configured for partner [%i] %s"
 msgstr "No hay CUIT configurado para el contacto [%i] %s"
 
 #. module: l10n_ar
+#: model:product.product,name:l10n_ar.product_product_cero
+#: model:product.template,name:l10n_ar.product_product_cero_product_template
+msgid "Non-industrialized animals and vegetables (VAT Zero)"
+msgstr "Animales y vegetales no industrializados (IVA Cero)"
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_vat_afip_code:0
+msgid "Not Applicable"
+msgstr "No Corresponde"
+
+#. module: l10n_ar
 #: selection:l10n_latam.document.type,purchase_aliquots:0
 msgid "Not Zero"
 msgstr "No Cero"
@@ -733,16 +805,31 @@ msgid "Number..."
 msgstr "Número..."
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/res_partner.py:99
+#: code:addons/l10n_ar/models/account_move.py:0
+#, python-format
+msgid "On invoice id \"%s\" you must use VAT Not Applicable on every line."
+msgstr "En la factura con id \"%s\" debe usar IVA NO Corresponde en cada línea."
+
+#. module: l10n_ar
+#: code:addons/l10n_ar/models/account_move.py:0
+#, python-format
+msgid ""
+"On invoice id \"%s\" you must use VAT taxes different than VAT Not "
+"Applicable."
+msgstr ""
+"En la factura con id \"%s\" debes usar impuestos de IVA diferentes de IVA No"
+" Corresponde."
+
+#. module: l10n_ar
+#: code:addons/l10n_ar/models/res_partner.py:0
 #, python-format
 msgid "Only numbers allowed for \"%s\""
 msgstr "Sólo números son permitidos para \"%s\""
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_tax:0
-#: selection:account.tax.group,l10n_ar_type:0
-msgid "Other"
-msgstr "Otro"
+#: model:account.tax.group,name:l10n_ar.tax_group_otras_percepciones
+msgid "Other Perceptions"
+msgstr "Otras Percepciones"
 
 #. module: l10n_ar
 #: model:ir.model.fields,field_description:l10n_ar.field_res_partner__l10n_ar_special_purchase_document_type_ids
@@ -751,47 +838,19 @@ msgid "Other Purchase Documents"
 msgstr "Otros Documentos de Compra"
 
 #. module: l10n_ar
-#: model:ir.model.fields,help:l10n_ar.field_account_tax_group__l10n_ar_application
-msgid "Other Taxes According AFIP"
-msgstr "Otros Impuestos según AFIP"
-
-#. module: l10n_ar
 #: model:ir.model.fields,field_description:l10n_ar.field_res_country__l10n_ar_other_vat
 msgid "Other VAT"
 msgstr "CUIT Otros"
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_application:0
-msgid "Others"
-msgstr "Otros"
-
-#. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_municipal
-msgid "Percepción DREI"
-msgstr ""
-
-#. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_ganancias
-msgid "Percepción Ganancias"
-msgstr ""
-
-#. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_iibb
-msgid "Percepción IIBB"
-msgstr ""
-
-#. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_iva
-msgid "Percepción IVA"
+#: code:addons/l10n_ar/models/account_move.py:0
+#, python-format
+msgid "Please configure the AFIP Responsibility for \"%s\" in order to continue"
 msgstr ""
+"Por favor configure la Responsabilidad AFIP de \"%s\" para poder continuar"
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_type:0
-msgid "Perception"
-msgstr "Percepción"
-
-#. module: l10n_ar
-#: code:addons/l10n_ar/models/account_journal.py:170
+#: code:addons/l10n_ar/models/account_journal.py:0
 #, python-format
 msgid "Please define a valid AFIP POS number"
 msgstr "Por favor defina un número de PdV AFIP válido"
@@ -802,14 +861,9 @@ msgid "Product Unit of Measure"
 msgstr "Unidad de medida del producto"
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_tax:0
-msgid "Profits"
-msgstr "Ganancias"
-
-#. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_application:0
-msgid "Provincial Taxes"
-msgstr "Impuestos Provinciales"
+#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_ganancias
+msgid "Profit Perceptions"
+msgstr "Percepción de Ganancias"
 
 #. module: l10n_ar
 #: model:ir.model.fields,field_description:l10n_ar.field_l10n_latam_document_type__purchase_aliquots
@@ -817,29 +871,20 @@ msgid "Purchase Aliquots"
 msgstr "Alícuotas de Compra"
 
 #. module: l10n_ar
-#: model:ir.ui.menu,name:l10n_ar.menu_afip_responsibility_type
-msgid "Responsibility Types"
-msgstr "Tipos de Responsabilidad"
-
-#. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_retencion_drei
-msgid "Retención DREI"
-msgstr ""
-
-#. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_retencion_ganancias
-msgid "Retención Ganancias"
-msgstr ""
-
-#. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_retencion_iibb
-msgid "Retención IIBB"
+#: model:ir.model.fields,help:l10n_ar.field_l10n_latam_document_type__purchase_aliquots
+msgid ""
+"Raise an error if a vendor bill is miss encoded. \"Not Zero\" means the VAT "
+"taxes are required for the invoices related to this document type, and those"
+" with \"Zero\" means that only \"VAT Not Applicable\" tax is allowed."
 msgstr ""
+"Lanze un error si la factura de vendedor esta mal cargada. \"No Cero\" significa "
+"que los impuestos de IVA son requeridos en las facturas relacionadas a este Tipo "
+" de Documento, y aquellas con \"Cero\" significa que solo  \"IVA No Corresponde\" esta permitido."
 
 #. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_retencion_iva
-msgid "Retención IVA"
-msgstr ""
+#: model:ir.ui.menu,name:l10n_ar.menu_afip_responsibility_type
+msgid "Responsibility Types"
+msgstr "Tipos de Responsabilidad"
 
 #. module: l10n_ar
 #: model:ir.model,name:l10n_ar.model_ir_sequence
@@ -880,9 +925,16 @@ msgid "State"
 msgstr "Estado"
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_type:0
-msgid "TAX"
-msgstr "IMPUESTO"
+#: model:product.product,name:l10n_ar.product_product_tasa_estadistica
+#: model:product.template,name:l10n_ar.product_product_tasa_estadistica_product_template
+msgid "Statistics Rate"
+msgstr "Tasa Estadística"
+
+#. module: l10n_ar
+#: model:product.product,name:l10n_ar.product_product_arancel
+#: model:product.template,name:l10n_ar.product_product_arancel_product_template
+msgid "Tariff"
+msgstr "Arancel"
 
 #. module: l10n_ar
 #: model:ir.model,name:l10n_ar.model_account_tax_group
@@ -890,6 +942,12 @@ msgid "Tax Group"
 msgstr "Grupo de impuestos"
 
 #. module: l10n_ar
+#: model:product.product,name:l10n_ar.product_product_telefonia
+#: model:product.template,name:l10n_ar.product_product_telefonia_product_template
+msgid "Telephone service (VAT 27)"
+msgstr "Servicio Telefónico (IVA 27)"
+
+#. module: l10n_ar
 #: model:ir.model,name:l10n_ar.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
 msgstr "Plantilla de posición fiscal"
@@ -904,7 +962,7 @@ msgstr ""
 "Puede utilizar este campo para la búsqueda rápida."
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/l10n_latam_document_type.py:88
+#: code:addons/l10n_ar/models/l10n_latam_document_type.py:0
 #, python-format
 msgid ""
 "The document number must be entered with a dash (-) and a maximum of 5 characters for the first partand 8 for the second. The following are examples of valid numbers:\n"
@@ -918,56 +976,26 @@ msgstr ""
 "* 00001-00000001"
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_move.py:144
+#: code:addons/l10n_ar/models/l10n_latam_document_type.py:0
 #, python-format
-msgid "The following invoices has a partner without AFIP responsibility"
-msgstr ""
-"Las siguientes facturas tienen una cliente/proveedor sin responsabilidad "
-"AFIP"
+msgid "The number of import Dispatch must be 16 characters"
+msgstr "El número de Despacho de importación debe ser de 16 caracteres"
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_move.py:172
-#, python-format
-msgid ""
-"The following invoices have VAT not applicable but you must select a correct"
-" rate (Not Taxed, Exempt, Zero, 10.5, etc.)"
-msgstr ""
-"Las siguientes facturas tienen IVA no corresponde pero debe seleccionar una "
-"alícuota correcta (No gravado, Exento, Cero, 10.5, etc)"
-
-#. module: l10n_ar
-#: code:addons/l10n_ar/models/account_move.py:161
-#, python-format
-msgid ""
-"The following invoices have incorrect VAT configured. You must use VAT Not "
-"Applicable.<br/> * Invoices: %s"
-msgstr ""
-"Las siguientes facturas tienen configurados IVA incorrecto. Debe utilizar "
-"IVA no corresponde.<br/> *Facturas: %s"
-
-#. module: l10n_ar
-#: code:addons/l10n_ar/models/account_move.py:152
-#, python-format
-msgid "The following partners do not have VAT configured"
-msgstr "Los siguientes contactos no tienen CUIT configurado"
-
-#. module: l10n_ar
-#: code:addons/l10n_ar/models/res_partner.py:95
+#: code:addons/l10n_ar/models/res_partner.py:0
 #, python-format
 msgid "The validation digit is not valid for \"%s\""
 msgstr "El dígito de validación no es válido para \"%s\""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_move.py:136
+#: code:addons/l10n_ar/models/account_move.py:0
 #, python-format
-msgid ""
-"There must be one and only one VAT tax per line. Verify lines with product"
+msgid "There must be one and only one VAT tax per line. Check line \"%s\""
 msgstr ""
-"Debe haber solo un impuesto de IVA por línea. Verifique las líneas con los "
-"productos"
+"Debe haver un único y solo un impuestp de IVA por línea. Revise la línea "
+"\"%s\""
 
 #. module: l10n_ar
-#: model:ir.model.fields,help:l10n_ar.field_account_tax_group__l10n_ar_afip_code
 #: model:ir.model.fields,help:l10n_ar.field_res_country__l10n_ar_afip_code
 #: model:ir.model.fields,help:l10n_ar.field_res_currency__l10n_ar_afip_code
 #: model:ir.model.fields,help:l10n_ar.field_uom_uom__l10n_ar_afip_code
@@ -996,6 +1024,11 @@ msgstr ""
 "Este es el número de PdV asignado por la AFIP para poder generar facturas"
 
 #. module: l10n_ar
+#: model:ir.model.fields,field_description:l10n_ar.field_account_tax_group__l10n_ar_tribute_afip_code
+msgid "Tribute AFIP Code"
+msgstr "Código AFIP Tributos"
+
+#. module: l10n_ar
 #: model:ir.model.fields,help:l10n_ar.field_res_partner__l10n_ar_gross_income_type
 #: model:ir.model.fields,help:l10n_ar.field_res_users__l10n_ar_gross_income_type
 msgid "Type of gross income: exempt, local, multilateral"
@@ -1027,10 +1060,15 @@ msgid "Units"
 msgstr "Unidades"
 
 #. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_vat_afip_code:0
+msgid "Untaxed"
+msgstr "No Gravado"
+
+#. module: l10n_ar
 #: model:product.product,name:l10n_ar.product_product_no_gravado
 #: model:product.template,name:l10n_ar.product_product_no_gravado_product_template
 msgid "Untaxed concepts (VAT NT)"
-msgstr "Conceptos no gravados (IVA NG)"
+msgstr "Conceptos No gravados"
 
 #. module: l10n_ar
 #: model:l10n_latam.identification.type,name:l10n_ar.it_UpApP
@@ -1043,7 +1081,6 @@ msgid "Use same sequence for documents with the same letter"
 msgstr "Usar la misma secuencia para documentos con misma letra"
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_tax:0
 #: model:ir.model.fields,field_description:l10n_ar.field_res_partner__l10n_ar_vat
 #: model:ir.model.fields,field_description:l10n_ar.field_res_users__l10n_ar_vat
 msgid "VAT"
@@ -1080,6 +1117,11 @@ msgid "VAT 5%"
 msgstr "IVA 5%"
 
 #. module: l10n_ar
+#: model:ir.model.fields,field_description:l10n_ar.field_account_tax_group__l10n_ar_vat_afip_code
+msgid "VAT AFIP Code"
+msgstr "Código AFIP de IVA"
+
+#. module: l10n_ar
 #: model_terms:ir.ui.view,arch_db:l10n_ar.argentinian_extra_info
 msgid "VAT Cond.:"
 msgstr "Cond. IVA:"
@@ -1095,9 +1137,9 @@ msgid "VAT Not Applicable"
 msgstr "IVA No Corresponde"
 
 #. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_iva_gravado
-msgid "VAT Taxed"
-msgstr "IVA Gravado"
+#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_iva
+msgid "VAT Perception"
+msgstr "Percepción de IVA"
 
 #. module: l10n_ar
 #: model:account.tax.group,name:l10n_ar.tax_group_iva_no_gravado
@@ -1105,17 +1147,18 @@ msgid "VAT Untaxed"
 msgstr "IVA No Gravado"
 
 #. module: l10n_ar
-#: model_terms:ir.ui.view,arch_db:l10n_ar.view_account_invoice_report_search_inherit
-msgid "With Document"
-msgstr ""
+#: code:addons/l10n_ar/models/account_fiscal_position.py:0
+#, python-format
+msgid "Warning"
+msgstr "Advertencia"
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_type:0
-msgid "Withholding"
-msgstr "Retención"
+#: model_terms:ir.ui.view,arch_db:l10n_ar.view_account_invoice_report_search_inherit
+msgid "With Document"
+msgstr "Con Documento"
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_chart_template.py:69
+#: code:addons/l10n_ar/models/account_chart_template.py:0
 #, python-format
 msgid ""
 "You are trying to install a chart of account for the %s responsibility but "
@@ -1125,7 +1168,7 @@ msgstr ""
 " tu compañía ha sido configurada con el tipo %s"
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_journal.py:132
+#: code:addons/l10n_ar/models/account_journal.py:0
 #, python-format
 msgid ""
 "You can not change the journal configuration for a journal that already have"
@@ -1140,7 +1183,7 @@ msgid "Zero"
 msgstr "Cero"
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/l10n_latam_document_type.py:67
+#: code:addons/l10n_ar/models/l10n_latam_document_type.py:0
 #, python-format
 msgid "is not a valid value for"
 msgstr "no es un valor valido para"
diff --git a/addons/l10n_ar/i18n/l10n_ar.pot b/addons/l10n_ar/i18n/l10n_ar.pot
index 3e921a04d76..d4ad3ece408 100644
--- a/addons/l10n_ar/i18n/l10n_ar.pot
+++ b/addons/l10n_ar/i18n/l10n_ar.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 13.0alpha1+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-03 16:16+0000\n"
-"PO-Revision-Date: 2019-08-03 16:16+0000\n"
+"POT-Creation-Date: 2019-08-22 12:59+0000\n"
+"PO-Revision-Date: 2019-08-22 12:59+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,68 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: l10n_ar
-#: model_terms:ir.ui.view,arch_db:l10n_ar.report_invoice_document
-msgid "<br/><span>Incoterm: </span>"
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "01 - National Taxes"
 msgstr ""
 
 #. module: l10n_ar
-#: model_terms:ir.ui.view,arch_db:l10n_ar.report_invoice_document
-msgid "<span>VAT Cond.: </span>"
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "02 - Provincial Taxes"
+msgstr ""
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "03 - Municipal Taxes"
+msgstr ""
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "04 - Internal Taxes"
+msgstr ""
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "06 - VAT perception"
+msgstr ""
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "07 - IIBB perception"
+msgstr ""
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "08 - Municipal Taxes Perceptions"
+msgstr ""
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "09 - Other Perceptions"
+msgstr ""
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_vat_afip_code:0
+msgid "10.5%"
+msgstr ""
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_vat_afip_code:0
+msgid "2,5%"
+msgstr ""
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_vat_afip_code:0
+msgid "21%"
+msgstr ""
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_vat_afip_code:0
+msgid "27%"
+msgstr ""
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_tribute_afip_code:0
+msgid "99 - Others"
 msgstr ""
 
 #. module: l10n_ar
@@ -34,11 +89,11 @@ msgstr ""
 
 #. module: l10n_ar
 #: model:ir.ui.menu,name:l10n_ar.menu_afip_config
+#: model_terms:ir.ui.view,arch_db:l10n_ar.view_move_form
 msgid "AFIP"
 msgstr ""
 
 #. module: l10n_ar
-#: model:ir.model.fields,field_description:l10n_ar.field_account_tax_group__l10n_ar_afip_code
 #: model:ir.model.fields,field_description:l10n_ar.field_l10n_latam_identification_type__l10n_ar_afip_code
 #: model:ir.model.fields,field_description:l10n_ar.field_res_country__l10n_ar_afip_code
 #: model:ir.model.fields,field_description:l10n_ar.field_res_currency__l10n_ar_afip_code
@@ -142,16 +197,6 @@ msgid "Activities Start Date:"
 msgstr ""
 
 #. module: l10n_ar
-#: model:ir.model.fields,field_description:l10n_ar.field_account_tax_group__l10n_ar_application_code
-msgid "Application Code"
-msgstr ""
-
-#. module: l10n_ar
-#: model:ir.model.fields,field_description:l10n_ar.field_account_tax_group__l10n_ar_application
-msgid "Argentinian Application"
-msgstr ""
-
-#. module: l10n_ar
 #: model_terms:ir.ui.view,arch_db:l10n_ar.view_document_type_filter
 msgid "Argentinian Documents"
 msgstr ""
@@ -162,18 +207,14 @@ msgid "Argentinian Statements"
 msgstr ""
 
 #. module: l10n_ar
-#: model:ir.model.fields,field_description:l10n_ar.field_account_tax_group__l10n_ar_tax
-msgid "Argentinian Tax"
-msgstr ""
-
-#. module: l10n_ar
-#: model:ir.model.fields,field_description:l10n_ar.field_account_tax_group__l10n_ar_type
-msgid "Argentinian Type"
+#: model:ir.model,name:l10n_ar.model_res_partner_bank
+msgid "Bank Accounts"
 msgstr ""
 
 #. module: l10n_ar
-#: model:ir.model,name:l10n_ar.model_res_partner_bank
-msgid "Bank Accounts"
+#: model:product.product,name:l10n_ar.product_product_exento
+#: model:product.template,name:l10n_ar.product_product_exento_product_template
+msgid "Book \"Development in Odoo\" (VAT Exempt)"
 msgstr ""
 
 #. module: l10n_ar
@@ -182,7 +223,7 @@ msgid "CBA"
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/res_partner_bank.py:18
+#: code:addons/l10n_ar/models/res_partner_bank.py:0
 #, python-format
 msgid "CBU"
 msgstr ""
@@ -323,7 +364,7 @@ msgid "CUIT"
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_journal.py:65
+#: code:addons/l10n_ar/models/account_journal.py:0
 #, python-format
 msgid ""
 "Can not create chart of account until you configure your company AFIP "
@@ -336,11 +377,6 @@ msgid "CdM"
 msgstr ""
 
 #. module: l10n_ar
-#: model_terms:ir.ui.view,arch_db:l10n_ar.report_invoice_document
-msgid "Cod"
-msgstr ""
-
-#. module: l10n_ar
 #: model:ir.model.fields,field_description:l10n_ar.field_l10n_ar_afip_responsibility_type__code
 msgid "Code"
 msgstr ""
@@ -382,7 +418,7 @@ msgid "Contact"
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/res_company.py:51
+#: code:addons/l10n_ar/models/res_company.py:0
 #, python-format
 msgid ""
 "Could not change the AFIP Responsibility of this company because there are "
@@ -425,6 +461,21 @@ msgid "DNI"
 msgstr ""
 
 #. module: l10n_ar
+#: model:res.company,overdue_msg:l10n_ar.company_exento
+#: model:res.company,overdue_msg:l10n_ar.company_mono
+#: model:res.company,overdue_msg:l10n_ar.company_ri
+msgid ""
+"Dear Sir/Madam,\n"
+"\n"
+"Our records indicate that some payments on your account are still due. Please find details below.\n"
+"If the amount has already been paid, please disregard this notice. Otherwise, please forward us the total amount stated below.\n"
+"If you have any queries regarding your account, Please contact us.\n"
+"\n"
+"Thank you in advance for your cooperation.\n"
+"Best Regards,"
+msgstr ""
+
+#. module: l10n_ar
 #: model:ir.model.fields,help:l10n_ar.field_account_move__l10n_ar_afip_responsibility_type_id
 #: model:ir.model.fields,help:l10n_ar.field_res_company__l10n_ar_afip_responsibility_type_id
 #: model:ir.model.fields,help:l10n_ar.field_res_partner__l10n_ar_afip_responsibility_type_id
@@ -457,6 +508,7 @@ msgid "ET"
 msgstr ""
 
 #. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_vat_afip_code:0
 #: selection:res.partner,l10n_ar_gross_income_type:0
 msgid "Exempt"
 msgstr ""
@@ -494,13 +546,12 @@ msgid ""
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_journal.py:66
+#: code:addons/l10n_ar/models/account_journal.py:0
 #, python-format
 msgid "Go to Companies"
 msgstr ""
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_tax:0
 #: model:ir.model.fields,field_description:l10n_ar.field_res_company__l10n_ar_gross_income_type
 #: model_terms:ir.ui.view,arch_db:l10n_ar.view_company_form
 #: model_terms:ir.ui.view,arch_db:l10n_ar.view_partner_property_form
@@ -549,40 +600,41 @@ msgid "IIBB - Sales by jurisdiction"
 msgstr ""
 
 #. module: l10n_ar
+#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_iibb
+msgid "IIBB Perceptions"
+msgstr ""
+
+#. module: l10n_ar
 #: model:ir.model,name:l10n_ar.model_l10n_latam_identification_type
 msgid "Identification Types"
 msgstr ""
 
 #. module: l10n_ar
-#: model:product.product,name:l10n_ar.product_product_quote_despacho
-#: model:product.template,name:l10n_ar.product_product_quote_despacho_product_template
-msgid "Import Clearance"
+#: code:addons/l10n_ar/models/account_fiscal_position.py:0
+#, python-format
+msgid ""
+"If use AFIP Responsibility then the country / zip codes will be not take "
+"into account"
 msgstr ""
 
 #. module: l10n_ar
-#: model:ir.model.fields,help:l10n_ar.field_l10n_latam_document_type__purchase_aliquots
-msgid "Indicates if this type of documents has VAT or Not"
+#: model:product.product,name:l10n_ar.product_product_quote_despacho
+#: model:product.template,name:l10n_ar.product_product_quote_despacho_product_template
+msgid "Import Clearance"
 msgstr ""
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_application:0
 #: model:account.tax.group,name:l10n_ar.tax_impuestos_internos
 msgid "Internal Taxes"
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/res_partner.py:97
+#: code:addons/l10n_ar/models/res_partner.py:0
 #, python-format
 msgid "Invalid length for \"%s\""
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_move.py:174
-#, python-format
-msgid "Invoices"
-msgstr ""
-
-#. module: l10n_ar
 #: model:ir.model,name:l10n_ar.model_account_invoice_report
 msgid "Invoices Statistics"
 msgstr ""
@@ -663,13 +715,19 @@ msgid "Local"
 msgstr ""
 
 #. module: l10n_ar
+#: code:addons/l10n_ar/models/account_move.py:0
+#, python-format
+msgid "Missing Partner Configuration"
+msgstr ""
+
+#. module: l10n_ar
 #: selection:res.partner,l10n_ar_gross_income_type:0
 msgid "Multilateral"
 msgstr ""
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_application:0
-msgid "Municipal Taxes"
+#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_municipal
+msgid "Municipal Taxes Perceptions"
 msgstr ""
 
 #. module: l10n_ar
@@ -683,11 +741,6 @@ msgid "Name must be unique!"
 msgstr ""
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_application:0
-msgid "National Taxes"
-msgstr ""
-
-#. module: l10n_ar
 #: model:ir.model.fields,field_description:l10n_ar.field_res_country__l10n_ar_natural_vat
 msgid "Natural Person VAT"
 msgstr ""
@@ -698,82 +751,77 @@ msgid "Next Number"
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/res_partner.py:77
+#: code:addons/l10n_ar/models/res_partner.py:0
 #, python-format
 msgid "No VAT configured for partner [%i] %s"
 msgstr ""
 
 #. module: l10n_ar
-#: selection:l10n_latam.document.type,purchase_aliquots:0
-msgid "Not Zero"
+#: model:product.product,name:l10n_ar.product_product_cero
+#: model:product.template,name:l10n_ar.product_product_cero_product_template
+msgid "Non-industrialized animals and vegetables (VAT Zero)"
 msgstr ""
 
 #. module: l10n_ar
-#: model_terms:ir.ui.view,arch_db:l10n_ar.view_company_form
-#: model_terms:ir.ui.view,arch_db:l10n_ar.view_partner_property_form
-msgid "Number..."
+#: selection:account.tax.group,l10n_ar_vat_afip_code:0
+msgid "Not Applicable"
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/res_partner.py:99
-#, python-format
-msgid "Only numbers allowed for \"%s\""
-msgstr ""
-
-#. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_tax:0
-#: selection:account.tax.group,l10n_ar_type:0
-msgid "Other"
-msgstr ""
-
-#. module: l10n_ar
-#: model:ir.model.fields,field_description:l10n_ar.field_res_partner__l10n_ar_special_purchase_document_type_ids
-#: model:ir.model.fields,field_description:l10n_ar.field_res_users__l10n_ar_special_purchase_document_type_ids
-msgid "Other Purchase Documents"
+#: selection:l10n_latam.document.type,purchase_aliquots:0
+msgid "Not Zero"
 msgstr ""
 
 #. module: l10n_ar
-#: model:ir.model.fields,help:l10n_ar.field_account_tax_group__l10n_ar_application
-msgid "Other Taxes According AFIP"
+#: model_terms:ir.ui.view,arch_db:l10n_ar.view_company_form
+#: model_terms:ir.ui.view,arch_db:l10n_ar.view_partner_property_form
+msgid "Number..."
 msgstr ""
 
 #. module: l10n_ar
-#: model:ir.model.fields,field_description:l10n_ar.field_res_country__l10n_ar_other_vat
-msgid "Other VAT"
+#: code:addons/l10n_ar/models/account_move.py:0
+#, python-format
+msgid "On invoice id \"%s\" you must use VAT Not Applicable on every line."
 msgstr ""
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_application:0
-msgid "Others"
+#: code:addons/l10n_ar/models/account_move.py:0
+#, python-format
+msgid ""
+"On invoice id \"%s\" you must use VAT taxes different than VAT Not "
+"Applicable."
 msgstr ""
 
 #. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_municipal
-msgid "Percepción DREI"
+#: code:addons/l10n_ar/models/res_partner.py:0
+#, python-format
+msgid "Only numbers allowed for \"%s\""
 msgstr ""
 
 #. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_ganancias
-msgid "Percepción Ganancias"
+#: model:account.tax.group,name:l10n_ar.tax_group_otras_percepciones
+msgid "Other Perceptions"
 msgstr ""
 
 #. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_iibb
-msgid "Percepción IIBB"
+#: model:ir.model.fields,field_description:l10n_ar.field_res_partner__l10n_ar_special_purchase_document_type_ids
+#: model:ir.model.fields,field_description:l10n_ar.field_res_users__l10n_ar_special_purchase_document_type_ids
+msgid "Other Purchase Documents"
 msgstr ""
 
 #. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_iva
-msgid "Percepción IVA"
+#: model:ir.model.fields,field_description:l10n_ar.field_res_country__l10n_ar_other_vat
+msgid "Other VAT"
 msgstr ""
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_type:0
-msgid "Perception"
+#: code:addons/l10n_ar/models/account_move.py:0
+#, python-format
+msgid "Please configure the AFIP Responsibility for \"%s\" in order to continue"
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_journal.py:170
+#: code:addons/l10n_ar/models/account_journal.py:0
 #, python-format
 msgid "Please define a valid AFIP POS number"
 msgstr ""
@@ -784,13 +832,8 @@ msgid "Product Unit of Measure"
 msgstr ""
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_tax:0
-msgid "Profits"
-msgstr ""
-
-#. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_application:0
-msgid "Provincial Taxes"
+#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_ganancias
+msgid "Profit Perceptions"
 msgstr ""
 
 #. module: l10n_ar
@@ -799,28 +842,16 @@ msgid "Purchase Aliquots"
 msgstr ""
 
 #. module: l10n_ar
-#: model:ir.ui.menu,name:l10n_ar.menu_afip_responsibility_type
-msgid "Responsibility Types"
-msgstr ""
-
-#. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_retencion_drei
-msgid "Retención DREI"
-msgstr ""
-
-#. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_retencion_ganancias
-msgid "Retención Ganancias"
-msgstr ""
-
-#. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_retencion_iibb
-msgid "Retención IIBB"
+#: model:ir.model.fields,help:l10n_ar.field_l10n_latam_document_type__purchase_aliquots
+msgid ""
+"Raise an error if a vendor bill is miss encoded. \"Not Zero\" means the VAT "
+"taxes are required for the invoices related to this document type, and those"
+" with \"Zero\" means that only \"VAT Not Applicable\" tax is allowed."
 msgstr ""
 
 #. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_retencion_iva
-msgid "Retención IVA"
+#: model:ir.ui.menu,name:l10n_ar.menu_afip_responsibility_type
+msgid "Responsibility Types"
 msgstr ""
 
 #. module: l10n_ar
@@ -854,25 +885,32 @@ msgid "Sigd"
 msgstr ""
 
 #. module: l10n_ar
+#: model:ir.model.fields,field_description:l10n_ar.field_account_invoice_report__l10n_ar_state_id
+#: model_terms:ir.ui.view,arch_db:l10n_ar.view_account_invoice_report_search_inherit
+msgid "State"
+msgstr ""
+
+#. module: l10n_ar
 #: model:product.product,name:l10n_ar.product_product_tasa_estadistica
 #: model:product.template,name:l10n_ar.product_product_tasa_estadistica_product_template
 msgid "Statistics Rate"
 msgstr ""
 
 #. module: l10n_ar
-#: model:ir.model.fields,field_description:l10n_ar.field_account_invoice_report__l10n_ar_state_id
-#: model_terms:ir.ui.view,arch_db:l10n_ar.view_account_invoice_report_search_inherit
-msgid "State"
+#: model:product.product,name:l10n_ar.product_product_arancel
+#: model:product.template,name:l10n_ar.product_product_arancel_product_template
+msgid "Tariff"
 msgstr ""
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_type:0
-msgid "TAX"
+#: model:ir.model,name:l10n_ar.model_account_tax_group
+msgid "Tax Group"
 msgstr ""
 
 #. module: l10n_ar
-#: model:ir.model,name:l10n_ar.model_account_tax_group
-msgid "Tax Group"
+#: model:product.product,name:l10n_ar.product_product_telefonia
+#: model:product.template,name:l10n_ar.product_product_telefonia_product_template
+msgid "Telephone service (VAT 27)"
 msgstr ""
 
 #. module: l10n_ar
@@ -888,7 +926,7 @@ msgid ""
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/l10n_latam_document_type.py:88
+#: code:addons/l10n_ar/models/l10n_latam_document_type.py:0
 #, python-format
 msgid ""
 "The document number must be entered with a dash (-) and a maximum of 5 characters for the first partand 8 for the second. The following are examples of valid numbers:\n"
@@ -898,48 +936,24 @@ msgid ""
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_move.py:144
-#, python-format
-msgid "The following invoices has a partner without AFIP responsibility"
-msgstr ""
-
-#. module: l10n_ar
-#: code:addons/l10n_ar/models/account_move.py:172
-#, python-format
-msgid ""
-"The following invoices have VAT not applicable but you must select a correct"
-" rate (Not Taxed, Exempt, Zero, 10.5, etc.)"
-msgstr ""
-
-#. module: l10n_ar
-#: code:addons/l10n_ar/models/account_move.py:161
-#, python-format
-msgid ""
-"The following invoices have incorrect VAT configured. You must use VAT Not "
-"Applicable.<br/> * Invoices: %s"
-msgstr ""
-
-#. module: l10n_ar
-#: code:addons/l10n_ar/models/account_move.py:152
+#: code:addons/l10n_ar/models/l10n_latam_document_type.py:0
 #, python-format
-msgid "The following partners do not have VAT configured"
+msgid "The number of import Dispatch must be 16 characters"
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/res_partner.py:95
+#: code:addons/l10n_ar/models/res_partner.py:0
 #, python-format
 msgid "The validation digit is not valid for \"%s\""
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_move.py:136
+#: code:addons/l10n_ar/models/account_move.py:0
 #, python-format
-msgid ""
-"There must be one and only one VAT tax per line. Verify lines with product"
+msgid "There must be one and only one VAT tax per line. Check line \"%s\""
 msgstr ""
 
 #. module: l10n_ar
-#: model:ir.model.fields,help:l10n_ar.field_account_tax_group__l10n_ar_afip_code
 #: model:ir.model.fields,help:l10n_ar.field_res_country__l10n_ar_afip_code
 #: model:ir.model.fields,help:l10n_ar.field_res_currency__l10n_ar_afip_code
 #: model:ir.model.fields,help:l10n_ar.field_uom_uom__l10n_ar_afip_code
@@ -965,6 +979,11 @@ msgid ""
 msgstr ""
 
 #. module: l10n_ar
+#: model:ir.model.fields,field_description:l10n_ar.field_account_tax_group__l10n_ar_tribute_afip_code
+msgid "Tribute AFIP Code"
+msgstr ""
+
+#. module: l10n_ar
 #: model:ir.model.fields,help:l10n_ar.field_res_partner__l10n_ar_gross_income_type
 #: model:ir.model.fields,help:l10n_ar.field_res_users__l10n_ar_gross_income_type
 msgid "Type of gross income: exempt, local, multilateral"
@@ -976,6 +995,37 @@ msgid "Unified Book"
 msgstr ""
 
 #. module: l10n_ar
+#: model:product.product,uom_name:l10n_ar.product_product_arancel
+#: model:product.product,uom_name:l10n_ar.product_product_cero
+#: model:product.product,uom_name:l10n_ar.product_product_exento
+#: model:product.product,uom_name:l10n_ar.product_product_no_gravado
+#: model:product.product,uom_name:l10n_ar.product_product_quote_despacho
+#: model:product.product,uom_name:l10n_ar.product_product_servicio_de_guarda
+#: model:product.product,uom_name:l10n_ar.product_product_tasa_estadistica
+#: model:product.product,uom_name:l10n_ar.product_product_telefonia
+#: model:product.template,uom_name:l10n_ar.product_product_arancel_product_template
+#: model:product.template,uom_name:l10n_ar.product_product_cero_product_template
+#: model:product.template,uom_name:l10n_ar.product_product_exento_product_template
+#: model:product.template,uom_name:l10n_ar.product_product_no_gravado_product_template
+#: model:product.template,uom_name:l10n_ar.product_product_quote_despacho_product_template
+#: model:product.template,uom_name:l10n_ar.product_product_servicio_de_guarda_product_template
+#: model:product.template,uom_name:l10n_ar.product_product_tasa_estadistica_product_template
+#: model:product.template,uom_name:l10n_ar.product_product_telefonia_product_template
+msgid "Units"
+msgstr ""
+
+#. module: l10n_ar
+#: selection:account.tax.group,l10n_ar_vat_afip_code:0
+msgid "Untaxed"
+msgstr ""
+
+#. module: l10n_ar
+#: model:product.product,name:l10n_ar.product_product_no_gravado
+#: model:product.template,name:l10n_ar.product_product_no_gravado_product_template
+msgid "Untaxed concepts (VAT NT)"
+msgstr ""
+
+#. module: l10n_ar
 #: model:l10n_latam.identification.type,name:l10n_ar.it_UpApP
 msgid "UpApP"
 msgstr ""
@@ -986,7 +1036,6 @@ msgid "Use same sequence for documents with the same letter"
 msgstr ""
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_tax:0
 #: model:ir.model.fields,field_description:l10n_ar.field_res_partner__l10n_ar_vat
 #: model:ir.model.fields,field_description:l10n_ar.field_res_users__l10n_ar_vat
 msgid "VAT"
@@ -1023,6 +1072,11 @@ msgid "VAT 5%"
 msgstr ""
 
 #. module: l10n_ar
+#: model:ir.model.fields,field_description:l10n_ar.field_account_tax_group__l10n_ar_vat_afip_code
+msgid "VAT AFIP Code"
+msgstr ""
+
+#. module: l10n_ar
 #: model_terms:ir.ui.view,arch_db:l10n_ar.argentinian_extra_info
 msgid "VAT Cond.:"
 msgstr ""
@@ -1038,8 +1092,8 @@ msgid "VAT Not Applicable"
 msgstr ""
 
 #. module: l10n_ar
-#: model:account.tax.group,name:l10n_ar.tax_group_iva_gravado
-msgid "VAT Taxed"
+#: model:account.tax.group,name:l10n_ar.tax_group_percepcion_iva
+msgid "VAT Perception"
 msgstr ""
 
 #. module: l10n_ar
@@ -1048,17 +1102,18 @@ msgid "VAT Untaxed"
 msgstr ""
 
 #. module: l10n_ar
-#: model_terms:ir.ui.view,arch_db:l10n_ar.view_account_invoice_report_search_inherit
-msgid "With Document"
+#: code:addons/l10n_ar/models/account_fiscal_position.py:0
+#, python-format
+msgid "Warning"
 msgstr ""
 
 #. module: l10n_ar
-#: selection:account.tax.group,l10n_ar_type:0
-msgid "Withholding"
+#: model_terms:ir.ui.view,arch_db:l10n_ar.view_account_invoice_report_search_inherit
+msgid "With Document"
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_chart_template.py:69
+#: code:addons/l10n_ar/models/account_chart_template.py:0
 #, python-format
 msgid ""
 "You are trying to install a chart of account for the %s responsibility but "
@@ -1066,7 +1121,7 @@ msgid ""
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/account_journal.py:132
+#: code:addons/l10n_ar/models/account_journal.py:0
 #, python-format
 msgid ""
 "You can not change the journal configuration for a journal that already have"
@@ -1079,7 +1134,7 @@ msgid "Zero"
 msgstr ""
 
 #. module: l10n_ar
-#: code:addons/l10n_ar/models/l10n_latam_document_type.py:67
+#: code:addons/l10n_ar/models/l10n_latam_document_type.py:0
 #, python-format
 msgid "is not a valid value for"
 msgstr ""
diff --git a/addons/l10n_ar/models/account_chart_template.py b/addons/l10n_ar/models/account_chart_template.py
index f83a3371833..bc60a4e1345 100644
--- a/addons/l10n_ar/models/account_chart_template.py
+++ b/addons/l10n_ar/models/account_chart_template.py
@@ -27,18 +27,15 @@ class AccountChartTemplate(models.Model):
         return res
 
     @api.model
-    def _get_ar_responsibility_match(self, chart_template_id=False):
-        """ If not chart_template_id: return the {recordset(coa): recordset(responsibility recordset)} match dictionary
-            if chart_template_id: return responsibility type that match with the given chart_template_id
+    def _get_ar_responsibility_match(self, chart_template_id):
+        """ return responsibility type that match with the given chart_template_id
         """
         match = {
             self.env.ref('l10n_ar.l10nar_base_chart_template').id: self.env.ref('l10n_ar.res_RM'),
             self.env.ref('l10n_ar.l10nar_ex_chart_template').id: self.env.ref('l10n_ar.res_IVAE'),
             self.env.ref('l10n_ar.l10nar_ri_chart_template').id: self.env.ref('l10n_ar.res_IVARI'),
         }
-        if chart_template_id:
-            return match.get(chart_template_id)
-        return match
+        return match.get(chart_template_id)
 
     def _load(self, sale_tax_rate, purchase_tax_rate, company):
         """ Set companies AFIP Responsibility and Country if AR CoA is installed, also set tax calculation rounding
@@ -48,18 +45,16 @@ class AccountChartTemplate(models.Model):
         Responsibility defined in the company
         """
         self.ensure_one()
-        if company.country_id == self.env.ref('base.ar'):
+        coa_responsibility = self._get_ar_responsibility_match(self.id)
+        if coa_responsibility:
             company_responsibility = company.l10n_ar_afip_responsibility_type_id
-            coa_responsibility = self._get_ar_responsibility_match(self.id)
-            if coa_responsibility:
-                company.write({
-                    'l10n_ar_afip_responsibility_type_id': coa_responsibility.id,
-                    'country_id': self.env.ref('base.ar').id,
-                    'tax_calculation_rounding_method': 'round_globally',
-                })
-
             if company_responsibility and company_responsibility != coa_responsibility:
                 raise UserError(_(
-                    'You are trying to install a chart of account for the %s responsibility but your company is configured'
-                    ' as %s type' % (coa_responsibility.name, company_responsibility.name)))
+                    'You are trying to install a chart of account for the %s responsibility but your company is'
+                    ' configured as %s type' % (coa_responsibility.name, company_responsibility.name)))
+            company.write({
+                'l10n_ar_afip_responsibility_type_id': coa_responsibility.id,
+                'country_id': self.env.ref('base.ar').id,
+                'tax_calculation_rounding_method': 'round_globally',
+            })
         return super()._load(sale_tax_rate, purchase_tax_rate, company)
diff --git a/addons/l10n_ar/models/account_fiscal_position.py b/addons/l10n_ar/models/account_fiscal_position.py
index 9e54831f8ff..e00005ac62b 100644
--- a/addons/l10n_ar/models/account_fiscal_position.py
+++ b/addons/l10n_ar/models/account_fiscal_position.py
@@ -1,5 +1,5 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import fields, models
+from odoo import fields, models, api, _
 
 
 class AccountFiscalPosition(models.Model):
@@ -22,5 +22,16 @@ class AccountFiscalPosition(models.Model):
             ]
             if self.env.context.get('force_company'):
                 domain.append(('company_id', '=', self.env.context.get('force_company')))
-            return self.search(domain, limit=1).id
+            fp = self.search(domain, limit=1).id
+            if fp:
+                return fp
         return super().get_fiscal_position(partner_id, delivery_id=delivery_id)
+
+    @api.onchange('l10n_ar_afip_responsibility_type_ids', 'country_group_id', 'country_id', 'zip_from', 'zip_to')
+    def _onchange_afip_responsibility(self):
+        if self.company_id.country_id == self.env.ref('base.ar'):
+            if self.l10n_ar_afip_responsibility_type_ids and any(['country_group_id', 'country_id', 'zip_from', 'zip_to']):
+                return {'warning': {
+                    'title': _("Warning"),
+                    'message': _('If use AFIP Responsibility then the country / zip codes will be not take into account'),
+                }}
diff --git a/addons/l10n_ar/models/account_journal.py b/addons/l10n_ar/models/account_journal.py
index e568db79685..ce26069294b 100644
--- a/addons/l10n_ar/models/account_journal.py
+++ b/addons/l10n_ar/models/account_journal.py
@@ -23,10 +23,10 @@ class AccountJournal(models.Model):
         return [
             ('II_IM', 'Pre-printed Invoice'),
             ('RLI_RLM', 'Online Invoice'),
-            ('BFERCEL', 'Electronic Fiscal Bonds - Online Invoice'),
-            ('FEERCELP', 'Export Vouchers - Billing Plus'),
-            ('FEERCEL', 'Export Vouchers - Online Invoice'),
-            ('CPERCEL', 'Product Coding - Online Vouchers'),
+            ('BFERCEL', 'Electronic Fiscal Bond - Online Invoice'),
+            ('FEERCELP', 'Export Voucher - Billing Plus'),
+            ('FEERCEL', 'Export Voucher - Online Invoice'),
+            ('CPERCEL', 'Product Coding - Online Voucher'),
         ]
 
     def _get_journal_letter(self, counterpart_partner=False):
@@ -105,7 +105,7 @@ class AccountJournal(models.Model):
     def create(self, values):
         """ Create Document sequences after create the journal """
         res = super().create(values)
-        res.create_document_sequences()
+        res._l10n_ar_create_document_sequences()
         return res
 
     def write(self, values):
@@ -115,7 +115,7 @@ class AccountJournal(models.Model):
         res = super().write(values)
         if to_check.intersection(set(values.keys())):
             for rec in self:
-                rec.create_document_sequences()
+                rec._l10n_ar_create_document_sequences()
         return res
 
     @api.constrains('type', 'l10n_ar_afip_pos_system', 'l10n_ar_afip_pos_number', 'l10n_ar_share_sequences',
@@ -133,7 +133,7 @@ class AccountJournal(models.Model):
                 'You can not change the journal configuration for a journal that already have validate invoices') +
                 ':<br/><br/> - %s' % ('<br/>- '.join(invoices.mapped('display_name'))))
 
-    def create_document_sequences(self):
+    def _l10n_ar_create_document_sequences(self):
         """ IF AFIP Configuration change try to review if this can be done and then create / update the document
         sequences """
         self.ensure_one()
@@ -159,7 +159,7 @@ class AccountJournal(models.Model):
                lambda x: x.l10n_ar_letter == document.l10n_ar_letter):
                 continue
 
-            sequences |= self.env['ir.sequence'].create(document.get_document_sequence_vals(self))
+            sequences |= self.env['ir.sequence'].create(document._get_document_sequence_vals(self))
         return sequences
 
     @api.constrains('l10n_ar_afip_pos_number')
diff --git a/addons/l10n_ar/models/account_move.py b/addons/l10n_ar/models/account_move.py
index 6dd6b2c8727..8d235662ca2 100644
--- a/addons/l10n_ar/models/account_move.py
+++ b/addons/l10n_ar/models/account_move.py
@@ -25,7 +25,6 @@ class AccountMove(models.Model):
         ' identify the type of responsibilities that a person or a legal entity could have and that impacts in the'
         ' type of operations and requirements they need.')
 
-    # TODO make it editable, we have to change move creation method
     l10n_ar_currency_rate = fields.Float(copy=False, digits=(16, 4), readonly=True, string="Currency Rate")
 
     # Mostly used on reports
@@ -52,22 +51,20 @@ class AccountMove(models.Model):
     def _get_concept(self):
         """ Method to get the concept of the invoice considering the type of the products on the invoice """
         self.ensure_one()
-        invoice_lines = self.invoice_line_ids
+        invoice_lines = self.invoice_line_ids.filtered(lambda x: not x.display_type)
         product_types = set([x.product_id.type for x in invoice_lines if x.product_id])
         consumable = set(['consu', 'product'])
         service = set(['service'])
         mixed = set(['consu', 'service', 'product'])
+        # on expo invoice you can mix services and products
+        expo_invoice = self.l10n_latam_document_type_id.code in ['19', '20', '21']
+
         # Default value "product"
         afip_concept = '1'
-        if product_types.issubset(mixed):
-            afip_concept = '3'
-        if product_types.issubset(service):
+        if product_types == service:
             afip_concept = '2'
-        if product_types.issubset(consumable):
-            afip_concept = '1'
-        # on expo invoice you can mix services and products
-        if self.l10n_latam_document_type_id.code in ['19', '20', '21'] and afip_concept == '3':
-            afip_concept = '1'
+        elif product_types - consumable and product_types - service and not expo_invoice:
+            afip_concept = '3'
         return afip_concept
 
     def _get_l10n_latam_documents_domain(self):
@@ -82,7 +79,6 @@ class AccountMove(models.Model):
         return domain
 
     def _check_argentinian_invoice_taxes(self):
-        _logger.info('Running checks related to argentinian documents')
 
         # check vat on companies thats has it (Responsable inscripto)
         for inv in self.filtered(lambda x: x.company_id.l10n_ar_company_requires_vat):
@@ -106,11 +102,6 @@ class AccountMove(models.Model):
             if not rec.l10n_ar_afip_service_end:
                 rec.l10n_ar_afip_service_end = rec.invoice_date + relativedelta(day=1, days=-1, months=+1)
 
-    @api.onchange('invoice_date')
-    def _onchange_invoice_date(self):
-        super()._onchange_invoice_date()
-        self._set_afip_service_dates()
-
     @api.onchange('partner_id')
     def _onchange_afip_responsibility(self):
         if self.company_id.country_id == self.env.ref('base.ar') and self.l10n_latam_use_documents and self.partner_id \
@@ -161,18 +152,18 @@ class AccountMove(models.Model):
                     1.0, rec.company_id.currency_id, rec.company_id, rec.invoice_date or fields.Date.today(), round=False)
             rec.l10n_ar_currency_rate = l10n_ar_currency_rate
 
-        # We make validations here and not with a constraint because we want validaiton before sending electronic
+        # We make validations here and not with a constraint because we want validation before sending electronic
         # data on l10n_ar_edi
         ar_invoices._check_argentinian_invoice_taxes()
-        return super().post()
+        res = super().post()
+        self._set_afip_service_dates()
+        return res
 
     def _reverse_moves(self, default_values_list=None, cancel=False):
         if not default_values_list:
             default_values_list = [{} for move in self]
         for move, default_values in zip(self, default_values_list):
             default_values.update({
-                # TODO enable when we make l10n_ar_currency_rate editable
-                # 'l10n_ar_currency_rate': move.l10n_ar_currency_rate,
                 'l10n_ar_afip_service_start': move.l10n_ar_afip_service_start,
                 'l10n_ar_afip_service_end': move.l10n_ar_afip_service_end,
             })
diff --git a/addons/l10n_ar/models/account_tax_group.py b/addons/l10n_ar/models/account_tax_group.py
index 4a26e09a974..f59fcc47890 100644
--- a/addons/l10n_ar/models/account_tax_group.py
+++ b/addons/l10n_ar/models/account_tax_group.py
@@ -8,21 +8,21 @@ class AccountTaxGroup(models.Model):
 
     # values from http://www.afip.gob.ar/fe/documentos/otros_Tributos.xlsx
     l10n_ar_tribute_afip_code = fields.Selection([
-        ('01', '01 - Impuestos nacionales'),
-        ('02', '02 - Impuestos provinciales'),
-        ('03', '03 - Impuestos municipales'),
-        ('04', '04 - Impuestos internos'),
-        ('06', '06 - Percepción de IVA'),
-        ('07', '07 - Percepción de IIBB'),
-        ('08', '08 - Percepciones por Impuestos Municipales'),
-        ('09', '09 - Otras Percepciones'),
-        ('99', '99 - Otros'),
+        ('01', '01 - National Taxes'),
+        ('02', '02 - Provincial Taxes'),
+        ('03', '03 - Municipal Taxes'),
+        ('04', '04 - Internal Taxes'),
+        ('06', '06 - VAT perception'),
+        ('07', '07 - IIBB perception'),
+        ('08', '08 - Municipal Taxes Perceptions'),
+        ('09', '09 - Other Perceptions'),
+        ('99', '99 - Others'),
     ], string='Tribute AFIP Code', index=True, readonly=True)
     # values from http://www.afip.gob.ar/fe/documentos/OperacionCondicionIVA.xls
     l10n_ar_vat_afip_code = fields.Selection([
-        ('0', 'No Corresponde'),
-        ('1', 'No Gravado'),
-        ('2', 'Exento'),
+        ('0', 'Not Applicable'),
+        ('1', 'Untaxed'),
+        ('2', 'Exempt'),
         ('3', '0%'),
         ('4', '10.5%'),
         ('5', '21%'),
diff --git a/addons/l10n_ar/models/l10n_latam_document_type.py b/addons/l10n_ar/models/l10n_latam_document_type.py
index fc7c5a3c8f9..d15caa8778a 100644
--- a/addons/l10n_ar/models/l10n_latam_document_type.py
+++ b/addons/l10n_ar/models/l10n_latam_document_type.py
@@ -14,7 +14,9 @@ class L10nLatamDocumentType(models.Model):
         ' operation type, the responsibility of both the issuer and the'
         ' receptor of the document')
     purchase_aliquots = fields.Selection(
-        [('not_zero', 'Not Zero'), ('zero', 'Zero')], help='Indicates if this type of documents has VAT or Not')
+        [('not_zero', 'Not Zero'), ('zero', 'Zero')], help='Raise an error if a vendor bill is miss encoded. "Not Zero"'
+        ' means the VAT taxes are required for the invoices related to this document type, and those with "Zero" means'
+        ' that only "VAT Not Applicable" tax is allowed.')
 
     def _get_l10n_ar_letters(self):
         """ Return the list of values of the selection field. """
@@ -30,9 +32,9 @@ class L10nLatamDocumentType(models.Model):
             ('I', 'I'),  # used for mapping of imports
         ]
 
-    def get_document_sequence_vals(self, journal):
+    def _get_document_sequence_vals(self, journal):
         """ Values to create the sequences """
-        values = super().get_document_sequence_vals(journal)
+        values = super()._get_document_sequence_vals(journal)
         if self.country_id != self.env.ref('base.ar'):
             return values
 
diff --git a/addons/l10n_ar/models/res_partner.py b/addons/l10n_ar/models/res_partner.py
index 5dff2f85959..d79552f3583 100644
--- a/addons/l10n_ar/models/res_partner.py
+++ b/addons/l10n_ar/models/res_partner.py
@@ -33,19 +33,23 @@ class ResPartner(models.Model):
 
     @api.depends('l10n_ar_vat')
     def _compute_l10n_ar_formatted_vat(self):
-        """ This will add some dash to the CUIT number in order to show in his natural format:
+        """ This will add some dash to the CUIT number (VAT AR) in order to show in his natural format:
         {person_category}-{number}-{validation_number} """
         recs_ar_vat = self.filtered('l10n_ar_vat')
         for rec in recs_ar_vat:
-            rec.l10n_ar_formatted_vat = stdnum.ar.cuit.format(rec.l10n_ar_vat)
+            try:
+                rec.l10n_ar_formatted_vat = stdnum.ar.cuit.format(rec.l10n_ar_vat)
+            except Exception as error:
+                rec.l10n_ar_formatted_vat = rec.l10n_ar_vat
+                _logger.log(25, "Argentinian VAT was not formatted: %s", repr(error))
         remaining = self - recs_ar_vat
         remaining.l10n_ar_formatted_vat = False
 
     @api.depends('vat', 'l10n_latam_identification_type_id')
     def _compute_l10n_ar_vat(self):
-        """ We add this computed field that returns cuit or nothing if this one is not set for the partner. This
-        Validation can be also done by calling ensure_vat() method that returns the cuit or error if this one is not
-        found """
+        """ We add this computed field that returns cuit (VAT AR) or nothing if this one is not set for the partner.
+        This Validation can be also done by calling ensure_vat() method that returns the cuit (VAT AR) or error if this
+        one is not found """
         recs_ar_vat = self.filtered(lambda x: x.l10n_latam_identification_type_id.l10n_ar_afip_code == '80')
         for rec in recs_ar_vat:
             rec.l10n_ar_vat = rec.vat
@@ -54,9 +58,9 @@ class ResPartner(models.Model):
 
     @api.constrains('vat', 'l10n_latam_identification_type_id')
     def check_vat(self):
-        """ Since we validate more documents than the vat for Argentinian partners (CUIT, CUIL, DNI) we
+        """ Since we validate more documents than the vat for Argentinian partners (CUIT - VAT AR, CUIL, DNI) we
         extend this method in order to process it. """
-        # NOTE by the moment we include the CUIT (VAT) validation also here because we extend the messages
+        # NOTE by the moment we include the CUIT (VAT AR) validation also here because we extend the messages
         # errors to be more friendly to the user. In a future when Odoo improve the base_vat message errors
         # we can change this method and use the base_vat.check_vat_ar method.s
         l10n_ar_partners = self.filtered(lambda x: x.l10n_latam_identification_type_id.l10n_ar_afip_code)
diff --git a/addons/l10n_latam_base/__manifest__.py b/addons/l10n_latam_base/__manifest__.py
index 3194f64401c..65f115d24e7 100644
--- a/addons/l10n_latam_base/__manifest__.py
+++ b/addons/l10n_latam_base/__manifest__.py
@@ -5,12 +5,46 @@
     'category': 'Localization',
     'sequence': 14,
     'author': 'Odoo, ADHOC SA',
+    'summary': 'LATAM Identification Types',
     'description': """
-Base Module for LATAM Localizations
-===================================
+Add a new model named "Identification Type" that extend the vat field functionality in the partner and let the user to identify (an eventually invoice) to contacts not only with their fiscal tax ID (VAT) but with other types of identifications like national document, passport, foreign ID, etc. With this module installed you will see now in the partner form view two fields:
 
-* Add Identification Type model to represent valid identifications types in different countries: for AFIP (AR), SII (CL), ...
-* Add Countries code defined by government to identify legal entities and natural persons of foreign countries.""",
+* Identification Type
+* Identification Number
+
+This behavior is a common requirement for some latam countries like Argentina and Chile. If your localization has this requirements then you need to depend on this module and define in your localization module the identifications types that are used in your country. Generally these types of identifications are defined by the government authorities that regulate the fiscal operations. For example:
+
+* AFIP in Argentina defines DNI, CUIT (vat for legal entities), CUIL (vat for natural person), and another 80 valid identification types.
+
+Each identification holds this information:
+
+* name: short name of the identification
+* description: could be the same short name or a long name
+* country_id: the country where this identification belongs
+* is_vat: identify this record as the corresponding VAT for the specific country.
+* sequence: let us to sort the identification types depending on the ones that are most used.
+* active: we can activate/inactivate identifications to make it easier to our customers
+
+In order to make this module compatible for multi-company environments where we have companies that does not need/support this requirement, we have added generic identification types and generic rules to manage the contact information and make it transparent for the user when only use the VAT as we formerly know.
+
+Generic Identifications:
+
+* VAT: The Fiscal Tax Identification or VAT number, by default will be selected as identification type so the user will only need to add the related vat number.
+* Passport
+* Foreign ID (Foreign National Document)
+
+Rules when creating a new partner: We will only see the identification types that are meaningful, taking into account these rules:
+
+* If the partner have not country address set: Will show the generic identification types plus the ones defined in the partner's related company country (If the partner has not specific company then will show the identification types related to the current user company)
+
+* If the partner has country address : will show the generic identification types plus the ones defined for the country of the partner.
+
+When creating a new company, will set to the related partner always the related country is_vat identification type.
+
+All the defined identification types can be reviewed and activate/deactivate in "Contacts / Configuration / Identification Type" menu.
+
+This module is compatible with base_vat module in order to be able to validate VAT numbers for each country that have or not have the possibility to manage multiple identification types.
+""",
     'depends': [
         'contacts',
         'base_vat',
diff --git a/addons/l10n_latam_base/i18n/es.po b/addons/l10n_latam_base/i18n/es.po
index a58fb117604..3960d01032b 100644
--- a/addons/l10n_latam_base/i18n/es.po
+++ b/addons/l10n_latam_base/i18n/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 13.0alpha1+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-02 16:26+0000\n"
-"PO-Revision-Date: 2019-08-02 16:26+0000\n"
+"POT-Creation-Date: 2019-08-22 13:00+0000\n"
+"PO-Revision-Date: 2019-08-22 13:00+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -161,4 +161,4 @@ msgstr "Tipo"
 #. module: l10n_latam_base
 #: model:l10n_latam.identification.type,name:l10n_latam_base.it_vat
 msgid "VAT"
-msgstr "VAT"
+msgstr ""
diff --git a/addons/l10n_latam_base/i18n/l10n_latam_base.pot b/addons/l10n_latam_base/i18n/l10n_latam_base.pot
index 7151893fe04..513b3fb89e7 100644
--- a/addons/l10n_latam_base/i18n/l10n_latam_base.pot
+++ b/addons/l10n_latam_base/i18n/l10n_latam_base.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 13.0alpha1+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-02 16:28+0000\n"
-"PO-Revision-Date: 2019-08-02 16:28+0000\n"
+"POT-Creation-Date: 2019-08-22 13:00+0000\n"
+"PO-Revision-Date: 2019-08-22 13:00+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/l10n_latam_invoice_document/__manifest__.py b/addons/l10n_latam_invoice_document/__manifest__.py
index 146e2ba83e4..4570470b358 100644
--- a/addons/l10n_latam_invoice_document/__manifest__.py
+++ b/addons/l10n_latam_invoice_document/__manifest__.py
@@ -4,16 +4,25 @@
     "version": "13.0.1.0.0",
     "author": "ADHOC SA",
     "category": "Localization",
+    "summary": "LATAM Document Types",
     'description': """
-LATAM Document
-==============
+Functional
+----------
 
-This module is intended to be extended by localizations (like Argentina and
-Chile) in order to manage the document types that need to be reported to the
-government required by this countries.
+In some Latinamerica countries, including Argentina and Chile, some accounting transactions like invoices and vendor bills are classified by a document types defined by the government fiscal authorities (In Argentina case AFIP, Chile case SII).
+
+This module is intended to be extended by localizations in order to manage these document types and 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 have their own rules and sequence number, this last one is integrated with the invoice number and journal sequence in order to be easy for the localization user. In order to support or not this document types a Journal has a new option that lets to use document or not.
+
+Technical
+---------
+
+If your localization needs this logic will then need to add this module as dependency and in your localization module extend:
+
+* extend company's _localization_use_documents() method.
+* create the data of the document types that exists for the specific country. The document type has a country field
 
-In order to do that we add a new model named Document Topes and we create
-links between this new model and another Odoo's models.
 """,
     "depends": [
         "account",
diff --git a/addons/l10n_latam_invoice_document/i18n/es.po b/addons/l10n_latam_invoice_document/i18n/es.po
index 8174d2b4161..13ea6c2e4a5 100644
--- a/addons/l10n_latam_invoice_document/i18n/es.po
+++ b/addons/l10n_latam_invoice_document/i18n/es.po
@@ -1,13 +1,13 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# 	* l10n_latam_document
+# 	* l10n_latam_invoice_document
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 13.0alpha1+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-02 20:49+0000\n"
-"PO-Revision-Date: 2019-08-02 20:49+0000\n"
+"POT-Creation-Date: 2019-08-22 13:00+0000\n"
+"PO-Revision-Date: 2019-08-22 13:00+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,23 +15,23 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_account_chart_template
 msgid "Account Chart Template"
 msgstr "Plantilla de Plan de Cuentas"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_account_move_reversal
 msgid "Account Move Reversal"
 msgstr "Revocación de movimiento en cuenta"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__active
 #: model_terms:ir.ui.view,arch_db:l10n_latam_invoice_document.view_document_type_filter
 msgid "Active"
 msgstr "Activo"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_l10n_latam_document_type__internal_type
 msgid ""
 "Analog to odoo account.move.type but with more options allowing to identify "
@@ -43,79 +43,79 @@ msgstr ""
 "relacionado a la factura, puede ser para documentos de otros modelos como "
 "los movimientos de inventario)."
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model_terms:ir.ui.view,arch_db:l10n_latam_invoice_document.view_document_type_filter
 msgid "Archived"
 msgstr "Archivado"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__code
 msgid "Code"
 msgstr "Código"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_l10n_latam_document_type__code
 msgid "Code used by different localizations"
 msgstr "Código usando por diferentes localizaciones"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_res_company
 msgid "Companies"
 msgstr "Compañías"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__country_id
 msgid "Country"
 msgstr "País"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_journal__l10n_latam_country_code
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_country_code
 msgid "Country Code"
 msgstr "Código País"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_l10n_latam_document_type__country_id
 msgid "Country in which this type of document is valid"
 msgstr "País donde el tipo de documento es valido"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__create_uid
 msgid "Created by"
 msgstr "Creado por"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__create_date
 msgid "Created on"
 msgstr "Creado el"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: selection:l10n_latam.document.type,internal_type:0
 msgid "Credit Notes"
 msgstr "Notas de Crédito"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: selection:l10n_latam.document.type,internal_type:0
 msgid "Debit Notes"
 msgstr "Notas de Débito"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__display_name
 msgid "Display Name"
 msgstr "Nombre a mostrar"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__doc_code_prefix
 msgid "Document Code Prefix"
 msgstr "Prefijo del código de documento"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_document_number
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_reversal__l10n_latam_document_number
 msgid "Document Number"
 msgstr "Número de Documento"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_invoice_report__l10n_latam_document_type_id
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_document_type_id
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_line__l10n_latam_document_type_id
@@ -131,23 +131,33 @@ msgstr "Número de Documento"
 msgid "Document Type"
 msgstr "Tipo de Documento"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.actions.act_window,name:l10n_latam_invoice_document.action_document_type
 #: model:ir.ui.menu,name:l10n_latam_invoice_document.menu_document_type
 msgid "Document Types"
 msgstr "Tipos de Documentos"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_move.py:0
+#, python-format
+msgid ""
+"Duplicated invoice number detected. You probably added twice the same vendor "
+"bill/debit note."
+msgstr ""
+"Número de factura duplicado. Probablemente agregaste repetido la misma "
+"factura o nota de debito de proveedor."
+
+#. module: l10n_latam_invoice_document
 #: model_terms:ir.ui.view,arch_db:l10n_latam_invoice_document.view_document_type_filter
 msgid "Group By..."
 msgstr "Agrupar por..."
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__id
 msgid "ID"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_account_journal__l10n_latam_use_documents
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_account_move__l10n_latam_use_documents
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_account_move_reversal__l10n_latam_use_documents
@@ -162,139 +172,139 @@ msgstr ""
 "movimientos contables que no están relacionas con facturación como tal. Por "
 "ejemplo: Recibos, Pagos de Impuestos, Registrar asientos contables"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__internal_type
 #: model_terms:ir.ui.view,arch_db:l10n_latam_invoice_document.view_document_type_filter
 msgid "Internal Type"
 msgstr "Tipo interno"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: selection:l10n_latam.document.type,internal_type:0
 msgid "Invoices"
 msgstr "Facturas"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_account_invoice_report
 msgid "Invoices Statistics"
 msgstr "Estadísticas de facturas"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_account_journal
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_ir_sequence__l10n_latam_journal_id
 msgid "Journal"
 msgstr "Diario"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_account_move
 msgid "Journal Entries"
 msgstr "Asientos contables"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_account_move_line
 msgid "Journal Item"
 msgstr "Apunte contable"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_amount_tax
 msgid "L10N Latam Amount Tax"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_amount_untaxed
 msgid "L10N Latam Amount Untaxed"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_available_document_type_ids
 msgid "L10N Latam Available Document Type"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_journal__l10n_latam_company_use_documents
 msgid "L10N Latam Company Use Documents"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_line__l10n_latam_price_net
 msgid "L10N Latam Price Net"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_line__l10n_latam_price_subtotal
 msgid "L10N Latam Price Subtotal"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_line__l10n_latam_price_unit
 msgid "L10N Latam Price Unit"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_sequence_id
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_reversal__l10n_latam_sequence_id
 msgid "L10N Latam Sequence"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_tax_ids
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_line__l10n_latam_tax_ids
 msgid "L10N Latam Tax"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type____last_update
 msgid "Last Modified on"
 msgstr "Última modificación en"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__write_uid
 msgid "Last Updated by"
 msgstr "Última actualización por"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__write_date
 msgid "Last Updated on"
 msgstr "Última actualización el"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_l10n_latam_document_type
 msgid "Latam Document Type"
 msgstr "Tipo de Documento Latam"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model_terms:ir.ui.view,arch_db:l10n_latam_invoice_document.view_document_type_filter
 msgid "Localization"
 msgstr "Localización"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__name
 msgid "Name"
 msgstr "Nombre"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__report_name
 msgid "Name on Reports"
 msgstr "Nombre en Reportes"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_l10n_latam_document_type__report_name
 msgid "Name that will be printed in reports, for example \"CREDIT NOTE\""
 msgstr "Nombre que será impreso en los reportes, por ejemplo \"NOTA DE CREDITO\""
 
-#. module: l10n_latam_document
-#: code:addons/l10n_latam_document/models/account_move.py:87
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_move.py:0
 #, python-format
 msgid "No sequence or document number linked to invoice id %s"
 msgstr "No hay secuencia o número de documento vinculado a la factura %s"
 
-#. module: l10n_latam_document
-#: code:addons/l10n_latam_document/models/account_move.py:102
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_move.py:0
 #, python-format
 msgid "Please set the document number on the following invoices %s."
 msgstr ""
 "Por favor asigne el número de documento en las siguientes facturas %s."
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_l10n_latam_document_type__doc_code_prefix
 msgid ""
 "Prefix for Documents Codes on Invoices and Account Moves. For eg. 'FA ' will"
@@ -303,36 +313,36 @@ msgstr ""
 "Prefijo para Códigos de Documentos en Facturas y Asientos. Por eje: 'FA ' "
 "será construirá 'FA 0001-0000001' como el numero de documento"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_ir_sequence
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model_terms:ir.ui.view,arch_db:l10n_latam_invoice_document.view_document_type_filter
 msgid "Show active document types"
 msgstr "Mostrar tipos de documento activos"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model_terms:ir.ui.view,arch_db:l10n_latam_invoice_document.view_document_type_filter
 msgid "Show archived document types"
 msgstr "Mostrar tipos de documento archivados"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_account_journal__l10n_latam_country_code
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_account_move__l10n_latam_country_code
 msgid "Technical field used to hide/show fields regarding the localization"
 msgstr ""
 "Campo técnico usado para esconder/mostrar dependiendo de la liocalización"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_l10n_latam_document_type__name
 msgid "The document name"
 msgstr "El nombre del documento"
 
-#. module: l10n_latam_document
-#: code:addons/l10n_latam_document/models/account_move.py:97
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_move.py:0
 #, python-format
 msgid ""
 "The journal require a document type but not document type has been selected "
@@ -341,7 +351,7 @@ msgstr ""
 "El diario requiere un tipo de documento pero no hay tipo de documento "
 "seleccionado en las facturas %s."
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_l10n_latam_document_type__sequence
 msgid ""
 "To set in which order show the documents type taking into account the most "
@@ -350,23 +360,23 @@ msgstr ""
 "Para seleccionar en que orden deben mostrar los tipos de documento teniendo "
 "en cuenta los más usados comunmente"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_journal__l10n_latam_use_documents
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_use_documents
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_reversal__l10n_latam_use_documents
 msgid "Use Documents?"
 msgstr "Usa Documentos?"
 
-#. module: l10n_latam_document
-#: code:addons/l10n_latam_document/models/account_move.py:182
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_move.py:0
 #, python-format
 msgid "Vendor bill number must be unique per vendor and company."
 msgstr ""
 "El número de la Factura de Proveedor debe ser único por proveedor y por "
 "compañía."
 
-#. module: l10n_latam_document
-#: code:addons/l10n_latam_document/models/account_journal.py:32
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_journal.py:0
 #, python-format
 msgid ""
 "You can not modify the field \"Use Documents?\" if there are validated "
@@ -375,14 +385,14 @@ msgstr ""
 "No puedes modificar el campo \"Usa Documentos?\" si ya existen facturas "
 "validades en este diario!"
 
-#. module: l10n_latam_document
-#: code:addons/l10n_latam_document/models/account_move.py:113
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_move.py:0
 #, python-format
 msgid "You can not use a %s document type with a invoice"
 msgstr "No puedes utilizar el tipo de documento %s en una factura"
 
-#. module: l10n_latam_document
-#: code:addons/l10n_latam_document/models/account_move.py:111
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_move.py:0
 #, python-format
 msgid "You can not use a %s document type with a refund invoice"
 msgstr ""
diff --git a/addons/l10n_latam_invoice_document/i18n/l10n_latam_invoice_document.pot b/addons/l10n_latam_invoice_document/i18n/l10n_latam_invoice_document.pot
index 7b4fa12663e..46c1236068b 100644
--- a/addons/l10n_latam_invoice_document/i18n/l10n_latam_invoice_document.pot
+++ b/addons/l10n_latam_invoice_document/i18n/l10n_latam_invoice_document.pot
@@ -1,13 +1,13 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# 	* l10n_latam_document
+# 	* l10n_latam_invoice_document
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 13.0alpha1+e\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-02 20:54+0000\n"
-"PO-Revision-Date: 2019-08-02 20:54+0000\n"
+"POT-Creation-Date: 2019-08-22 13:00+0000\n"
+"PO-Revision-Date: 2019-08-22 13:00+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,23 +15,23 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_account_chart_template
 msgid "Account Chart Template"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_account_move_reversal
 msgid "Account Move Reversal"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__active
 #: model_terms:ir.ui.view,arch_db:l10n_latam_invoice_document.view_document_type_filter
 msgid "Active"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_l10n_latam_document_type__internal_type
 msgid ""
 "Analog to odoo account.move.type but with more options allowing to identify "
@@ -39,79 +39,79 @@ msgid ""
 " could be for documents of other models like stock.picking)"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model_terms:ir.ui.view,arch_db:l10n_latam_invoice_document.view_document_type_filter
 msgid "Archived"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__code
 msgid "Code"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_l10n_latam_document_type__code
 msgid "Code used by different localizations"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_res_company
 msgid "Companies"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__country_id
 msgid "Country"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_journal__l10n_latam_country_code
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_country_code
 msgid "Country Code"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_l10n_latam_document_type__country_id
 msgid "Country in which this type of document is valid"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__create_uid
 msgid "Created by"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__create_date
 msgid "Created on"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: selection:l10n_latam.document.type,internal_type:0
 msgid "Credit Notes"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: selection:l10n_latam.document.type,internal_type:0
 msgid "Debit Notes"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__display_name
 msgid "Display Name"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__doc_code_prefix
 msgid "Document Code Prefix"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_document_number
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_reversal__l10n_latam_document_number
 msgid "Document Number"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_invoice_report__l10n_latam_document_type_id
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_document_type_id
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_line__l10n_latam_document_type_id
@@ -127,23 +127,31 @@ msgstr ""
 msgid "Document Type"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.actions.act_window,name:l10n_latam_invoice_document.action_document_type
 #: model:ir.ui.menu,name:l10n_latam_invoice_document.menu_document_type
 msgid "Document Types"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_move.py:0
+#, python-format
+msgid ""
+"Duplicated invoice number detected. You probably added twice the same vendor "
+"bill/debit note."
+msgstr ""
+
+#. module: l10n_latam_invoice_document
 #: model_terms:ir.ui.view,arch_db:l10n_latam_invoice_document.view_document_type_filter
 msgid "Group By..."
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__id
 msgid "ID"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_account_journal__l10n_latam_use_documents
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_account_move__l10n_latam_use_documents
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_account_move_reversal__l10n_latam_use_documents
@@ -154,215 +162,215 @@ msgid ""
 "Register journal entries"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__internal_type
 #: model_terms:ir.ui.view,arch_db:l10n_latam_invoice_document.view_document_type_filter
 msgid "Internal Type"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: selection:l10n_latam.document.type,internal_type:0
 msgid "Invoices"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_account_invoice_report
 msgid "Invoices Statistics"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_account_journal
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_ir_sequence__l10n_latam_journal_id
 msgid "Journal"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_account_move
 msgid "Journal Entries"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_account_move_line
 msgid "Journal Item"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_amount_tax
 msgid "L10N Latam Amount Tax"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_amount_untaxed
 msgid "L10N Latam Amount Untaxed"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_available_document_type_ids
 msgid "L10N Latam Available Document Type"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_journal__l10n_latam_company_use_documents
 msgid "L10N Latam Company Use Documents"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_line__l10n_latam_price_net
 msgid "L10N Latam Price Net"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_line__l10n_latam_price_subtotal
 msgid "L10N Latam Price Subtotal"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_line__l10n_latam_price_unit
 msgid "L10N Latam Price Unit"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_sequence_id
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_reversal__l10n_latam_sequence_id
 msgid "L10N Latam Sequence"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_tax_ids
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_line__l10n_latam_tax_ids
 msgid "L10N Latam Tax"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type____last_update
 msgid "Last Modified on"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__write_uid
 msgid "Last Updated by"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__write_date
 msgid "Last Updated on"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_l10n_latam_document_type
 msgid "Latam Document Type"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model_terms:ir.ui.view,arch_db:l10n_latam_invoice_document.view_document_type_filter
 msgid "Localization"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__name
 msgid "Name"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__report_name
 msgid "Name on Reports"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_l10n_latam_document_type__report_name
 msgid "Name that will be printed in reports, for example \"CREDIT NOTE\""
 msgstr ""
 
-#. module: l10n_latam_document
-#: code:addons/l10n_latam_document/models/account_move.py:87
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_move.py:0
 #, python-format
 msgid "No sequence or document number linked to invoice id %s"
 msgstr ""
 
-#. module: l10n_latam_document
-#: code:addons/l10n_latam_document/models/account_move.py:102
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_move.py:0
 #, python-format
 msgid "Please set the document number on the following invoices %s."
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_l10n_latam_document_type__doc_code_prefix
 msgid ""
 "Prefix for Documents Codes on Invoices and Account Moves. For eg. 'FA ' will"
 " build 'FA 0001-0000001' Document Number"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model,name:l10n_latam_invoice_document.model_ir_sequence
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_l10n_latam_document_type__sequence
 msgid "Sequence"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model_terms:ir.ui.view,arch_db:l10n_latam_invoice_document.view_document_type_filter
 msgid "Show active document types"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model_terms:ir.ui.view,arch_db:l10n_latam_invoice_document.view_document_type_filter
 msgid "Show archived document types"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_account_journal__l10n_latam_country_code
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_account_move__l10n_latam_country_code
 msgid "Technical field used to hide/show fields regarding the localization"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_l10n_latam_document_type__name
 msgid "The document name"
 msgstr ""
 
-#. module: l10n_latam_document
-#: code:addons/l10n_latam_document/models/account_move.py:97
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_move.py:0
 #, python-format
 msgid ""
 "The journal require a document type but not document type has been selected "
 "on invoices %s."
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,help:l10n_latam_invoice_document.field_l10n_latam_document_type__sequence
 msgid ""
 "To set in which order show the documents type taking into account the most "
 "commonly used first"
 msgstr ""
 
-#. module: l10n_latam_document
+#. module: l10n_latam_invoice_document
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_journal__l10n_latam_use_documents
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move__l10n_latam_use_documents
 #: model:ir.model.fields,field_description:l10n_latam_invoice_document.field_account_move_reversal__l10n_latam_use_documents
 msgid "Use Documents?"
 msgstr ""
 
-#. module: l10n_latam_document
-#: code:addons/l10n_latam_document/models/account_move.py:182
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_move.py:0
 #, python-format
 msgid "Vendor bill number must be unique per vendor and company."
 msgstr ""
 
-#. module: l10n_latam_document
-#: code:addons/l10n_latam_document/models/account_journal.py:32
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_journal.py:0
 #, python-format
 msgid ""
 "You can not modify the field \"Use Documents?\" if there are validated "
 "invoices in this journal!"
 msgstr ""
 
-#. module: l10n_latam_document
-#: code:addons/l10n_latam_document/models/account_move.py:113
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_move.py:0
 #, python-format
 msgid "You can not use a %s document type with a invoice"
 msgstr ""
 
-#. module: l10n_latam_document
-#: code:addons/l10n_latam_document/models/account_move.py:111
+#. module: l10n_latam_invoice_document
+#: code:addons/l10n_latam_invoice_document/models/account_move.py:0
 #, python-format
 msgid "You can not use a %s document type with a refund invoice"
 msgstr ""
diff --git a/addons/l10n_latam_invoice_document/models/account_journal.py b/addons/l10n_latam_invoice_document/models/account_journal.py
index 230aa8abd51..a87fdb87f43 100644
--- a/addons/l10n_latam_invoice_document/models/account_journal.py
+++ b/addons/l10n_latam_invoice_document/models/account_journal.py
@@ -31,9 +31,3 @@ class AccountJournal(models.Model):
             if rec.env['account.move'].search([('journal_id', '=', rec.id), ('state', '!=', 'draft')]):
                 raise ValidationError(_(
                     'You can not modify the field "Use Documents?" if there are validated invoices in this journal!'))
-
-    @api.model
-    def _search(self, args, offset=0, limit=None, order=None, count=False, access_rights_uid=None):
-        if self._context.get('default_type') in ('out_receipt', 'in_receipt'):
-            args += [('l10n_latam_use_documents', '=', False)]
-        return super()._search(args, offset, limit, order, count=count, access_rights_uid=access_rights_uid)
diff --git a/addons/l10n_latam_invoice_document/models/account_move.py b/addons/l10n_latam_invoice_document/models/account_move.py
index 6d00037840c..3f9c66910c6 100644
--- a/addons/l10n_latam_invoice_document/models/account_move.py
+++ b/addons/l10n_latam_invoice_document/models/account_move.py
@@ -106,8 +106,8 @@ class AccountMove(models.Model):
         try:
             return super(AccountMove, self - vendor)._check_unique_sequence_number()
         except ValidationError:
-            raise ValidationError(_('Duplicated invoice number detected. You probably add twice the same customer'
-                                    ' invoice/debit note.'))
+            raise ValidationError(_('Duplicated invoice number detected. You probably added twice the same vendor'
+                                    ' bill/debit note.'))
 
     @api.constrains('state', 'l10n_latam_document_type_id')
     def _check_l10n_latam_documents(self):
diff --git a/addons/l10n_latam_invoice_document/models/l10n_latam_document_type.py b/addons/l10n_latam_invoice_document/models/l10n_latam_document_type.py
index e57262e6464..a21eafcf8f8 100644
--- a/addons/l10n_latam_invoice_document/models/l10n_latam_document_type.py
+++ b/addons/l10n_latam_invoice_document/models/l10n_latam_document_type.py
@@ -50,6 +50,6 @@ class L10nLatamDocumentType(models.Model):
         self.ensure_one()
         return self.env['account.tax']
 
-    def get_document_sequence_vals(self, journal):
+    def _get_document_sequence_vals(self, journal):
         self.ensure_one()
         return {'name': '%s - %s' % (journal.name, self.name), 'padding': 8, 'prefix': self.code}
diff --git a/addons/l10n_latam_invoice_document/wizards/account_move_reversal.py b/addons/l10n_latam_invoice_document/wizards/account_move_reversal.py
index cb7036bd618..93823240558 100644
--- a/addons/l10n_latam_invoice_document/wizards/account_move_reversal.py
+++ b/addons/l10n_latam_invoice_document/wizards/account_move_reversal.py
@@ -15,7 +15,7 @@ class AccountMoveReversal(models.TransientModel):
     l10n_latam_document_number = fields.Char(string='Document Number')
 
     @staticmethod
-    def reverse_type_map(move_type):
+    def _reverse_type_map(move_type):
         match = {
             'entry': 'entry',
             'out_invoice': 'out_refund',
@@ -29,7 +29,7 @@ class AccountMoveReversal(models.TransientModel):
     def _onchange_move_id(self):
         if self.move_id.l10n_latam_use_documents:
             refund = self.move_id.new({
-                'type': self.reverse_type_map(self.move_id.type),
+                'type': self._reverse_type_map(self.move_id.type),
                 'journal_id': self.move_id.journal_id.id,
                 'partner_id': self.move_id.partner_id.id,
                 'company_id': self.move_id.company_id.id,
@@ -48,7 +48,7 @@ class AccountMoveReversal(models.TransientModel):
     def _compute_l10n_latam_sequence(self):
         for rec in self:
             refund = rec.move_id.new({
-                'type': self.reverse_type_map(rec.move_id.type),
+                'type': self._reverse_type_map(rec.move_id.type),
                 'journal_id': rec.move_id.journal_id.id,
                 'partner_id': rec.move_id.partner_id.id,
                 'company_id': rec.move_id.company_id.id,