[MERGE] forward port branch saas-12.3 up to 60e71302a38

8 files changed, 1000 insertions, 198 deletions

diff --git a/addons/l10n_do/__manifest__.py b/addons/l10n_do/__manifest__.py
index 596c03d9221..d07f64c808f 100644
--- a/addons/l10n_do/__manifest__.py
+++ b/addons/l10n_do/__manifest__.py
@@ -95,6 +95,7 @@ en Odoo):
         'data/account.account.template.csv',
         'data/account_chart_template_data.xml',
         'data/account_data.xml',
+        'data/account_tax_report_data.xml',
         'data/account.tax.template.xml',
         # Country States
         'data/l10n_do_state_data.xml',
diff --git a/addons/l10n_do/data/account.tax.template.xml b/addons/l10n_do/data/account.tax.template.xml
index 6e49d7244dc..7d970672e91 100644
--- a/addons/l10n_do/data/account.tax.template.xml
+++ b/addons/l10n_do/data/account.tax.template.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="1">
+    <data>
+
         <!-- Chart template for Taxes -->
         <record id="tax_0_sale" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
@@ -11,9 +12,31 @@
             <field name="amount_type">percent</field>
             <field name="type_tax_use">sale</field>
             <field eval="0" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_V_EXENTA')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_2A3_ingrs_local_vnts')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_2A3_ingrs_local_vnts')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                }),
+            ]"/>
         </record>
+
         <record id="tax_0_purch" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">10</field>
@@ -23,9 +46,29 @@
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
             <field eval="0" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_C_EXENTA')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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',
+                }),
+            ]"/>
+            <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',
+                }),
+            ]"/>
         </record>
+
         <record id="tax_18_sale" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">1</field>
@@ -34,12 +77,36 @@
             <field name="amount">18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">sale</field>
-            <field name="account_id" ref="do_niif_21030102"/>
-            <field name="refund_account_id" ref="do_niif_21030102"/>
             <field eval="0" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_V_ITBIS_18')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_2b6_grvd')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('do_niif_21030102'),
+                    'plus_report_line_ids': [ref('account_tax_report_itbs_18_casilla')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_2b6_grvd')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('do_niif_21030102'),
+                    'minus_report_line_ids': [ref('account_tax_report_itbs_18_casilla')],
+                }),
+            ]"/>
         </record>
+
         <record id="tax_18_sale_incl" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">2</field>
@@ -48,12 +115,36 @@
             <field name="amount">18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">sale</field>
-            <field name="account_id" ref="do_niif_21030102"/>
-            <field name="refund_account_id" ref="do_niif_21030102"/>
             <field eval="1" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_V_ITBIS_18')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_2b6_grvd')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('do_niif_21030102'),
+                    'plus_report_line_ids': [ref('account_tax_report_itbs_18_casilla')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_2b6_grvd')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('do_niif_21030102'),
+                    'minus_report_line_ids': [ref('account_tax_report_itbs_18_casilla')],
+                }),
+            ]"/>
         </record>
+
         <record id="tax_tip_sale" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">3</field>
@@ -62,11 +153,32 @@
             <field name="amount">10</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">sale</field>
-            <field name="account_id" ref="do_niif_21030503"/>
-            <field name="refund_account_id" ref="do_niif_21030503"/>
             <field eval="0" name="price_include"/>
             <field name="tax_group_id" ref="tax_group_tip"/>
+            <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('do_niif_21030503'),
+                }),
+            ]"/>
+            <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('do_niif_21030503'),
+                }),
+            ]"/>
         </record>
+
         <record id="tax_18_purch" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="name">18% ITBIS Compras</field>
@@ -75,12 +187,34 @@
             <field name="amount">18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_11080101"/>
-            <field name="refund_account_id" ref="do_niif_11080101"/>
             <field eval="0" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_C_ITBIS_18')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_11080101'),
+                    'plus_report_line_ids': [ref('account_tax_report_itbs_pgdo_locales')],
+                }),
+            ]"/>
+            <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('do_niif_11080101'),
+                    'minus_report_line_ids': [ref('account_tax_report_itbs_pgdo_locales')],
+                }),
+            ]"/>
         </record>
