[MERGE] forward port branch saas-12.4 up to 98a55917a60

2 files changed, 151 insertions, 570 deletions

diff --git a/addons/l10n_ro/data/account_tax_data.xml b/addons/l10n_ro/data/account_tax_data.xml
index b4551410427..3409d10ad0f 100644
--- a/addons/l10n_ro/data/account_tax_data.xml
+++ b/addons/l10n_ro/data/account_tax_data.xml
@@ -18,8 +18,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_tva_0')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -31,8 +29,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_tva_0')],
             }),
         ]"/>
     </record>
@@ -236,8 +232,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_0')],
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -249,8 +243,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_0')],
             }),
         ]"/>
     </record>
@@ -273,7 +265,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_5')],
             }),
         ]"/>
@@ -286,7 +278,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_5')],
             }),
         ]"/>
@@ -310,7 +302,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_9')],
             }),
         ]"/>
@@ -323,7 +315,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_9')],
             }),
         ]"/>
@@ -347,7 +339,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_19')],
             }),
         ]"/>
@@ -360,7 +352,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_19')],
             }),
         ]"/>
@@ -383,7 +375,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -394,7 +386,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
             }),
         ]"/>
     </record>
@@ -417,7 +409,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'plus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_24')],
             }),
         ]"/>
@@ -430,7 +422,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
                 'minus_report_line_ids': [ref('account_tax_report_ro_tva_decucible_24')],
             }),
         ]"/>
@@ -449,24 +441,22 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx1_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx1_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
     </record>
@@ -484,36 +474,24 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx1_invrsa')],
-                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx1_invrsa')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
             }),
         ]"/>
         <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_baza_tva_tx1_invrsa')],
-                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx1_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
             }),
         ]"/>
     </record>
@@ -531,40 +509,40 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx2_invrsa'),
-                ref('account_tax_report_ro_baza_tva_tx2_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'),
+                ref('account_tax_report_ro_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_tva_tx2_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx2_invrsa')],
+                'account_id': ref('pcg_4426'),
+                'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
             }),
         ]"/>
         <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_baza_tva_tx2_invrsa'),
-                ref('account_tax_report_ro_baza_tva_tx2_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'),
+                ref('account_tax_report_ro_baza_tva_tx_invrsa')],
             }),
             (0,0, {
-                'factor_percent': 100,
+                'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_tva_tx2_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
             }),
             (0,0, {
-                'factor_percent': -100,
+                'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx2_invrsa')],
+                'account_id': ref('pcg_4426'),
+                'minus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
             }),
         ]"/>
     </record>
@@ -582,40 +560,40 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx3_invrsa'),
-                ref('account_tax_report_baza_tva_tx3_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa'),
+                ref('account_tax_report_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_tva_tx3_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
-                'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx3_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
             }),
         ]"/>
         <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_ro_baza_tva_tx3_invrsa'),
-                ref('account_tax_report_baza_tva_tx3_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_tx_invrsa'),
+                ref('account_tax_report_baza_tva_tx_invrsa')],
             }),
             (0,0, {
-                'factor_percent': 100,
+                'factor_percent': -100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_tva_tx3_invrsa')],
+                'account_id': ref('pcg_4426'),
+                'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
             }),
             (0,0, {
-                'factor_percent': -100,
+                'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
-                'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx3_invrsa')],
+                'account_id': ref('pcg_4427'),
+                'minus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
             }),
         ]"/>
     </record>
@@ -651,14 +629,14 @@
                 'repartition_type': 'base',
             }),
             (0,0, {
-                'factor_percent': 100,
+                'factor_percent': -100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
             }),
             (0,0, {
-                'factor_percent': -100,
+                'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
+                'account_id': ref('pcg_4427'),
             }),
         ]"/>
     </record>
@@ -694,14 +672,14 @@
                 'repartition_type': 'base',
             }),
             (0,0, {
-                'factor_percent': 100,
+                'factor_percent': -100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
             }),
             (0,0, {
-                'factor_percent': -100,
+                'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
+                'account_id': ref('pcg_4427'),
             }),
         ]"/>
     </record>
