diff --git a/addons/l10n_fr/__manifest__.py b/addons/l10n_fr/__manifest__.py
index a1aadeaf849..fef029afb3d 100644
--- a/addons/l10n_fr/__manifest__.py
+++ b/addons/l10n_fr/__manifest__.py
@@ -36,6 +36,7 @@ configuration of their taxes and fiscal positions manually.
         'data/account_chart_template_data.xml',
         'views/l10n_fr_view.xml',
         'data/account_tax_data.xml',
+        'data/res_country_data.xml',
         'data/account_fiscal_position_template_data.xml',
         'data/account_reconcile_model_template.xml',
         'data/account_chart_template_data.yml',
diff --git a/addons/l10n_fr/data/account_chart_template_data.xml b/addons/l10n_fr/data/account_chart_template_data.xml
index 429e5b3030e..67deb80cc04 100644
--- a/addons/l10n_fr/data/account_chart_template_data.xml
+++ b/addons/l10n_fr/data/account_chart_template_data.xml
@@ -2298,6 +2298,13 @@
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
     </record>
 
+    <record id="pcg_445204" model="account.account.template">
+      <field name="name">TVA due imports</field>
+      <field name="code">445204</field>
+      <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+    </record>
+
     <record id="pcg_44551" model="account.account.template">
       <field name="name">TVA à décaisser</field>
       <field name="code">44551</field>
@@ -2343,6 +2350,13 @@
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
     </record>
 
+    <record id="pcg_445663" model="account.account.template">
+      <field name="name">TVA déductible imports</field>
+      <field name="code">445663</field>
+      <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+    </record>
+
     <record id="pcg_44567" model="account.account.template">
       <field name="name">Crédit de TVA à reporter</field>
       <field name="code">44567</field>
@@ -2389,6 +2403,14 @@
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
     </record>
 
+    <record id="pcg_445800" model="account.account.template">
+      <field name="name">Taxes sur le chiffre d'affaires à régulariser ou en attente</field>
+      <field name="code">445800</field>
+      <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+      <field name="reconcile" eval="True"/>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+    </record>
+
     <record id="pcg_44581" model="account.account.template">
       <field name="name">Acomptes - Régime simplifié d'imposition</field>
       <field name="code">44581</field>
diff --git a/addons/l10n_fr/data/account_fiscal_position_template_data.xml b/addons/l10n_fr/data/account_fiscal_position_template_data.xml
index 51108bb0be8..c1b3663520f 100644
--- a/addons/l10n_fr/data/account_fiscal_position_template_data.xml
+++ b/addons/l10n_fr/data/account_fiscal_position_template_data.xml
@@ -11,19 +11,30 @@
     <!-- = = = = = = = = = = = = = = = -->
 
 <!-- Position Géographique du partenaire -->
+        <record id="fiscal_position_template_domestic" model="account.fiscal.position.template">
+            <field name="sequence">1</field>
+            <field name="name">Domestique - France</field>
+            <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+            <field name="auto_apply" eval="True" />
+            <field name="country_id" ref="base.fr"></field>
+        </record>
         <record id="fiscal_position_template_intraeub2b" model="account.fiscal.position.template">
+            <field name="sequence">2</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>
+            <field name="auto_apply" eval="True" />
+            <field name="country_group_id" ref="base.europe"></field>
+            <field name="vat_required" eval="True" />
         </record>
-
         <record id="fiscal_position_template_import_export" model="account.fiscal.position.template">
-            <field name="name">Import/Export + DOM-TOM</field>
+            <field name="sequence">50</field>
+            <field name="name">Import/Export Hors Europe + 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>
+            <field name="note">French VAT exemption according to articles 291, 294 and 262 I of "CGI"</field>
+            <field name="auto_apply" eval="True" />
         </record>
 
-
     <!-- = = = = = = = = = = = = = = = -->
     <!-- Fiscal Position Tax Templates -->
     <!-- = = = = = = = = = = = = = = = -->
@@ -43,6 +54,16 @@
             <field name="tax_src_id" ref="tva_normale_ttc" />
             <field name="tax_dest_id" ref="tva_intra_0" />
         </record>