+
         <record id="tax_18_purch_incl" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">12</field>
@@ -89,12 +223,34 @@
             <field name="amount">18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_11080101"/>
-            <field name="refund_account_id" ref="do_niif_11080101"/>
             <field eval="1" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_C_ITBIS_18_Incluido')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_11080101'),
+                    'plus_report_line_ids': [ref('account_tax_report_itbs_pgdo_locales')],
+                }),
+            ]"/>
+            <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('do_niif_11080101'),
+                    'minus_report_line_ids': [ref('account_tax_report_itbs_pgdo_locales')],
+                }),
+            ]"/>
         </record>
+
         <record id="tax_16_purch" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="name">16% ITBIS Compras</field>
@@ -103,11 +259,32 @@
             <field name="amount">16</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_11080101"/>
-            <field name="refund_account_id" ref="do_niif_11080101"/>
             <field eval="0" name="price_include"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_11080101'),
+                }),
+            ]"/>
+            <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('do_niif_11080101'),
+                }),
+            ]"/>
         </record>
+
         <record id="tax_16_purch_incl" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="name">16% ITBIS Incl. Compras</field>
@@ -116,11 +293,32 @@
             <field name="amount">16</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_11080101"/>
-            <field name="refund_account_id" ref="do_niif_11080101"/>
             <field eval="1" name="price_include"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_11080101'),
+                }),
+            ]"/>
+            <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('do_niif_11080101'),
+                }),
+            ]"/>
         </record>
+
         <record id="tax_9_purch" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="name">9% ITBIS Compras</field>
@@ -129,11 +327,32 @@
             <field name="amount">9</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_11080101"/>
-            <field name="refund_account_id" ref="do_niif_11080101"/>
             <field eval="0" name="price_include"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_11080101'),
+                }),
+            ]"/>
+            <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('do_niif_11080101'),
+                }),
+            ]"/>
         </record>
+
         <record id="tax_9_purch_incl" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="name">9% ITBIS Incl. Compras</field>
@@ -142,11 +361,32 @@
             <field name="amount">9</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_11080101"/>
-            <field name="refund_account_id" ref="do_niif_11080101"/>
             <field eval="1" name="price_include"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_11080101'),
+                }),
+            ]"/>
+            <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('do_niif_11080101'),
+                }),
+            ]"/>
         </record>
+
         <record id="tax_8_purch" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="name">8% ITBIS Compras</field>
@@ -155,11 +395,32 @@
             <field name="amount">8</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_11080101"/>
-            <field name="refund_account_id" ref="do_niif_11080101"/>
             <field eval="0" name="price_include"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_11080101'),
+                }),
+            ]"/>
+            <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('do_niif_11080101'),
+                }),
+            ]"/>
         </record>
+
         <record id="tax_8_purch_incl" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="name">8% ITBIS Incl. Compras</field>
@@ -168,11 +429,32 @@
             <field name="amount">8</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_11080101"/>
-            <field name="refund_account_id" ref="do_niif_11080101"/>
             <field eval="1" name="price_include"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_11080101'),
+                }),
+            ]"/>
+            <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('do_niif_11080101'),
+                }),
+            ]"/>
         </record>
+
         <record id="tax_tip_purch" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">19</field>
@@ -181,11 +463,32 @@
             <field name="amount">10</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_52080900"/>
-            <field name="refund_account_id" ref="do_niif_52080900"/>
             <field eval="0" name="price_include"/>
             <field name="tax_group_id" ref="tax_group_tip"/>
+            <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('do_niif_52080900'),
+                }),
+            ]"/>
+            <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('do_niif_52080900'),
+                }),
+            ]"/>
         </record>
+
         <record id="tax_18_purch_serv" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">20</field>
@@ -194,12 +497,34 @@
             <field name="amount">18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_11080102"/>
-            <field name="refund_account_id" ref="do_niif_11080102"/>
             <field eval="0" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_C_ITBIS_18')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_11080102'),