@@ -719,39 +697,39 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx4_invrsa'), ref('account_tax_report_ro_baza_tva_tx4_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'), ref('account_tax_report_ro_baza_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_tva_tx4_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
-                'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx4_invrsa')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
             }),
         ]"/>
         <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_baza_tva_tx4_invrsa'),
-                ref('account_tax_report_ro_baza_tva_tx4_invrsa')],
+                'minus_report_line_ids': [ref('account_tax_report_baza_tva_tx_invrsa'),
+                ref('account_tax_report_ro_baza_tva_tx_invrsa')],
             }),
             (0,0, {
-                'factor_percent': 100,
+                'factor_percent': -100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_tva_tx4_invrsa')],
+                'account_id': ref('pcg_4426'),
+                'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx_invrsa')],
             }),
             (0,0, {
-                'factor_percent': -100,
+                'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
-                'minus_report_line_ids': [ref('account_tax_report_ro_tva_tx4_invrsa')],
+                'account_id': ref('pcg_4427'),
+                'minus_report_line_ids': [ref('account_tax_report_tva_tx_invrsa')],
             }),
         ]"/>
     </record>
@@ -774,7 +752,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -786,7 +763,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
     </record>
@@ -810,7 +786,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -823,7 +798,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
     </record>
@@ -846,7 +820,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -858,7 +831,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
     </record>
@@ -881,7 +853,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -893,7 +864,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
             }),
         ]"/>
     </record>
@@ -914,7 +884,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
@@ -925,7 +894,6 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
             }),
         ]"/>
     </record>
@@ -942,36 +910,24 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr1_bnr')],
-                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr1_bnuri')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'minus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5,0,0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr1_bnr')],
-                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr1_bnuri')],
-            }),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
             }),
         ]"/>
     </record>
@@ -988,39 +944,42 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr2_bnuri'),
-                ref('account_tax_report_baza_tva_intrcmtr2_bnr')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'),
+                ref('account_tax_report_baza_tva_intrcmtr_bnr')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr2_bunri')],
+                'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr2_bunri')],
+                'account_id': ref('pcg_4426'),
+                'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
             }),
         ]"/>
         <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_ro_baza_tva_intracmunitr2_bnuri'),
-                ref('account_tax_report_baza_tva_intrcmtr2_bnr')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'),
+                ref('account_tax_report_baza_tva_intrcmtr_bnr')],
             }),
             (0,0, {
-                'factor_percent': 100,
+                'factor_percent': -100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr2_bunri')],
+                'account_id': ref('pcg_4426'),
+                'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
             }),
             (0,0, {
-                'factor_percent': -100,
+                'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr2_bunri')],
+                'account_id': ref('pcg_4427'),
+                'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
             }),
+
         ]"/>
     </record>
 
@@ -1036,40 +995,40 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr3_bnr'),
-                ref('account_tax_report_ro_baza_tva_intracmunitr3_bnuri')],
+                'plus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr'),
+                ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4427'),
-                'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr3_bunri')],
+                'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
-                'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr3_bunri')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
             }),
         ]"/>
         <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_baza_tva_intrcmtr3_bnr'),
-                ref('account_tax_report_ro_baza_tva_intracmunitr3_bnuri')],
+                'minus_report_line_ids': [ref('account_tax_report_baza_tva_intrcmtr_bnr'),
+                ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri')],
             }),
             (0,0, {
-                'factor_percent': 100,
+                'factor_percent': -100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
-                'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr3_bunri')],
+                'account_id': ref('pcg_4426'),
+                'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
             }),
             (0,0, {
-                'factor_percent': -100,
+                'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
-                'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr3_bunri')],
+                'account_id': ref('pcg_4427'),
+                'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
             }),
         ]"/>
     </record>
@@ -1104,14 +1063,14 @@
                 'repartition_type': 'base',
             }),
             (0,0, {
-                'factor_percent': 100,
+                'factor_percent': -100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
             }),
             (0,0, {
-                'factor_percent': -100,
+                'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
+                'account_id': ref('pcg_4427'),
             }),
         ]"/>
     </record>
