From ccd28977c7da3627d0969929e9bb8f313b0469fb Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Fri, 19 Feb 2016 14:19:39 +0100
Subject: [PATCH] [FIX] l10n_fr: remove old tax codes + some cleanup. Was PR
 #10625

---
 addons/l10n_fr/fr_pcg_taxes.xml | 180 --------------------------------
 addons/l10n_fr/fr_tax.xml       |   4 +-
 2 files changed, 2 insertions(+), 182 deletions(-)

diff --git a/addons/l10n_fr/fr_pcg_taxes.xml b/addons/l10n_fr/fr_pcg_taxes.xml
index a64f1d0087c..582ed8b4971 100644
--- a/addons/l10n_fr/fr_pcg_taxes.xml
+++ b/addons/l10n_fr/fr_pcg_taxes.xml
@@ -26,12 +26,6 @@
       <field name="parent_id" ref="tax_col_ht"/>
       <field name="sign">1.00</field>
     </record>    
-    <record model="account.tax.code.template" id="tax_col_196_ht">
-      <field name="name">Base H.T. 19.6%</field>
-      <field name="code">TVA collectée 19.6% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_col_ht"/>
-      <field name="sign">1.00</field>
-    </record>    
     <record model="account.tax.code.template" id="tax_col_85_ht">
       <field name="name">Base H.T. 8.5%</field>
       <field name="code">TVA collectée 8.5% (Base H.T.)</field>
@@ -44,18 +38,6 @@
       <field name="parent_id" ref="tax_col_ht"/>
       <field name="sign">1.00</field>
     </record>   
-    <record model="account.tax.code.template" id="tax_col_70_ht">
-      <field name="name">Base H.T. 7.0%</field>
-      <field name="code">TVA collectée 7.0% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_col_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_col_50_ht">
-      <field name="name">Base H.T. 5.0%</field>
-      <field name="code">TVA collectée 5.0% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_col_ht"/>
-      <field name="sign">1.00</field>
-    </record>       
     <record model="account.tax.code.template" id="tax_col_55_ht">
       <field name="name">Base H.T. 5.5%</field>
       <field name="code">TVA collectée 5.5% (Base H.T.)</field>
@@ -81,12 +63,6 @@
       <field name="parent_id" ref="tax_col"/>
       <field name="sign">1.00</field>
     </record>   
-    <record model="account.tax.code.template" id="tax_col_196">
-      <field name="name">TVA 19.6%</field>
-      <field name="code">TVA collectée 19.6%</field>
-      <field name="parent_id" ref="tax_col"/>
-      <field name="sign">1.00</field>
-    </record>
     <record model="account.tax.code.template" id="tax_col_85">
       <field name="name">TVA 8.5%</field>
       <field name="code">TVA collectée 8.5%</field>
@@ -99,18 +75,6 @@
       <field name="parent_id" ref="tax_col"/>
       <field name="sign">1.00</field>
     </record>
-    <record model="account.tax.code.template" id="tax_col_70">
-      <field name="name">TVA 7.0%</field>
-      <field name="code">TVA collectée 7.0%</field>
-      <field name="parent_id" ref="tax_col"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_col_50">
-      <field name="name">TVA 5.0%</field>
-      <field name="code">TVA collectée 5.0%</field>
-      <field name="parent_id" ref="tax_col"/>
-      <field name="sign">1.00</field>
-    </record>    
     <record model="account.tax.code.template" id="tax_col_55">
       <field name="name">TVA 5.5%</field>
       <field name="code">TVA collectée 5.5%</field>
@@ -136,12 +100,6 @@
       <field name="parent_id" ref="tax_acq_ht"/>
       <field name="sign">1.00</field>
     </record>    
-    <record model="account.tax.code.template" id="tax_acq_196_ht">
-      <field name="name">Base H.T. 19.6%</field>
-      <field name="code">TVA acquittée 19.6% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>
     <record model="account.tax.code.template" id="tax_acq_85_ht">
       <field name="name">Base H.T. 8.5%</field>
       <field name="code">TVA acquittée 8.5% (Base H.T.)</field>