+                    'plus_report_line_ids': [ref('account_tax_report_itbs_pgdo_locales')],
+                }),
+            ]"/>
+            <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('do_niif_11080102'),
+                    'minus_report_line_ids': [ref('account_tax_report_itbs_pgdo_locales')],
+                }),
+            ]"/>
         </record>
+
         <record id="tax_18_purch_serv_incl" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">20</field>
@@ -208,12 +533,34 @@
             <field name="amount">18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_11080102"/>
-            <field name="refund_account_id" ref="do_niif_11080102"/>
             <field eval="1" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_C_ITBIS_18_Incluido')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_11080102'),
+                    'plus_report_line_ids': [ref('account_tax_report_itbs_pgdo_locales')],
+                }),
+            ]"/>
+            <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('do_niif_11080102'),
+                    'minus_report_line_ids': [ref('account_tax_report_itbs_pgdo_locales')],
+                }),
+            ]"/>
         </record>
+
         <record id="tax_18_importation" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">20</field>
@@ -222,12 +569,34 @@
             <field name="amount">18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_11080103"/>
-            <field name="refund_account_id" ref="do_niif_11080103"/>
             <field eval="0" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_IMP_ITBIS_18')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_11080103'),
+                    'plus_report_line_ids': [ref('account_tax_report_itbs_pgdo_imptcn')],
+                }),
+            ]"/>
+            <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('do_niif_11080103'),
+                    'minus_report_line_ids': [ref('account_tax_report_itbs_pgdo_imptcn')],
+                }),
+            ]"/>
         </record>
+
         <record id="tax_18_of_10" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">20</field>
@@ -236,11 +605,32 @@
             <field name="amount">1.8</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">sale</field>
-            <field name="account_id" ref="do_niif_21030102"/>
-            <field name="refund_account_id" ref="do_niif_21030102"/>
             <field eval="0" name="price_include"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_21030102'),
+                }),
+            ]"/>
+            <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('do_niif_21030102'),
+                }),
+            ]"/>
         </record>
+
         <record id="tax_0015_bank" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">30</field>
@@ -249,11 +639,32 @@
             <field name="amount">0.0015</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">none</field>
-            <field name="account_id" ref="do_niif_52070200"/>
-            <field name="refund_account_id" ref="do_niif_52070200"/>
             <field eval="1" name="price_include"/>
             <field name="tax_group_id" ref="group_tax"/>
+            <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('do_niif_52070200'),
+                }),
+            ]"/>
+            <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('do_niif_52070200'),
+                }),
+            ]"/>
         </record>
+
         <record id="tax_10_telco" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">30</field>
@@ -262,12 +673,32 @@
             <field name="amount">10</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_52020200"/>
-            <field name="refund_account_id" ref="do_niif_52020200"/>
             <field eval="0" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_TELE_ISC')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="tax_group_isc"/>
+            <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('do_niif_52020200'),
+                }),
+            ]"/>
+            <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('do_niif_52020200'),
+                }),
+            ]"/>
         </record>
+
         <record id="tax_2_telco" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">30</field>
@@ -276,22 +707,43 @@
             <field name="amount">2</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_52020200"/>
-            <field name="refund_account_id" ref="do_niif_52020200"/>
             <field eval="0" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_TELE_CDT')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_tax"/>
+            <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('do_niif_52020200'),
+                }),
+            ]"/>
+            <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('do_niif_52020200'),
+                }),
+            ]"/>
         </record>
+
         <record id="tax_group_telco" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">30</field>
             <field name="name">Impuestos a las Telecomunicaciones</field>
-            <field eval="0" name="amount"/>
+            <field eval="18" name="amount"/>
             <field name="amount_type">group</field>
             <field name="type_tax_use">purchase</field>
             <field eval="[(6, 0, [ref('tax_18_purch'), ref('tax_10_telco'), ref('tax_2_telco')])]" name="children_tax_ids"/>
             <field name="tax_group_id" ref="group_tax"/>
         </record>
+
         <record id="ret_100_tax_security" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">40</field>
@@ -300,11 +752,32 @@
             <field name="amount">-18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_21030201"/>
-            <field name="refund_account_id" ref="do_niif_21030201"/>
             <field eval="0" name="price_include"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_21030201'),