+        <record id="fp_tax_template_intraeub2b_vt_normale_encaissement" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_normale_encaissement" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
+        </record>
+        <record id="fp_tax_template_intraeub2b_vt_normale_encaissement_ttc" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_normale_encaissement_ttc" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
+        </record>
 <!-- Taux DOM-TOM -->
         <record id="fp_tax_template_intraeub2b_vt_specifique" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_intraeub2b" />
@@ -76,6 +97,16 @@
             <field name="tax_src_id" ref="tva_reduite_ttc" />
             <field name="tax_dest_id" ref="tva_intra_0" />
         </record>
+        <record id="fp_tax_template_intraeub2b_vt_reduite_encaissement_ttc" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_reduite_encaissement_ttc" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
+        </record>
+        <record id="fp_tax_template_intraeub2b_vt_reduite_encaissement" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_reduite_encaissement" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
+        </record>
 <!-- Taux super réduit -->
         <record id="fp_tax_template_intraeub2b_vt_super_reduite" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_intraeub2b" />
@@ -87,6 +118,16 @@
             <field name="tax_src_id" ref="tva_super_reduite_ttc" />
             <field name="tax_dest_id" ref="tva_intra_0" />
         </record>
+        <record id="fp_tax_template_intraeub2b_vt_super_reduite_encaissement_ttc" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_super_reduite_encaissement_ttc" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
+        </record>
+        <record id="fp_tax_template_intraeub2b_vt_super_reduite_encaissement" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_super_reduite_encaissement" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
+        </record>
 <!-- achats -->
 <!-- Taux Normal -->
         <record id="fp_tax_template_intraeub2b_ha_normale_deduc" model="account.fiscal.position.tax.template">
@@ -157,6 +198,16 @@
             <field name="tax_src_id" ref="tva_normale_ttc" />
             <field name="tax_dest_id" ref="tva_export_0" />
         </record>
+        <record id="fp_tax_template_impexp_vt_normale_encaissement" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
+            <field name="tax_src_id" ref="tva_normale_encaissement" />
+            <field name="tax_dest_id" ref="tva_export_0" />
+        </record>
+        <record id="fp_tax_template_impexp_vt_normale_encaissement_ttc" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
+            <field name="tax_src_id" ref="tva_normale_encaissement_ttc" />
+            <field name="tax_dest_id" ref="tva_export_0" />
+        </record>
 <!-- Taux DOM-TOM -->
         <record id="fp_tax_template_impexp_vt_specifique" model="account.fiscal.position.tax.template">
             <field name="position_id" ref="fiscal_position_template_import_export" />
@@ -190,6 +241,16 @@
             <field name="tax_src_id" ref="tva_reduite_ttc" />
             <field name="tax_dest_id" ref="tva_export_0" />
         </record>
+        <record id="fp_tax_template_impexp_vt_reduite_encaissement_ttc" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
+            <field name="tax_src_id" ref="tva_reduite_encaissement_ttc" />
+            <field name="tax_dest_id" ref="tva_export_0" />
+        </record>
+        <record id="fp_tax_template_impexp_vt_reduite_encaissement" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
+            <field name="tax_src_id" ref="tva_reduite_encaissement" />
+            <field name="tax_dest_id" ref="tva_export_0" />
+        </record>
 <!-- Taux super réduit -->
         <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" />
@@ -201,7 +262,16 @@
             <field name="tax_src_id" ref="tva_super_reduite_ttc" />
             <field name="tax_dest_id" ref="tva_export_0" />
         </record>
-
+        <record id="fp_tax_template_impexp_vt_super_reduite_encaissement_ttc" 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_encaissement_ttc" />
+            <field name="tax_dest_id" ref="tva_export_0" />
+        </record>
+        <record id="fp_tax_template_impexp_vt_super_reduite_encaissement" 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_encaissement" />
+            <field name="tax_dest_id" ref="tva_export_0" />
+        </record>
 <!-- achats -->
 <!-- Taux Normal -->
         <record id="fp_tax_template_impexp_ha_normale" model="account.fiscal.position.tax.template">
diff --git a/addons/l10n_fr/data/account_tax_data.xml b/addons/l10n_fr/data/account_tax_data.xml
index ea0044ba6ff..b2eee3a6b5e 100644
--- a/addons/l10n_fr/data/account_tax_data.xml
+++ b/addons/l10n_fr/data/account_tax_data.xml
@@ -510,6 +510,21 @@
       <field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tag_fr_02'),ref('l10n_fr.tag_fr_11')])]"/>
     </record>
 