@@ -154,18 +112,6 @@
       <field name="parent_id" ref="tax_acq_ht"/>
       <field name="sign">1.00</field>
     </record>    
-    <record model="account.tax.code.template" id="tax_acq_70_ht">
-      <field name="name">Base H.T. 7.0%</field>
-      <field name="code">TVA acquittée 7.0% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_acq_50_ht">
-      <field name="name">Base H.T. 5.0%</field>
-      <field name="code">TVA acquittée 5.0% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>    
     <record model="account.tax.code.template" id="tax_acq_55_ht">
       <field name="name">Base H.T. 5.5%</field>
       <field name="code">TVA acquittée 5.5% (Base H.T.)</field>
@@ -191,12 +137,6 @@
       <field name="parent_id" ref="tax_acq"/>
       <field name="sign">1.00</field>
     </record>    
-    <record model="account.tax.code.template" id="tax_acq_196">
-      <field name="name">TVA 19.6%</field>
-      <field name="code">TVA acquittée 19.6%</field>
-      <field name="parent_id" ref="tax_acq"/>
-      <field name="sign">1.00</field>
-    </record>
     <record model="account.tax.code.template" id="tax_acq_85">
       <field name="name">TVA 8.5%</field>
       <field name="code">TVA acquittée 8.5%</field>
@@ -209,18 +149,6 @@
       <field name="parent_id" ref="tax_acq"/>
       <field name="sign">1.00</field>
     </record>  
-    <record model="account.tax.code.template" id="tax_acq_70">
-      <field name="name">TVA 7.0%</field>
-      <field name="code">TVA acquittée 7.0%</field>
-      <field name="parent_id" ref="tax_acq"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_acq_50">
-      <field name="name">TVA 5.0%</field>
-      <field name="code">TVA acquittée 5.0%</field>
-      <field name="parent_id" ref="tax_acq"/>
-      <field name="sign">1.00</field>
-    </record>    
     <record model="account.tax.code.template" id="tax_acq_55">
       <field name="name">TVA 5.5%</field>
       <field name="code">TVA acquittée 5.5%</field>
@@ -248,12 +176,6 @@
       <field name="parent_id" ref="tax_imm_ht"/>
       <field name="sign">1.00</field>
     </record>    
-    <record model="account.tax.code.template" id="tax_imm_196_ht">
-      <field name="name">Base H.T. 19.6%</field>
-      <field name="code">TVA acquittée sur immobilisations 19.6% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_imm_ht"/>
-      <field name="sign">1.00</field>
-    </record>
     <record model="account.tax.code.template" id="tax_imm_85_ht">
       <field name="name">Base H.T. 8.5%</field>
       <field name="code">TVA acquittée sur immobilisations 8.5% (Base H.T.)</field>
@@ -266,18 +188,6 @@
       <field name="parent_id" ref="tax_imm_ht"/>
       <field name="sign">1.00</field>
     </record>    
-    <record model="account.tax.code.template" id="tax_imm_70_ht">
-      <field name="name">Base H.T. 7.0%</field>
-      <field name="code">TVA acquittée sur immobilisations 7.0% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_imm_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_imm_50_ht">
-      <field name="name">Base H.T. 5.0%</field>
-      <field name="code">TVA acquittée sur immobilisations 5.0% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_imm_ht"/>
-      <field name="sign">1.00</field>
-    </record>    
     <record model="account.tax.code.template" id="tax_imm_55_ht">
       <field name="name">Base H.T. 5.5%</field>
       <field name="code">TVA acquittée sur immobilisations 5.5% (Base H.T.)</field>
@@ -304,12 +214,6 @@
       <field name="parent_id" ref="tax_imm"/>
       <field name="sign">1.00</field>
     </record>     