+                }),
+            ]"/>
+            <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('do_niif_21030201'),
+                }),
+            ]"/>
         </record>
+
         <record id="ret_100_tax_nonprofit" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">41</field>
@@ -313,12 +786,36 @@
             <field name="amount">-18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_21030203"/>
-            <field name="refund_account_id" ref="do_niif_21030203"/>
             <field eval="0" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_R_ITBIS_18')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_retcn_prsn')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('do_niif_21030203'),
+                    'plus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_retcn_prsn')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('do_niif_21030203'),
+                    'minus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')],
+                }),
+            ]"/>
         </record>
+
         <record id="ret_100_tax_person" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">42</field>
@@ -327,12 +824,36 @@
             <field name="amount">-18</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_21030202"/>
-            <field name="refund_account_id" ref="do_niif_21030202"/>
             <field eval="0" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_R_ITBIS_18')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <field name="invoice_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'plus_report_line_ids': [ref('account_tax_report_retcn_prsn')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('do_niif_21030202'),
+                    'plus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')],
+                }),
+            ]"/>
+            <field name="refund_repartition_line_ids" eval="[(5,0,0),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'minus_report_line_ids': [ref('account_tax_report_retcn_prsn')],
+                }),
+                (0,0, {
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'account_id': ref('do_niif_21030202'),
+                    'minus_report_line_ids': [ref('account_tax_report_itbs_retcn_prsn')],
+                }),
+            ]"/>
         </record>
+
         <record id="ret_30_tax_moral" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">43</field>
@@ -341,11 +862,32 @@
             <field name="amount">-5.4</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_21030201"/>
-            <field name="refund_account_id" ref="do_niif_21030201"/>
             <field eval="0" name="price_include"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_21030201'),
+                }),
+            ]"/>
+            <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('do_niif_21030201'),
+                }),
+            ]"/>
         </record>
+
         <record id="ret_30_tax_freelance" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="active">False</field>
@@ -355,11 +897,32 @@
             <field name="amount">-5.4</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">none</field>
-            <field name="account_id" ref="do_niif_21030201"/>
-            <field name="refund_account_id" ref="do_niif_21030201"/>
             <field eval="0" name="price_include"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_21030201'),
+                }),
+            ]"/>
+            <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('do_niif_21030201'),
+                }),
+            ]"/>
         </record>
+
         <record id="ret_75_tax_nonformal" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">44</field>
@@ -368,11 +931,32 @@
             <field name="amount">-13.5</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_21030205"/>
-            <field name="refund_account_id" ref="do_niif_21030205"/>
             <field eval="0" name="price_include"/>
             <field name="tax_group_id" ref="group_itbis"/>
+            <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('do_niif_21030205'),
+                }),
+            ]"/>
+            <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('do_niif_21030205'),
+                }),
+            ]"/>
         </record>
+
         <record id="ret_10_income_person" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">40</field>
@@ -381,12 +965,32 @@
             <field name="amount">-10</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_21030301"/>
-            <field name="refund_account_id" ref="do_niif_21030301"/>
             <field eval="0" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_R_ISR_10')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_isr"/>
+            <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('do_niif_21030301'),
+                }),
+            ]"/>
+            <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('do_niif_21030301'),
+                }),
+            ]"/>
         </record>
+
         <record id="ret_10_income_rent" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">50</field>
@@ -395,12 +999,32 @@
             <field name="amount">-10</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_21030302"/>
-            <field name="refund_account_id" ref="do_niif_21030302"/>
             <field eval="0" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_R_ISR_10')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_isr"/>
+            <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('do_niif_21030302'),
+                }),
+            ]"/>
+            <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('do_niif_21030302'),
+                }),
+            ]"/>
         </record>
+
         <record id="ret_10_income_dividend" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">51</field>
@@ -409,12 +1033,32 @@
             <field name="amount">-10</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_21030303"/>
-            <field name="refund_account_id" ref="do_niif_21030303"/>
             <field eval="0" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_R_ISR_10')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_isr"/>
+            <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('do_niif_21030303'),
+                }),
+            ]"/>
+            <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('do_niif_21030303'),
+                }),
+            ]"/>
         </record>
