diff --git a/addons/l10n_eu_oss/models/eu_tag_map.py b/addons/l10n_eu_oss/models/eu_tag_map.py
index 0cd829b100d..69aaed38c63 100644
--- a/addons/l10n_eu_oss/models/eu_tag_map.py
+++ b/addons/l10n_eu_oss/models/eu_tag_map.py
@@ -80,9 +80,9 @@ EU_TAG_MAP = {
     },
     # France
     'l10n_fr.l10n_fr_pcg_chart_template': {
-        'invoice_base_tag': None,
+        'invoice_base_tag': 'l10n_fr.tax_report_E3_tag',
         'invoice_tax_tag': None,
-        'refund_base_tag': None,
+        'refund_base_tag': 'l10n_fr.tax_report_F8_tag',
         'refund_tax_tag': None,
     },
     # Germany SKR03
diff --git a/addons/l10n_fr/data/account_tax_data.xml b/addons/l10n_fr/data/account_tax_data.xml
index dc8da853c24..4aff5ea8eaa 100644
--- a/addons/l10n_fr/data/account_tax_data.xml
+++ b/addons/l10n_fr/data/account_tax_data.xml
@@ -14,7 +14,7 @@
     <!-- ########### PURCHASE, Goods (Based on Invoice) ########### -->
     <record model="account.tax.template" id="tva_acq_normale">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 20,0%</field>
+        <field name="name">TVA 20%</field>
         <field name="description">TVA 20%</field>
         <field name="amount" eval="20.0"/>
         <field name="amount_type">percent</field>
@@ -94,7 +94,7 @@
     </record>
     <record model="account.tax.template" id="tva_acq_intermediaire">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 10,0%</field>
+        <field name="name">TVA 10%</field>
         <field name="description">TVA 10%</field>
         <field name="amount" eval="10.0"/>
         <field name="amount_type">percent</field>
@@ -229,42 +229,36 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_P1_base_tag')],
             }),
 
             (0,0, {
                 'factor_percent': 80,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_P1_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_44566'),
             }),
 
             (0,0, {
                 'factor_percent': 20,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_P1_taxe_tag')],
-                'account_id': ref('pcg_6061'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_P1_base_tag')],
             }),
 
             (0,0, {
                 'factor_percent': 80,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_P1_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_44566'),
             }),
 
             (0,0, {
                 'factor_percent': 20,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_P1_taxe_tag')],
-                'account_id': ref('pcg_6061'),
             }),
         ]"/>
     </record>
@@ -276,6 +270,7 @@
         <field name="amount_type">percent</field>
         <field name="sequence" eval="9"/>
         <field name="price_include" eval="1"/>
+        <field name="include_base_amount" eval="1"/>
         <field name="type_tax_use">purchase</field>
         <field name="tax_scope">consu</field>
         <field name="tax_group_id" ref="tax_group_tva_20"/>
@@ -283,42 +278,36 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_P1_base_tag')],
             }),
 
             (0,0, {
                 'factor_percent': 80,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_P1_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_44566'),
             }),
 
             (0,0, {
                 'factor_percent': 20,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_P1_taxe_tag')],
-                'account_id': ref('pcg_6061'),
             }),
         ]"/>
         <field name="refund_repartition_line_ids" eval="[(5, 0, 0),
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_P1_base_tag')],
             }),
 
             (0,0, {
                 'factor_percent': 80,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_P1_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_44566'),
             }),
 
             (0,0, {
                 'factor_percent': 20,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_P1_taxe_tag')],
-                'account_id': ref('pcg_6061'),
             }),
         ]"/>
     </record>
@@ -326,8 +315,8 @@
     <!-- TTC -->
     <record model="account.tax.template" id="tva_acq_normale_TTC">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 20,0% TTC</field>
-        <field name="description">TVA 20% TTC</field>
+        <field name="name">TVA 20% TTC</field>
+        <field name="description">TVA 20%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="20.0"/>
         <field name="amount_type">percent</field>
@@ -367,7 +356,7 @@
     <record model="account.tax.template" id="tva_acq_specifique_TTC">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
         <field name="name">TVA 8,5% TTC</field>
-        <field name="description">TVA 8,5% TTC</field>
+        <field name="description">TVA 8,5%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="8.5"/>
         <field name="amount_type">percent</field>
@@ -406,8 +395,8 @@
     </record>
     <record model="account.tax.template" id="tva_acq_intermediaire_TTC">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 10,0% TTC</field>
