diff --git a/addons/l10n_ae/data/l10n_ae_chart_data.xml b/addons/l10n_ae/data/l10n_ae_chart_data.xml
index 337ef71fea7..a9fed9e43b7 100644
--- a/addons/l10n_ae/data/l10n_ae_chart_data.xml
+++ b/addons/l10n_ae/data/l10n_ae_chart_data.xml
@@ -10,5 +10,6 @@
          <field name="transfer_account_code_prefix">100</field>
          <field name="currency_id" ref="base.AED" />
          <field name="complete_tax_set" eval="True"/>
+         <field name="country_id" ref="base.ae"/>
      </record>
 </odoo>
diff --git a/addons/l10n_ar/data/account_chart_template_data.xml b/addons/l10n_ar/data/account_chart_template_data.xml
index 05c3fb4e1fa..b1d3e7d4927 100644
--- a/addons/l10n_ar/data/account_chart_template_data.xml
+++ b/addons/l10n_ar/data/account_chart_template_data.xml
@@ -1,13 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <odoo>
 
-    <record model="account.chart.template" id="l10nar_base_chart_template">
+    <record id="l10nar_base_chart_template" model="account.chart.template">
         <field name="name">Plan Contable Genérico Argentina Monotributista / Base</field>
         <field name="currency_id" ref="base.ARS"/>
         <field name="bank_account_code_prefix">1.1.1.02.</field>
         <field name="cash_account_code_prefix">1.1.1.01.</field>
         <field name="code_digits">12</field>
         <field name="transfer_account_code_prefix">6.0.00.00.</field>
+        <field name="country_id" ref="base.ar"/>
     </record>
 
     <record id="l10nar_ex_chart_template" model="account.chart.template">
@@ -18,6 +19,7 @@
         <field name="cash_account_code_prefix">1.1.1.01.</field>
         <field name="code_digits">12</field>
         <field name="transfer_account_code_prefix">6.0.00.00.</field>
+        <field name="country_id" ref="base.ar"/>
     </record>
 
     <record id="l10nar_ri_chart_template" model="account.chart.template">
@@ -28,6 +30,7 @@
         <field name="cash_account_code_prefix">1.1.1.01.</field>
         <field name="code_digits">12</field>
         <field name="transfer_account_code_prefix">6.0.00.00.</field>
+        <field name="country_id" ref="base.ar"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_at/data/account_account_template.xml b/addons/l10n_at/data/account_account_template.xml
index 5f4f430d1f1..70ee1d52e06 100644
--- a/addons/l10n_at/data/account_account_template.xml
+++ b/addons/l10n_at/data/account_account_template.xml
@@ -15,6 +15,7 @@
             <field name="cash_account_code_prefix">270</field>
             <field name="transfer_account_code_prefix">288</field>
             <field name="currency_id" ref="base.EUR"/>
+            <field name="country_id" ref="base.at"/>
         </record>
         <record id="chart_at_template_transfer_288" model="account.account.template">
             <field name="chart_template_id" ref="l10n_at_chart_template"/>
@@ -1033,7 +1034,7 @@
           <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
           <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_PCVIII1')])]" />
         </record>
-        
+
         <record id="chart_at_template_3530" model="account.account.template">
           <field name="name">Verrechnungskonto Finanzamt</field>
           <field name="code">3530</field>
@@ -1043,7 +1044,7 @@
           <field name="tag_ids" eval="[(6, 0, [ref('l10n_at.account_tag_l10n_at_PCVIII1')])]" />
           <field eval="[(6,0,[])]" name="tax_ids"/>
         </record>
-        
+
         <record id="chart_at_template_3540" model="account.account.template">
           <field name="name">Verrechnung Lohnsteuer</field>
           <field name="code">3540</field>
diff --git a/addons/l10n_au/data/l10n_au_chart_data.xml b/addons/l10n_au/data/l10n_au_chart_data.xml
index 30b549e60e5..ece7647222f 100644
--- a/addons/l10n_au/data/l10n_au_chart_data.xml
+++ b/addons/l10n_au/data/l10n_au_chart_data.xml
@@ -7,5 +7,6 @@
         <field name="transfer_account_code_prefix">11170</field>
         <field name="code_digits">5</field>
         <field name="currency_id" ref="base.AUD"/>
+        <field name="country_id" ref="base.au"/>
     </record>
 </odoo>
diff --git a/addons/l10n_be/data/account_chart_template_data.xml b/addons/l10n_be/data/account_chart_template_data.xml
index 24b61bb7c3a..27729534652 100644
--- a/addons/l10n_be/data/account_chart_template_data.xml
+++ b/addons/l10n_be/data/account_chart_template_data.xml
@@ -8,5 +8,6 @@
             <field name="transfer_account_code_prefix">580</field>
             <field name="currency_id" ref="base.EUR"/>
             <field name="spoken_languages" eval="'nl_BE;nl_NL;fr_FR;fr_BE;de_DE'"/>
+            <field name="country_id" ref="base.be"/>
         </record>
 </odoo>
diff --git a/addons/l10n_bo/data/l10n_bo_chart_data.xml b/addons/l10n_bo/data/l10n_bo_chart_data.xml
index 2cd7ead995a..d45cbd912ce 100644
--- a/addons/l10n_bo/data/l10n_bo_chart_data.xml
+++ b/addons/l10n_bo/data/l10n_bo_chart_data.xml
@@ -9,5 +9,6 @@
         <field name="cash_account_code_prefix">111</field>
         <field name="transfer_account_code_prefix">117</field>
         <field name="currency_id" ref="base.BOB"/>
+        <field name="country_id" ref="base.bo"/>
     </record>
 </odoo>