-    <record model="account.tax.code.template" id="tax_imm_196">
-      <field name="name">TVA 19.6%</field>
-      <field name="code">TVA acquittée sur immobilisations 19.6%</field>
-      <field name="parent_id" ref="tax_imm"/>
-      <field name="sign">1.00</field>
-    </record>
     <record model="account.tax.code.template" id="tax_imm_85">
       <field name="name">TVA 8.5%</field>
       <field name="code">TVA acquittée sur immobilisations 8.5%</field>
@@ -322,18 +226,6 @@
       <field name="parent_id" ref="tax_imm"/>
       <field name="sign">1.00</field>
     </record>  
-    <record model="account.tax.code.template" id="tax_imm_70">
-      <field name="name">TVA 7.0%</field>
-      <field name="code">TVA acquittée sur immobilisations 7.0%</field>
-      <field name="parent_id" ref="tax_imm"/>
-      <field name="sign">1.00</field>
-    </record>
-   <record model="account.tax.code.template" id="tax_imm_50">
-      <field name="name">TVA 5.0%</field>
-      <field name="code">TVA acquittée sur immobilisations 5.0%</field>
-      <field name="parent_id" ref="tax_imm"/>
-      <field name="sign">1.00</field>
-    </record>    
     <record model="account.tax.code.template" id="tax_imm_55">
       <field name="name">TVA 5.5%</field>
       <field name="code">TVA acquittée sur immobilisations 5.5%</field>
@@ -359,12 +251,6 @@
       <field name="parent_id" ref="tax_intra_ht"/>
       <field name="sign">1.00</field>
     </record>    
-    <record model="account.tax.code.template" id="tax_intra_196_ht">
-      <field name="name">Base H.T. 19.6%</field>
-      <field name="code">TVA due intracommunautaire 19.6% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_ht"/>
-      <field name="sign">1.00</field>
-    </record>
     <record model="account.tax.code.template" id="tax_intra_85_ht">
       <field name="name">Base H.T. 8.5%</field>
       <field name="code">TVA due intracommunautaire 8.5% (Base H.T.)</field>
@@ -377,18 +263,6 @@
       <field name="parent_id" ref="tax_intra_ht"/>
       <field name="sign">1.00</field>
     </record>    
-    <record model="account.tax.code.template" id="tax_intra_70_ht">
-      <field name="name">Base H.T. 7.0%</field>
-      <field name="code">TVA due intracommunautaire 7.0% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_50_ht">
-      <field name="name">Base H.T. 5.0%</field>
-      <field name="code">TVA due intracommunautaire 5.0% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_ht"/>
-      <field name="sign">1.00</field>
-    </record>    
     <record model="account.tax.code.template" id="tax_intra_55_ht">
       <field name="name">Base H.T. 5.5%</field>
       <field name="code">TVA due intracommunautaire 5.5% (Base H.T.)</field>
@@ -414,12 +288,6 @@
       <field name="parent_id" ref="tax_intra"/>
       <field name="sign">1.00</field>
     </record>    
-    <record model="account.tax.code.template" id="tax_intra_196">
-      <field name="name">TVA 19.6%</field>
-      <field name="code">TVA due intracommunautaire 19.6%</field>
-      <field name="parent_id" ref="tax_intra"/>
-      <field name="sign">1.00</field>
-    </record>
     <record model="account.tax.code.template" id="tax_intra_85">
       <field name="name">TVA 8.5%</field>
       <field name="code">TVA due intracommunautaire 8.5%</field>
@@ -432,18 +300,6 @@
       <field name="parent_id" ref="tax_intra"/>
       <field name="sign">1.00</field>
     </record>    
-    <record model="account.tax.code.template" id="tax_intra_70">
-      <field name="name">TVA 7.0%</field>
-      <field name="code">TVA due intracommunautaire 7.0%</field>
-      <field name="parent_id" ref="tax_intra"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_50">
-      <field name="name">TVA 5.0%</field>
-      <field name="code">TVA due intracommunautaire 5.0%</field>
-      <field name="parent_id" ref="tax_intra"/>
-      <field name="sign">1.00</field>
-    </record>   
     <record model="account.tax.code.template" id="tax_intra_55">
       <field name="name">TVA 5.5%</field>
       <field name="code">TVA due intracommunautaire 5.5%</field>