-        <field name="description">TVA 10% TTC</field>
+        <field name="name">TVA 10% TTC</field>
+        <field name="description">TVA 10%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="10.0"/>
         <field name="amount_type">percent</field>
@@ -447,7 +436,7 @@
     <record model="account.tax.template" id="tva_acq_reduite_TTC">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
         <field name="name">TVA 5,5% TTC</field>
-        <field name="description">TVA 5,5% TTC</field>
+        <field name="description">TVA 5,5%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="5.5"/>
         <field name="amount_type">percent</field>
@@ -487,7 +476,7 @@
     <record model="account.tax.template" id="tva_acq_super_reduite_TTC">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
         <field name="name">TVA 2,1% TTC</field>
-        <field name="description">TVA 2,1% TTC</field>
+        <field name="description">TVA 2,1%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="2.1"/>
         <field name="amount_type">percent</field>
@@ -529,7 +518,7 @@
     <record model="account.tax.template" id="tva_imm_normale">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
         <field name="name">TVA 20% IMMO</field>
-        <field name="description">TVA 20% IMMO</field>
+        <field name="description">TVA 20%</field>
         <field name="amount" eval="20.0"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -569,7 +558,7 @@
     <record model="account.tax.template" id="tva_imm_specifique">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
         <field name="name">TVA 8,5% IMMO</field>
-        <field name="description">TVA 8,5% IMMO</field>
+        <field name="description">TVA 8,5%</field>
         <field name="amount" eval="8.5"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -610,7 +599,7 @@
     <record model="account.tax.template" id="tva_imm_intermediaire">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
         <field name="name">TVA 10% IMMO</field>
-        <field name="description">TVA 10% IMMO</field>
+        <field name="description">TVA 10%</field>
         <field name="amount" eval="10.0"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -651,7 +640,7 @@
     <record model="account.tax.template" id="tva_imm_reduite">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
         <field name="name">TVA 5,5% IMMO</field>
-        <field name="description">TVA 5,5% IMMO</field>
+        <field name="description">TVA 5,5%</field>
         <field name="amount" eval="5.5"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -692,7 +681,7 @@
     <record model="account.tax.template" id="tva_imm_super_reduite">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
         <field name="name">TVA 2,1% IMMO</field>
-        <field name="description">TVA 2,1% IMMO</field>
+        <field name="description">TVA 2,1%</field>
         <field name="amount" eval="2.1"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -735,7 +724,7 @@
     <record model="account.tax.template" id="tva_import_outside_eu_20">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
         <field name="name">TVA 20% IMPORT</field>
-        <field name="description">TVA 20% IMPORT</field>
+        <field name="description">TVA 20%</field>
         <field name="amount" eval="20.0"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="11"/>
@@ -747,20 +736,20 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_08_base_tag'), ref('l10n_fr.tax_report_I1_base_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_I1_base_tag')],
             }),
 
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_I1_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_24_tag')],
                 'account_id': ref('pcg_445663'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_08_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_I1_taxe_tag')],
                 'account_id': ref('pcg_4453'),
             }),
         ]"/>
@@ -768,20 +757,20 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_08_base_tag'), ref('l10n_fr.tax_report_I1_base_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_I1_base_tag')],
             }),
 
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_I1_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_24_tag')],
                 'account_id': ref('pcg_445663'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_08_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_I1_taxe_tag')],
                 'account_id': ref('pcg_4453'),
             }),
         ]"/>
@@ -789,7 +778,7 @@
     <record model="account.tax.template" id="tva_import_outside_eu_10">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
         <field name="name">TVA 10% IMPORT</field>
-        <field name="description">TVA 10% IMPORT</field>
+        <field name="description">TVA 10%</field>
         <field name="amount" eval="10.0"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="11"/>
@@ -802,20 +791,20 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_9B_base_tag'), ref('l10n_fr.tax_report_I2_base_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_I2_base_tag')],
             }),
 
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_I2_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_24_tag')],
                 'account_id': ref('pcg_445663'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_9B_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_I2_taxe_tag')],
                 'account_id': ref('pcg_4453'),
             }),
         ]"/>
@@ -823,28 +812,28 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_9B_base_tag'), ref('l10n_fr.tax_report_I2_base_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_I2_base_tag')],
             }),
 
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_I2_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_24_tag')],
                 'account_id': ref('pcg_445663'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_9B_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_I2_taxe_tag')],
                 'account_id': ref('pcg_4453'),
             }),
         ]"/>
     </record>
     <record model="account.tax.template" id="tva_import_outside_eu_8_5">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 8.5% IMPORT</field>