diff --git a/addons/l10n_br/data/l10n_br_chart_data.xml b/addons/l10n_br/data/l10n_br_chart_data.xml
index fda672e894c..39cc8a1e2e8 100644
--- a/addons/l10n_br/data/l10n_br_chart_data.xml
+++ b/addons/l10n_br/data/l10n_br_chart_data.xml
@@ -9,5 +9,6 @@
         <field name="cash_account_code_prefix">1.01.01.01.00</field>
         <field name="transfer_account_code_prefix">1.01.01.12.00</field>
 		<field name="currency_id" ref="base.BRL"/>
+        <field name="country_id" ref="base.br"/>
 	</record>
 </odoo>
diff --git a/addons/l10n_ca/data/account_chart_template_data.xml b/addons/l10n_ca/data/account_chart_template_data.xml
index 24ecb640074..6b07def85c9 100644
--- a/addons/l10n_ca/data/account_chart_template_data.xml
+++ b/addons/l10n_ca/data/account_chart_template_data.xml
@@ -10,5 +10,6 @@
         <field name="currency_id" ref="base.CAD"/>
         <field name="use_anglo_saxon" eval="True"/>
         <field name="spoken_languages" eval="'fr_FR;fr_CA'"/>
+        <field name="country_id" ref="base.ca"/>
     </record>
 </odoo>
diff --git a/addons/l10n_ch/data/l10n_ch_chart_data.xml b/addons/l10n_ch/data/l10n_ch_chart_data.xml
index 10c50705237..a151f4dee1b 100644
--- a/addons/l10n_ch/data/l10n_ch_chart_data.xml
+++ b/addons/l10n_ch/data/l10n_ch_chart_data.xml
@@ -12,6 +12,7 @@
             <field name="transfer_account_code_prefix">1090</field>
             <field name="currency_id" ref="base.CHF"/>
             <field name="spoken_languages" eval="'it_IT;de_DE;de_CH'"/>
+            <field name="country_id" ref="base.ch"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/l10n_cl/data/l10n_cl_chart_data.xml b/addons/l10n_cl/data/l10n_cl_chart_data.xml
index b602685bdb1..9910f1eb7b4 100644
--- a/addons/l10n_cl/data/l10n_cl_chart_data.xml
+++ b/addons/l10n_cl/data/l10n_cl_chart_data.xml
@@ -125,6 +125,7 @@
         <field name="code_digits">6</field>
         <field name="currency_id" ref="base.CLP"/>
         <field name="use_anglo_saxon" eval="True" />
+        <field name="country_id" ref="base.cl"/>
     </record>
 
     <record id="account_11700" model="account.account.template">
diff --git a/addons/l10n_cn/data/l10n_cn_chart_data.xml b/addons/l10n_cn/data/l10n_cn_chart_data.xml
index 5c68280675c..80f804255bd 100644
--- a/addons/l10n_cn/data/l10n_cn_chart_data.xml
+++ b/addons/l10n_cn/data/l10n_cn_chart_data.xml
@@ -4,7 +4,7 @@
 <!--
 
      Copyright (C) 2012-2012 南京盈通 ccdos@intoerp.com <small business chart>
-     
+
 会计科目表模板( 小企业会计准则2011)
 
 科目表依据：
@@ -21,6 +21,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
             <field name="bank_account_code_prefix">1002</field>
             <field name="transfer_account_code_prefix">1012</field>
             <field name="spoken_languages" eval="'en_US'"/>
+            <field name="country_id" ref="base.cn"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/l10n_co/data/l10n_co_chart_data.xml b/addons/l10n_co/data/l10n_co_chart_data.xml
index 309c3785205..01653a200a1 100644
--- a/addons/l10n_co/data/l10n_co_chart_data.xml
+++ b/addons/l10n_co/data/l10n_co_chart_data.xml
@@ -8,6 +8,7 @@
         <field name="bank_account_code_prefix">1110</field>
         <field name="cash_account_code_prefix">1105</field>
         <field name="transfer_account_code_prefix">1115</field>
+        <field name="country_id" ref="base.co"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_cr/data/l10n_cr_chart_data.xml b/addons/l10n_cr/data/l10n_cr_chart_data.xml
index 8b88a2eda6d..fbd4517ccc4 100644
--- a/addons/l10n_cr/data/l10n_cr_chart_data.xml
+++ b/addons/l10n_cr/data/l10n_cr_chart_data.xml
@@ -8,5 +8,6 @@
             <field name="cash_account_code_prefix">0-1111</field>
             <field name="transfer_account_code_prefix">0-1114</field>
             <field name="currency_id" ref="base.CRC"/>
+            <field name="country_id" ref="base.cr"/>
         </record>
 </odoo>
diff --git a/addons/l10n_cz/data/l10n_cz_coa_data.xml b/addons/l10n_cz/data/l10n_cz_coa_data.xml
index 2173680a0e8..620fb50f490 100644
--- a/addons/l10n_cz/data/l10n_cz_coa_data.xml
+++ b/addons/l10n_cz/data/l10n_cz_coa_data.xml
@@ -9,6 +9,7 @@
             <field name="cash_account_code_prefix">211</field>
             <field name="transfer_account_code_prefix">261</field>
             <field name="currency_id" ref="base.CZK"/>
+            <field name="country_id" ref="base.cz"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml b/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml
index 4c974f40554..7b0edc255b4 100644
--- a/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml
+++ b/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml
@@ -7,6 +7,7 @@
             <field name="bank_account_code_prefix">120</field>
             <field name="transfer_account_code_prefix">1360</field>
             <field name="currency_id" ref="base.EUR"/>
+            <field name="country_id" ref="base.de"/>
         </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/addons/l10n_de_skr04/data/l10n_de_skr04_chart_data.xml b/addons/l10n_de_skr04/data/l10n_de_skr04_chart_data.xml
