[FIX] l10n_fr: fix intra com, extra com taxes and fiscal positions

1. merge intra community taxes (one taxe with two report lines instead of two taxes with one report line each)
2. fix "tva à l'encaissement" fiscal position mapping (two rates were using the same xml_id)
3. add outside EU import taxes

closes odoo/odoo#49186

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

addons/l10n_fr/data/account_fiscal_position_template_data.xml

@@ -153,11 +153,6 @@
             <field name="tax_src_id" ref="tva_acq_normale" />
             <field name="tax_dest_id" ref="tva_intra_normale" />
         </record>
-        <record id="fp_tax_template_intraeub2b_ha_normale_acq" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_acq_normale" />
-            <field name="tax_dest_id" ref="tva_acq_intra_normale" />
-        </record>
 <!-- Taux DOM-TOM -->
         <record id="fp_tax_template_intraeub2b_ha_specifique_deduc" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_intraeub2b" />
@@ -169,37 +164,17 @@
             <field name="tax_src_id" ref="tva_acq_encaissement" />
             <field name="tax_dest_id" ref="tva_intra_normale" />
         </record>
-        <record id="fp_tax_template_intraeub2b_ha_specifique_acq" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_acq_specifique" />
-            <field name="tax_dest_id" ref="tva_acq_intra_specifique" />
-        </record>
-        <record id="fp_tax_template_intraeub2b_ha_encaissement_acq" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_acq_encaissement" />
-            <field name="tax_dest_id" ref="tva_acq_intra_normale" />
-        </record>
-        <record id="fp_tax_template_intraeub2b_ha_encaissement_deduc" model="account.fiscal.position.tax.template">
+        <record id="fp_tax_template_intraeub2b_ha_encaissement_deduc_intermediaire" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_intraeub2b" />
             <field name="tax_src_id" ref="tva_acq_intermediaire_encaissement" />
             <field name="tax_dest_id" ref="tva_intra_intermediaire" />
         </record>
-        <record id="fp_tax_template_intraeub2b_ha_encaissement_acq" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_acq_intermediaire_encaissement" />
-            <field name="tax_dest_id" ref="tva_acq_intra_intermediaire" />
-        </record>
 <!-- Taux Intermédiaire -->
         <record id="fp_tax_template_intraeub2b_ha_intermediaire_deduc" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_intraeub2b" />
             <field name="tax_src_id" ref="tva_acq_intermediaire" />
             <field name="tax_dest_id" ref="tva_intra_intermediaire" />
         </record>
-        <record id="fp_tax_template_intraeub2b_ha_intermediaire_acq" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_acq_intermediaire" />
-            <field name="tax_dest_id" ref="tva_acq_intra_intermediaire" />
-        </record>
 <!-- Taux réduit -->
         <record id="fp_tax_template_intraeub2b_ha_reduite_deduc" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_intraeub2b" />
@@ -211,16 +186,6 @@
             <field name="tax_src_id" ref="tva_acq_encaissement_reduite" />
             <field name="tax_dest_id" ref="tva_intra_reduite" />
         </record>
-        <record id="fp_tax_template_intraeub2b_ha_reduite_acq" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_acq_reduite" />
-            <field name="tax_dest_id" ref="tva_acq_intra_reduite" />
-        </record>
-        <record id="fp_tax_template_intraeub2b_ha_encaissement_reduite_acq" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_acq_encaissement_reduite" />
-            <field name="tax_dest_id" ref="tva_acq_intra_reduite" />
-        </record>
 <!-- Taux super réduit -->
         <record id="fp_tax_template_intraeub2b_ha_super_reduite_deduc" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_intraeub2b" />
@@ -232,16 +197,6 @@
             <field name="tax_src_id" ref="tva_acq_encaissement_super_reduite" />
             <field name="tax_dest_id" ref="tva_intra_super_reduite" />
         </record>
-        <record id="fp_tax_template_intraeub2b_ha_super_reduite_acq" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_acq_super_reduite" />
-            <field name="tax_dest_id" ref="tva_acq_intra_super_reduite" />
-        </record>
-        <record id="fp_tax_template_intraeub2b_ha_encaissement_super_reduite_acq" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
-            <field name="tax_src_id" ref="tva_acq_encaissement_super_reduite" />
-            <field name="tax_dest_id" ref="tva_acq_intra_super_reduite" />
-        </record>
 
 <!-- Import/Export + DOM/TOM -->
 <!-- ventes -->
@@ -345,7 +300,7 @@
         <record id="fp_tax_template_impexp_ha_normale" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_import_export" />
             <field name="tax_src_id" ref="tva_acq_normale" />
-            <field name="tax_dest_id" ref="tva_import_0" />
+            <field name="tax_dest_id" ref="tva_import_outside_eu_20" />
         </record>
 <!-- Taux DOM-TOM -->
         <record id="fp_tax_template_impexp_ha_encaissement" model="account.fiscal.position.tax.template">
@@ -356,13 +311,13 @@
         <record id="fp_tax_template_impexp_ha_specifique" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_import_export" />
             <field name="tax_src_id" ref="tva_acq_specifique" />
-            <field name="tax_dest_id" ref="tva_import_0" />
+            <field name="tax_dest_id" ref="tva_import_outside_eu_8_5" />
         </record>
 <!-- Taux Intermédiare -->
         <record id="fp_tax_template_impexp_ha_intermediaire" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_import_export" />
             <field name="tax_src_id" ref="tva_acq_intermediaire" />
-            <field name="tax_dest_id" ref="tva_import_0" />
+            <field name="tax_dest_id" ref="tva_import_outside_eu_10" />
         </record>
         <record id="fp_tax_template_impexp_ha_intermediaire" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_import_export" />
@@ -373,7 +328,7 @@
         <record id="fp_tax_template_impexp_ha_reduite" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_import_export" />
             <field name="tax_src_id" ref="tva_acq_reduite" />
-            <field name="tax_dest_id" ref="tva_import_0" />
+            <field name="tax_dest_id" ref="tva_import_outside_eu_5_5" />
         </record>
         <record id="fp_tax_template_impexp_ha_encaissement_super_reduite" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_import_export" />
@@ -389,6 +344,6 @@
         <record id="fp_tax_template_impexp_ha_super_reduite" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_import_export" />
             <field name="tax_src_id" ref="tva_acq_super_reduite" />
-            <field name="tax_dest_id" ref="tva_import_0" />
+            <field name="tax_dest_id" ref="tva_import_outside_eu_2_1" />
         </record>
 </odoo>