-        <field name="description">TVA 8.5% IMPORT</field>
+        <field name="name">TVA 8,5% IMPORT</field>
+        <field name="description">TVA 8,5%</field>
         <field name="amount" eval="8.5"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="11"/>
@@ -857,20 +846,20 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_10_base_tag'), ref('l10n_fr.tax_report_I3_base_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_I3_base_tag')],
             }),
 
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_I3_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_24_tag')],
                 'account_id': ref('pcg_445663'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_10_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_I3_taxe_tag')],
                 'account_id': ref('pcg_4453'),
             }),
         ]"/>
@@ -878,28 +867,28 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_10_base_tag'), ref('l10n_fr.tax_report_I3_base_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_I3_base_tag')],
             }),
 
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_I3_base_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_24_tag')],
                 'account_id': ref('pcg_445663'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_10_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_I3_taxe_tag')],
                 'account_id': ref('pcg_4453'),
             }),
         ]"/>
     </record>
     <record model="account.tax.template" id="tva_import_outside_eu_5_5">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 5.5% IMPORT</field>
-        <field name="description">TVA 5.5% IMPORT</field>
+        <field name="name">TVA 5,5% IMPORT</field>
+        <field name="description">TVA 5,5%</field>
         <field name="amount" eval="5.5"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="11"/>
@@ -912,20 +901,20 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_09_base_tag'), ref('l10n_fr.tax_report_I4_base_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_I4_base_tag')],
             }),
 
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_I4_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_24_tag')],
                 'account_id': ref('pcg_445663'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_09_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_I4_taxe_tag')],
                 'account_id': ref('pcg_4453'),
             }),
         ]"/>
@@ -933,28 +922,28 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_09_base_tag'), ref('l10n_fr.tax_report_I4_base_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_I4_base_tag')],
             }),
 
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_I4_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_24_tag')],
                 'account_id': ref('pcg_445663'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_09_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_I4_taxe_tag')],
                 'account_id': ref('pcg_4453'),
             }),
         ]"/>
     </record>
     <record model="account.tax.template" id="tva_import_outside_eu_2_1">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 2.1% IMPORT</field>
-        <field name="description">TVA 2.1% IMPORT</field>
+        <field name="name">TVA 2,1% IMPORT</field>
+        <field name="description">TVA 2,1%</field>
         <field name="amount" eval="2.1"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="11"/>
@@ -967,20 +956,20 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_11_base_tag'), ref('l10n_fr.tax_report_I5_base_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_I5_base_tag')],
             }),
 
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_I5_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_24_tag')],
                 'account_id': ref('pcg_445663'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_11_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_I5_taxe_tag')],
                 'account_id': ref('pcg_4453'),
             }),
         ]"/>
@@ -988,20 +977,20 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_11_base_tag'), ref('l10n_fr.tax_report_I5_base_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_A4_tag'), ref('l10n_fr.tax_report_I5_base_tag')],
             }),
 
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_I5_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag'), ref('l10n_fr.tax_report_24_tag')],
                 'account_id': ref('pcg_445663'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_11_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_I5_taxe_tag')],
                 'account_id': ref('pcg_4453'),
             }),
         ]"/>
@@ -1010,8 +999,8 @@
     <!-- INTRACOM -->
     <record model="account.tax.template" id="tva_intra_normale_biens">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 20% INTRACOM</field>
-        <field name="description">TVA 20% INTRACOM</field>
+        <field name="name">TVA 20% EU M</field>
+        <field name="description">TVA 20%</field>
         <field name="amount" eval="20.0"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -1029,14 +1018,14 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_08_taxe_tag'), ref('l10n_fr.tax_report_17_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_08_taxe_tag'), ref('l10n_fr.tax_report_17_tag')],
                 'account_id': ref('pcg_4452'),
             }),
         ]"/>
@@ -1050,14 +1039,14 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_08_taxe_tag'), ref('l10n_fr.tax_report_17_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_08_taxe_tag'), ref('l10n_fr.tax_report_17_tag')],
                 'account_id': ref('pcg_4452'),
             }),
         ]"/>
@@ -1067,8 +1056,8 @@
     <!-- ########### PURCHASE, Services (Based on Invoice) ########### -->
     <record model="account.tax.template" id="tva_intra_normale_services">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 20% INTRACOM</field>
-        <field name="description">TVA 20% INTRACOM</field>
+        <field name="name">TVA 20% EU S</field>
+        <field name="description">TVA 20%</field>
         <field name="amount" eval="20.0"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -1086,14 +1075,14 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_08_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_08_taxe_tag')],
                 'account_id': ref('pcg_44521'),
             }),
         ]"/>