index 2c72d58bd80..34b8f9acd0f 100644
--- a/addons/l10n_de_skr04/data/l10n_de_skr04_chart_data.xml
+++ b/addons/l10n_de_skr04/data/l10n_de_skr04_chart_data.xml
@@ -7,6 +7,7 @@
             <field name="bank_account_code_prefix">180</field>
             <field name="transfer_account_code_prefix">1460</field>
             <field name="currency_id" ref="base.EUR"/>
+            <field name="country_id" ref="base.de"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/l10n_dk/data/l10n_dk_chart_template_data.xml b/addons/l10n_dk/data/l10n_dk_chart_template_data.xml
index 9be300562f0..328ace20b1c 100644
--- a/addons/l10n_dk/data/l10n_dk_chart_template_data.xml
+++ b/addons/l10n_dk/data/l10n_dk_chart_template_data.xml
@@ -5,8 +5,9 @@
         <field name="code_digits">4</field>
         <field name="currency_id" ref="base.DKK"/>
         <field name="use_anglo_saxon" eval="True"/>
-        <field name="cash_account_code_prefix">681</field> 
+        <field name="cash_account_code_prefix">681</field>
         <field name="bank_account_code_prefix">682</field>
         <field name="transfer_account_code_prefix">683</field>
+        <field name="country_id" ref="base.dk"/>
     </record>
 </odoo>
diff --git a/addons/l10n_do/data/l10n_do_chart_data.xml b/addons/l10n_do/data/l10n_do_chart_data.xml
index 3b24155542f..9e44ea02b37 100644
--- a/addons/l10n_do/data/l10n_do_chart_data.xml
+++ b/addons/l10n_do/data/l10n_do_chart_data.xml
@@ -10,5 +10,6 @@
         <field name="bank_account_code_prefix">110102</field>
         <field name="transfer_account_code_prefix">11010100</field>
         <field name="currency_id" ref="base.DOP"/>
+        <field name="country_id" ref="base.do"/>
     </record>
 </odoo>
diff --git a/addons/l10n_dz/data/account_chart_template_data.xml b/addons/l10n_dz/data/account_chart_template_data.xml
index 34b37a5ebf6..7be75d2d134 100644
--- a/addons/l10n_dz/data/account_chart_template_data.xml
+++ b/addons/l10n_dz/data/account_chart_template_data.xml
@@ -8,6 +8,7 @@
         <field name="bank_account_code_prefix">512</field>
         <field name="cash_account_code_prefix">53</field>
         <field name="transfer_account_code_prefix">58</field>
+        <field name="country_id" ref="base.dz"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_ec/data/l10n_ec_chart_data.xml b/addons/l10n_ec/data/l10n_ec_chart_data.xml
index 8d3e59cdb09..a7585aa559a 100644
--- a/addons/l10n_ec/data/l10n_ec_chart_data.xml
+++ b/addons/l10n_ec/data/l10n_ec_chart_data.xml
@@ -7,5 +7,6 @@
       <field name="cash_account_code_prefix">10.01.01</field>
       <field name="transfer_account_code_prefix">10.01.03</field>
       <field name="code_digits" eval="6"/>
+      <field name="country_id" ref="base.ec"/>
     </record>
 </odoo>
diff --git a/addons/l10n_es/data/account_chart_template_data.xml b/addons/l10n_es/data/account_chart_template_data.xml
index 7f91ca78dcd..bdcab5b37b0 100644
--- a/addons/l10n_es/data/account_chart_template_data.xml
+++ b/addons/l10n_es/data/account_chart_template_data.xml
@@ -8,6 +8,7 @@
             <field name="cash_account_code_prefix">570</field>
             <field name="bank_account_code_prefix">572</field>
             <field name="transfer_account_code_prefix">572999</field>
+            <field name="country_id" ref="base.es"/>
         </record>
 
         <record id="account_chart_template_pymes" model="account.chart.template">
@@ -18,6 +19,7 @@
             <field name="bank_account_code_prefix">572</field>
             <field name="transfer_account_code_prefix">572999</field>
             <field name="parent_id" ref="account_chart_template_common"/>
+            <field name="country_id" ref="base.es"/>
         </record>
 
         <record id="account_chart_template_assoc" model="account.chart.template">
@@ -28,6 +30,7 @@
         <field name="bank_account_code_prefix">572</field>
         <field name="transfer_account_code_prefix">572999</field>
         <field name="parent_id" ref="account_chart_template_common"/>
+        <field name="country_id" ref="base.es"/>
     </record>
 
     <record id="account_chart_template_full" model="account.chart.template">
@@ -38,6 +41,7 @@
         <field name="bank_account_code_prefix">572</field>
         <field name="transfer_account_code_prefix">572999</field>
         <field name="parent_id" ref="account_chart_template_common"/>
+        <field name="country_id" ref="base.es"/>
     </record>
     </data>
 </odoo>
diff --git a/addons/l10n_et/data/l10n_et_chart_data.xml b/addons/l10n_et/data/l10n_et_chart_data.xml
index 127143d6d11..b7b3c3cd82b 100644
--- a/addons/l10n_et/data/l10n_et_chart_data.xml
+++ b/addons/l10n_et/data/l10n_et_chart_data.xml
@@ -9,5 +9,6 @@
         <field name="bank_account_code_prefix">211</field>
         <field name="cash_account_code_prefix">211</field>
         <field name="transfer_account_code_prefix">212</field>
+        <field name="country_id" ref="base.et"/>
     </record>
 </odoo>