+
         <record id="ret_2_income_person" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">52</field>
@@ -423,12 +1067,32 @@
             <field name="amount">-2</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_21030308"/>
-            <field name="refund_account_id" ref="do_niif_21030308"/>
             <field eval="0" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_R_ISR_2')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_isr"/>
+            <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('do_niif_21030308'),
+                }),
+            ]"/>
+            <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('do_niif_21030308'),
+                }),
+            ]"/>
         </record>
+
         <record id="ret_2_income_transfer" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">53</field>
@@ -437,12 +1101,32 @@
             <field name="amount">-2</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_21030306"/>
-            <field name="refund_account_id" ref="do_niif_21030306"/>
             <field eval="0" name="price_include"/>
-            <field eval="[(6,0,[ref('tag_R_ISR_2')])]" name="tag_ids"/>
             <field name="tax_group_id" ref="group_isr"/>
+            <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('do_niif_21030306'),
+                }),
+            ]"/>
+            <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('do_niif_21030306'),
+                }),
+            ]"/>
         </record>
+
         <record id="ret_27_income_remittance" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">49</field>
@@ -451,11 +1135,32 @@
             <field name="amount">-27</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">purchase</field>
-            <field name="account_id" ref="do_niif_21030307"/>
-            <field name="refund_account_id" ref="do_niif_21030307"/>
             <field eval="0" name="price_include"/>
             <field name="tax_group_id" ref="group_isr"/>
+            <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('do_niif_21030307'),
+                }),
+            ]"/>
+            <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('do_niif_21030307'),
+                }),
+            ]"/>
         </record>
+
         <record id="ret_5_income_gov" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">50</field>
@@ -464,31 +1169,54 @@
             <field name="amount">-5</field>
             <field name="amount_type">percent</field>
             <field name="type_tax_use">sale</field>
-            <field name="account_id" ref="do_niif_21030308"/>
-            <field name="refund_account_id" ref="do_niif_21030308"/>
             <field eval="0" name="price_include"/>
             <field name="tax_group_id" ref="group_isr"/>
+            <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('do_niif_21030308'),
+                }),
+            ]"/>
+            <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('do_niif_21030308'),
+                }),
+            ]"/>
         </record>
+
         <record id="tax_group_nonformal" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">60</field>
             <field name="name">Retención a Proveedores Informales de Bienes (75%)</field>
             <field name="amount_type">group</field>
-            <field eval="0" name="amount"/>
+            <field eval="18" name="amount"/>
             <field name="type_tax_use">purchase</field>
-            <field eval="[(6, 0, [ref('tax_18_purch'), ref('ret_75_tax_nonformal')])]" name="children_tax_ids"/>
             <field name="tax_group_id" ref="group_ret"/>
+            <field eval="[(6, 0, [ref('tax_18_purch'), ref('ret_75_tax_nonformal')])]" name="children_tax_ids"/>
         </record>
+
         <record id="tax_group_person_construction" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">61</field>
             <field name="name">Retención a Físicas por Servicios con Materiales (2%)</field>
             <field name="amount_type">group</field>
-            <field eval="0" name="amount"/>
+            <field eval="18" name="amount"/>
             <field name="type_tax_use">purchase</field>
             <field eval="[(6, 0, [ref('tax_18_purch'), ref('ret_100_tax_person'), ref('ret_2_income_person')])]" name="children_tax_ids"/>
             <field name="tax_group_id" ref="group_ret"/>
         </record>
+
         <record id="tax_group_moral_construction" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">62</field>
@@ -497,43 +1225,67 @@
             <field eval="0" name="amount"/>
             <field name="type_tax_use">none</field>
             <field name="tax_group_id" ref="group_ret"/>
+            <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',
+                }),
+            ]"/>
+            <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',
+                }),
+            ]"/>
         </record>
+
         <record id="tax_group_person_services" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">58</field>
             <field name="name">Retención a Físicas por Honorarios por Servicios (10%)</field>
             <field name="amount_type">group</field>