@@ -1107,14 +1096,14 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_08_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_08_taxe_tag')],
                 'account_id': ref('pcg_44521'),
             }),
         ]"/>
@@ -1122,7 +1111,7 @@
     <record model="account.tax.template" id="tva_purchase_service_20_import">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
         <field name="name">TVA 20% IMPORT</field>
-        <field name="description">TVA 20% IMPORT</field>
+        <field name="description">TVA 20%</field>
         <field name="amount" eval="20.0"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -1134,20 +1123,20 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_A3_tag'), ref('l10n_fr.tax_report_08_base_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_B4_tag'), ref('l10n_fr.tax_report_08_base_tag')],
             }),
 
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_08_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445663'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_08_taxe_tag')],
                 'account_id': ref('pcg_44531'),
             }),
         ]"/>
@@ -1155,30 +1144,67 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_A3_tag'), ref('l10n_fr.tax_report_08_base_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_B4_tag'), ref('l10n_fr.tax_report_08_base_tag')],
             }),
 
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_08_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445663'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_08_taxe_tag')],
                 'account_id': ref('pcg_44531'),
             }),
         ]"/>
     </record>
 
+    <record model="account.tax.template" id="tva_purchase_service_0">
+        <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+        <field name="name">TVA 0% EXO</field>
+        <field name="description">TVA 0%</field>
+        <field name="amount" eval="0.00"/>
+        <field name="amount_type">percent</field>
+        <field name="sequence" eval="10"/>
+        <field name="type_tax_use">purchase</field>
+        <field name="tax_scope">service</field>
+        <field name="tax_exigibility">on_invoice</field>
+        <field name="cash_basis_transition_account_id" ref="pcg_44574"/>
+        <field name="include_base_amount" eval="1"/>
+        <field name="tax_group_id" ref="tax_group_tva_0"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_expression_ids': [],
+            }),
+           (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_expression_ids': [],
+            }),
+           (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+            }),
+        ]"/>
+    </record>
+
 
     <!-- ########### PURCHASE, Services (Based on Payment) ########### -->
     <record model="account.tax.template" id="tva_acq_encaissement">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 20,0%</field>
+        <field name="name">TVA 20%</field>
         <field name="description">TVA 20%</field>
         <field name="amount" eval="20.0"/>
         <field name="amount_type">percent</field>
@@ -1220,7 +1246,7 @@
     </record>
     <record model="account.tax.template" id="tva_acq_intermediaire_encaissement">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 10,0%</field>
+        <field name="name">TVA 10%</field>
         <field name="description">TVA 10%</field>
         <field name="amount" eval="10.0"/>
         <field name="amount_type">percent</field>
@@ -1351,8 +1377,8 @@
     <!-- TTC -->
     <record model="account.tax.template" id="tva_acq_encaissement_TTC">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 20,0% TTC</field>
-        <field name="description">TVA 20% TTC</field>
+        <field name="name">TVA 20% TTC</field>
+        <field name="description">TVA 20%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="20.0"/>
         <field name="amount_type">percent</field>
@@ -1393,8 +1419,8 @@
     </record>
     <record model="account.tax.template" id="tva_acq_intermediaire_encaissement_TTC">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 10,0% TTC</field>
-        <field name="description">TVA 10% TTC</field>
+        <field name="name">TVA 10% TTC</field>
+        <field name="description">TVA 10%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="10.0"/>
         <field name="amount_type">percent</field>
@@ -1437,12 +1463,12 @@
     <record model="account.tax.template" id="tva_acq_encaissement_reduite_TTC">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
         <field name="name">TVA 5,5% TTC</field>
-        <field name="description">TVA 5,5% TTC</field>
+        <field name="description">TVA 5,5%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="5.5"/>
         <field name="amount_type">percent</field>
         <field name="tax_exigibility">on_payment</field>
-        <field name="cash_basis_transition_account_id" ref="pcg_445800"/>
+        <field name="cash_basis_transition_account_id" ref="pcg_44564"/>
         <field name="sequence" eval="10"/>
         <field name="type_tax_use">purchase</field>
         <field name="tax_scope">service</field>
@@ -1480,13 +1506,13 @@
     <record model="account.tax.template" id="tva_acq_encaissement_super_reduite_TTC">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
         <field name="name">TVA 2,1% TTC</field>
