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) -->