-            <field eval="0" name="amount"/>
+            <field eval="18" name="amount"/>
             <field name="type_tax_use">purchase</field>
             <field eval="[(6, 0, [ref('tax_18_purch'), ref('ret_100_tax_person'), ref('ret_10_income_person')])]" name="children_tax_ids"/>
             <field name="tax_group_id" ref="group_ret"/>
         </record>
+
         <record id="tax_group_moral_services" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">58</field>
             <field name="name">Retención a Jurídicas por Servicios Profesionales (30%)</field>
             <field name="amount_type">group</field>
-            <field eval="0" name="amount"/>
+            <field eval="18" name="amount"/>
             <field name="type_tax_use">purchase</field>
             <field eval="[(6, 0, [ref('tax_18_purch'), ref('ret_30_tax_moral')])]" name="children_tax_ids"/>
             <field name="tax_group_id" ref="group_ret"/>
         </record>
+
         <record id="tax_group_restaurant_sale" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">64</field>
             <field name="name">Ventas del Restaurante</field>
             <field name="amount_type">group</field>
-            <field eval="0" name="amount"/>
+            <field eval="18" name="amount"/>
             <field name="type_tax_use">sale</field>
             <field eval="[(6, 0, [ref('tax_18_sale'), ref('tax_tip_sale')])]" name="children_tax_ids"/>
             <field name="tax_group_id" ref="group_ret"/>
         </record>
+
         <record id="tax_group_restaurant_purch" model="account.tax.template">
             <field name="chart_template_id" ref="do_chart_template"/>
             <field name="sequence">65</field>
             <field name="name">Compras a Restaurantes</field>
             <field name="amount_type">group</field>
-            <field eval="0" name="amount"/>
+            <field eval="18" name="amount"/>
             <field name="type_tax_use">purchase</field>
             <field eval="[(6, 0, [ref('tax_18_purch'), ref('tax_tip_purch')])]" name="children_tax_ids"/>
             <field name="tax_group_id" ref="group_ret"/>
diff --git a/addons/l10n_do/data/account_account_tag_data.xml b/addons/l10n_do/data/account_account_tag_data.xml
index 70826b6bbf5..7097e3a0197 100644
--- a/addons/l10n_do/data/account_account_tag_data.xml
+++ b/addons/l10n_do/data/account_account_tag_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="1">
+    <data>
 
     <!-- Account Tags -->
 
@@ -562,97 +562,5 @@
                 <field name='applicability'>accounts</field>
         </record>
 
-    <!-- Tax Tags -->
-
-        <record id="tag_R_ISR_10" model="account.account.tag">
-            <field name="name">R-ISR 10%</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_C_EXENTA" model="account.account.tag">
-            <field name="name">C-EXENTA</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_V_ITBIS_8" model="account.account.tag">
-            <field name="name">V-ITBIS 8%</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_C_ITBIS_8" model="account.account.tag">
-            <field name="name">C-ITBIS 8%</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_V_ITBIS_11" model="account.account.tag">
-            <field name="name">V-ITBIS 11%</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_C_ITBIS_11" model="account.account.tag">
-            <field name="name">C-ITBIS 11%</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_V_EXENTA" model="account.account.tag">
-            <field name="name">V-EXENTA</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_V_ITBIS_18" model="account.account.tag">
-            <field name="name">V-ITBIS 18%</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_C_ITBIS_18_Incluido" model="account.account.tag">
-            <field name="name">C-ITBIS 18% Incluido</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_C_ITBIS_18" model="account.account.tag">
-            <field name="name">C-ITBIS 18%</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_CS_ITBIS_18_Incluido" model="account.account.tag">
-            <field name="name">CS-ITBIS 18% Incluido</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_CS_ITBIS_18" model="account.account.tag">
-            <field name="name">CS-ITBIS 18%</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_IMP_ITBIS_18" model="account.account.tag">
-            <field name="name">IMP-ITBIS 18%</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_R_ITBIS_18" model="account.account.tag">
-            <field name="name">R-ITBIS 18%</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_R_ISR_2" model="account.account.tag">
-            <field name="name">R-ISR 2%</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_TELE_ISC" model="account.account.tag">
-            <field name="name">TELE-ISC</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_TELE_CDT" model="account.account.tag">
-            <field name="name">TELE-CDT</field>
-            <field name="applicability">taxes</field>
-        </record>
-
-        <record id="tag_R_Alquileres_10" model="account.account.tag">
-            <field name="name">R-Alquileres 10%</field>
-            <field name="applicability">taxes</field>
-        </record>
-
     </data>
 </odoo>