-        <field name="description">TVA 2,1% TTC</field>
+        <field name="description">TVA 2,1%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="2.1"/>
         <field name="amount_type">percent</field>
         <field name="tax_exigibility">on_payment</field>
         <field name="active" eval="0"/>
-        <field name="cash_basis_transition_account_id" ref="pcg_445800"/>
+        <field name="cash_basis_transition_account_id" ref="pcg_44564"/>
         <field name="sequence" eval="10"/>
         <field name="type_tax_use">purchase</field>
         <field name="tax_scope">service</field>
@@ -1524,8 +1550,8 @@
     <!-- Others -->
     <record model="account.tax.template" id="tva_purchase_imm_normale">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 20,0% IMMO</field>
-        <field name="description">TVA 20% IMMO</field>
+        <field name="name">TVA 20% IMMO</field>
+        <field name="description">TVA 20%</field>
         <field name="amount" eval="20.0"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -1569,7 +1595,7 @@
     <!-- ########### SALE, Goods (Based on Invoice) ########### -->
     <record model="account.tax.template" id="tva_normale">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 20,0%</field>
+        <field name="name">TVA 20%</field>
         <field name="description">TVA 20%</field>
         <field name="amount" eval="20.0"/>
         <field name="amount_type">percent</field>
@@ -1609,7 +1635,7 @@
     </record>
     <record model="account.tax.template" id="tva_intermediaire">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 10,0%</field>
+        <field name="name">TVA 10%</field>
         <field name="description">TVA 10%</field>
         <field name="amount" eval="10.0"/>
         <field name="amount_type">percent</field>
@@ -1650,7 +1676,7 @@
     </record>
     <record model="account.tax.template" id="tva_reduite">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 5.5%</field>
+        <field name="name">TVA 5,5%</field>
         <field name="description">TVA 5,5%</field>
         <field name="amount" eval="5.5"/>
         <field name="amount_type">percent</field>
@@ -1691,7 +1717,7 @@
     </record>
     <record model="account.tax.template" id="tva_specifique">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 8.5%</field>
+        <field name="name">TVA 8,5%</field>
         <field name="description">TVA 8,5%</field>
         <field name="amount" eval="8.5"/>
         <field name="amount_type">percent</field>
@@ -1732,7 +1758,7 @@
     </record>
     <record model="account.tax.template" id="tva_super_reduite">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 2.1%</field>
+        <field name="name">TVA 2,1%</field>
         <field name="description">TVA 2,1%</field>
         <field name="amount" eval="2.1"/>
         <field name="amount_type">percent</field>
@@ -1775,8 +1801,8 @@
     <!-- TTC -->
     <record model="account.tax.template" id="tva_normale_ttc">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 20,0% TTC</field>
-        <field name="description">TVA 20% TTC</field>
+        <field name="name">TVA 20% TTC</field>
+        <field name="description">TVA 20%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="20"/>
         <field name="amount_type">percent</field>
@@ -1816,8 +1842,8 @@
     </record>
     <record model="account.tax.template" id="tva_intermediaire_ttc">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 10,0% TTC</field>
-        <field name="description">TVA 10% TTC</field>
+        <field name="name">TVA 10% TTC</field>
+        <field name="description">TVA 10%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="10"/>
         <field name="amount_type">percent</field>
@@ -1857,8 +1883,8 @@
     </record>
     <record model="account.tax.template" id="tva_specifique_ttc">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 8.5% TTC</field>
-        <field name="description">TVA 8.5% TTC</field>
+        <field name="name">TVA 8,5% TTC</field>
+        <field name="description">TVA 8,5%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="8.5"/>
         <field name="amount_type">percent</field>
@@ -1898,8 +1924,8 @@
     </record>
     <record model="account.tax.template" id="tva_reduite_ttc">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 5.5% TTC</field>
-        <field name="description">TVA 5,5% TTC</field>
+        <field name="name">TVA 5,5% TTC</field>
+        <field name="description">TVA 5,5%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="5.5"/>
         <field name="amount_type">percent</field>
@@ -1939,8 +1965,8 @@
     </record>
     <record model="account.tax.template" id="tva_super_reduite_ttc">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 2.1% TTC</field>
-        <field name="description">TVA 2,1% TTC</field>
+        <field name="name">TVA 2,1% TTC</field>
+        <field name="description">TVA 2,1%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="2.1"/>
         <field name="amount_type">percent</field>