+    <record model="account.tax.template" id="tva_normale_encaissement">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA à l'encaissement (vente) 20,0%</field>
+      <field name="description">20.0</field>
+      <field name="amount" eval="20.0"/>
+      <field name="amount_type">percent</field>
+      <field name="refund_account_id" ref="pcg_445711"/>
+      <field name="account_id" ref="pcg_445800"/>
+      <field name="use_cash_basis" eval="True" />
+      <field name="cash_basis_account" ref="pcg_445711" />
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">sale</field>
+      <field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tag_fr_02'),ref('l10n_fr.tag_fr_11')])]"/>
+    </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>
@@ -549,6 +564,21 @@
       <field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tag_fr_08'),ref('l10n_fr.tag_fr_17')])]"/>
     </record>
 
+    <record model="account.tax.template" id="tva_reduite_encaissement">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA réduite à l'encaissement (vente) 5.5%</field>
+      <field name="description">5.5</field>
+      <field name="amount" eval="5.5"/>
+      <field name="amount_type">percent</field>
+      <field name="refund_account_id" ref="pcg_445713"/>
+      <field name="account_id" ref="pcg_445800"/>
+      <field name="use_cash_basis" eval="True" />
+      <field name="cash_basis_account" ref="pcg_445713" />
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">sale</field>
+      <field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tag_fr_08'),ref('l10n_fr.tag_fr_17')])]"/>
+    </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>
@@ -562,6 +592,21 @@
       <field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tag_fr_09'),ref('l10n_fr.tag_fr_18')])]"/>
     </record>
 
+    <record model="account.tax.template" id="tva_super_reduite_encaissement">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA réduite à l'encaissement (vente) 2.1%</field>
+      <field name="description">2.1</field>
+      <field name="amount" eval="2.1"/>
+      <field name="amount_type">percent</field>
+      <field name="refund_account_id" ref="pcg_445713"/>
+      <field name="account_id" ref="pcg_445800"/>
+      <field name="use_cash_basis" eval="True" />
+      <field name="cash_basis_account" ref="pcg_445713" />
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">sale</field>
+      <field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tag_fr_09'),ref('l10n_fr.tag_fr_18')])]"/>
+    </record>
+
 
 <!-- VENTES Tax INCLUDE (TTC) -->
     <record model="account.tax.template" id="tva_normale_ttc">
@@ -578,6 +623,22 @@
       <field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tag_fr_02'),ref('l10n_fr.tag_fr_11')])]"/>
     </record>
 
+    <record model="account.tax.template" id="tva_normale_encaissement_ttc">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA à l'encaissement (vente) 20,0% TTC</field>
+      <field name="description">20.0-TTC</field>
+      <field name="price_include" eval="1"/>
+      <field name="amount" eval="20"/>
+      <field name="amount_type">percent</field>
+      <field name="refund_account_id" ref="pcg_445711"/>
+      <field name="account_id" ref="pcg_445800"/>
+      <field name="use_cash_basis" eval="True" />
+      <field name="cash_basis_account" ref="pcg_445711" />
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">sale</field>
+      <field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tag_fr_02'),ref('l10n_fr.tag_fr_11')])]"/>
+    </record>
+
     <record model="account.tax.template" id="tva_specifique_ttc">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA collectée (vente) 8,5% TTC</field>
@@ -620,6 +681,22 @@
       <field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tag_fr_08'),ref('l10n_fr.tag_fr_17')])]"/>
     </record>
 
+    <record model="account.tax.template" id="tva_reduite_encaissement_ttc">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA réduite à l'encaissement (vente) 5.5% TTC</field>
+      <field name="description">5.5-TTC</field>
+      <field name="price_include" eval="1"/>
+      <field name="amount" eval="5.5"/>
+      <field name="amount_type">percent</field>
+      <field name="refund_account_id" ref="pcg_445713"/>
+      <field name="account_id" ref="pcg_445800"/>
+      <field name="use_cash_basis" eval="True" />
+      <field name="cash_basis_account" ref="pcg_445713" />
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">sale</field>
+      <field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tag_fr_08'),ref('l10n_fr.tag_fr_17')])]"/>
+    </record>
+
     <record model="account.tax.template" id="tva_super_reduite_ttc">
       <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA collectée (vente) 2,1% TTC</field>