@@ -1121,7 +1080,7 @@
         <field name="sequence">61</field>
         <field name="name">TVA Intracomunitara Achizitii 20%</field>
         <field name="amount">20</field>
-        <field name="amount_type">group</field>
+        <field name="amount_type">percent</field>
         <field name="type_tax_use">purchase</field>
         <field name="tax_group_id" ref="tax_group_tva_0"/>
         <field name="invoice_repartition_line_ids" eval="[(5,0,0),
@@ -1146,14 +1105,14 @@
                 'repartition_type': 'base',
             }),
             (0,0, {
-                'factor_percent': 100,
+                'factor_percent': -100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4427'),
+                'account_id': ref('pcg_4426'),
             }),
             (0,0, {
-                'factor_percent': -100,
+                'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
+                'account_id': ref('pcg_4427'),
             }),
         ]"/>
     </record>
@@ -1170,38 +1129,40 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr4_bnuri'),
-                ref('account_tax_report_baza_tva_intrcmtr4_bnr')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'),
+                ref('account_tax_report_baza_tva_intrcmtr_bnr')],
             }),
             (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr4_bunri')],
+                'account_id': ref('pcg_4427'),
+                'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
             }),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
                 'account_id': ref('pcg_4426'),
-                'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr4_bunri')],
+                'plus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
             }),
         ]"/>
         <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_ro_baza_tva_intracmunitr4_bnuri'),
-                ref('account_tax_report_baza_tva_intrcmtr4_bnr')],
+                'minus_report_line_ids': [ref('account_tax_report_ro_baza_tva_intracmunitr_bnuri'),
+                ref('account_tax_report_baza_tva_intrcmtr_bnr')],
             }),
             (0,0, {
-                'factor_percent': 100,
+                'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_line_ids': [ref('account_tax_report_tva_intracmunitr4_bunri')],
+                'account_id': ref('pcg_4426'),
+                'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr_bunri')],
             }),
             (0,0, {
-                'factor_percent': -100,
+                'factor_percent': 100,
                 'repartition_type': 'tax',
-                'account_id': ref('pcg_4426'),
-                'minus_report_line_ids': [ref('account_tax_report_ro_tva_intracmunitr4_bunri')],
+                'account_id': ref('pcg_4427'),
+                'minus_report_line_ids': [ref('account_tax_report_tva_intracmunitr_bunri')],
             }),
         ]"/>
     </record>
diff --git a/addons/l10n_ro/data/account_tax_report_data.xml b/addons/l10n_ro/data/account_tax_report_data.xml
index c8fd6e4019d..a390419ef68 100644
--- a/addons/l10n_ro/data/account_tax_report_data.xml
+++ b/addons/l10n_ro/data/account_tax_report_data.xml
@@ -54,125 +54,28 @@
 
     <record id="account_tax_report_baza_tva_intrcmtr_bnr" model="account.tax.report.line">
         <field name="name">Baza TVA Intracomunitar Bunuri</field>
+        <field name="tag_name">Baza TVA Intracomunitar Bunuri</field>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_clt"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_baza_tva_intrcmtr1_bnr" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_colectata_00_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_intrcmtr2_bnr" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_colectata_05_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_intrcmtr3_bnr" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_colectata_09_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_intrcmtr4_bnr" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_colectata_24_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_bnr"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_baza_tva_intrcmtr_srvci" model="account.tax.report.line">
         <field name="name">Baza TVA Intracomunitar Servicii</field>
+        <field name="tag_name">Baza TVA Intracomunitar Servicii</field>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_clt"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_baza_tva_intrcmtr1_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_intrcmtr2_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_intrcmtr3_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_intrcmtr4_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_intrcmtr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_baza_tva_tx_invrsa" model="account.tax.report.line">
         <field name="name">Baza TVA Taxare Inversa</field>