@@ -1995,7 +2021,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_A2_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_E2_tag')],
             }),
 
             (0,0, {
@@ -2007,7 +2033,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_A2_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_E2_tag')],
             }),
 
             (0,0, {
@@ -2021,7 +2047,7 @@
     <record model="account.tax.template" id="tva_sale_good_export_0">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
         <field name="name">TVA 0% EXPORT</field>
-        <field name="description">TVA 0% EXPORT</field>
+        <field name="description">TVA 0%</field>
         <field name="amount" eval="0.00"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -2058,8 +2084,8 @@
 
     <record model="account.tax.template" id="tva_sale_good_intra_0">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 0% INTRACOM</field>
-        <field name="description">TVA 0% INTRACOM</field>
+        <field name="name">TVA 0% EU M</field>
+        <field name="description">TVA 0%</field>
         <field name="amount" eval="0.00"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -2098,7 +2124,7 @@
     <!-- ########### SALE, Services (Based Payment) ########### -->
     <record model="account.tax.template" id="tva_normale_encaissement">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 20,0%</field>
+        <field name="name">TVA 20%</field>
         <field name="description">TVA 20%</field>
         <field name="amount" eval="20.0"/>
         <field name="amount_type">percent</field>
@@ -2140,7 +2166,7 @@
     </record>
     <record model="account.tax.template" id="tva_intermediaire_encaissement">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 10,0%</field>
+        <field name="name">TVA 10%</field>
         <field name="description">TVA 10%</field>
         <field name="amount" eval="10.0"/>
         <field name="amount_type">percent</field>
@@ -2183,7 +2209,7 @@
     </record>
     <record model="account.tax.template" id="tva_reduite_encaissement">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 5.5%</field>
+        <field name="name">TVA 5,5%</field>
         <field name="description">TVA 5,5%</field>
         <field name="amount" eval="5.5"/>
         <field name="amount_type">percent</field>
@@ -2226,7 +2252,7 @@
     </record>
     <record model="account.tax.template" id="tva_super_reduite_encaissement">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 2.1%</field>
+        <field name="name">TVA 2,1%</field>
         <field name="description">TVA 2,1%</field>
         <field name="amount" eval="2.1"/>
         <field name="amount_type">percent</field>
@@ -2271,8 +2297,8 @@
     <!-- TTC -->
     <record model="account.tax.template" id="tva_normale_encaissement_ttc">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 20,0% TTC</field>
-        <field name="description">TVA 20% TTC</field>
+        <field name="name">TVA 20% TTC</field>
+        <field name="description">TVA 20%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="20"/>
         <field name="amount_type">percent</field>
@@ -2314,8 +2340,8 @@
     </record>
     <record model="account.tax.template" id="tva_intermediaire_encaissement_ttc">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 10,0% TTC</field>
-        <field name="description">TVA 10% TTC</field>
+        <field name="name">TVA 10% TTC</field>
+        <field name="description">TVA 10%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="10"/>
         <field name="amount_type">percent</field>
@@ -2357,8 +2383,8 @@
     </record>
     <record model="account.tax.template" id="tva_reduite_encaissement_ttc">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 5.5% TTC</field>
-        <field name="description">TVA 5,5% TTC</field>
+        <field name="name">TVA 5,5% TTC</field>
+        <field name="description">TVA 5,5%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="5.5"/>
         <field name="amount_type">percent</field>
@@ -2410,8 +2436,8 @@
     </record>
     <record model="account.tax.template" id="tva_super_reduite_encaissement_ttc">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 2.1% TTC</field>
-        <field name="description">TVA 2,1% TTC</field>
+        <field name="name">TVA 2,1% TTC</field>
+        <field name="description">TVA 2,1%</field>
         <field name="price_include" eval="1"/>
         <field name="amount" eval="2.1"/>
         <field name="amount_type">percent</field>
@@ -2481,7 +2507,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_A2_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_E2_tag')],
             }),
 
            (0,0, {
@@ -2493,7 +2519,7 @@
             (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'base',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_A2_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_E2_tag')],
             }),
 
            (0,0, {
@@ -2507,7 +2533,46 @@
     <record model="account.tax.template" id="tva_sale_service_export_0">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
         <field name="name">TVA 0% EXPORT</field>
-        <field name="description">TVA 0% EXPORT</field>
+        <field name="description">TVA 0%</field>
+        <field name="amount" eval="0.00"/>
+        <field name="amount_type">percent</field>
+        <field name="sequence" eval="10"/>
+        <field name="type_tax_use">sale</field>
+        <field name="tax_scope">service</field>
+        <field name="cash_basis_transition_account_id" ref="pcg_44574"/>
+        <field name="include_base_amount" eval="1"/>
+        <field name="tax_group_id" ref="tax_group_tva_0"/>
+        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'base',
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_E2_tag')],
+            }),
+
+            (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_expression_ids': [ref('l10n_fr.tax_report_E2_tag')],
+            }),
+
+            (0,0, {
+                'factor_percent': 100,
+                'repartition_type': 'tax',
+            }),
+        ]"/>
+    </record>
+    <!-- previous id: tva_export_0 -->
+
+    <record model="account.tax.template" id="tva_sale_service_intra_0">
+        <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+        <field name="name">TVA 0% EU S</field>
+        <field name="description">TVA 0%</field>
         <field name="amount" eval="0.00"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -2541,55 +2606,13 @@
                 'repartition_type': 'tax',
             }),
         ]"/>