@@ -634,6 +711,22 @@
       <field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tag_fr_09'),ref('l10n_fr.tag_fr_18')])]"/>
     </record>
 
+    <record model="account.tax.template" id="tva_super_reduite_encaissement_ttc">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA réduite à l'encaissement (vente) 2.1% TTC</field>
+      <field name="description">2.1-TTC</field>
+      <field name="price_include" eval="1"/>
+      <field name="amount" eval="2.1"/>
+      <field name="amount_type">percent</field>
+      <field name="refund_account_id" ref="pcg_445713"/>
+      <field name="account_id" ref="pcg_445800"/>
+      <field name="use_cash_basis" eval="True" />
+      <field name="cash_basis_account" ref="pcg_445713" />
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">sale</field>
+      <field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tag_fr_09'),ref('l10n_fr.tag_fr_18')])]"/>
+    </record>
+
 <!-- 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"/>
@@ -1024,13 +1117,15 @@
         <field name="description">IMPORT-0</field>
         <field name="amount" eval="0.00"/>
         <field name="amount_type">percent</field>
-        <field name="refund_account_id" ref="pcg_44566"/>
-        <field name="account_id" ref="pcg_44566"/>
+        <field name="refund_account_id" ref="pcg_445663"/>
+        <field name="account_id" ref="pcg_445663"/>
         <field name="sequence" eval="10"/>
         <field name="type_tax_use">purchase</field>
         <field name="tag_ids" eval="[(6,0,[ref('l10n_fr.tag_fr_97')])]"/>
     </record>
 
+
+
 <!--
     Comptes sur lesquels les taxes s'appliquent par défaut
 -->
diff --git a/addons/l10n_fr/data/l10n_fr_chart_data.xml b/addons/l10n_fr/data/l10n_fr_chart_data.xml
index 281b1717092..eadc305bc34 100644
--- a/addons/l10n_fr/data/l10n_fr_chart_data.xml
+++ b/addons/l10n_fr/data/l10n_fr_chart_data.xml
@@ -15,6 +15,7 @@
         <field name="bank_account_code_prefix">512</field>
         <field name="cash_account_code_prefix">53</field>
         <field name="transfer_account_id" ref="pcg_58"/>
+        <field name="complete_tax_set" eval="True" />
     </record>
 
     <record id="pcg_58" model="account.account.template">
diff --git a/addons/l10n_fr/data/res_country_data.xml b/addons/l10n_fr/data/res_country_data.xml
new file mode 100644
index 00000000000..b2d3f7cdae8
--- /dev/null
+++ b/addons/l10n_fr/data/res_country_data.xml
@@ -0,0 +1,16 @@
+<odoo>
+    <record id="dom-tom" model="res.country.group">
+             <field name="name">DOM-TOM</field>
+             <field name="country_ids" eval="[(6,0,[
+                                                ref('base.yt'),
+                                                ref('base.gp'),
+                                                ref('base.mq'),
+                                                ref('base.gf'),
+                                                ref('base.re'),
+                                                ref('base.pf'),
+                                                ref('base.pm'),
+                                                ref('base.mf'),
+                                                ref('base.bl'),
+                                                ref('base.nc')])]"/>
+       </record>
+</odoo>
diff --git a/addons/l10n_fr/models/l10n_fr.py b/addons/l10n_fr/models/l10n_fr.py
index 54b557cb7c1..714df0a9744 100644
--- a/addons/l10n_fr/models/l10n_fr.py
+++ b/addons/l10n_fr/models/l10n_fr.py
@@ -9,3 +9,16 @@ class ResCompany(models.Model):
 
     siret = fields.Char(string='SIRET', size=14)
     ape = fields.Char(string='APE')
+
+
+class ChartTemplate(models.Model):
+    _inherit = 'account.chart.template'
+
+    def _prepare_all_journals(self, acc_template_ref, company, journals_dict=None):
+        journals = super(ChartTemplate, self)._prepare_all_journals(acc_template_ref, company, journals_dict)
+        if company.country_id == self.env.ref('base.fr'):
+            #For France, sale/purchase journals must have a dedicated sequence for refunds
+            for journal in journals:
+                if journal['type'] in ['sale', 'purchase']:
+                    journal['refund_sequence'] = True
+        return journals