diff --git a/addons/l10n_be/data/fiscal_templates_data.xml b/addons/l10n_be/data/fiscal_templates_data.xml
index 0ba76da33da..3c286752dd8 100644
--- a/addons/l10n_be/data/fiscal_templates_data.xml
+++ b/addons/l10n_be/data/fiscal_templates_data.xml
@@ -3,22 +3,41 @@
+ 1
Régime National
+
+
+
-
+
+
+ 2
+ EU privé
+
+
+
+
+
+ 4
Régime Extra-Communautaire
+
+ 3
Régime Intra-Communautaire
+
+
+
Régime Cocontractant
+ 5
diff --git a/addons/l10n_be/i18n_extra/l10n_be.pot b/addons/l10n_be/i18n_extra/l10n_be.pot
index 5949274f2c7..fdf2febeda9 100644
--- a/addons/l10n_be/i18n_extra/l10n_be.pot
+++ b/addons/l10n_be/i18n_extra/l10n_be.pot
@@ -1428,6 +1428,11 @@ msgstr ""
msgid "Réductions de valeur sur stocks"
msgstr ""
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_5
+msgid "EU privé"
+msgstr ""
+
#. module: l10n_be
#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_4
msgid "Régime Cocontractant"
diff --git a/addons/l10n_be/i18n_extra/nl.po b/addons/l10n_be/i18n_extra/nl.po
index 44a32e80437..ec8947c1b36 100644
--- a/addons/l10n_be/i18n_extra/nl.po
+++ b/addons/l10n_be/i18n_extra/nl.po
@@ -1429,6 +1429,11 @@ msgstr "Waardeverminderingen op bestellingen in uitvoering"
msgid "Réductions de valeur sur stocks"
msgstr "Waardeverminderingen op voorraden"
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_5
+msgid "EU privé"
+msgstr "EU privé"
+
#. module: l10n_be
#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_4
msgid "Régime Cocontractant"
diff --git a/addons/l10n_ca/data/fiscal_templates_data.xml b/addons/l10n_ca/data/fiscal_templates_data.xml
index 8f79f743d6b..f3b93153c76 100644
--- a/addons/l10n_ca/data/fiscal_templates_data.xml
+++ b/addons/l10n_ca/data/fiscal_templates_data.xml
@@ -5,71 +5,112 @@
Alberta (AB)
+
+
+
British Columbia (BC)
+
+
+
Manitoba (MB)
+
+
+
New Brunswick (NB)
+
+
+
Newfoundland and Labrador (NL)
+
+
+
Nova Scotia (NS)
+
+
+
Northwest Territories (NT)
+
+
+
Nunavut (NU)
+
+
+
Ontario (ON)
+
+
+
Prince Edward Islands (PE)
+
+
+
Quebec (QC)
+
+
+
Saskatchewan (SK)
+
+
+
Yukon (YT)
+
+
+
+ 1
International (INTL)
+
diff --git a/addons/l10n_ch/data/account_fiscal_position_data.xml b/addons/l10n_ch/data/account_fiscal_position_data.xml
index 4c0d554cae9..ae3102400f1 100644
--- a/addons/l10n_ch/data/account_fiscal_position_data.xml
+++ b/addons/l10n_ch/data/account_fiscal_position_data.xml
@@ -2,10 +2,18 @@
+
+ Suisse national
+
+
+
+
+ 1
Import/Export
+
diff --git a/addons/l10n_ch/i18n_extra/de.po b/addons/l10n_ch/i18n_extra/de.po
index 825220cd143..24cb694103c 100644
--- a/addons/l10n_ch/i18n_extra/de.po
+++ b/addons/l10n_ch/i18n_extra/de.po
@@ -617,6 +617,11 @@ msgstr "Hypotheken"
msgid "Immeubles d’exploitation"
msgstr "Geschäftsliegenschaften"
+#. module: l10n_ch
+#: model:account.fiscal.position.template,name:l10n_ch.fiscal_position_template_1
+msgid "Suisse national"
+msgstr "Schweiz national"
+
#. module: l10n_ch
#: model:account.fiscal.position.template,name:l10n_ch.fiscal_position_template_import
msgid "Import/Export"
diff --git a/addons/l10n_ch/i18n_extra/it.po b/addons/l10n_ch/i18n_extra/it.po
index 2af6ef38dc0..684f6a08fe8 100644
--- a/addons/l10n_ch/i18n_extra/it.po
+++ b/addons/l10n_ch/i18n_extra/it.po
@@ -617,6 +617,11 @@ msgstr "Prestiti ipotecari"
msgid "Immeubles d’exploitation"
msgstr "Immobili aziendali"
+#. module: l10n_ch
+#: model:account.fiscal.position.template,name:l10n_ch.fiscal_position_template_1
+msgid "Suisse national"
+msgstr "Svizzera nazionale"
+
#. module: l10n_ch
#: model:account.fiscal.position.template,name:l10n_ch.fiscal_position_template_import
msgid "Import/Export"
diff --git a/addons/l10n_ch/i18n_extra/l10n_ch.pot b/addons/l10n_ch/i18n_extra/l10n_ch.pot
index 73b91c2b356..a01d3c931b0 100644
--- a/addons/l10n_ch/i18n_extra/l10n_ch.pot
+++ b/addons/l10n_ch/i18n_extra/l10n_ch.pot
@@ -607,6 +607,11 @@ msgstr ""
msgid "Immeubles d’exploitation"
msgstr ""
+#. module: l10n_ch
+#: model:account.fiscal.position.template,name:l10n_ch.fiscal_position_template_1
+msgid "Suisse national"
+msgstr ""
+
#. module: l10n_ch
#: model:account.fiscal.position.template,name:l10n_ch.fiscal_position_template_import
msgid "Import/Export"
diff --git a/addons/l10n_es/data/account_fiscal_position_template_data.xml b/addons/l10n_es/data/account_fiscal_position_template_data.xml
index eef1bd1ac03..0350599837d 100644
--- a/addons/l10n_es/data/account_fiscal_position_template_data.xml
+++ b/addons/l10n_es/data/account_fiscal_position_template_data.xml
@@ -14,18 +14,36 @@
+ 1
Régimen Nacional
+
+
+
+
+
+
+ 2
+ EU privado
+
+
+
+ 3
Régimen Intracomunitario
+
+
+
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 c82d89442e7..83e8b456577 100644
--- a/addons/l10n_fr/data/account_fiscal_position_template_data.xml
+++ b/addons/l10n_fr/data/account_fiscal_position_template_data.xml
@@ -16,10 +16,18 @@
Domestique - France
+
-
+
2
+ EU privé
+
+
+
+
+
+ 3
Intra-EU B2B
French VAT exemption according to articles 262 ter I (for products) and/or 283-2 (for services) of "CGI"
diff --git a/addons/l10n_hu/data/account.fiscal.position.template.csv b/addons/l10n_hu/data/account.fiscal.position.template.csv
index 97d35b31c3d..6ce7b03d2d8 100644
--- a/addons/l10n_hu/data/account.fiscal.position.template.csv
+++ b/addons/l10n_hu/data/account.fiscal.position.template.csv
@@ -1,4 +1,6 @@
-"id","chart_template_id/id","name"
-"fiscal_position_hu_exempt","hungarian_chart_template","Alanyi adómentes"
-"fiscal_position_hu_eu","hungarian_chart_template","EU partner"
-"fiscal_position_hu_eu_out","hungarian_chart_template","EU-n kívüli partner"
+"id","chart_template_id/id","name","sequence","auto_apply","vat_required","country_id:id","country_group_id:id"
+"fiscal_position_hu_exempt","hungarian_chart_template","Alanyi adómentes",,,,,
+"fiscal_position_hu_national","hungarian_chart_template","Magyar",1,1,1,base.hu,
+"fiscal_position_hu_eu_private","hungarian_chart_template","EU partner private",2,1,,,base.europe
+"fiscal_position_hu_eu","hungarian_chart_template","EU partner",3,1,1,,base.europe
+"fiscal_position_hu_eu_out","hungarian_chart_template","EU-n kívüli partner",4,1,,,
diff --git a/addons/l10n_it/data/account.fiscal.position.template.csv b/addons/l10n_it/data/account.fiscal.position.template.csv
index a2a64ced128..351d8976f84 100644
--- a/addons/l10n_it/data/account.fiscal.position.template.csv
+++ b/addons/l10n_it/data/account.fiscal.position.template.csv
@@ -1,4 +1,5 @@
-"name","chart_template_id:id","id"
-"Italia","l10n_it_chart_template_generic","it"
-"Regime Extra comunitario","l10n_it_chart_template_generic","extra"
-"Regime Intra comunitario","l10n_it_chart_template_generic","intra"
+"name","chart_template_id:id","id","sequence","auto_apply","vat_required","country_id:id","country_group_id:id"
+"Italia","l10n_it_chart_template_generic","it",1,1,1,base.it,
+"Regime Extra comunitario","l10n_it_chart_template_generic","extra",4,1,,,
+"Regime Intra comunitario privato","l10n_it_chart_template_generic","intra_private",2,1,,,base.europe
+"Regime Intra comunitario","l10n_it_chart_template_generic","intra",3,1,1,,base.europe
diff --git a/addons/l10n_lu/data/account.fiscal.position.template-2011.csv b/addons/l10n_lu/data/account.fiscal.position.template-2011.csv
index 7a937e9b87b..949cef0d361 100644
--- a/addons/l10n_lu/data/account.fiscal.position.template-2011.csv
+++ b/addons/l10n_lu/data/account.fiscal.position.template-2011.csv
@@ -1,5 +1,6 @@
-id,name,chart_template_id:id
-account_fiscal_position_template_LU_NO,Not liable to VAT,lu_2011_chart_1
-account_fiscal_position_template_LU_LU,Luxembourgish Taxable Person,lu_2011_chart_1
-account_fiscal_position_template_LU_IC,Intra-Community Taxable Person,lu_2011_chart_1
-account_fiscal_position_template_LU_EC,Extra-Community Taxable Person,lu_2011_chart_1
+id,name,chart_template_id:id,sequence,auto_apply,vat_required,country_id:id,country_group_id:id
+account_fiscal_position_template_LU_NO,Not liable to VAT,lu_2011_chart_1,,,,,
+account_fiscal_position_template_LU_LU,Luxembourgish Taxable Person,lu_2011_chart_1,1,1,1,base.lu,
+account_fiscal_position_template_private_LU_IC,EU private,lu_2011_chart_1,2,1,,,base.europe
+account_fiscal_position_template_LU_IC,Intra-Community Taxable Person,lu_2011_chart_1,3,1,1,,base.europe
+account_fiscal_position_template_LU_EC,Extra-Community Taxable Person,lu_2011_chart_1,4,1,,,
diff --git a/addons/l10n_lu/i18n_extra/de.po b/addons/l10n_lu/i18n_extra/de.po
index a94f7bf1566..4657b064fe4 100644
--- a/addons/l10n_lu/i18n_extra/de.po
+++ b/addons/l10n_lu/i18n_extra/de.po
@@ -2043,6 +2043,11 @@ msgstr "Interne Transferkonten : Guthaben"
msgid "Internal transfers : debit balance"
msgstr "Interne Transferkonten : Sollsaldo"
+#. module: l10n_lu
+#: model:account.fiscal.position.template,name:l10n_lu.account_fiscal_position_template_private_LU_IC
+msgid "EU private"
+msgstr "EU privat"
+
#. module: l10n_lu
#: model:account.fiscal.position.template,name:l10n_lu.account_fiscal_position_template_LU_IC
msgid "Intra-Community Taxable Person"
diff --git a/addons/l10n_lu/i18n_extra/fr.po b/addons/l10n_lu/i18n_extra/fr.po
index 8e7092238e3..c2b2eccc868 100644
--- a/addons/l10n_lu/i18n_extra/fr.po
+++ b/addons/l10n_lu/i18n_extra/fr.po
@@ -1967,6 +1967,11 @@ msgstr "Virements internes : solde créditeur"
msgid "Internal transfers : debit balance"
msgstr "Virements internes : solde débiteur"
+#. module: l10n_lu
+#: model:account.fiscal.position.template,name:l10n_lu.account_fiscal_position_template_private_LU_IC
+msgid "EU private"
+msgstr "EU privé"
+
#. module: l10n_lu
#: model:account.fiscal.position.template,name:l10n_lu.account_fiscal_position_template_LU_IC
msgid "Intra-Community Taxable Person"
diff --git a/addons/l10n_lu/i18n_extra/l10n_lu_multilang.pot b/addons/l10n_lu/i18n_extra/l10n_lu_multilang.pot
index 5c31551a650..f54c60d360d 100644
--- a/addons/l10n_lu/i18n_extra/l10n_lu_multilang.pot
+++ b/addons/l10n_lu/i18n_extra/l10n_lu_multilang.pot
@@ -1934,6 +1934,11 @@ msgstr ""
msgid "Internal transfers : debit balance"
msgstr ""
+#. module: l10n_lu
+#: model:account.fiscal.position.template,name:l10n_lu.account_fiscal_position_template_private_LU_IC
+msgid "EU private"
+msgstr ""
+
#. module: l10n_lu
#: model:account.fiscal.position.template,name:l10n_lu.account_fiscal_position_template_LU_IC
msgid "Intra-Community Taxable Person"
diff --git a/addons/l10n_nl/data/account_fiscal_position_template.xml b/addons/l10n_nl/data/account_fiscal_position_template.xml
index a6519cac9d7..4f1b01f772b 100644
--- a/addons/l10n_nl/data/account_fiscal_position_template.xml
+++ b/addons/l10n_nl/data/account_fiscal_position_template.xml
@@ -4,20 +4,37 @@
+ 1
Binnenland
+
+
+
BTW verlegd
+
+ 2
+ EU landen privaat
+
+
+
+
+ 3
EU landen
+
+
+
+ 4
Niet-EU landen
+
diff --git a/addons/l10n_pl/data/account_fiscal_position_data.xml b/addons/l10n_pl/data/account_fiscal_position_data.xml
index 2662c9f4ecd..b57712a3954 100644
--- a/addons/l10n_pl/data/account_fiscal_position_data.xml
+++ b/addons/l10n_pl/data/account_fiscal_position_data.xml
@@ -5,18 +5,36 @@
+ 1
Kraj
+
+
+
-
+
+
+ 2
+ Wspólnota Prywatny
+
+
+
+
+
+ 3
Wspólnota
+
+
+
+ 4
Import/Eksport
+
diff --git a/addons/l10n_pt/data/account_fiscal_position_template_data.xml b/addons/l10n_pt/data/account_fiscal_position_template_data.xml
index 361087d7526..c455412f507 100644
--- a/addons/l10n_pt/data/account_fiscal_position_template_data.xml
+++ b/addons/l10n_pt/data/account_fiscal_position_template_data.xml
@@ -5,18 +5,36 @@
+ 1
Portugal
+
+
+
+
+
+
+ 2
+ Europa Privado
+
+
+
+ 3
Europa
+
+
+
+ 4
Extra-comunitário
+
diff --git a/addons/l10n_si/data/account.fiscal.position.template.csv b/addons/l10n_si/data/account.fiscal.position.template.csv
index 6f4d8896698..ce11cecc5ee 100644
--- a/addons/l10n_si/data/account.fiscal.position.template.csv
+++ b/addons/l10n_si/data/account.fiscal.position.template.csv
@@ -1,5 +1,5 @@
-"id","chart_template_id/id","name"
-"gd_fp_do","gd_chart","Domači partner"
-"gd_fp_eu","gd_chart","Partner EU"
-"gd_fp_ne","gd_chart","Partner izven EU / EU brez DŠ"
-
+"id","chart_template_id/id","name","sequence","vat_required","auto_apply","country_id:id","country_group_id:id"
+"gd_fp_do","gd_chart","Domači partner",1,1,1,base.si,
+"gd_fp_do1","gd_chart","Zasebno EU",2,0,1,,base.europe
+"gd_fp_eu","gd_chart","Partner EU",3,1,1,,base.europe
+"gd_fp_ne","gd_chart","Partner izven EU / EU brez DŠ",4,0,1,,