diff --git a/addons/l10n_fi/data/account_chart_template_data.xml b/addons/l10n_fi/data/account_chart_template_data.xml
index c4b2ad4c0d6..fbaa4833ea9 100644
--- a/addons/l10n_fi/data/account_chart_template_data.xml
+++ b/addons/l10n_fi/data/account_chart_template_data.xml
@@ -9,5 +9,6 @@
         <field name="transfer_account_code_prefix">1950</field>
         <field name="code_digits">4</field>
         <field name="currency_id" ref="base.EUR"/>
+        <field name="country_id" ref="base.fi"/>
     </record>
 </odoo>
diff --git a/addons/l10n_fr/data/l10n_fr_chart_data.xml b/addons/l10n_fr/data/l10n_fr_chart_data.xml
index 3b8ae445e62..396a0d4153a 100644
--- a/addons/l10n_fr/data/l10n_fr_chart_data.xml
+++ b/addons/l10n_fr/data/l10n_fr_chart_data.xml
@@ -9,5 +9,6 @@
         <field name="cash_account_code_prefix">53</field>
         <field name="transfer_account_code_prefix">58</field>
         <field name="complete_tax_set" eval="True" />
+        <field name="country_id" ref="base.fr"/>
     </record>
 </odoo>
diff --git a/addons/l10n_fr/models/res_company.py b/addons/l10n_fr/models/res_company.py
index 6235d207b9a..b0afe7abad6 100644
--- a/addons/l10n_fr/models/res_company.py
+++ b/addons/l10n_fr/models/res_company.py
@@ -15,9 +15,6 @@ class ResCompany(models.Model):
     def _get_unalterable_country(self):
         return ['FR', 'MF', 'MQ', 'NC', 'PF', 'RE', 'GF', 'GP', 'TF'] # These codes correspond to France and DOM-TOM.
 
-    def _is_vat_french(self):
-        return self.vat and self.vat.startswith('FR') and len(self.vat) == 13
-
     def _is_accounting_unalterable(self):
         if not self.vat and not self.country_id:
             return False
diff --git a/addons/l10n_generic_coa/data/l10n_generic_coa.xml b/addons/l10n_generic_coa/data/l10n_generic_coa.xml
index b729c78cd9d..5dcf99fcb69 100644
--- a/addons/l10n_generic_coa/data/l10n_generic_coa.xml
+++ b/addons/l10n_generic_coa/data/l10n_generic_coa.xml
@@ -8,5 +8,6 @@
         <field name="cash_account_code_prefix">1015</field>
         <field name="transfer_account_code_prefix">1017</field>
         <field name="currency_id" ref="base.USD"/>
+        <field name="country_id" ref="base.us"/>
     </record>
 </odoo>
diff --git a/addons/l10n_gr/data/l10n_gr_chart_data.xml b/addons/l10n_gr/data/l10n_gr_chart_data.xml
index 6dd19e77f7e..331d70c9916 100644
--- a/addons/l10n_gr/data/l10n_gr_chart_data.xml
+++ b/addons/l10n_gr/data/l10n_gr_chart_data.xml
@@ -10,5 +10,6 @@
             <field name="transfer_account_code_prefix">38.07</field>
             <field name="code_digits">6</field>
             <field name="currency_id" ref="base.EUR"/>
+            <field name="country_id" ref="base.gr"/>
         </record>
 </odoo>
diff --git a/addons/l10n_gt/data/l10n_gt_chart_data.xml b/addons/l10n_gt/data/l10n_gt_chart_data.xml
index ec63c8d780f..179294839c0 100644
--- a/addons/l10n_gt/data/l10n_gt_chart_data.xml
+++ b/addons/l10n_gt/data/l10n_gt_chart_data.xml
@@ -8,6 +8,7 @@
             <field name="transfer_account_code_prefix">1.0.03.01</field>
             <field name="code_digits">9</field>
             <field name="currency_id" ref="base.GTQ"/>
+            <field name="country_id" ref="base.gt"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/l10n_hk/data/account_chart_template_data.xml b/addons/l10n_hk/data/account_chart_template_data.xml
index 9ab9856b36b..c6cfb9ef638 100644
--- a/addons/l10n_hk/data/account_chart_template_data.xml
+++ b/addons/l10n_hk/data/account_chart_template_data.xml
@@ -12,5 +12,6 @@
         <field name="transfer_account_code_prefix">111220</field>
         <field name="code_digits">6</field>
         <field name="currency_id" ref="base.HKD" />
+        <field name="country_id" ref="base.hk"/>
     </record>
 </odoo>
diff --git a/addons/l10n_hn/data/l10n_hn_chart_data.xml b/addons/l10n_hn/data/l10n_hn_chart_data.xml
index 568efd39868..f26245c3cfc 100644
--- a/addons/l10n_hn/data/l10n_hn_chart_data.xml
+++ b/addons/l10n_hn/data/l10n_hn_chart_data.xml
@@ -8,6 +8,7 @@
             <field name="transfer_account_code_prefix">1.1.01.00</field>
             <field name="code_digits">9</field>
             <field name="currency_id" ref="base.HNL"/>
+            <field name="country_id" ref="base.hn"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/l10n_hr/data/l10n_hr_chart_data.xml b/addons/l10n_hr/data/l10n_hr_chart_data.xml
index c0563756590..fe497fabd41 100644
--- a/addons/l10n_hr/data/l10n_hr_chart_data.xml
+++ b/addons/l10n_hr/data/l10n_hr_chart_data.xml
@@ -12,6 +12,7 @@
             <field name="transfer_account_code_prefix">1009</field>
             <field name="currency_id" ref="base.HRK"/>
             <field name="code_digits">0</field>
+            <field name="country_id" ref="base.hr"/>
         </record>
 
     </data>