+        <field name="tag_name">Baza TVA Taxare Inversa</field>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_clt"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_baza_tva_tx1_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_colectata_00_taxare_inversa_Baza</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_tx2_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_colectata_05_taxare_inversa_Baza</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_tx3_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_colectata_09_taxare_inversa_Baza</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_baza_tva_tx4_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_colectata_24_taxare_inversa_Baza</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_tva_colcta" model="account.tax.report.line">
         <field name="name">TVA COLECTATA</field>
         <field name="sequence" eval="2"/>
@@ -181,7 +84,7 @@
 
     <record id="account_tax_report_tva_0" model="account.tax.report.line">
         <field name="name">TVA 0%</field>
-        <field name="tag_name">TVA 0%</field>
+        <field name="tag_name">TVA 0% (TVA colectata)</field>
         <field name="code">ROTAX_TVA_colectata_0</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
@@ -190,7 +93,7 @@
 
     <record id="account_tax_report_tva_19" model="account.tax.report.line">
         <field name="name">TVA 19%</field>
-        <field name="tag_name">TVA 19%</field>
+        <field name="tag_name">TVA 19% (TVA colectata)</field>
         <field name="code">ROTAX_TVA_colectata_19</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
@@ -199,7 +102,7 @@
 
     <record id="account_tax_report_tva_24" model="account.tax.report.line">
         <field name="name">TVA 24%</field>
-        <field name="tag_name">TVA 24%</field>
+        <field name="tag_name">TVA 24% (TVA colectata)</field>
         <field name="code">ROTAX_TVA_colectata_24</field>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
@@ -208,7 +111,7 @@
 
     <record id="account_tax_report_tva_5" model="account.tax.report.line">
         <field name="name">TVA 5%</field>
-        <field name="tag_name">TVA 5%</field>
+        <field name="tag_name">TVA 5% (TVA colectata)</field>
         <field name="code">ROTAX_TVA_colectata_5</field>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
@@ -217,7 +120,7 @@
 
     <record id="account_tax_report_tva_9" model="account.tax.report.line">
         <field name="name">TVA 9%</field>
-        <field name="tag_name">TVA 9%</field>
+        <field name="tag_name">TVA 9% (TVA colectata)</field>
         <field name="code">ROTAX_TVA_colectata_9</field>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
@@ -225,131 +128,38 @@
     </record>
 
     <record id="account_tax_report_tva_intracmunitr_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
+        <field name="name">TVA Intracomunitar Bunuri (TVA colectata)</field>
+        <field name="tag_name">TVA Intracomunitar Bunuri (TVA colectata)</field>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_tva_intracmunitr1_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_intracmunitr2_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_colectata_05_intracomunitar_bunuri</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_intracmunitr3_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_colectata_09_intracomunitar_bunuri</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_intracmunitr4_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_colectata_24_intracomunitar_bunuri</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_tva_intra_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
+        <field name="name">TVA Intracomunitar Servicii (TVA colectata)</field>
+        <field name="tag_name">TVA Intracomunitar Servicii (TVA colectata)</field>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_tva_intra1_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_intra2_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_intra3_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_intra4_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_tva_intra_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_tva_tx_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
+        <field name="name">TVA Taxare Inversa (TVA colectata)</field>
+        <field name="tag_name">TVA Taxare Inversa (TVA colectata)</field>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="account_tax_report_tva_colcta"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_tva_tx1_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_tx2_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="tag_name">TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_colectata_05_taxare_inversa</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_tx3_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="tag_name">TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_colectata_09_taxare_inversa</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_tva_tx4_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="tag_name">TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_colectata_24_taxare_inversa</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_baza_tva_deducbl" model="account.tax.report.line">
-        <field name="name">BAZA TVA DEDUCTIBIL</field>
+        <field name="name">BAZA TVA DEDUCTIBILA</field>
         <field name="sequence" eval="3"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
     <record id="account_tax_report_baza_tva_deducbl_0" model="account.tax.report.line">
         <field name="name">Baza TVA 0%</field>
-        <field name="tag_name">Baza TVA 0%</field>
+        <field name="tag_name">Baza TVA 0% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_0_Baza</field>
         <field name="sequence" eval="1"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