@@ -470,12 +326,6 @@
       <field name="parent_id" ref="tax_intra_acq_ht"/>
       <field name="sign">1.00</field>
     </record>   
-    <record model="account.tax.code.template" id="tax_intra_acq_196_ht">
-      <field name="name">Base H.T. 19.6%</field>
-      <field name="code">TVA déductible intracommunautaire 19.6% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>
     <record model="account.tax.code.template" id="tax_intra_acq_85_ht">
       <field name="name">Base H.T. 8.5%</field>
       <field name="code">TVA déductible intracommunautaire 8.5% (Base H.T.)</field>
@@ -488,18 +338,6 @@
       <field name="parent_id" ref="tax_intra_acq_ht"/>
       <field name="sign">1.00</field>
     </record>    
-    <record model="account.tax.code.template" id="tax_intra_acq_70_ht">
-      <field name="name">Base H.T. 7.0%</field>
-      <field name="code">TVA déductible intracommunautaire 7.0% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_acq_50_ht">
-      <field name="name">Base H.T. 5.0%</field>
-      <field name="code">TVA déductible intracommunautaire 5.0% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>     
     <record model="account.tax.code.template" id="tax_intra_acq_55_ht">
       <field name="name">Base H.T. 5.5%</field>
       <field name="code">TVA déductible intracommunautaire 5.5% (Base H.T.)</field>
@@ -525,12 +363,6 @@
       <field name="parent_id" ref="tax_intra_acq"/>
       <field name="sign">1.00</field>
     </record>     
-    <record model="account.tax.code.template" id="tax_intra_acq_196">
-      <field name="name">TVA 19.6%</field>
-      <field name="code">TVA déductible intracommunautaire 19.6%</field>
-      <field name="parent_id" ref="tax_intra_acq"/>
-      <field name="sign">1.00</field>
-    </record>
     <record model="account.tax.code.template" id="tax_intra_acq_85">
       <field name="name">TVA 8.5%</field>
       <field name="code">TVA déductible intracommunautaire 8.5%</field>
@@ -543,18 +375,6 @@
       <field name="parent_id" ref="tax_intra_acq"/>
       <field name="sign">1.00</field>
     </record>    
-    <record model="account.tax.code.template" id="tax_intra_acq_70">
-      <field name="name">TVA 7.0%</field>
-      <field name="code">TVA déductible intracommunautaire 7.0%</field>
-      <field name="parent_id" ref="tax_intra_acq"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_acq_50">
-      <field name="name">TVA 5.0%</field>
-      <field name="code">TVA déductible intracommunautaire 5.0%</field>
-      <field name="parent_id" ref="tax_intra_acq"/>
-      <field name="sign">1.00</field>
-    </record>    
     <record model="account.tax.code.template" id="tax_intra_acq_55">
       <field name="name">TVA 5.5%</field>
       <field name="code">TVA déductible intracommunautaire 5.5%</field>
diff --git a/addons/l10n_fr/fr_tax.xml b/addons/l10n_fr/fr_tax.xml
index 22e1e12f03c..69cc536efd0 100644
--- a/addons/l10n_fr/fr_tax.xml
+++ b/addons/l10n_fr/fr_tax.xml
@@ -26,7 +26,7 @@
       <field name="ref_base_sign" eval="-1"/>
       <field name="ref_tax_code_id" ref="tax_col_200"/>
       <field name="ref_tax_sign" eval="-1"/>
-      <field name="sequence" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">sale</field>
     </record>
 
@@ -138,7 +138,7 @@
       <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_acq_200"/>
       <field name="ref_tax_sign" eval="1"/>
-      <field name="sequence" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>