diff --git a/addons/l10n_hu/data/l10n_hu_chart_data.xml b/addons/l10n_hu/data/l10n_hu_chart_data.xml
index 555d05c9bdf..ab0c7ce9894 100644
--- a/addons/l10n_hu/data/l10n_hu_chart_data.xml
+++ b/addons/l10n_hu/data/l10n_hu_chart_data.xml
@@ -9,5 +9,6 @@
         <field name="bank_account_code_prefix">384</field>
         <field name="transfer_account_code_prefix">389</field>
         <field name="currency_id" ref="base.HUF"/>
+        <field name="country_id" ref="base.hu"/>
     </record>
 </odoo>
diff --git a/addons/l10n_id/data/account_chart_template_data.xml b/addons/l10n_id/data/account_chart_template_data.xml
index a9f34b79394..0f7516af429 100644
--- a/addons/l10n_id/data/account_chart_template_data.xml
+++ b/addons/l10n_id/data/account_chart_template_data.xml
@@ -8,5 +8,6 @@
         <field name="code_digits">8</field>
         <field name="currency_id" ref="base.IDR"/>
         <field name="spoken_languages" eval="'id_ID'"/>
+        <field name="country_id" ref="base.id"/>
     </record>
 </odoo>
diff --git a/addons/l10n_ie/data/account_chart_template.xml b/addons/l10n_ie/data/account_chart_template.xml
index 11c5605b52a..449bea8b9ea 100644
--- a/addons/l10n_ie/data/account_chart_template.xml
+++ b/addons/l10n_ie/data/account_chart_template.xml
@@ -10,6 +10,7 @@
         <field name="transfer_account_code_prefix">1220</field>
         <field name="code_digits">6</field>
         <field name="currency_id" ref="base.EUR"/>
+        <field name="country_id" ref="base.ie"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_il/data/account_chart_template_data.xml b/addons/l10n_il/data/account_chart_template_data.xml
index 0431bd672e9..b6aab2e3c0c 100644
--- a/addons/l10n_il/data/account_chart_template_data.xml
+++ b/addons/l10n_il/data/account_chart_template_data.xml
@@ -8,5 +8,6 @@
         <field name="code_digits">6</field>
         <field name="currency_id" ref="base.ILS"/>
         <field name="spoken_languages" eval="'he_IL'"/>
+        <field name="country_id" ref="base.il"/>
     </record>
 </odoo>
diff --git a/addons/l10n_in/data/l10n_in_chart_data.xml b/addons/l10n_in/data/l10n_in_chart_data.xml
index 68ba18d6b85..bb2c02b3b9f 100644
--- a/addons/l10n_in/data/l10n_in_chart_data.xml
+++ b/addons/l10n_in/data/l10n_in_chart_data.xml
@@ -9,6 +9,7 @@
             <field name="transfer_account_code_prefix">1008</field>
             <field name="code_digits">6</field>
             <field name="currency_id" ref="base.INR"/>
+            <field name="country_id" ref="base.in"/>
         </record>
 
         <record id="sgst_tag_account" model="account.account.tag">
diff --git a/addons/l10n_it/data/l10n_it_chart_data.xml b/addons/l10n_it/data/l10n_it_chart_data.xml
index 04286b97373..d08ef5a0eb0 100644
--- a/addons/l10n_it/data/l10n_it_chart_data.xml
+++ b/addons/l10n_it/data/l10n_it_chart_data.xml
@@ -7,6 +7,7 @@
             <field name="bank_account_code_prefix">182</field>
             <field name="transfer_account_code_prefix">183</field>
             <field name="currency_id" ref="base.EUR"/>
+            <field name="country_id" ref="base.it"/>
         </record>
 
 </odoo>
diff --git a/addons/l10n_jp/data/l10n_jp_chart_data.xml b/addons/l10n_jp/data/l10n_jp_chart_data.xml
index efe86d1acd6..66bd04b1884 100644
--- a/addons/l10n_jp/data/l10n_jp_chart_data.xml
+++ b/addons/l10n_jp/data/l10n_jp_chart_data.xml
@@ -8,5 +8,6 @@
         <field name="cash_account_code_prefix">A11105</field>
         <field name="transfer_account_code_prefix">A11109</field>
         <field name="currency_id" ref="base.JPY"/>
+        <field name="country_id" ref="base.jp"/>
     </record>
 </odoo>
diff --git a/addons/l10n_lt/data/account_chart_template_data.xml b/addons/l10n_lt/data/account_chart_template_data.xml
index 734b0829faf..c3327e4c1c9 100644
--- a/addons/l10n_lt/data/account_chart_template_data.xml
+++ b/addons/l10n_lt/data/account_chart_template_data.xml
@@ -14,5 +14,6 @@
         <field name="bank_account_code_prefix">271</field>
         <field name="cash_account_code_prefix">272</field>
         <field name="transfer_account_code_prefix">273</field>
+        <field name="country_id" ref="base.lt"/>
     </record>
 </odoo>
diff --git a/addons/l10n_lu/data/l10n_lu_chart_data.xml b/addons/l10n_lu/data/l10n_lu_chart_data.xml
index 036cc3145e6..b8ce6fe6a74 100644
--- a/addons/l10n_lu/data/l10n_lu_chart_data.xml
+++ b/addons/l10n_lu/data/l10n_lu_chart_data.xml
@@ -10,5 +10,6 @@
             <field name="code_digits">6</field>
             <field name="currency_id" ref="base.EUR"/>
             <field name="spoken_languages" eval="'fr_FR;fr_BE;de_DE'"/>
+            <field name="country_id" ref="base.lu"/>
         </record>
 </odoo>