@@ -358,7 +168,7 @@
 
     <record id="account_tax_report_baza_tva_deducbl_19" model="account.tax.report.line">
         <field name="name">Baza TVA 19%</field>
-        <field name="tag_name">Baza TVA 19%</field>
+        <field name="tag_name">Baza TVA 19% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_19_Baza</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
@@ -367,7 +177,7 @@
 
     <record id="account_tax_report_baza_tva_deducbl_24" model="account.tax.report.line">
         <field name="name">Baza TVA 24%</field>
-        <field name="tag_name">Baza TVA 24%</field>
+        <field name="tag_name">Baza TVA 24% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_24_Baza</field>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
@@ -376,7 +186,7 @@
 
     <record id="account_tax_report_baza_tva_deducbl_5" model="account.tax.report.line">
         <field name="name">Baza TVA 5%</field>
-        <field name="tag_name">Baza TVA 5%</field>
+        <field name="tag_name">Baza TVA 5% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_5_Baza</field>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
@@ -385,7 +195,7 @@
 
     <record id="account_tax_report_baza_tva_deducbl_9" model="account.tax.report.line">
         <field name="name">Baza TVA 9%</field>
-        <field name="tag_name">Baza TVA 9%</field>
+        <field name="tag_name">Baza TVA 9% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_9_Baza</field>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
@@ -393,126 +203,29 @@
     </record>
 
     <record id="account_tax_report_ro_baza_tva_intracmunitr_bnuri" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri%</field>
+        <field name="name">Baza TVA Intracomunitar Bunuri (deductibila)</field>
+        <field name="tag_name">Baza TVA Intracomunitar Bunuri (deductibila)</field>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_ro_baza_tva_intracmunitr1_bnuri" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="code">ROTAX_TVA_deductibila_00_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_intracmunitr2_bnuri" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="code">ROTAX_TVA_deductibila_05_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_intracmunitr3_bnuri" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="code">ROTAX_TVA_deductibila_09_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_intracmunitr4_bnuri" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="tag_name">Baza TVA Intracomunitar Bunuri%</field>
-        <field name="code">ROTAX_TVA_deductibila_24_intracomunitar_bunuri_Baza</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_bnuri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_ro_baza_tva_intracmunitr_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii%</field>
+        <field name="name">Baza TVA Intracomunitar Servicii (deductibila)</field>
+        <field name="tag_name">Baza TVA Intracomunitar Servicii (deductibila)</field>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_ro_baza_tva_intracmunitr1_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii%</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_intracmunitr2_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii%</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_intracmunitr3_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii%</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_intracmunitr4_srvci" model="account.tax.report.line">
-        <field name="name">Baza TVA Intracomunitar Servicii%</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_ro_baza_tva_tx_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
+        <field name="name">Baza TVA Taxare Inversa (deductibila)</field>
+        <field name="tag_name">Baza TVA Taxare Inversa (deductibila)</field>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="account_tax_report_baza_tva_deducbl"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_ro_baza_tva_tx1_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_deductibila_00_taxare_inversa_Baza</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_tx2_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_deductibila_05_taxare_inversa_Baza</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_tx3_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_deductibila_09_taxare_inversa_Baza</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_baza_tva_tx4_invrsa" model="account.tax.report.line">
-        <field name="name">Baza TVA Taxare Inversa</field>
-        <field name="tag_name">Baza TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_deductibila_24_taxare_inversa_Baza</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_ro_baza_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_ro_tva_decucible" model="account.tax.report.line">
         <field name="name">TVA DEDUCTIBILA</field>
         <field name="sequence" eval="4"/>
@@ -529,8 +242,8 @@
     </record>
 
     <record id="account_tax_report_ro_tva_decucible_19" model="account.tax.report.line">
-        <field name="name">TVA 19%</field>
-        <field name="tag_name">TVA 19%</field>
+        <field name="name">TVA 19% (deductibila)</field>
+        <field name="tag_name">TVA 19% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_19</field>
         <field name="sequence" eval="2"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