diff --git a/addons/l10n_do/data/account_data.xml b/addons/l10n_do/data/account_data.xml
index 462fb38760d..fe655ba0da2 100644
--- a/addons/l10n_do/data/account_data.xml
+++ b/addons/l10n_do/data/account_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="1">
+    <data>
 
         <!-- Account Tax Group -->
         <record id="group_itbis" model="account.tax.group">
diff --git a/addons/l10n_do/data/account_tax_report_data.xml b/addons/l10n_do/data/account_tax_report_data.xml
new file mode 100644
index 00000000000..c19f354a183
--- /dev/null
+++ b/addons/l10n_do/data/account_tax_report_data.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="account_tax_report_total_operaciones" model="account.tax.report.line">
+        <field name="name">II-1 Total de Operaciones</field>
+        <field name="sequence" eval="1"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_2A_ingrs_exprt" model="account.tax.report.line">
+        <field name="name">II.A INGRESOS POR EXPORTACIONES DE BIENES O SERVICIOS EXENTOS</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_total_operaciones"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_2A2_ingrs_exprt" model="account.tax.report.line">
+        <field name="name">II.A.2 INGRESOS POR EXPORTACIONES DE BIENES O SERVICIOS EXENTOS</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_2A_ingrs_exprt"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_2A3_ingrs_local_vnts" model="account.tax.report.line">
+        <field name="name">II.A.3 INGRESOS POR VENTAS LOCALES DE BIENES O SERVICIOS EXENTOS</field>
+        <field name="tag_name">II.A.3</field>
+        <field name="code">DOTAX010102</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_2A_ingrs_exprt"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_2b_grvd" model="account.tax.report.line">
+        <field name="name">II.B GRAVADAS</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_total_operaciones"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_2b6_grvd" model="account.tax.report.line">
+        <field name="name">II.B.6 OPERACIONES GRAVADAS AL 18%</field>
+        <field name="tag_name">II.B.6</field>
+        <field name="code">DOTAX010201</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_2b_grvd"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_2b7_grvd" model="account.tax.report.line">
+        <field name="name">II.B.7 OPERACIONES GRAVADAS AL 11%</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_2b_grvd"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_3_liquidacion" model="account.tax.report.line">
+        <field name="name">III LIQUIDACION</field>
+        <field name="sequence" eval="2"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_financial_report_line_02_01_do account_tax_report_total_itbs" model="account.tax.report.line">
+        <field name="name">III.10 TOTAL ITBIS COBRADO (Sumar casillas 8+9)</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_3_liquidacion"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_itbs_18_casilla" model="account.tax.report.line">
+        <field name="name">III.8 ITBIS COBRADO (18% de la casilla 6)</field>
+        <field name="tag_name">III.8</field>
+        <field name="code">DOTAX020101</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_financial_report_line_02_01_do account_tax_report_total_itbs"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_tbs_11_casilla" model="account.tax.report.line">
+        <field name="name">III.9 TBIS COBRADO (11% de la casilla 7)</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_financial_report_line_02_01_do account_tax_report_total_itbs"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_total_itbs_pgdo" model="account.tax.report.line">
+        <field name="name">III.14 TOTAL ITBIS PAGADO (Sumar casillas 11+12+13)</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_3_liquidacion"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_itbs_pgdo_locales" model="account.tax.report.line">
+        <field name="name">III.11 ITBIS PAGADO EN COMPRAS LOCALES</field>
+        <field name="tag_name">III.11</field>
+        <field name="code">DOTAX020201</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_total_itbs_pgdo"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_itbs_pgdo_dedubl" model="account.tax.report.line">
+        <field name="name">III.12 ITBIS PAGADO POR SERVICIOS DEDUCIBLES</field>
+        <field name="tag_name">III.12</field>
+        <field name="code">DOTAX020202</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_total_itbs_pgdo"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_itbs_pgdo_imptcn" model="account.tax.report.line">
+        <field name="name">III.13 ITBIS PAGADO EN IMPORTACIONES</field>
+        <field name="tag_name">III.13</field>
+        <field name="code">DOTAX020203</field>
+        <field name="sequence" eval="3"/>
+        <field name="parent_id" ref="account_tax_report_total_itbs_pgdo"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_itbs_rntnd" model="account.tax.report.line">
+        <field name="name">A,1 ITBIS RETENIDO</field>
+        <field name="sequence" eval="3"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_retcn_prsn" model="account.tax.report.line">
+        <field name="name">A.25 Servicios Sujetos a Retención Personas = Físicas y Entidad</field>
+        <field name="tag_name">A.25</field>
+        <field name="code">DOTAX0301</field>
+        <field name="sequence" eval="1"/>
+        <field name="parent_id" ref="account_tax_report_itbs_rntnd"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+    <record id="account_tax_report_itbs_retcn_prsn" model="account.tax.report.line">
+        <field name="name">A.30 Itbis Por Servicios Sujetos A Retencion Personas Físicas</field>
+        <field name="tag_name">A.30</field>
+        <field name="code">DOTAX0302</field>
+        <field name="sequence" eval="2"/>
+        <field name="parent_id" ref="account_tax_report_itbs_rntnd"/>
+        <field name="country_id" ref="base.do"/>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/addons/l10n_do/data/fiscal_position_template.xml b/addons/l10n_do/data/fiscal_position_template.xml
index 03900817ec6..bafe680b853 100644
--- a/addons/l10n_do/data/fiscal_position_template.xml
+++ b/addons/l10n_do/data/fiscal_position_template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="1">
+    <data>
         <!-- = = = = = = = = = = = = = = = -->
         <!-- Fiscal Position Templates     -->
         <!-- = = = = = = = = = = = = = = = -->