-    </record>
-    <!-- previous id: tva_export_0 -->
+    </record>  <!-- previous id: tva_intra_0 -->
 
-    <record model="account.tax.template" id="tva_sale_service_intra_0">
-        <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 0% INTRACOM</field>
-        <field name="description">TVA 0% INTRACOM</field>
-        <field name="amount" eval="0.00"/>
-        <field name="amount_type">percent</field>
-        <field name="sequence" eval="10"/>
-        <field name="type_tax_use">sale</field>
-        <field name="tax_scope">service</field>
-        <field name="tax_exigibility">on_payment</field>
-        <field name="cash_basis_transition_account_id" ref="pcg_44574"/>
-        <field name="include_base_amount" eval="1"/>
-        <field name="tax_group_id" ref="tax_group_tva_0"/>
-        <field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'base',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_E2_tag'), ref('l10n_fr.tax_report_F1_tag')],
-            }),
-
-            (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_expression_ids': [ref('l10n_fr.tax_report_E2_tag'), ref('l10n_fr.tax_report_F1_tag')],
-            }),
-
-            (0,0, {
-                'factor_percent': 100,
-                'repartition_type': 'tax',
-            }),
-        ]"/>
-    </record>
-    <!-- previous id: tva_intra_0 -->
-
-    
     <!-- ACHATS INTRACOMMUNAUTAIRE -->
     <record model="account.tax.template" id="tva_intra_specifique_biens">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 8,5% INTRACOM</field>
-        <field name="description">TVA 8,5% INTRACOM</field>
+        <field name="name">TVA 8,5% EU M</field>
+        <field name="description">TVA 8,5%</field>
         <field name="amount" eval="8.5"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -2608,14 +2631,14 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_17_tag'), ref('l10n_fr.tax_report_10_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_10_taxe_tag'), ref('l10n_fr.tax_report_17_tag')],
                 'account_id': ref('pcg_4452'),
             }),
         ]"/>
@@ -2629,22 +2652,22 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_17_tag'), ref('l10n_fr.tax_report_10_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_10_taxe_tag'), ref('l10n_fr.tax_report_17_tag')],
                 'account_id': ref('pcg_4452'),
             }),
         ]"/>
     </record>
     <record model="account.tax.template" id="tva_intra_specifique_services">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 8,5% INTRACOM</field>
-        <field name="description">TVA 8,5% INTRACOM</field>
+        <field name="name">TVA 8,5% EU S</field>
+        <field name="description">TVA 8,5%</field>
         <field name="amount" eval="8.5"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -2698,8 +2721,8 @@
     </record>
     <record model="account.tax.template" id="tva_intra_intermediaire_biens">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 10% INTRACOM</field>
-        <field name="description">TVA 10% INTRACOM</field>
+        <field name="name">TVA 10% EU M</field>
+        <field name="description">TVA 10%</field>
         <field name="amount" eval="10.0"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -2718,14 +2741,14 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_17_tag'), ref('l10n_fr.tax_report_9B_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_9B_taxe_tag'), ref('l10n_fr.tax_report_17_tag')],
                 'account_id': ref('pcg_4452'),
             }),
         ]"/>
@@ -2739,22 +2762,22 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_17_tag'), ref('l10n_fr.tax_report_9B_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_9B_taxe_tag'), ref('l10n_fr.tax_report_17_tag')],
                 'account_id': ref('pcg_4452'),
             }),
         ]"/>
     </record>
     <record model="account.tax.template" id="tva_intra_intermediaire_services">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 10% INTRACOM</field>
-        <field name="description">TVA 10% INTRACOM</field>
+        <field name="name">TVA 10% EU S</field>
+        <field name="description">TVA 10%</field>
         <field name="amount" eval="10.0"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -2773,14 +2796,14 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_17_tag'), ref('l10n_fr.tax_report_9B_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_9B_taxe_tag')],
                 'account_id': ref('pcg_44521'),
             }),
         ]"/>