@@ -538,8 +251,8 @@
     </record>
 
     <record id="account_tax_report_ro_tva_decucible_24" model="account.tax.report.line">
-        <field name="name">TVA 24%</field>
-        <field name="tag_name">TVA 24%</field>
+        <field name="name">TVA 24% (deductibila)</field>
+        <field name="tag_name">TVA 24% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_24</field>
         <field name="sequence" eval="3"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
@@ -547,8 +260,8 @@
     </record>
 
     <record id="account_tax_report_ro_tva_decucible_5" model="account.tax.report.line">
-        <field name="name">TVA 5%</field>
-        <field name="tag_name">TVA 5%</field>
+        <field name="name">TVA 5% (deductibila)</field>
+        <field name="tag_name">TVA 5% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_5</field>
         <field name="sequence" eval="4"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
@@ -556,8 +269,8 @@
     </record>
 
     <record id="account_tax_report_ro_tva_decucible_9" model="account.tax.report.line">
-        <field name="name">TVA 9%</field>
-        <field name="tag_name">TVA 9%</field>
+        <field name="name">TVA 9% (deductibila)</field>
+        <field name="tag_name">TVA 9% (deductibila)</field>
         <field name="code">ROTAX_TVA_deductibila_9</field>
         <field name="sequence" eval="5"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
@@ -565,122 +278,29 @@
     </record>
 
     <record id="account_tax_report_ro_tva_intracmunitr_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
+        <field name="name">TVA Intracomunitar Bunuri (deductibila)</field>
+        <field name="tag_name">TVA Intracomunitar Bunuri (deductibila)</field>
         <field name="sequence" eval="6"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_ro_tva_intracmunitr1_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_intracmunitr2_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_deductibila_05_intracomunitar_bunuri</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_intracmunitr3_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_deductibila_09_intracomunitar_bunuri</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_intracmunitr4_bunri" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Bunuri</field>
-        <field name="tag_name">TVA Intracomunitar Bunuri</field>
-        <field name="code">ROTAX_TVA_deductibila_24_intracomunitar_bunuri</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_bunri"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_ro_tva_intracmunitr_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
+        <field name="name">TVA Intracomunitar Servicii (deductibila)</field>
+        <field name="tag_name">TVA Intracomunitar Servicii (deductibila)</field>
         <field name="sequence" eval="7"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_ro_tva_intracmunitr1_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_intracmunitr2_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_intracmunitr3_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_intracmunitr4_srvci" model="account.tax.report.line">
-        <field name="name">TVA Intracomunitar Servicii</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_intracmunitr_srvci"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_ro_tva_tx_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
+        <field name="name">TVA Taxare Inversa (deductibila)</field>
+        <field name="tag_name">TVA Taxare Inversa (deductibila)</field>
         <field name="sequence" eval="8"/>
         <field name="parent_id" ref="account_tax_report_ro_tva_decucible"/>
         <field name="country_id" ref="base.ro"/>
     </record>
 
-    <record id="account_tax_report_ro_tva_tx1_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="sequence" eval="1"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_tx2_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="tag_name">TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_deductibila_05_taxare_inversa</field>
-        <field name="sequence" eval="2"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_tx3_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="tag_name">TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_deductibila_09_taxare_inversa</field>
-        <field name="sequence" eval="3"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
-    <record id="account_tax_report_ro_tva_tx4_invrsa" model="account.tax.report.line">
-        <field name="name">TVA Taxare Inversa</field>
-        <field name="tag_name">TVA Taxare Inversa</field>
-        <field name="code">ROTAX_TVA_deductibila_24_taxare_inversa</field>
-        <field name="sequence" eval="4"/>
-        <field name="parent_id" ref="account_tax_report_ro_tva_tx_invrsa"/>
-        <field name="country_id" ref="base.ro"/>
-    </record>
-
     <record id="account_tax_report_ro_baza_tva_nxgibl" model="account.tax.report.line">
         <field name="name">BAZA TVA NEEXIGIBILA</field>
         <field name="sequence" eval="5"/>