diff --git a/addons/l10n_ma/data/l10n_ma_chart_data.xml b/addons/l10n_ma/data/l10n_ma_chart_data.xml
index 5943976bab2..7df08e19d82 100644
--- a/addons/l10n_ma/data/l10n_ma_chart_data.xml
+++ b/addons/l10n_ma/data/l10n_ma_chart_data.xml
@@ -15,6 +15,7 @@
         <field name="bank_account_code_prefix">5141</field>
         <field name="cash_account_code_prefix">5161</field>
         <field name="transfer_account_code_prefix">5115</field>
+        <field name="country_id" ref="base.ma"/>
     </record>
 
   <record id="pcg_1111" model="account.account.template">
diff --git a/addons/l10n_mn/data/account_chart_template_data.xml b/addons/l10n_mn/data/account_chart_template_data.xml
index 29400dfaaaf..1d64676c5ed 100644
--- a/addons/l10n_mn/data/account_chart_template_data.xml
+++ b/addons/l10n_mn/data/account_chart_template_data.xml
@@ -11,6 +11,7 @@
         <field name="code_digits">8</field>
         <field name="currency_id" ref="base.MNT"/>
         <field name="use_anglo_saxon" eval="True"/>
+        <field name="country_id" ref="base.mn"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_mx/data/l10n_mx_chart_data.xml b/addons/l10n_mx/data/l10n_mx_chart_data.xml
index 5d74a5a73be..dde4a73bf64 100644
--- a/addons/l10n_mx/data/l10n_mx_chart_data.xml
+++ b/addons/l10n_mx/data/l10n_mx_chart_data.xml
@@ -12,6 +12,7 @@
         <field name="code_digits">3</field>
         <field name="currency_id" ref="base.MXN"/>
         <field name="use_anglo_saxon" eval="True"/>
+        <field name="country_id" ref="base.mx"/>
     </record>
     </data>
 </odoo>
diff --git a/addons/l10n_nl/data/account_chart_template.xml b/addons/l10n_nl/data/account_chart_template.xml
index de6b60d5a7d..9f9b2e9d784 100644
--- a/addons/l10n_nl/data/account_chart_template.xml
+++ b/addons/l10n_nl/data/account_chart_template.xml
@@ -10,6 +10,7 @@
             <field name="transfer_account_code_prefix">1060</field>
             <field name="code_digits">6</field>
             <field name="currency_id" ref="base.EUR"/>
+            <field name="country_id" ref="base.nl"/>
         </record>
 
     </data>
diff --git a/addons/l10n_no/data/l10n_no_chart_data.xml b/addons/l10n_no/data/l10n_no_chart_data.xml
index f4194f08793..4167bf5091c 100644
--- a/addons/l10n_no/data/l10n_no_chart_data.xml
+++ b/addons/l10n_no/data/l10n_no_chart_data.xml
@@ -14,6 +14,7 @@
         <field name="transfer_account_code_prefix">1940</field>
         <field name="code_digits">4</field>
         <field name="currency_id" ref="base.NOK"/>
+        <field name="country_id" ref="base.no"/>
     </record>
 
     </data>
diff --git a/addons/l10n_nz/data/l10n_nz_chart_data.xml b/addons/l10n_nz/data/l10n_nz_chart_data.xml
index 23892f54b9f..d2b4aa697c8 100644
--- a/addons/l10n_nz/data/l10n_nz_chart_data.xml
+++ b/addons/l10n_nz/data/l10n_nz_chart_data.xml
@@ -10,6 +10,7 @@
         <field name="transfer_account_code_prefix">11170</field>
         <field name="code_digits">5</field>
         <field name="currency_id" ref="base.NZD"/>
+        <field name="country_id" ref="base.nz"/>
     </record>
 
 </data>
diff --git a/addons/l10n_pa/data/l10n_pa_chart_data.xml b/addons/l10n_pa/data/l10n_pa_chart_data.xml
index 04c8361fe23..534fb7984d5 100644
--- a/addons/l10n_pa/data/l10n_pa_chart_data.xml
+++ b/addons/l10n_pa/data/l10n_pa_chart_data.xml
@@ -8,6 +8,7 @@
         <field name="transfer_account_code_prefix">112.</field>
         <field name="code_digits">7</field>
         <field name="currency_id" ref="base.PAB"/>
+        <field name="country_id" ref="base.pa"/>
     </record>
     <!-- Account Templates -->
 
diff --git a/addons/l10n_pe/data/l10n_pe_chart_data.xml b/addons/l10n_pe/data/l10n_pe_chart_data.xml
index 837ef5f00ad..48fb433ffbf 100644
--- a/addons/l10n_pe/data/l10n_pe_chart_data.xml
+++ b/addons/l10n_pe/data/l10n_pe_chart_data.xml
@@ -7,5 +7,6 @@
         <field name="transfer_account_code_prefix">1051</field>
         <field name="code_digits">7</field>
         <field name="currency_id" ref="base.PEN"/>
+        <field name="country_id" ref="base.pe"/>
     </record>
 </odoo>
diff --git a/addons/l10n_pl/data/l10n_pl_chart_data.xml b/addons/l10n_pl/data/l10n_pl_chart_data.xml
index f470ee4868b..3cb19e41036 100644
--- a/addons/l10n_pl/data/l10n_pl_chart_data.xml
+++ b/addons/l10n_pl/data/l10n_pl_chart_data.xml
@@ -20,6 +20,7 @@
             <field name="bank_account_code_prefix">11-000-000</field>
             <field name="cash_account_code_prefix">12-000-000</field>
             <field name="transfer_account_code_prefix">11-090-000</field>
+            <field name="country_id" ref="base.pl"/>
         </record>
 
 </data>
