From 4254162e4330140b2decf5e872862c656e1e3373 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Wed, 18 Apr 2012 11:14:10 +0200
Subject: [PATCH 1/7] Remove the '_demo' suffix in filenames... as they don't
 contain demo data !

bzr revid: alexis@via.ecp.fr-20120418091410-2yxefhy2lio840vu
---
 addons/l10n_fr/__openerp__.py                          | 10 +++++-----
 ...scal_templates_demo.xml => fr_fiscal_templates.xml} |  0
 .../{fr_pcg_taxes_demo.xml => fr_pcg_taxes.xml}        |  0
 addons/l10n_fr/{fr_report_demo.xml => fr_report.xml}   |  0
 addons/l10n_fr/{fr_tax_demo.xml => fr_tax.xml}         |  0
 ...ble_general_demo.xml => plan_comptable_general.xml} |  0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename addons/l10n_fr/{fr_fiscal_templates_demo.xml => fr_fiscal_templates.xml} (100%)
 rename addons/l10n_fr/{fr_pcg_taxes_demo.xml => fr_pcg_taxes.xml} (100%)
 rename addons/l10n_fr/{fr_report_demo.xml => fr_report.xml} (100%)
 rename addons/l10n_fr/{fr_tax_demo.xml => fr_tax.xml} (100%)
 rename addons/l10n_fr/{plan_comptable_general_demo.xml => plan_comptable_general.xml} (100%)

diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index 839907c778a..4dd94a92e18 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -40,12 +40,12 @@ Credits: Sistheo Zeekom CrysaLEAD
     "depends" : ['base_iban', 'account', 'account_chart', 'base_vat', 'l10n_fr_rib'],
     "init_xml" : [],
     "update_xml" : [
-        "fr_report_demo.xml",
-        "plan_comptable_general_demo.xml",
+        "fr_report.xml",
+        "plan_comptable_general.xml",
         "l10n_fr_wizard.xml",
-        "fr_pcg_taxes_demo.xml",
-        "fr_tax_demo.xml",
-        "fr_fiscal_templates_demo.xml",
+        "fr_pcg_taxes.xml",
+        "fr_tax.xml",
+        "fr_fiscal_templates.xml",
         "security/ir.model.access.csv",
         "wizard/fr_report_bilan_view.xml",
         "wizard/fr_report_compute_resultant_view.xml",
diff --git a/addons/l10n_fr/fr_fiscal_templates_demo.xml b/addons/l10n_fr/fr_fiscal_templates.xml
similarity index 100%
rename from addons/l10n_fr/fr_fiscal_templates_demo.xml
rename to addons/l10n_fr/fr_fiscal_templates.xml
diff --git a/addons/l10n_fr/fr_pcg_taxes_demo.xml b/addons/l10n_fr/fr_pcg_taxes.xml
similarity index 100%
rename from addons/l10n_fr/fr_pcg_taxes_demo.xml
rename to addons/l10n_fr/fr_pcg_taxes.xml
diff --git a/addons/l10n_fr/fr_report_demo.xml b/addons/l10n_fr/fr_report.xml
similarity index 100%
rename from addons/l10n_fr/fr_report_demo.xml
rename to addons/l10n_fr/fr_report.xml
diff --git a/addons/l10n_fr/fr_tax_demo.xml b/addons/l10n_fr/fr_tax.xml
similarity index 100%
rename from addons/l10n_fr/fr_tax_demo.xml
rename to addons/l10n_fr/fr_tax.xml
diff --git a/addons/l10n_fr/plan_comptable_general_demo.xml b/addons/l10n_fr/plan_comptable_general.xml
similarity index 100%
rename from addons/l10n_fr/plan_comptable_general_demo.xml
rename to addons/l10n_fr/plan_comptable_general.xml

From f1eeec97db6e9b26a78948dbe69dd3e5104efbd5 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Wed, 18 Apr 2012 11:17:02 +0200
Subject: [PATCH 2/7] Fix French chart of accounts : - type of account 44566
 changed from 'view' to 'normal' - the parent of account 445662 is now 4456

bzr revid: alexis@via.ecp.fr-20120418091702-oepthwy3tyc2qy1v
---
 addons/l10n_fr/plan_comptable_general.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/l10n_fr/plan_comptable_general.xml b/addons/l10n_fr/plan_comptable_general.xml
index b78e1821720..18a83b735dc 100644
--- a/addons/l10n_fr/plan_comptable_general.xml
+++ b/addons/l10n_fr/plan_comptable_general.xml
@@ -4210,7 +4210,7 @@
     <record id="pcg_44566" model="account.account.template">
       <field name="name">TVA sur autres biens et services</field>
       <field name="code">44566</field>
-      <field name="type">view</field>
+      <field name="type">other</field>
       <field name="user_type" ref="account_type_tax"/>
 
       <field name="parent_id" ref="pcg_4456"/>
@@ -4223,7 +4223,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account_type_tax"/>
 
-      <field name="parent_id" ref="pcg_44566"/>
+      <field name="parent_id" ref="pcg_4456"/>
       <field name="reconcile" eval="True"/>
     </record>
 

From 4aedd699a1756300b1a0a165d1a116323f5b41bb Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Tue, 24 Apr 2012 01:03:16 +0200
Subject: [PATCH 3/7] Fix fiscal position templates Fix tax templates Add a tax
 template "TVA 0% import (achat)" Set sequence to 10 on all tax templates, to
 make it easier to manually defined taxes that must have a lower sequence
 (eco-taxes for example) Update the "Code" field on tax templates to a
 meaning-full value End the double definition of the tax templates (was
 defined in both fr_tax.xml and fr_pcg_taxes.xml ; now only in fr_tax.xml) Fix
 typo in tax codes Remove "classes 8" accounts, which are not official legal
 accounts Update module description

lp bug: https://launchpad.net/bugs/924234 fixed

bzr revid: alexis@via.ecp.fr-20120423230316-ecx6lk6sc2mr2y2z
---
 addons/l10n_fr/__openerp__.py             |   6 +-
 addons/l10n_fr/fr_fiscal_templates.xml    | 207 ++---
 addons/l10n_fr/fr_pcg_taxes.xml           | 898 +---------------------
 addons/l10n_fr/fr_tax.xml                 | 333 +++++---
 addons/l10n_fr/l10n_fr_wizard.xml         |   4 +-
 addons/l10n_fr/plan_comptable_general.xml | 207 -----
 6 files changed, 351 insertions(+), 1304 deletions(-)

diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index 4dd94a92e18..7def04c2814 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -27,7 +27,7 @@
 ##############################################################################
 {
     "name" : "France - Accounting",
-    "version" : "1.0",
+    "version" : "1.1",
     "author" : "OpenERP SA",
     "website": "http://www.openerp.com",
     "category" : "Localization/Account Charts",
@@ -35,7 +35,9 @@
 This is the module to manage the accounting chart for France in OpenERP.
 ========================================================================
 
-Credits: Sistheo Zeekom CrysaLEAD
+This module applies to companies based in France mainland. It doesn't apply to companies based in the DOM-TOMs (Guadeloupe, Martinique, Guyane, Réunion, Mayotte, etc...)
+
+Credits: Sistheo, Zeekom, CrysaLEAD, Akretion and Camptocamp.
 """,
     "depends" : ['base_iban', 'account', 'account_chart', 'base_vat', 'l10n_fr_rib'],
     "init_xml" : [],
diff --git a/addons/l10n_fr/fr_fiscal_templates.xml b/addons/l10n_fr/fr_fiscal_templates.xml
index d3380581cba..ceec59ffd7a 100644
--- a/addons/l10n_fr/fr_fiscal_templates.xml
+++ b/addons/l10n_fr/fr_fiscal_templates.xml
@@ -1,47 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
     <!-- = = = = = = = = = = = = = = = -->
-        <!-- Fiscal Position Templates     -->
+    <!-- Fiscal Position Templates     -->
     <!-- = = = = = = = = = = = = = = = -->
 
 <!-- Position Géographique du partenaire -->
-        <record id="fiscal_position_template_1" model="account.fiscal.position.template">
-            <field name="name">France</field>
-            <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        </record>
-        
         <record id="fiscal_position_template_2" model="account.fiscal.position.template">
-            <field name="name">Zone Euro</field>
+            <field name="name">Intra-EU B2B</field>
             <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+            <field name="note">French VAT exemption according to articles 262 ter I (for products) and/or 283-2 (for services) of "CGI"</field>
         </record>
-        
+
         <record id="fiscal_position_template_3" model="account.fiscal.position.template">
-            <field name="name">DOM-TOM</field>
-            <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        </record>
-        
-        <record id="fiscal_position_template_4" model="account.fiscal.position.template">
-            <field name="name">Hors Euro</field>
-            <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        </record>
-
-<!-- Immobilisations (substitution de taxes) -->
-        <record id="fiscal_position_template_5" model="account.fiscal.position.template">
-            <field name="name">France</field>
-            <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        </record>
-
-<!-- TVA sur Débits ou Encaissements (substitution de comptes) -->
-        <record id="fiscal_position_template_6" model="account.fiscal.position.template">
-            <field name="name">TVA sur le débits</field>
-            <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        </record>
-
-        <record id="fiscal_position_template_7" model="account.fiscal.position.template">
-            <field name="name">TVA sur les encaissements</field>
+            <field name="name">Import/Export + DOM-TOM</field>
             <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+            <field name="note">French VAT exemption according to articles 262 I of "CGI"</field>
         </record>
 
 
@@ -51,133 +26,159 @@
 
 <!-- Par défaut, les produits doivent être paramétrés pour utiliser les taxes, paramétrées pour des numéro de comptes (nationaux) -->
 
-<!-- Zone Euro == Intracomm -->
+<!-- Zone Intracommunautaire B2B -->
 <!-- ventes -->
 <!-- 19,6% -->
-    <record id="fiscal_position_tax_template_1" model="account.fiscal.position.tax.template">
+        <record id="fiscal_position_tax_template_1" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_2" />
             <field name="tax_src_id" ref="tva_normale" />
-            <field name="tax_dest_id" ref="tva_intra_normale" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
         </record>
-<!-- 8,5% - - >
-    <record id="fiscal_position_tax_template_2" model="account.fiscal.position.tax.template">
+<!-- 8,5% -->
+        <record id="fiscal_position_tax_template_2" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_2" />
             <field name="tax_src_id" ref="tva_specifique" />
-            <field name="tax_dest_id" ref="tva_intra_specifique" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
         </record>
-<! - - 5,5% -->
-    <record id="fiscal_position_tax_template_3" model="account.fiscal.position.tax.template">
+<!-- 7% -->
+        <record id="fiscal_position_tax_template_3" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_2" />
+            <field name="tax_src_id" ref="tva_specifique_1" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
+        </record>
+<!-- 5,5% -->
+        <record id="fiscal_position_tax_template_4" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_2" />
             <field name="tax_src_id" ref="tva_reduite" />
-            <field name="tax_dest_id" ref="tva_intra_reduite" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
         </record>
-<!-- 2,1% - - >
-    <record id="fiscal_position_tax_template_4" model="account.fiscal.position.tax.template">
+<!-- 2,1% -->
+        <record id="fiscal_position_tax_template_5" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_2" />
             <field name="tax_src_id" ref="tva_super_reduite" />
-            <field name="tax_dest_id" ref="tva_intra_super_reduite" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
         </record>
-<! - - achats -->
+<!-- achats -->
 <!-- 19,6% -->
-    <record id="fiscal_position_tax_template_5" model="account.fiscal.position.tax.template">
+        <record id="fiscal_position_tax_template_6" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_2" />
+            <field name="tax_src_id" ref="tva_acq_normale" />
+            <field name="tax_dest_id" ref="tva_intra_normale" />
+        </record>
+        <record id="fiscal_position_tax_template_7" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_2" />
             <field name="tax_src_id" ref="tva_acq_normale" />
             <field name="tax_dest_id" ref="tva_acq_intra_normale" />
         </record>
-<!-- 8,5% - - >
-    <record id="fiscal_position_tax_template_6" model="account.fiscal.position.tax.template">
+<!-- 8,5% -->
+        <record id="fiscal_position_tax_template_8" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_2" />
+            <field name="tax_src_id" ref="tva_acq_specifique" />
+            <field name="tax_dest_id" ref="tva_intra_specifique" />
+        </record>
+        <record id="fiscal_position_tax_template_9" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_2" />
             <field name="tax_src_id" ref="tva_acq_specifique" />
             <field name="tax_dest_id" ref="tva_acq_intra_specifique" />
         </record>
-<! - - 5,5% -->
-    <record id="fiscal_position_tax_template_7" model="account.fiscal.position.tax.template">
+<!-- 7% -->
+        <record id="fiscal_position_tax_template_10" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_2" />
+            <field name="tax_src_id" ref="tva_acq_specifique_1" />
+            <field name="tax_dest_id" ref="tva_intra_specifique_1" />
+        </record>
+        <record id="fiscal_position_tax_template_11" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_2" />
+            <field name="tax_src_id" ref="tva_acq_specifique_1" />
+            <field name="tax_dest_id" ref="tva_acq_intra_specifique_1" />
+        </record>
+<!-- 5,5% -->
+        <record id="fiscal_position_tax_template_12" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_2" />
+            <field name="tax_src_id" ref="tva_acq_reduite" />
+            <field name="tax_dest_id" ref="tva_intra_reduite" />
+        </record>
+        <record id="fiscal_position_tax_template_13" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_2" />
             <field name="tax_src_id" ref="tva_acq_reduite" />
             <field name="tax_dest_id" ref="tva_acq_intra_reduite" />
         </record>
-<!-- 2,1% - - >
-    <record id="fiscal_position_tax_template_8" model="account.fiscal.position.tax.template">
+<!-- 2,1% -->
+        <record id="fiscal_position_tax_template_14" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_2" />
+            <field name="tax_src_id" ref="tva_acq_super_reduite" />
+            <field name="tax_dest_id" ref="tva_intra_super_reduite" />
+        </record>
+        <record id="fiscal_position_tax_template_15" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_2" />
             <field name="tax_src_id" ref="tva_acq_super_reduite" />
             <field name="tax_dest_id" ref="tva_acq_intra_super_reduite" />
         </record>
 
-<! - - Hors Euro -->
+<!-- Import/Export + DOM/TOM -->
 <!-- ventes -->
 <!-- 19,6% -->
-    <record id="fiscal_position_tax_template_9" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <record id="fiscal_position_tax_template_16" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_3" />
             <field name="tax_src_id" ref="tva_normale" />
             <field name="tax_dest_id" ref="tva_export_0" />
         </record>
-<!-- 8,5% - - >
-    <record id="fiscal_position_tax_template_10" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+<!-- 8,5% -->
+        <record id="fiscal_position_tax_template_17" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_3" />
             <field name="tax_src_id" ref="tva_specifique" />
             <field name="tax_dest_id" ref="tva_export_0" />
         </record>
-<! - - 5,5% -->
-    <record id="fiscal_position_tax_template_11" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+<!-- 7% -->
+        <record id="fiscal_position_tax_template_18" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_3" />
+            <field name="tax_src_id" ref="tva_specifique_1" />
+            <field name="tax_dest_id" ref="tva_export_0" />
+        </record>
+<!-- 5,5% -->
+        <record id="fiscal_position_tax_template_19" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_3" />
             <field name="tax_src_id" ref="tva_reduite" />
             <field name="tax_dest_id" ref="tva_export_0" />
         </record>
-<!-- 2,1% - - >
-    <record id="fiscal_position_tax_template_12" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+<!-- 2,1% -->
+        <record id="fiscal_position_tax_template_20" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_3" />
             <field name="tax_src_id" ref="tva_super_reduite" />
             <field name="tax_dest_id" ref="tva_export_0" />
         </record>
--->
 
-<!-- Immobilisations -->
 <!-- achats -->
 <!-- 19,6% -->
-    <record id="fiscal_position_tax_template_5" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <record id="fiscal_position_tax_template_21" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_3" />
             <field name="tax_src_id" ref="tva_acq_normale" />
-            <field name="tax_dest_id" ref="tva_imm_normale" />
+            <field name="tax_dest_id" ref="tva_import_0" />
         </record>
-<!-- 8,5% - - >
-    <record id="fiscal_position_tax_template_6" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+<!-- 8,5% -->
+        <record id="fiscal_position_tax_template_22" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_3" />
             <field name="tax_src_id" ref="tva_acq_specifique" />
-            <field name="tax_dest_id" ref="tva_imm_specifique" />
+            <field name="tax_dest_id" ref="tva_import_0" />
         </record>
-<! - - 5,5% -->
-    <record id="fiscal_position_tax_template_7" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+<!-- 7% -->
+        <record id="fiscal_position_tax_template_23" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_3" />
+            <field name="tax_src_id" ref="tva_acq_specifique_1" />
+            <field name="tax_dest_id" ref="tva_import_0" />
+        </record>
+<!-- 5,5% -->
+        <record id="fiscal_position_tax_template_24" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_3" />
             <field name="tax_src_id" ref="tva_acq_reduite" />
-            <field name="tax_dest_id" ref="tva_imm_reduite" />
+            <field name="tax_dest_id" ref="tva_import_0" />
         </record>
-<!-- 2,1% - - >
-    <record id="fiscal_position_tax_template_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+<!-- 2,1% -->
+        <record id="fiscal_position_tax_template_25" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_3" />
             <field name="tax_src_id" ref="tva_acq_super_reduite" />
-            <field name="tax_dest_id" ref="tva_imm_super_reduite" />
+            <field name="tax_dest_id" ref="tva_import_0" />
         </record>
--->
-
-    <!-- = = = = = = = = = = = = = = = = = -->
-    <!-- Fiscal Position Account Templates -->
-    <!-- = = = = = = = = = = = = = = = = = -->
-
-<!-- Substitution des comptes de produits -->
-
-<!-- TVA sur Débits ou Encaissements Pr les 4 taux : 19,6% ; 8,5% ; 5,5% ; 2,1% - - >
-    <record id="fiscal_position_account_template_1" model="account.fiscal.position.account.template">
-            <field name="position_id" ref="fiscal_position_template_1"  />
-            <field name="account_src_id" ref="a7000" />
-            <field name="account_dest_id" ref="a_sale" />
-        </record>
-
-        <record id="fiscal_position_account_template_6" model="account.fiscal.position.account.template">
-            <field name="position_id" ref="fiscal_position_template_2"  />
-            <field name="account_src_id" ref="a7050" />
-            <field name="account_dest_id" ref="a7051" />
-        </record -->
-
 
     </data>
-</openerp>    
+</openerp>
diff --git a/addons/l10n_fr/fr_pcg_taxes.xml b/addons/l10n_fr/fr_pcg_taxes.xml
index 60d0a21844a..c1ba2063c89 100644
--- a/addons/l10n_fr/fr_pcg_taxes.xml
+++ b/addons/l10n_fr/fr_pcg_taxes.xml
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
     <!--
-        Définition des taux de TVA et des Tax Codes
+        Définition des Tax Codes
         Version du fichier : 12-04-2008
       -->
 
     <!--
         Tax Code Configuration (version générique)
       -->
-        
-        <record id="vat_code_chart_root" model="account.tax.code.template">
-                <field name="name">Plan de Taxes France</field>
+    <record id="vat_code_chart_root" model="account.tax.code.template">
+        <field name="name">Plan de Taxes France</field>
     </record>
-        
+
     <record model="account.tax.code.template" id="tax_col_ht">
       <field name="name">Base H.T. TVA collectée</field>
       <field name="code">a)</field>
@@ -390,6 +389,7 @@
       <field name="parent_id" ref="tax_intra_acq"/>
       <field name="sign">1.00</field>
     </record>
+
     <record model="account.tax.code.template" id="tax_0_ht">
       <field name="name">Base H.T. Opérations non imposables</field>
       <field name="code">k)</field>
@@ -397,8 +397,8 @@
       <field name="parent_id" ref="vat_code_chart_root"/>
     </record> 
     <record model="account.tax.code.template" id="tax_export_0_ht">
-      <field name="name">Exportations hors C.E.</field>
-      <field name="code">Exportations hors C.E. TVA 0%</field>
+      <field name="name">Exportations hors U.E.</field>
+      <field name="code">Exportations hors U.E. TVA 0%</field>
       <field name="parent_id" ref="tax_0_ht"/>
       <field name="sign">1.00</field>
     </record>
@@ -409,8 +409,8 @@
       <field name="sign">1.00</field>
     </record>
     <record model="account.tax.code.template" id="tax_misc_0_ht">
-      <field name="name">Autres oprérations non imposables</field>
-      <field name="code">Autres oprérations non imposables TVA 0%</field>
+      <field name="name">Autres opérations non imposables</field>
+      <field name="code">Autres opérations non imposables TVA 0%</field>
       <field name="parent_id" ref="tax_0_ht"/>
       <field name="sign">1.00</field>
     </record>
@@ -427,882 +427,6 @@
             <field name="property_account_expense_categ" ref="pcg_6071"/>
             <field name="property_account_income_categ" ref="pcg_7071"/>
         </record>
-       
-      <!--
-        TVA
-      -->
 
-    <record model="account.tax.template" id="tva_normale">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>                        
-      
-      <field name="name">TVA collectée (vente) 19,6%</field>
-      <field name="amount" eval="0.196"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_col_196_ht"/>
-      <field name="tax_code_id" ref="tax_col_196"/>
-
-      <field name="ref_base_code_id" ref="tax_col_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_col_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
-
-    </record>
-
-    <record model="account.tax.template" id="tva_specifique">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA collectée (vente) 8,5%</field>
-      <field name="amount" eval="0.085"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_col_85_ht"/>
-      <field name="tax_code_id" ref="tax_col_85"/>
-
-      <field name="ref_base_code_id" ref="tax_col_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_col_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-    
-    <record model="account.tax.template" id="tva_specifique_1">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-
-      <field name="name">TVA collectée (vente) 7,0%</field>
-      <field name="amount" eval="0.07"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_col_70_ht"/>
-      <field name="tax_code_id" ref="tax_col_70"/>
-
-      <field name="ref_base_code_id" ref="tax_col_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_col_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA collectée (vente) 5,5%</field>
-      <field name="amount" eval="0.055"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_col_55_ht"/>
-      <field name="tax_code_id" ref="tax_col_55"/>
-
-      <field name="ref_base_code_id" ref="tax_col_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_col_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </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 collectée (vente) 2,1%</field>
-      <field name="amount" eval="0.021"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_col_21_ht"/>
-      <field name="tax_code_id" ref="tax_col_21"/>
-
-      <field name="ref_base_code_id" ref="tax_col_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_col_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record> 
-
-    <record model="account.tax.template" id="tva_acq_normale">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA acquittée (achat) 19,6%</field>
-      <field name="amount" eval="0.196"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_196_ht"/>
-      <field name="tax_code_id" ref="tax_acq_196"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_specifique">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA acquittée (achat) 8,5%</field>
-      <field name="amount" eval="0.085"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_85_ht"/>
-      <field name="tax_code_id" ref="tax_acq_85"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_specifique_1">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-
-      <field name="name">TVA acquittée (achat) 7,0%</field>
-      <field name="amount" eval="0.07"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_70_ht"/>
-      <field name="tax_code_id" ref="tax_acq_70"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA acquittée (achat) 5,5%</field>
-      <field name="amount" eval="0.055"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_55_ht"/>
-      <field name="tax_code_id" ref="tax_acq_55"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_super_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA acquittée (achat) 2,1%</field>
-      <field name="amount" eval="0.021"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_21_ht"/>
-      <field name="tax_code_id" ref="tax_acq_21"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record> 
-
-    <record model="account.tax.template" id="tva_imm_normale">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA immobilisation (achat) 19,6%</field>
-      <field name="amount" eval="0.196"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_imm_196_ht"/>
-      <field name="tax_code_id" ref="tax_imm_196"/>
-
-      <field name="ref_base_code_id" ref="tax_imm_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_imm_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_specifique">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA immobilisation (achat) 8,5%</field>
-      <field name="amount" eval="0.085"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_imm_85_ht"/>
-      <field name="tax_code_id" ref="tax_imm_85"/>
-
-      <field name="ref_base_code_id" ref="tax_imm_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_imm_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_specifique_1">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-
-      <field name="name">TVA immobilisation (achat) 7,0%</field>
-      <field name="amount" eval="0.07"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_imm_70_ht"/>
-      <field name="tax_code_id" ref="tax_imm_70"/>
-
-      <field name="ref_base_code_id" ref="tax_imm_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_imm_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA immobilisation (achat) 5,5%</field>
-      <field name="amount" eval="0.055"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_imm_55_ht"/>
-      <field name="tax_code_id" ref="tax_imm_55"/>
-
-      <field name="ref_base_code_id" ref="tax_imm_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_imm_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <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 immobilisation (achat) 2,1%</field>
-      <field name="amount" eval="0.021"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_imm_21_ht"/>
-      <field name="tax_code_id" ref="tax_imm_21"/>
-
-      <field name="ref_base_code_id" ref="tax_imm_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_imm_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_normale">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA due intracommunautaire 19,6%</field>
-      <field name="amount" eval="-0.196"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_196_ht"/>
-      <field name="tax_code_id" ref="tax_intra_196"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_specifique">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>        
-      
-      <field name="name">TVA due intracommunautaire 8,5%</field>
-      <field name="amount" eval="-0.085"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_85_ht"/>
-      <field name="tax_code_id" ref="tax_intra_85"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_specifique_1">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-
-      <field name="name">TVA due intracommunautaire 7,0%</field>
-      <field name="amount" eval="-0.07"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_70_ht"/>
-      <field name="tax_code_id" ref="tax_intra_70"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA due intracommunautaire 5,5%</field>
-      <field name="amount" eval="-0.055"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_55_ht"/>
-      <field name="tax_code_id" ref="tax_intra_55"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_super_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA due intracommunautaire 2,1%</field>
-      <field name="amount" eval="-0.021"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_21_ht"/>
-      <field name="tax_code_id" ref="tax_intra_21"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_normale">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA déductible intracommunautaire 19,6%</field>
-      <field name="amount" eval="0.196"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_acq_196_ht"/>
-      <field name="tax_code_id" ref="tax_intra_acq_196"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_acq_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_acq_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_specifique">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA déductible intracommunautaire 8,5%</field>
-      <field name="amount" eval="0.085"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_acq_85_ht"/>
-      <field name="tax_code_id" ref="tax_intra_acq_85"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_acq_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_acq_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_specifique_1">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-
-      <field name="name">TVA déductible intracommunautaire 7,0%</field>
-      <field name="amount" eval="0.07"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_acq_70_ht"/>
-      <field name="tax_code_id" ref="tax_intra_acq_70"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_acq_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_acq_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA déductible intracommunautaire 5,5%</field>
-      <field name="amount" eval="0.055"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_acq_55_ht"/>
-      <field name="tax_code_id" ref="tax_intra_acq_55"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_acq_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_acq_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_super_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA déductible intracommunautaire 2,1%</field>
-      <field name="amount" eval="0.021"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_acq_21_ht"/>
-      <field name="tax_code_id" ref="tax_intra_acq_21"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_acq_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_acq_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_0">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA 0%</field>
-      <field name="amount" eval="0.00"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_misc_0_ht"/>
-
-      <field name="ref_base_code_id" ref="tax_misc_0_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_export_0">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA exportation 0%</field>
-      <field name="amount" eval="0.00"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_export_0_ht"/>
-
-      <field name="ref_base_code_id" ref="tax_export_0_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_0">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA livraisons intracommunautaires 0%</field>
-      <field name="amount" eval="0.00"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_0_ht"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_0_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-    </record>
-
-        <record id="pcg_601" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6011" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6012" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_602" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6021" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60211" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60212" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6022" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60221" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60222" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60223" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60224" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60225" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6026" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60261" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60265" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60267" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_603" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6031" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6032" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6037" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_604" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_605" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_606" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6061" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6063" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6064" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6068" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="fr_pcg_expense" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6071" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6072" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_608" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_609" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6091" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6092" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6094" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6095" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6096" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6097" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6098" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_61" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_611" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_612" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6122" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6125" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_613" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6132" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6135" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6136" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_614" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_615" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6152" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6155" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6156" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6225" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6226" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6227" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6228" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_623" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6231" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6232" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6233" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6234" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6235" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6236" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6237" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6238" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_624" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6241" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6242" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6243" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6244" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6247" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6248" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_7011" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_7012" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_702" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_703" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_704" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_7041" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_7042" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_705" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_706" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="fr_pcg_sale" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_7071" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_7072" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-    
-    <!-- TVA -->
-    <record model="account.tax.template" id="tva_normale">
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_specifique">
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_reduite">
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_super_reduite">
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_normale">
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_specifique">
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_reduite">
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_super_reduite">
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_normale">
-      <field name="account_collected_id" ref="pcg_44562"/>
-      <field name="account_paid_id" ref="pcg_44562"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_specifique">
-      <field name="account_collected_id" ref="pcg_44562"/>
-      <field name="account_paid_id" ref="pcg_44562"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_reduite">
-      <field name="account_collected_id" ref="pcg_44562"/>
-      <field name="account_paid_id" ref="pcg_44562"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_super_reduite">
-      <field name="account_collected_id" ref="pcg_44562"/>
-      <field name="account_paid_id" ref="pcg_44562"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_normale">
-      <field name="account_collected_id" ref="pcg_4452"/>
-      <field name="account_paid_id" ref="pcg_4452"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_specifique">
-      <field name="account_collected_id" ref="pcg_4452"/>
-      <field name="account_paid_id" ref="pcg_4452"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_reduite">
-      <field name="account_collected_id" ref="pcg_4452"/>
-      <field name="account_paid_id" ref="pcg_4452"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_super_reduite">
-      <field name="account_collected_id" ref="pcg_4452"/>
-      <field name="account_paid_id" ref="pcg_4452"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_normale">
-      <field name="account_collected_id" ref="pcg_445662"/>
-      <field name="account_paid_id" ref="pcg_445662"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_specifique">
-      <field name="account_collected_id" ref="pcg_445662"/>
-      <field name="account_paid_id" ref="pcg_445662"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_reduite">
-      <field name="account_collected_id" ref="pcg_445662"/>
-      <field name="account_paid_id" ref="pcg_445662"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_super_reduite">
-      <field name="account_collected_id" ref="pcg_445662"/>
-      <field name="account_paid_id" ref="pcg_445662"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_0">
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_export_0">
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_0">
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
-    </record>
-    
   </data>
-</openerp>    
+</openerp>
diff --git a/addons/l10n_fr/fr_tax.xml b/addons/l10n_fr/fr_tax.xml
index d51d3874091..db9acf17473 100644
--- a/addons/l10n_fr/fr_tax.xml
+++ b/addons/l10n_fr/fr_tax.xml
@@ -1,21 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
 
-    <!--
-    TVA :
-        France métropolitaine :  taux normal = 19,6%     Réduit = 5,5%
-        Département Outre Mer :                 8,5%                2,1%
-      -->
+<!-- Note : I set a sequence of 10 on all VAT taxes, because it is then
+     easier to create an eco-tax with a lower sequence (VAT applies on the
+     amount of the eco-tax)
+-->
 
 <!-- VENTES -->
     <record model="account.tax.template" id="tva_normale">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA collectée (vente) 19,6%</field>
-      <field name="description">1</field>   <!-- code -->
+      <field name="description">TVA-VT-19.6</field>
       <field name="amount" eval="0.196"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_col_196_ht"/>
+      <field name="base_sign" eval="1"/>
       <field name="tax_code_id" ref="tax_col_196"/>
+      <field name="tax_sign" eval="1"/>
 
       <field name="account_collected_id" ref="pcg_445711"/>
       <field name="account_paid_id" ref="pcg_445711"/>
@@ -24,496 +26,619 @@
       <field name="ref_base_sign" eval="-1"/>
       <field name="ref_tax_code_id" ref="tax_col_196"/>
       <field name="ref_tax_sign" eval="-1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">sale</field>
     </record>
 
     <record model="account.tax.template" id="tva_specifique">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA collectée (vente) 8,5%</field>
-      <field name="description">2</field>
+      <field name="description">TVA-VT-8.5</field>
       <field name="amount" eval="0.085"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_col_85_ht"/>
+      <field name="base_sign" eval="1"/>
       <field name="tax_code_id" ref="tax_col_85"/>
+      <field name="tax_sign" eval="1"/>
 
       <field name="account_collected_id" ref="pcg_445713"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
+      <field name="account_paid_id" ref="pcg_445713"/>
 
       <field name="ref_base_code_id" ref="tax_col_85_ht"/>
       <field name="ref_base_sign" eval="-1"/>
       <field name="ref_tax_code_id" ref="tax_col_85"/>
       <field name="ref_tax_sign" eval="-1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">sale</field>
     </record>
 
     <record model="account.tax.template" id="tva_specifique_1">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA collectée (vente) 7,0%</field>
-      <field name="description">24</field>
+      <field name="description">TVA-VT-7.0</field>
       <field name="amount" eval="0.07"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_col_70_ht"/>
+      <field name="base_sign" eval="1"/>
       <field name="tax_code_id" ref="tax_col_70"/>
+      <field name="tax_sign" eval="1"/>
 
       <field name="account_collected_id" ref="pcg_445713"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
+      <field name="account_paid_id" ref="pcg_445713"/>
 
       <field name="ref_base_code_id" ref="tax_col_70_ht"/>
       <field name="ref_base_sign" eval="-1"/>
       <field name="ref_tax_code_id" ref="tax_col_70"/>
       <field name="ref_tax_sign" eval="-1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">sale</field>
     </record>
 
     <record model="account.tax.template" id="tva_reduite">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA collectée (vente) 5,5%</field>
-      <field name="description">3</field>
+      <field name="description">TVA-VT-5.5</field>
       <field name="amount" eval="0.055"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_col_55_ht"/>
+      <field name="base_sign" eval="1"/>
       <field name="tax_code_id" ref="tax_col_55"/>
+      <field name="tax_sign" eval="1"/>
 
       <field name="account_collected_id" ref="pcg_445712"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
+      <field name="account_paid_id" ref="pcg_445712"/>
 
       <field name="ref_base_code_id" ref="tax_col_55_ht"/>
       <field name="ref_base_sign" eval="-1"/>
       <field name="ref_tax_code_id" ref="tax_col_55"/>
       <field name="ref_tax_sign" eval="-1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">sale</field>
     </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 collectée (vente) 2,1%</field>
-      <field name="description">4</field>
+      <field name="description">TVA-VT-2.1</field>
       <field name="amount" eval="0.021"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_col_21_ht"/>
+      <field name="base_sign" eval="1"/>
       <field name="tax_code_id" ref="tax_col_21"/>
+      <field name="tax_sign" eval="1"/>
 
       <field name="account_collected_id" ref="pcg_445713"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
+      <field name="account_paid_id" ref="pcg_445713"/>
 
       <field name="ref_base_code_id" ref="tax_col_21_ht"/>
       <field name="ref_base_sign" eval="-1"/>
       <field name="ref_tax_code_id" ref="tax_col_21"/>
       <field name="ref_tax_sign" eval="-1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">sale</field>
     </record>
 
 
 <!-- ACHATS -->
     <record model="account.tax.template" id="tva_acq_normale">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA acquittée (achat) 19,6%</field>
-      <field name="description">5</field>
+      <field name="description">TVA-HA-19.6</field>
       <field name="amount" eval="0.196"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_acq_196_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_acq_196"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44566"/>
       <field name="account_paid_id" ref="pcg_44566"/>
 
       <field name="ref_base_code_id" ref="tax_acq_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_acq_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_specifique">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA acquittée (achat) 8,5%</field>
-      <field name="description">6</field>
+      <field name="description">TVA-HA-8.5</field>
       <field name="amount" eval="0.085"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_acq_85_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_acq_85"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44566"/>
       <field name="account_paid_id" ref="pcg_44566"/> 
 
       <field name="ref_base_code_id" ref="tax_acq_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_acq_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_specifique_1">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA acquittée (achat) 7,0%</field>
-      <field name="description">25</field>
+      <field name="description">TVA-HA-7.0</field>
       <field name="amount" eval="0.07"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_acq_70_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_acq_70"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44566"/>
       <field name="account_paid_id" ref="pcg_44566"/>
 
       <field name="ref_base_code_id" ref="tax_acq_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_acq_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_reduite">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA acquittée (achat) 5,5%</field>
-      <field name="description">7</field>
+      <field name="description">TVA-HA-5.5</field>
       <field name="amount" eval="0.055"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_acq_55_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_acq_55"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44566"/>
       <field name="account_paid_id" ref="pcg_44566"/>
 
       <field name="ref_base_code_id" ref="tax_acq_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_acq_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_super_reduite">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA acquittée (achat) 2,1%</field>
-      <field name="description">8</field>
+      <field name="description">TVA-HA-2.1</field>
       <field name="amount" eval="0.021"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_acq_21_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_acq_21"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44566"/>
       <field name="account_paid_id" ref="pcg_44566"/>
 
       <field name="ref_base_code_id" ref="tax_acq_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_acq_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record> 
 
 
 <!-- IMMOBILISATIONS (achats) -->
     <record model="account.tax.template" id="tva_imm_normale">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA immobilisation (achat) 19,6%</field>
-      <field name="description">9</field>
+      <field name="description">TVA-immo-19.6</field>
       <field name="amount" eval="0.196"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_imm_196_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_imm_196"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44562"/>
       <field name="account_paid_id" ref="pcg_44562"/>
 
       <field name="ref_base_code_id" ref="tax_imm_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_imm_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_imm_specifique">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA immobilisation (achat) 8,5%</field>
-      <field name="description">10</field>
+      <field name="description">TVA-immo-8.5</field>
       <field name="amount" eval="0.085"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_imm_85_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_imm_85"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44562"/>
       <field name="account_paid_id" ref="pcg_44562"/>
 
       <field name="ref_base_code_id" ref="tax_imm_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_imm_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_imm_specifique_1">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA immobilisation (achat) 7,0%</field>
-      <field name="description">26</field>
+      <field name="description">TVA-immo-7.0</field>
       <field name="amount" eval="0.07"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_imm_70_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_imm_70"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44562"/>
       <field name="account_paid_id" ref="pcg_44562"/>
 
       <field name="ref_base_code_id" ref="tax_imm_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_imm_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_imm_reduite">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA immobilisation (achat) 5,5%</field>
-      <field name="description">11</field>
+      <field name="description">TVA-immo-5.5</field>
       <field name="amount" eval="0.055"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_imm_55_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_imm_55"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44562"/>
       <field name="account_paid_id" ref="pcg_44562"/>
 
       <field name="ref_base_code_id" ref="tax_imm_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_imm_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <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 immobilisation (achat) 2,1%</field>
-      <field name="description">12</field>
+      <field name="description">TVA-immo-2.1</field>
       <field name="amount" eval="0.021"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_imm_21_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_imm_21"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44562"/>
       <field name="account_paid_id" ref="pcg_44562"/>
 
       <field name="ref_base_code_id" ref="tax_imm_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_imm_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
 
 <!-- VENTES INTRACOMMUNAUTAIRE -->
     <record model="account.tax.template" id="tva_intra_normale">
-      <field name="name">TVA due intracommunautaire 19,6%</field>   <!-- ventes -->
-      <field name="description">13</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA due intracommunautaire (achat) 19,6%</field>   <!-- ventes -->
+      <field name="description">TVA-HA_UE_due-19.6</field>
       <field name="amount" eval="-0.196"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_196_ht"/>
+      <field name="base_sign" eval="-1" />
       <field name="tax_code_id" ref="tax_intra_196"/>
+      <field name="tax_sign" eval="-1" />
 
       <field name="account_collected_id" ref="pcg_445201"/>
-      <field name="account_paid_id" ref="pcg_4452"/>      
+      <field name="account_paid_id" ref="pcg_445201"/>
 
       <field name="ref_base_code_id" ref="tax_intra_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
-      <field name="type_tax_use">sale</field>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_intra_specifique">
-      <field name="name">TVA due intracommunautaire 8,5%</field>
-      <field name="description">14</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA due intracommunautaire (achat) 8,5%</field>
+      <field name="description">TVA-HA_UE_due-8.5</field>
       <field name="amount" eval="-0.085"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_85_ht"/>
+      <field name="base_sign" eval="-1" />
       <field name="tax_code_id" ref="tax_intra_85"/>
+      <field name="tax_sign" eval="-1" />
 
       <field name="account_collected_id" ref="pcg_445203"/>
-      <field name="account_paid_id" ref="pcg_4452"/>
+      <field name="account_paid_id" ref="pcg_445203"/>
 
       <field name="ref_base_code_id" ref="tax_intra_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
-      <field name="type_tax_use">sale</field>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_intra_specifique_1">
-      <field name="name">TVA due intracommunautaire 7,0%</field>
-      <field name="description">27</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA due intracommunautaire (achat) 7,0%</field>
+      <field name="description">TVA-HA_UE_due-7.0</field>
       <field name="amount" eval="-0.07"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_70_ht"/>
+      <field name="base_sign" eval="-1" />
       <field name="tax_code_id" ref="tax_intra_70"/>
+      <field name="tax_sign" eval="-1" />
 
       <field name="account_collected_id" ref="pcg_445203"/>
-      <field name="account_paid_id" ref="pcg_4452"/>
+      <field name="account_paid_id" ref="pcg_445203"/>
 
       <field name="ref_base_code_id" ref="tax_intra_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
-      <field name="type_tax_use">sale</field>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_intra_reduite">
-      <field name="name">TVA due intracommunautaire 5,5%</field>
-      <field name="description">15</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA due intracommunautaire (achat) 5,5%</field>
+      <field name="description">TVA-HA_UE_due-5.5</field>
       <field name="amount" eval="-0.055"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_55_ht"/>
+      <field name="base_sign" eval="-1" />
       <field name="tax_code_id" ref="tax_intra_55"/>
+      <field name="tax_sign" eval="-1" />
 
       <field name="account_collected_id" ref="pcg_445202"/>
-      <field name="account_paid_id" ref="pcg_4452"/>
+      <field name="account_paid_id" ref="pcg_445202"/>
 
       <field name="ref_base_code_id" ref="tax_intra_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
-      <field name="type_tax_use">sale</field>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_intra_super_reduite">
-      <field name="name">TVA due intracommunautaire 2,1%</field>
-      <field name="description">16</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA due intracommunautaire (achat) 2,1%</field>
+      <field name="description">TVA-HA_UE_due-2.1</field>
       <field name="amount" eval="-0.021"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_21_ht"/>
+      <field name="base_sign" eval="-1" />
       <field name="tax_code_id" ref="tax_intra_21"/>
+      <field name="tax_sign" eval="-1" />
 
       <field name="account_collected_id" ref="pcg_445203"/>
-      <field name="account_paid_id" ref="pcg_4452"/>      
+      <field name="account_paid_id" ref="pcg_445203"/>
 
       <field name="ref_base_code_id" ref="tax_intra_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
-      <field name="type_tax_use">sale</field>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
     </record>
 
 
 <!-- ACHATS INTRACOMMUNAUTAIRE -->
     <record model="account.tax.template" id="tva_acq_intra_normale">
-      <field name="name">TVA déductible intracommunautaire 19,6%</field>
-      <field name="description">17</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA déductible intracommunautaire (achat) 19,6%</field>
+      <field name="description">TVA-HA_UE_déduc-19.6</field>
       <field name="amount" eval="0.196"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_acq_196_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_intra_acq_196"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_445662"/>
       <field name="account_paid_id" ref="pcg_445662"/>
 
       <field name="ref_base_code_id" ref="tax_intra_acq_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_acq_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_intra_specifique">
-      <field name="name">TVA déductible intracommunautaire 8,5%</field>
-      <field name="description">18</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA déductible intracommunautaire (achat) 8,5%</field>
+      <field name="description">TVA-HA_UE_déduc-8.5</field>
       <field name="amount" eval="0.085"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_acq_85_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_intra_acq_85"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_445662"/>
       <field name="account_paid_id" ref="pcg_445662"/>
 
       <field name="ref_base_code_id" ref="tax_intra_acq_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_acq_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_intra_specifique_1">
-      <field name="name">TVA déductible intracommunautaire 7,0%</field>
-      <field name="description">28</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA déductible intracommunautaire (achat) 7,0%</field>
+      <field name="description">TVA-HA_UE_déduc-7.0</field>
       <field name="amount" eval="0.07"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_acq_70_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_intra_acq_70"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_445662"/>
       <field name="account_paid_id" ref="pcg_445662"/>
 
       <field name="ref_base_code_id" ref="tax_intra_acq_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_acq_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_intra_reduite">
-      <field name="name">TVA déductible intracommunautaire 5,5%</field>
-      <field name="description">19</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA déductible intracommunautaire (achat) 5,5%</field>
+      <field name="description">TVA-HA_UE_déduc-5.5</field>
       <field name="amount" eval="0.055"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_acq_55_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_intra_acq_55"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_445662"/>
       <field name="account_paid_id" ref="pcg_445662"/>
 
       <field name="ref_base_code_id" ref="tax_intra_acq_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_acq_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_intra_super_reduite">
-      <field name="name">TVA déductible intracommunautaire 2,1%</field>
-      <field name="description">20</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA déductible intracommunautaire (achat) 2,1%</field>
+      <field name="description">TVA-HA_UE_déduc-2.1</field>
       <field name="amount" eval="0.021"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_acq_21_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_intra_acq_21"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_445662"/>
       <field name="account_paid_id" ref="pcg_445662"/>
 
       <field name="ref_base_code_id" ref="tax_intra_acq_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_acq_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
 
 <!-- AUTRE -->
     <record model="account.tax.template" id="tva_0">
-      <field name="name">TVA 0%</field>
-      <field name="description">21</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA 0% autres opérations non imposables (vente)</field>
+      <field name="description">TVA-autre-0</field>
       <field name="amount" eval="0.00"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_misc_0_ht"/>
+      <field name="base_sign" eval="1"/>
 
       <field name="account_collected_id" ref="pcg_44571"/>
       <field name="account_paid_id" ref="pcg_44571"/>
 
       <field name="ref_base_code_id" ref="tax_misc_0_ht"/>
       <field name="ref_base_sign" eval="-1"/>
-      <field name="type_tax_use">purchase</field>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">sale</field>
     </record>
 
     <record model="account.tax.template" id="tva_export_0">
-      <field name="name">TVA 0% exportation</field>
-      <field name="description">22</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA 0% export (vente)</field>
+      <field name="description">TVA-export-0</field>
       <field name="amount" eval="0.00"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_export_0_ht"/>
+      <field name="base_sign" eval="1"/>
 
       <field name="account_collected_id" ref="pcg_44571"/>
       <field name="account_paid_id" ref="pcg_44571"/>
 
       <field name="ref_base_code_id" ref="tax_export_0_ht"/>
       <field name="ref_base_sign" eval="-1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">sale</field>
     </record>
 
     <record model="account.tax.template" id="tva_intra_0">
-      <field name="name">TVA 0% livraisons intracommunautaires</field>
-      <field name="description">23</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA 0% livraisons intracommunautaires (vente)</field>
+      <field name="description">TVA-VT-UE-0</field>
       <field name="amount" eval="0.00"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_0_ht"/>
+      <field name="base_sign" eval="1"/>
 
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
+      <field name="account_collected_id" ref="pcg_445201"/>
+      <field name="account_paid_id" ref="pcg_445201"/>
 
       <field name="ref_base_code_id" ref="tax_intra_0_ht"/>
       <field name="ref_base_sign" eval="-1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">sale</field>
     </record>
 
+    <record model="account.tax.template" id="tva_import_0">
+        <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+        <field name="name">TVA 0% import (achat)</field>
+        <field name="description">TVA-import-0</field>
+        <field name="amount" eval="0.00"/>
+        <field name="type">percent</field>
+        <!-- Les achats import à 0% ne sont pas mentionnés sur la déclaration de TVA
+        par conséquence, il n'y a pas de base_code_id -->
+
+        <field name="account_collected_id" ref="pcg_44566"/>
+        <field name="account_paid_id" ref="pcg_44566"/>
+
+        <field name="ref_base_code_id" ref=""/>
+        <field name="ref_base_sign" eval="1"/>
+        <field name="sequence" eval="10"/>
+        <field name="type_tax_use">purchase</field>
+    </record>
 
 <!--
     Comptes sur lesquels les taxes s'appliquent par défaut
diff --git a/addons/l10n_fr/l10n_fr_wizard.xml b/addons/l10n_fr/l10n_fr_wizard.xml
index 2f4ab7d932a..073396ad28b 100644
--- a/addons/l10n_fr/l10n_fr_wizard.xml
+++ b/addons/l10n_fr/l10n_fr_wizard.xml
@@ -1,6 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
+    <!-- This ir.actions.todo triggers the screen "Generate your chart of account
+     from a chart template" in the install wizard of the l10n_fr module -->
     <record id="config_call_account_template_fr" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
         <field name="type">automatic</field>
diff --git a/addons/l10n_fr/plan_comptable_general.xml b/addons/l10n_fr/plan_comptable_general.xml
index 18a83b735dc..9d16f44252b 100644
--- a/addons/l10n_fr/plan_comptable_general.xml
+++ b/addons/l10n_fr/plan_comptable_general.xml
@@ -9042,212 +9042,5 @@
       <field name="parent_id" ref="pcg_79"/>
     </record>
 
-    <record id="pcg_Classe_8" model="account.account.template">
-      <field name="name">Comptes spéciaux</field>
-      <field name="code">Classes 8</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
-      <field name="parent_id" ref="pcg_0"/>
-    </record>
-
-    <record id="pcg_80" model="account.account.template">
-      <field name="name">Engagements</field>
-      <field name="code">80</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
-      <field name="parent_id" ref="pcg_Classe_8"/>
-    </record>
-
-    <record id="pcg_801" model="account.account.template">
-      <field name="name">Engagements donnés par l'entité</field>
-      <field name="code">801</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_80"/>
-    </record>
-
-    <record id="pcg_8011" model="account.account.template">
-      <field name="name">Avals, cautions, garanties</field>
-      <field name="code">8011</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_801"/>
-    </record>
-
-    <record id="pcg_8014" model="account.account.template">
-      <field name="name">Effets circulant sous l'endos de l'entité</field>
-      <field name="code">8014</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_801"/>
-    </record>
-
-    <record id="pcg_8016" model="account.account.template">
-      <field name="name">Redevances crédit-bail restant à courir</field>
-      <field name="code">8016</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_801"/>
-    </record>
-
-    <record id="pcg_80161" model="account.account.template">
-      <field name="name">Crédit-bail mobilier</field>
-      <field name="code">80161</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_8016"/>
-    </record>
-
-    <record id="pcg_80165" model="account.account.template">
-      <field name="name">Crédit-bail immobilier</field>
-      <field name="code">80165</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_8016"/>
-    </record>
-
-    <record id="pcg_8018" model="account.account.template">
-      <field name="name">Autres engagements donnés</field>
-      <field name="code">8018</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_801"/>
-    </record>
-
-    <record id="pcg_802" model="account.account.template">
-      <field name="name">Engagements reçus par l'entité</field>
-      <field name="code">802</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_80"/>
-    </record>
-
-    <record id="pcg_8021" model="account.account.template">
-      <field name="name">Avals, cautions, garanties</field>
-      <field name="code">8021</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_802"/>
-    </record>
-
-    <record id="pcg_8024" model="account.account.template">
-      <field name="name">Créances escomptées non échues</field>
-      <field name="code">8024</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_802"/>
-    </record>
-
-    <record id="pcg_8026" model="account.account.template">
-      <field name="name">Engagements reçus pour utilisation en crédit-bail</field>
-      <field name="code">8026</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_802"/>
-    </record>
-
-    <record id="pcg_80261" model="account.account.template">
-      <field name="name">Crédit-bail mobilier</field>
-      <field name="code">80261</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_8026"/>
-    </record>
-
-    <record id="pcg_80265" model="account.account.template">
-      <field name="name">Crédit-bail immobilier</field>
-      <field name="code">80265</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_8026"/>
-    </record>
-
-    <record id="pcg_8028" model="account.account.template">
-      <field name="name">Autres engagements reçus</field>
-      <field name="code">8028</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_802"/>
-    </record>
-
-    <record id="pcg_809" model="account.account.template">
-      <field name="name">Contrepartie des engagements</field>
-      <field name="code">809</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
-      <field name="parent_id" ref="pcg_80"/>
-    </record>
-
-    <record id="pcg_8091" model="account.account.template">
-      <field name="name">Contrepartie 801</field>
-      <field name="code">8091</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_809"/>
-    </record>
-
-    <record id="pcg_8092" model="account.account.template">
-      <field name="name">Contrepartie 802</field>
-      <field name="code">8092</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_809"/>
-    </record>
-
-    <record id="pcg_88" model="account.account.template">
-      <field name="name">Résultats en instance d'affectation</field>
-      <field name="code">88</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
-      <field name="parent_id" ref="pcg_Classe_8"/>
-    </record>
-
-    <record id="pcg_89" model="account.account.template">
-      <field name="name">Bilan</field>
-      <field name="code">89</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
-      <field name="parent_id" ref="pcg_Classe_8"/>
-    </record>
-
-    <record id="pcg_890" model="account.account.template">
-      <field name="name">Bilan d'ouverture</field>
-      <field name="code">890</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_special"/>
-
-      <field name="parent_id" ref="pcg_89"/>
-    </record>
-
-    <record id="pcg_891" model="account.account.template">
-      <field name="name">Bilan de clôture</field>
-      <field name="code">891</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_special"/>
-
-      <field name="parent_id" ref="pcg_89"/>
-    </record>
-
   </data>
 </openerp>

From 0ce5a6bf596a4f104d47c2c30f29793a19793488 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Tue, 24 Apr 2012 01:03:30 +0200
Subject: [PATCH 4/7] Copy the "note" field from fiscal position template to
 fiscal position.

bzr revid: alexis@via.ecp.fr-20120423230330-6nmmbf8yae83jggq
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 75bfc891980..26af7a5f9bd 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2905,7 +2905,7 @@ class account_fiscal_position_template(osv.osv):
         obj_fiscal_position = self.pool.get('account.fiscal.position')
         fp_ids = self.search(cr, uid, [('chart_template_id', '=', chart_temp_id)])
         for position in self.browse(cr, uid, fp_ids, context=context):
-            new_fp = obj_fiscal_position.create(cr, uid, {'company_id': company_id, 'name': position.name})
+            new_fp = obj_fiscal_position.create(cr, uid, {'company_id': company_id, 'name': position.name, 'note': position.note})
             for tax in position.tax_ids:
                 obj_tax_fp.create(cr, uid, {
                     'tax_src_id': tax_template_ref[tax.tax_src_id.id],

From 843fba3cbb4e5d53e315f553454bfe7047340df9 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Mon, 7 May 2012 20:07:32 +0200
Subject: [PATCH 5/7] Meaningfull IDs for fiscal positions and tax mappings Add
 tax-included taxes for purchases Add property_reserve_and_surplus_account Add
 some usefull information in the description of the module

bzr revid: alexis@via.ecp.fr-20120507180732-xewd970p1eizsq3n
---
 addons/l10n_fr/__openerp__.py          |   4 +
 addons/l10n_fr/fr_fiscal_templates.xml | 104 ++++++++++-----------
 addons/l10n_fr/fr_pcg_taxes.xml        |   1 +
 addons/l10n_fr/fr_tax.xml              | 124 ++++++++++++++++++++++++-
 4 files changed, 178 insertions(+), 55 deletions(-)

diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index 7def04c2814..26ec91c3fc6 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -37,6 +37,10 @@ This is the module to manage the accounting chart for France in OpenERP.
 
 This module applies to companies based in France mainland. It doesn't apply to companies based in the DOM-TOMs (Guadeloupe, Martinique, Guyane, Réunion, Mayotte, etc...)
 
+This localisation module creates the VAT taxes of type "tax included" for purchases (it is notably required when you use the module "hr_expense"). Beware that these "tax included" VAT taxes are not managed by the fiscal positions provided by this module (because it is complex to manage both "tax excluded" and "tax included" scenarios in fiscal positions).
+
+This localisation module doesn't properly handle the scenario when a France-mainland company sells services to a company based in the DOMs. We could manage it in the fiscal positions, but it would require to differentiate between "product" VAT taxes and "service" VAT taxes. We consider that it is too "heavy" to have this by default in l10n_fr ; companies that sell services to DOM-based companies should update the configuration of their taxes and fiscal positions manually.
+
 Credits: Sistheo, Zeekom, CrysaLEAD, Akretion and Camptocamp.
 """,
     "depends" : ['base_iban', 'account', 'account_chart', 'base_vat', 'l10n_fr_rib'],
diff --git a/addons/l10n_fr/fr_fiscal_templates.xml b/addons/l10n_fr/fr_fiscal_templates.xml
index ceec59ffd7a..a7e202d47b8 100644
--- a/addons/l10n_fr/fr_fiscal_templates.xml
+++ b/addons/l10n_fr/fr_fiscal_templates.xml
@@ -7,13 +7,13 @@
     <!-- = = = = = = = = = = = = = = = -->
 
 <!-- Position Géographique du partenaire -->
-        <record id="fiscal_position_template_2" model="account.fiscal.position.template">
+        <record id="fiscal_position_template_intraeub2b" model="account.fiscal.position.template">
             <field name="name">Intra-EU B2B</field>
             <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
             <field name="note">French VAT exemption according to articles 262 ter I (for products) and/or 283-2 (for services) of "CGI"</field>
         </record>
 
-        <record id="fiscal_position_template_3" model="account.fiscal.position.template">
+        <record id="fiscal_position_template_import_export" model="account.fiscal.position.template">
             <field name="name">Import/Export + DOM-TOM</field>
             <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
             <field name="note">French VAT exemption according to articles 262 I of "CGI"</field>
@@ -29,88 +29,88 @@
 <!-- Zone Intracommunautaire B2B -->
 <!-- ventes -->
 <!-- 19,6% -->
-        <record id="fiscal_position_tax_template_1" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <record id="fp_tax_template_intraeub2b_vt_normale" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
             <field name="tax_src_id" ref="tva_normale" />
             <field name="tax_dest_id" ref="tva_intra_0" />
         </record>
 <!-- 8,5% -->
-        <record id="fiscal_position_tax_template_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <record id="fp_tax_template_intraeub2b_vt_specifique" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
             <field name="tax_src_id" ref="tva_specifique" />
             <field name="tax_dest_id" ref="tva_intra_0" />
         </record>
 <!-- 7% -->
-        <record id="fiscal_position_tax_template_3" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <record id="fp_tax_template_intraeub2b_vt_specifique_1" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
             <field name="tax_src_id" ref="tva_specifique_1" />
             <field name="tax_dest_id" ref="tva_intra_0" />
         </record>
 <!-- 5,5% -->
-        <record id="fiscal_position_tax_template_4" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <record id="fp_tax_template_intraeub2b_vt_reduite" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
             <field name="tax_src_id" ref="tva_reduite" />
             <field name="tax_dest_id" ref="tva_intra_0" />
         </record>
 <!-- 2,1% -->
-        <record id="fiscal_position_tax_template_5" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <record id="fp_tax_template_intraeub2b_vt_super_reduite" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
             <field name="tax_src_id" ref="tva_super_reduite" />
             <field name="tax_dest_id" ref="tva_intra_0" />
         </record>
 <!-- achats -->
 <!-- 19,6% -->
-        <record id="fiscal_position_tax_template_6" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <record id="fp_tax_template_intraeub2b_ha_normale_deduc" 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_intra_normale" />
         </record>
-        <record id="fiscal_position_tax_template_7" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <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>
 <!-- 8,5% -->
-        <record id="fiscal_position_tax_template_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <record id="fp_tax_template_intraeub2b_ha_specifique_deduc" 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_intra_specifique" />
         </record>
-        <record id="fiscal_position_tax_template_9" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <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>
 <!-- 7% -->
-        <record id="fiscal_position_tax_template_10" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <record id="fp_tax_template_intraeub2b_ha_specifique_1_deduc" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
             <field name="tax_src_id" ref="tva_acq_specifique_1" />
             <field name="tax_dest_id" ref="tva_intra_specifique_1" />
         </record>
-        <record id="fiscal_position_tax_template_11" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <record id="fp_tax_template_intraeub2b_ha_specifique_1_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_1" />
             <field name="tax_dest_id" ref="tva_acq_intra_specifique_1" />
         </record>
 <!-- 5,5% -->
-        <record id="fiscal_position_tax_template_12" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <record id="fp_tax_template_intraeub2b_ha_reduite_deduc" 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_intra_reduite" />
         </record>
-        <record id="fiscal_position_tax_template_13" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <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>
 <!-- 2,1% -->
-        <record id="fiscal_position_tax_template_14" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <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" />
             <field name="tax_src_id" ref="tva_acq_super_reduite" />
             <field name="tax_dest_id" ref="tva_intra_super_reduite" />
         </record>
-        <record id="fiscal_position_tax_template_15" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
+        <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>
@@ -118,64 +118,64 @@
 <!-- Import/Export + DOM/TOM -->
 <!-- ventes -->
 <!-- 19,6% -->
-        <record id="fiscal_position_tax_template_16" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_3" />
+        <record id="fp_tax_template_impexp_vt_normale" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
             <field name="tax_src_id" ref="tva_normale" />
             <field name="tax_dest_id" ref="tva_export_0" />
         </record>
 <!-- 8,5% -->
-        <record id="fiscal_position_tax_template_17" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_3" />
+        <record id="fp_tax_template_impexp_vt_specifique" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
             <field name="tax_src_id" ref="tva_specifique" />
             <field name="tax_dest_id" ref="tva_export_0" />
         </record>
 <!-- 7% -->
-        <record id="fiscal_position_tax_template_18" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_3" />
+        <record id="fp_tax_template_impexp_vt_specifique_1" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
             <field name="tax_src_id" ref="tva_specifique_1" />
             <field name="tax_dest_id" ref="tva_export_0" />
         </record>
 <!-- 5,5% -->
-        <record id="fiscal_position_tax_template_19" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_3" />
+        <record id="fp_tax_template_impexp_vt_reduite" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
             <field name="tax_src_id" ref="tva_reduite" />
             <field name="tax_dest_id" ref="tva_export_0" />
         </record>
 <!-- 2,1% -->
-        <record id="fiscal_position_tax_template_20" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_3" />
+        <record id="fp_tax_template_impexp_vt_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_super_reduite" />
             <field name="tax_dest_id" ref="tva_export_0" />
         </record>
 
 <!-- achats -->
 <!-- 19,6% -->
-        <record id="fiscal_position_tax_template_21" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_3" />
+        <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" />
         </record>
 <!-- 8,5% -->
-        <record id="fiscal_position_tax_template_22" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_3" />
+        <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" />
         </record>
 <!-- 7% -->
-        <record id="fiscal_position_tax_template_23" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_3" />
+        <record id="fp_tax_template_impexp_ha_specifique_1" 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_1" />
             <field name="tax_dest_id" ref="tva_import_0" />
         </record>
 <!-- 5,5% -->
-        <record id="fiscal_position_tax_template_24" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_3" />
+        <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" />
         </record>
 <!-- 2,1% -->
-        <record id="fiscal_position_tax_template_25" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_3" />
+        <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" />
         </record>
diff --git a/addons/l10n_fr/fr_pcg_taxes.xml b/addons/l10n_fr/fr_pcg_taxes.xml
index c1ba2063c89..18fbb34543b 100644
--- a/addons/l10n_fr/fr_pcg_taxes.xml
+++ b/addons/l10n_fr/fr_pcg_taxes.xml
@@ -426,6 +426,7 @@
             <field name="property_account_payable" ref="fr_pcg_pay"/>
             <field name="property_account_expense_categ" ref="pcg_6071"/>
             <field name="property_account_income_categ" ref="pcg_7071"/>
+            <field name="property_reserve_and_surplus_account" ref="pcg_120"/>
         </record>
 
   </data>
diff --git a/addons/l10n_fr/fr_tax.xml b/addons/l10n_fr/fr_tax.xml
index db9acf17473..402decda8d0 100644
--- a/addons/l10n_fr/fr_tax.xml
+++ b/addons/l10n_fr/fr_tax.xml
@@ -7,7 +7,7 @@
      amount of the eco-tax)
 -->
 
-<!-- VENTES -->
+<!-- VENTES Tax excluded from price -->
     <record model="account.tax.template" id="tva_normale">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA collectée (vente) 19,6%</field>
@@ -119,7 +119,7 @@
     </record>
 
 
-<!-- ACHATS -->
+<!-- ACHATS Tax excluded from price -->
     <record model="account.tax.template" id="tva_acq_normale">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA acquittée (achat) 19,6%</field>
@@ -228,7 +228,125 @@
       <field name="ref_tax_sign" eval="1"/>
       <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
-    </record> 
+    </record>
+
+
+<!-- ACHATS Tax included in price -->
+    <record model="account.tax.template" id="tva_acq_normale_inclue">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA acquittée (achat) 19,6% inclue</field>
+      <field name="description">TVA-HA-19.6-inclue</field>
+      <field name="price_include" eval="1"/>
+      <field name="amount" eval="0.196"/>
+      <field name="type">percent</field>
+      <field name="base_code_id" ref="tax_acq_196_ht"/>
+      <field name="base_sign" eval="-1"/>
+      <field name="tax_code_id" ref="tax_acq_196"/>
+      <field name="tax_sign" eval="-1"/>
+
+      <field name="account_collected_id" ref="pcg_44566"/>
+      <field name="account_paid_id" ref="pcg_44566"/>
+
+      <field name="ref_base_code_id" ref="tax_acq_196_ht"/>
+      <field name="ref_base_sign" eval="1"/>
+      <field name="ref_tax_code_id" ref="tax_acq_196"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
+    </record>
+
+    <record model="account.tax.template" id="tva_acq_specifique_inclue">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA acquittée (achat) 8,5% inclue</field>
+      <field name="description">TVA-HA-8.5-inclue</field>
+      <field name="price_include" eval="1"/>
+      <field name="amount" eval="0.085"/>
+      <field name="type">percent</field>
+      <field name="base_code_id" ref="tax_acq_85_ht"/>
+      <field name="base_sign" eval="-1"/>
+      <field name="tax_code_id" ref="tax_acq_85"/>
+      <field name="tax_sign" eval="-1"/>
+
+      <field name="account_collected_id" ref="pcg_44566"/>
+      <field name="account_paid_id" ref="pcg_44566"/> 
+
+      <field name="ref_base_code_id" ref="tax_acq_85_ht"/>
+      <field name="ref_base_sign" eval="1"/>
+      <field name="ref_tax_code_id" ref="tax_acq_85"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
+    </record>
+
+    <record model="account.tax.template" id="tva_acq_specifique_1_inclue">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA acquittée (achat) 7,0% inclue</field>
+      <field name="description">TVA-HA-7.0-inclue</field>
+      <field name="price_include" eval="1"/>
+      <field name="amount" eval="0.07"/>
+      <field name="type">percent</field>
+      <field name="base_code_id" ref="tax_acq_70_ht"/>
+      <field name="base_sign" eval="-1"/>
+      <field name="tax_code_id" ref="tax_acq_70"/>
+      <field name="tax_sign" eval="-1"/>
+
+      <field name="account_collected_id" ref="pcg_44566"/>
+      <field name="account_paid_id" ref="pcg_44566"/>
+
+      <field name="ref_base_code_id" ref="tax_acq_70_ht"/>
+      <field name="ref_base_sign" eval="1"/>
+      <field name="ref_tax_code_id" ref="tax_acq_70"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
+    </record>
+
+    <record model="account.tax.template" id="tva_acq_reduite_inclue">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA acquittée (achat) 5,5% inclue</field>
+      <field name="description">TVA-HA-5.5-inclue</field>
+      <field name="price_include" eval="1"/>
+      <field name="amount" eval="0.055"/>
+      <field name="type">percent</field>
+      <field name="base_code_id" ref="tax_acq_55_ht"/>
+      <field name="base_sign" eval="-1"/>
+      <field name="tax_code_id" ref="tax_acq_55"/>
+      <field name="tax_sign" eval="-1"/>
+
+      <field name="account_collected_id" ref="pcg_44566"/>
+      <field name="account_paid_id" ref="pcg_44566"/>
+
+      <field name="ref_base_code_id" ref="tax_acq_55_ht"/>
+      <field name="ref_base_sign" eval="1"/>
+      <field name="ref_tax_code_id" ref="tax_acq_55"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
+    </record>
+
+    <record model="account.tax.template" id="tva_acq_super_reduite_inclue">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA acquittée (achat) 2,1% inclue</field>
+      <field name="description">TVA-HA-2.1-inclue</field>
+      <field name="price_include" eval="1"/>
+      <field name="amount" eval="0.021"/>
+      <field name="type">percent</field>
+      <field name="base_code_id" ref="tax_acq_21_ht"/>
+      <field name="base_sign" eval="-1"/>
+      <field name="tax_code_id" ref="tax_acq_21"/>
+      <field name="tax_sign" eval="-1"/>
+
+      <field name="account_collected_id" ref="pcg_44566"/>
+      <field name="account_paid_id" ref="pcg_44566"/>
+
+      <field name="ref_base_code_id" ref="tax_acq_21_ht"/>
+      <field name="ref_base_sign" eval="1"/>
+      <field name="ref_tax_code_id" ref="tax_acq_21"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
+    </record>
+
 
 
 <!-- IMMOBILISATIONS (achats) -->

From 14dd4eab9364221eda8dc77c77a1c62546e880f3 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Mon, 7 May 2012 23:56:52 +0200
Subject: [PATCH 6/7] Add a tax code for "Import VAT 0%" and link it to the
 corresponding tax Coherent naming of tax codes

bzr revid: alexis@via.ecp.fr-20120507215652-uczzw96thic2mffo
---
 addons/l10n_fr/fr_pcg_taxes.xml | 85 +++++++++++++++++++--------------
 addons/l10n_fr/fr_tax.xml       |  6 +--
 2 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/addons/l10n_fr/fr_pcg_taxes.xml b/addons/l10n_fr/fr_pcg_taxes.xml
index 18fbb34543b..b44d04439f0 100644
--- a/addons/l10n_fr/fr_pcg_taxes.xml
+++ b/addons/l10n_fr/fr_pcg_taxes.xml
@@ -4,7 +4,7 @@
 
     <!--
         Définition des Tax Codes
-        Version du fichier : 12-04-2008
+        Version du fichier : 07-05-2012
       -->
 
     <!--
@@ -22,31 +22,31 @@
     </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="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>
+      <field name="code">TVA collectée 8.5% (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_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="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_55_ht">
       <field name="name">Base H.T. 5.5%</field>
-      <field name="code">TVA collectée à 5.5% (Base H.T.)</field>
+      <field name="code">TVA collectée 5.5% (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_21_ht">
       <field name="name">Base H.T. 2.1%</field>
-      <field name="code">TVA collectée à 2.1% (Base H.T.)</field>
+      <field name="code">TVA collectée 2.1% (Base H.T.)</field>
       <field name="parent_id" ref="tax_col_ht"/>
       <field name="sign">1.00</field>
     </record>
@@ -59,31 +59,31 @@
     </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="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>
+      <field name="code">TVA collectée 8.5%</field>
       <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="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_55">
       <field name="name">TVA 5.5%</field>
-      <field name="code">TVA collectée à 5.5%</field>
+      <field name="code">TVA collectée 5.5%</field>
       <field name="parent_id" ref="tax_col"/>
       <field name="sign">1.00</field>
     </record>
     <record model="account.tax.code.template" id="tax_col_21">
       <field name="name">TVA 2.1%</field>
-      <field name="code">TVA collectée à 2.1%</field>
+      <field name="code">TVA collectée 2.1%</field>
       <field name="parent_id" ref="tax_col"/>
       <field name="sign">1.00</field>
     </record>
@@ -98,31 +98,31 @@
     </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="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>
+      <field name="code">TVA acquittée 8.5% (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_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="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_55_ht">
       <field name="name">Base H.T. 5.5%</field>
-      <field name="code">TVA acquittée à 5.5% (Base H.T.)</field>
+      <field name="code">TVA acquittée 5.5% (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_21_ht">
       <field name="name">Base H.T. 2.1%</field>
-      <field name="code">TVA acquittée à 2.1% (Base H.T.)</field>
+      <field name="code">TVA acquittée 2.1% (Base H.T.)</field>
       <field name="parent_id" ref="tax_acq_ht"/>
       <field name="sign">1.00</field>
     </record>
@@ -135,31 +135,31 @@
     </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="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>
+      <field name="code">TVA acquittée 8.5%</field>
       <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="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_55">
       <field name="name">TVA 5.5%</field>
-      <field name="code">TVA acquittée à 5.5%</field>
+      <field name="code">TVA acquittée 5.5%</field>
       <field name="parent_id" ref="tax_acq"/>
       <field name="sign">1.00</field>
     </record>
     <record model="account.tax.code.template" id="tax_acq_21">
       <field name="name">TVA 2.1%</field>
-      <field name="code">TVA acquittée à 2.1%</field>
+      <field name="code">TVA acquittée 2.1%</field>
       <field name="parent_id" ref="tax_acq"/>
       <field name="sign">1.00</field>
     </record>
@@ -174,31 +174,31 @@
     </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="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>
+      <field name="code">TVA acquittée sur immobilisations 8.5% (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_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="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_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>
+      <field name="code">TVA acquittée sur immobilisations 5.5% (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_21_ht">
       <field name="name">Base H.T. 2.1%</field>
-      <field name="code">TVA acquittée sur immobilisations à 2.1% (Base H.T.)</field>
+      <field name="code">TVA acquittée sur immobilisations 2.1% (Base H.T.)</field>
       <field name="parent_id" ref="tax_imm_ht"/>
       <field name="sign">1.00</field>
     </record>
@@ -212,31 +212,31 @@
     </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="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>
+      <field name="code">TVA acquittée sur immobilisations 8.5%</field>
       <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="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_55">
       <field name="name">TVA 5.5%</field>
-      <field name="code">TVA acquittée sur immobilisations à 5.5%</field>
+      <field name="code">TVA acquittée sur immobilisations 5.5%</field>
       <field name="parent_id" ref="tax_imm"/>
       <field name="sign">1.00</field>
     </record>
     <record model="account.tax.code.template" id="tax_imm_21">
       <field name="name">TVA 2.1%</field>
-      <field name="code">TVA acquittée sur immobilisations à 2.1%</field>
+      <field name="code">TVA acquittée sur immobilisations 2.1%</field>
       <field name="parent_id" ref="tax_imm"/>
       <field name="sign">1.00</field>
     </record>
@@ -395,27 +395,42 @@
       <field name="code">k)</field>
       <field name="sign">1.00</field>
       <field name="parent_id" ref="vat_code_chart_root"/>
-    </record> 
+    </record>
     <record model="account.tax.code.template" id="tax_export_0_ht">
       <field name="name">Exportations hors U.E.</field>
-      <field name="code">Exportations hors U.E. TVA 0%</field>
+      <field name="code">Exportations hors U.E. TVA 0% (Base H.T.)</field>
       <field name="parent_id" ref="tax_0_ht"/>
       <field name="sign">1.00</field>
     </record>
     <record model="account.tax.code.template" id="tax_intra_0_ht">
       <field name="name">Livraisons intracommunautaires</field>
-      <field name="code">Livraisons intracommunautaires TVA 0%</field>
+      <field name="code">Livraisons intracommunautaires TVA 0% (Base H.T.)</field>
       <field name="parent_id" ref="tax_0_ht"/>
       <field name="sign">1.00</field>
     </record>
     <record model="account.tax.code.template" id="tax_misc_0_ht">
       <field name="name">Autres opérations non imposables</field>
-      <field name="code">Autres opérations non imposables TVA 0%</field>
+      <field name="code">Autres opérations non imposables TVA 0% (Base H.T.)</field>
       <field name="parent_id" ref="tax_0_ht"/>
       <field name="sign">1.00</field>
     </record>
 
 
+    <record model="account.tax.code.template" id="non_present_sur_ca3">
+      <field name="name">Base H.T. Non présent sur la CA3</field>
+      <field name="code">Absent CA3)</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_code_chart_root"/>
+    </record>
+    <record model="account.tax.code.template" id="tax_import_0_ht">
+      <field name="name">Achats import</field>
+      <field name="code">Achats import TVA 0% (Base H.T.)</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="non_present_sur_ca3"/>
+    </record>
+
+
+
       <!-- Chart template -->
          <record id="l10n_fr_pcg_chart_template" model="account.chart.template">
             <field name="name">Plan Comptable Général (France)</field>
diff --git a/addons/l10n_fr/fr_tax.xml b/addons/l10n_fr/fr_tax.xml
index 402decda8d0..14b109b0e7b 100644
--- a/addons/l10n_fr/fr_tax.xml
+++ b/addons/l10n_fr/fr_tax.xml
@@ -746,13 +746,13 @@
         <field name="description">TVA-import-0</field>
         <field name="amount" eval="0.00"/>
         <field name="type">percent</field>
-        <!-- Les achats import à 0% ne sont pas mentionnés sur la déclaration de TVA
-        par conséquence, il n'y a pas de base_code_id -->
+        <field name="base_code_id" ref="tax_import_0_ht"/>
+        <field name="base_sign" eval="-1"/>
 
         <field name="account_collected_id" ref="pcg_44566"/>
         <field name="account_paid_id" ref="pcg_44566"/>
 
-        <field name="ref_base_code_id" ref=""/>
+        <field name="ref_base_code_id" ref="tax_import_0_ht"/>
         <field name="ref_base_sign" eval="1"/>
         <field name="sequence" eval="10"/>
         <field name="type_tax_use">purchase</field>

From 0f2ac4e545ee4f12ac9e1ca2c6f7fac44383b4e2 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis@via.ecp.fr>
Date: Wed, 16 May 2012 15:09:11 +0200
Subject: [PATCH 7/7] Update code field, for to be coherent with others.

bzr revid: alexis@via.ecp.fr-20120516130911-jkr22le0nzvj2mid
---
 addons/l10n_fr/fr_tax.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/l10n_fr/fr_tax.xml b/addons/l10n_fr/fr_tax.xml
index 14b109b0e7b..fc5d4608f45 100644
--- a/addons/l10n_fr/fr_tax.xml
+++ b/addons/l10n_fr/fr_tax.xml
@@ -689,7 +689,7 @@
     <record model="account.tax.template" id="tva_0">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA 0% autres opérations non imposables (vente)</field>
-      <field name="description">TVA-autre-0</field>
+      <field name="description">TVA-VT-autre-0</field>
       <field name="amount" eval="0.00"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_misc_0_ht"/>