diff --git a/addons/l10n_do/data/l10n_do_chart_data.xml b/addons/l10n_do/data/l10n_do_chart_data.xml
index b8d5a68ff64..13e4cdf8969 100644
--- a/addons/l10n_do/data/l10n_do_chart_data.xml
+++ b/addons/l10n_do/data/l10n_do_chart_data.xml
@@ -2,15 +2,13 @@
 <odoo>
     <menuitem id="account_reports_do_statements_menu" name="Dominican Republic" parent="account.menu_finance_reports" sequence="0" groups="account.group_account_user"/>
 
-    <data noupdate="1">
-        <!-- Chart of Accounts Template -->
-        <record id="do_chart_template" model="account.chart.template">
-            <field name="name">Catálogo de Cuentas Dominicano (NIIF)</field>
-            <field name="code_digits">8</field>
-            <field name="cash_account_code_prefix">110101</field>
-            <field name="bank_account_code_prefix">110102</field>
-            <field name="transfer_account_code_prefix">11010100</field>
-            <field name="currency_id" ref="base.DOP"/>
-        </record>
-    </data>
+    <!-- Chart of Accounts Template -->
+    <record id="do_chart_template" model="account.chart.template">
+        <field name="name">Catálogo de Cuentas Dominicano (NIIF)</field>
+        <field name="code_digits">8</field>
+        <field name="cash_account_code_prefix">110101</field>
+        <field name="bank_account_code_prefix">110102</field>
+        <field name="transfer_account_code_prefix">11010100</field>
+        <field name="currency_id" ref="base.DOP"/>
+    </record>
 </odoo>
diff --git a/addons/l10n_do/data/l10n_do_state_data.xml b/addons/l10n_do/data/l10n_do_state_data.xml
index 8191da21cd9..c1707544a7a 100644
--- a/addons/l10n_do/data/l10n_do_state_data.xml
+++ b/addons/l10n_do/data/l10n_do_state_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data noupdate="1">
+    <data>
         <!--
     Resource: res.country.state
     Update states. This one is not using ISO 3166-2:DO codes,