diff --git a/addons/l10n_pt/data/l10n_pt_chart_data.xml b/addons/l10n_pt/data/l10n_pt_chart_data.xml
index 9ca4ae3ad4a..d956b40867a 100644
--- a/addons/l10n_pt/data/l10n_pt_chart_data.xml
+++ b/addons/l10n_pt/data/l10n_pt_chart_data.xml
@@ -8,6 +8,7 @@
         <field name="bank_account_code_prefix">12</field>
         <field name="transfer_account_code_prefix">15</field>
         <field name="currency_id" ref="base.EUR"/>
+        <field name="country_id" ref="base.pt"/>
     </record>
 
     <record id="chart_13" model="account.account.template">
@@ -208,7 +209,7 @@
       <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
       <field name="chart_template_id" ref="pt_chart_template"/>
     </record>
-    
+
     <record id="chart_2221" model="account.account.template">
       <field name="code">2221</field>
       <field name="name">Fornecedores gerais</field>
@@ -334,7 +335,7 @@
       <field name="user_type_id" ref="account.data_account_type_current_liabilities" />
       <field name="chart_template_id" ref="pt_chart_template"/>
     </record>
-    
+
     <record id="chart_2433" model="account.account.template">
       <field name="code">2433</field>
       <field name="name">Iva liquidado</field>
@@ -348,7 +349,7 @@
       <field name="user_type_id" ref="account.data_account_type_current_assets" />
       <field name="chart_template_id" ref="pt_chart_template"/>
     </record>
-    
+
     <record id="chart_2435" model="account.account.template">
       <field name="code">2435</field>
       <field name="name">Iva apuramento</field>
@@ -691,7 +692,7 @@
       <field name="user_type_id" ref="account.data_account_type_expenses" />
       <field name="chart_template_id" ref="pt_chart_template"/>
     </record>
-    
+
     <record id="chart_313" model="account.account.template">
       <field name="code">313</field>
       <field name="name">Activos biológicos</field>
@@ -1111,7 +1112,7 @@
       <field name="user_type_id" ref="account.data_account_type_current_assets" />
       <field name="chart_template_id" ref="pt_chart_template"/>
     </record>
-    
+
     <record id="chart_444" model="account.account.template">
       <field name="code">444</field>
       <field name="name">Propriedade industrial</field>
diff --git a/addons/l10n_ro/data/l10n_ro_chart_data.xml b/addons/l10n_ro/data/l10n_ro_chart_data.xml
index e07d7167dd4..21c3aa4e397 100644
--- a/addons/l10n_ro/data/l10n_ro_chart_data.xml
+++ b/addons/l10n_ro/data/l10n_ro_chart_data.xml
@@ -10,5 +10,6 @@
         <field name="transfer_account_code_prefix">581</field>
         <field name="code_digits">6</field>
         <field name="currency_id" ref="base.RON"/>
+        <field name="country_id" ref="base.ro"/>
     </record>
 </odoo>
diff --git a/addons/l10n_sa/data/account_chart_template_data.xml b/addons/l10n_sa/data/account_chart_template_data.xml
index ea76788f923..a2d1b067af3 100644
--- a/addons/l10n_sa/data/account_chart_template_data.xml
+++ b/addons/l10n_sa/data/account_chart_template_data.xml
@@ -8,5 +8,6 @@
             <field name="code_digits">6</field>
             <field name="currency_id" ref="base.SAR"/>
             <field name="spoken_languages" eval="'en_US;ar_EG;ar_SY'"/>
+            <field name="country_id" ref="base.sa"/>
         </record>
 </odoo>
diff --git a/addons/l10n_se/data/account_chart_template_before_accounts.xml b/addons/l10n_se/data/account_chart_template_before_accounts.xml
index 198232979ca..50f07e59e15 100644
--- a/addons/l10n_se/data/account_chart_template_before_accounts.xml
+++ b/addons/l10n_se/data/account_chart_template_before_accounts.xml
@@ -9,6 +9,7 @@
             <field name="transfer_account_code_prefix">194</field>
             <field name="code_digits">4</field>
             <field name="complete_tax_set" eval="True"/>
+            <field name="country_id" ref="base.se"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/l10n_sg/data/l10n_sg_chart_data.xml b/addons/l10n_sg/data/l10n_sg_chart_data.xml
index d5bad956b0a..4af1ff669be 100644
--- a/addons/l10n_sg/data/l10n_sg_chart_data.xml
+++ b/addons/l10n_sg/data/l10n_sg_chart_data.xml
@@ -9,6 +9,7 @@
             <field name="transfer_account_code_prefix">101100</field>
             <field name="code_digits">6</field>
             <field name="currency_id" ref="base.SGD" />
+            <field name="country_id" ref="base.sg"/>
         </record>
 
         <record model="account.account.template" id="account_account_696">
diff --git a/addons/l10n_si/data/l10n_si_chart_data.xml b/addons/l10n_si/data/l10n_si_chart_data.xml
index d4392018d76..351e5386e96 100644
--- a/addons/l10n_si/data/l10n_si_chart_data.xml
+++ b/addons/l10n_si/data/l10n_si_chart_data.xml
@@ -9,5 +9,6 @@
         <field name="transfer_account_code_prefix">109</field>
         <field name="code_digits">6</field>
         <field name="currency_id" ref="base.EUR"/>
+        <field name="country_id" ref="base.si"/>
     </record>
 </odoo>
diff --git a/addons/l10n_sk/data/l10n_sk_coa_data.xml b/addons/l10n_sk/data/l10n_sk_coa_data.xml
index dc36a5dfd12..8c745e57782 100644
--- a/addons/l10n_sk/data/l10n_sk_coa_data.xml
+++ b/addons/l10n_sk/data/l10n_sk_coa_data.xml
@@ -9,6 +9,7 @@
             <field name="cash_account_code_prefix">211</field>
             <field name="transfer_account_code_prefix">261</field>
             <field name="currency_id" ref="base.EUR"/>