@@ -2794,22 +2817,22 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_17_tag'), ref('l10n_fr.tax_report_9B_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_9B_taxe_tag')],
                 'account_id': ref('pcg_44521'),
             }),
         ]"/>
     </record>
     <record model="account.tax.template" id="tva_intra_reduite_biens">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 5,5% INTRACOM</field>
-        <field name="description">TVA 5,5% EU</field>
+        <field name="name">TVA 5,5% EU M</field>
+        <field name="description">TVA 5,5%</field>
         <field name="amount" eval="5.5"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -2823,19 +2846,20 @@
                 'factor_percent': 100,
                 'repartition_type': 'base',
                 'plus_report_expression_ids': [ref('l10n_fr.tax_report_B2_tag'), ref('l10n_fr.tax_report_09_base_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_B2_tag'), ref('l10n_fr.tax_report_09_base_tag')],
             }),
 
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_17_tag'), ref('l10n_fr.tax_report_09_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_09_taxe_tag'), ref('l10n_fr.tax_report_17_tag')],
                 'account_id': ref('pcg_4452'),
             }),
         ]"/>
@@ -2849,22 +2873,22 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_17_tag'), ref('l10n_fr.tax_report_09_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_09_taxe_tag'), ref('l10n_fr.tax_report_17_tag')],
                 'account_id': ref('pcg_4452'),
             }),
         ]"/>
     </record>
     <record model="account.tax.template" id="tva_intra_reduite_services">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 5,5% INTRACOM</field>
-        <field name="description">TVA 5,5% INTRACOM</field>
+        <field name="name">TVA 5,5% EU S</field>
+        <field name="description">TVA 5,5%</field>
         <field name="amount" eval="5.5"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -2883,14 +2907,14 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_17_tag'), ref('l10n_fr.tax_report_09_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_09_taxe_tag')],
                 'account_id': ref('pcg_44521'),
             }),
         ]"/>
@@ -2904,22 +2928,22 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_17_tag'), ref('l10n_fr.tax_report_09_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_09_taxe_tag')],
                 'account_id': ref('pcg_44521'),
             }),
         ]"/>
     </record>
     <record model="account.tax.template" id="tva_intra_super_reduite_biens">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 2,1% INTRACOM</field>
-        <field name="description">TVA 2,1% INTRACOM</field>
+        <field name="name">TVA 2,1% EU M</field>
+        <field name="description">TVA 2,1%</field>
         <field name="amount" eval="2.1"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -2938,14 +2962,14 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_17_tag'), ref('l10n_fr.tax_report_11_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_11_taxe_tag'), ref('l10n_fr.tax_report_17_tag')],
                 'account_id': ref('pcg_4452'),
             }),
         ]"/>
@@ -2959,22 +2983,22 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_17_tag'), ref('l10n_fr.tax_report_11_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_11_taxe_tag'), ref('l10n_fr.tax_report_17_tag')],
                 'account_id': ref('pcg_4452'),
             }),
         ]"/>
     </record>
     <record model="account.tax.template" id="tva_intra_super_reduite_services">
         <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        <field name="name">TVA 2,1% INTRACOM</field>
-        <field name="description">TVA 2,1% INTRACOM</field>
+        <field name="name">TVA 2,1% EU S</field>
+        <field name="description">TVA 2,1%</field>
         <field name="amount" eval="2.1"/>
         <field name="amount_type">percent</field>
         <field name="sequence" eval="10"/>
@@ -2993,14 +3017,14 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_17_tag'), ref('l10n_fr.tax_report_11_taxe_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_11_taxe_tag')],
                 'account_id': ref('pcg_44521'),
             }),
         ]"/>
@@ -3014,14 +3038,14 @@
            (0,0, {
                 'factor_percent': 100,
                 'repartition_type': 'tax',
-                'minus_report_expression_ids': [ref('l10n_fr.tax_report_17_tag'), ref('l10n_fr.tax_report_11_taxe_tag')],
+                'minus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
                 'account_id': ref('pcg_445662'),
             }),
 
            (0,0, {
                 'factor_percent': -100,
                 'repartition_type': 'tax',
-                'plus_report_expression_ids': [ref('l10n_fr.tax_report_20_tag')],
+                'plus_report_expression_ids': [ref('l10n_fr.tax_report_11_taxe_tag')],
                 'account_id': ref('pcg_44521'),
             }),
         ]"/>