+            <field name="country_id" ref="base.sk"/>
         </record>
     </data>
 </odoo>
diff --git a/addons/l10n_th/data/l10n_th_chart_data.xml b/addons/l10n_th/data/l10n_th_chart_data.xml
index 36a6c23c86b..0828b60e516 100644
--- a/addons/l10n_th/data/l10n_th_chart_data.xml
+++ b/addons/l10n_th/data/l10n_th_chart_data.xml
@@ -16,5 +16,6 @@
     <field name="bank_account_code_prefix">1110</field>
     <field name="transfer_account_code_prefix">16</field>
     <field name="currency_id" ref="base.THB"/>
+    <field name="country_id" ref="base.th"/>
 </record>
 </odoo>
diff --git a/addons/l10n_tr/data/l10n_tr_chart_data.xml b/addons/l10n_tr/data/l10n_tr_chart_data.xml
index b304d7ba0dd..6c624d29d33 100644
--- a/addons/l10n_tr/data/l10n_tr_chart_data.xml
+++ b/addons/l10n_tr/data/l10n_tr_chart_data.xml
@@ -8,6 +8,7 @@
         <field name="transfer_account_code_prefix">103</field>
         <field name="code_digits">6</field>
         <field name="currency_id" ref="base.TRY"/>
+        <field name="country_id" ref="base.tr"/>
     </record>
 
 </odoo>
diff --git a/addons/l10n_ua/data/account_chart_template.xml b/addons/l10n_ua/data/account_chart_template.xml
index f84159b9d01..e09895dbd9e 100644
--- a/addons/l10n_ua/data/account_chart_template.xml
+++ b/addons/l10n_ua/data/account_chart_template.xml
@@ -8,6 +8,7 @@
         <field name="transfer_account_code_prefix">333</field>
         <field name="code_digits">6</field>
         <field name="currency_id" ref="base.UAH"/>
+        <field name="country_id" ref="base.ua"/>
     </record>
 
     <record id="l10n_ua_ias_chart_template" model="account.chart.template">
@@ -17,5 +18,6 @@
         <field name="transfer_account_code_prefix">1119</field>
         <field name="code_digits">6</field>
         <field name="currency_id" ref="base.UAH"/>
+        <field name="country_id" ref="base.ua"/>
     </record>
 </odoo>
diff --git a/addons/l10n_uk/data/l10n_uk_chart_data.xml b/addons/l10n_uk/data/l10n_uk_chart_data.xml
index ed3d46d5c9a..010ee5f3793 100644
--- a/addons/l10n_uk/data/l10n_uk_chart_data.xml
+++ b/addons/l10n_uk/data/l10n_uk_chart_data.xml
@@ -10,5 +10,6 @@
             <field name="transfer_account_code_prefix">1220</field>
             <field name="code_digits">6</field>
             <field name="currency_id" ref="base.GBP"/>
+            <field name="country_id" ref="base.uk"/>
         </record>
 </odoo>
diff --git a/addons/l10n_uy/data/l10n_uy_chart_data.xml b/addons/l10n_uy/data/l10n_uy_chart_data.xml
index 20a75be4228..cb7778b02a9 100644
--- a/addons/l10n_uy/data/l10n_uy_chart_data.xml
+++ b/addons/l10n_uy/data/l10n_uy_chart_data.xml
@@ -10,6 +10,7 @@
             <field name="cash_account_code_prefix">1112</field>
             <field name="transfer_account_code_prefix">11120</field>
             <field name="currency_id" ref="base.UYU"/>
+            <field name="country_id" ref="base.uy"/>
         </record>
 
     </data>
diff --git a/addons/l10n_ve/data/l10n_ve_chart_data.xml b/addons/l10n_ve/data/l10n_ve_chart_data.xml
index 1199ae54179..b8132f2104c 100644
--- a/addons/l10n_ve/data/l10n_ve_chart_data.xml
+++ b/addons/l10n_ve/data/l10n_ve_chart_data.xml
@@ -8,6 +8,7 @@
         <field name="transfer_account_code_prefix">1129003</field>
         <field name="code_digits">7</field>
         <field name="currency_id" ref="base.VEF"/>
+        <field name="country_id" ref="base.ve"/>
     </record>
   </data>
 </odoo>
diff --git a/addons/l10n_vn/data/l10n_vn_chart_data.xml b/addons/l10n_vn/data/l10n_vn_chart_data.xml
index 7c32ea4693b..6e34838b231 100644
--- a/addons/l10n_vn/data/l10n_vn_chart_data.xml
+++ b/addons/l10n_vn/data/l10n_vn_chart_data.xml
@@ -13,6 +13,7 @@
         <field name="transfer_account_code_prefix">113</field>
         <field name="spoken_languages" eval="'vi_VN'"/>
         <field name="use_anglo_saxon" eval="True"/>
+        <field name="country_id" ref="base.vn"/>
     </record>
 </data>
 </odoo>
diff --git a/addons/l10n_za/data/account_chart_template_data.xml b/addons/l10n_za/data/account_chart_template_data.xml
index 4925dbff7df..ad0f339163e 100644
--- a/addons/l10n_za/data/account_chart_template_data.xml
+++ b/addons/l10n_za/data/account_chart_template_data.xml
@@ -10,6 +10,7 @@
         <field name="transfer_account_code_prefix">1010</field>
         <field name="code_digits">6</field>
         <field name="currency_id" ref="base.ZAR"/>
+        <field name="country_id" ref="base.za"/>
     </record>
 
 </odoo>