diff --git a/addons/l10n_ae/__manifest__.py b/addons/l10n_ae/__manifest__.py
index 8263b48a7a4..c52aab17155 100644
--- a/addons/l10n_ae/__manifest__.py
+++ b/addons/l10n_ae/__manifest__.py
@@ -17,6 +17,6 @@ United Arab Emirates accounting chart and localization.
     'data': [
              'data/account_data.xml',
              'data/l10n_ae_chart_data.xml',
-             'data/account_chart_template_data.yml',
+             'data/account_chart_template_data.xml',
     ],
 }
diff --git a/addons/l10n_ae/data/account_chart_template_data.xml b/addons/l10n_ae/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..9e6ae93bbcd
--- /dev/null
+++ b/addons/l10n_ae/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_ae.uae_chart_template_standard')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_ae/data/account_chart_template_data.yml b/addons/l10n_ae/data/account_chart_template_data.yml
deleted file mode 100644
index 21ba5335c3f..00000000000
--- a/addons/l10n_ae/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: uae_chart_template_standard}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_ar/__manifest__.py b/addons/l10n_ar/__manifest__.py
index e865bd02d03..3dc4a8c6ca7 100644
--- a/addons/l10n_ar/__manifest__.py
+++ b/addons/l10n_ar/__manifest__.py
@@ -21,6 +21,6 @@ Plan contable argentino e impuestos de acuerdo a disposiciones vigentes
         'data/l10n_ar_chart_data.xml',
         'data/account_data.xml',
         'data/account_tax_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
 }
diff --git a/addons/l10n_ar/data/account_chart_template_data.xml b/addons/l10n_ar/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..073f46b83f4
--- /dev/null
+++ b/addons/l10n_ar/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_ar.ar_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_ar/data/account_chart_template_data.yml b/addons/l10n_ar/data/account_chart_template_data.yml
deleted file mode 100644
index 5b1449f3f35..00000000000
--- a/addons/l10n_ar/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: ar_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_at/__manifest__.py b/addons/l10n_at/__manifest__.py
index 1ed6a01d61a..4f1cce1a091 100644
--- a/addons/l10n_at/__manifest__.py
+++ b/addons/l10n_at/__manifest__.py
@@ -18,5 +18,5 @@ Please keep in mind that you should review and adapt it with your Accountant, be
     'data': ['data/l10n_at_chart_data.xml',
              'data/account_data.xml',
              'data/account_tax_data.xml',
-             'data/account_chart_template_data.yml'],
+             'data/account_chart_template_data.xml'],
 }
diff --git a/addons/l10n_at/data/account_chart_template_data.xml b/addons/l10n_at/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..cca117de2c5
--- /dev/null
+++ b/addons/l10n_at/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_at.austria_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_at/data/account_chart_template_data.yml b/addons/l10n_at/data/account_chart_template_data.yml
deleted file mode 100644
index 8c6159182db..00000000000
--- a/addons/l10n_at/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: austria_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_au/__manifest__.py b/addons/l10n_au/__manifest__.py
index d03c6acd0a5..d39b06da0a1 100644
--- a/addons/l10n_au/__manifest__.py
+++ b/addons/l10n_au/__manifest__.py
@@ -28,7 +28,7 @@ Also:
              'data/account.tax.group.csv',
              'data/account.tax.template.csv',
              'data/account_fiscal_position_tax_template_data.xml',
-             'data/account_chart_template_data.yml',
+             'data/account_chart_template_configure_data.xml',
              'data/res_currency_data.xml',
              ],
 }
diff --git a/addons/l10n_au/data/account_chart_template_configure_data.xml b/addons/l10n_au/data/account_chart_template_configure_data.xml
new file mode 100644
index 00000000000..12e91eb5d94
--- /dev/null
+++ b/addons/l10n_au/data/account_chart_template_configure_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_au.l10n_au_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_au/data/account_chart_template_data.yml b/addons/l10n_au/data/account_chart_template_data.yml
deleted file mode 100644
index 63dea9050ad..00000000000
--- a/addons/l10n_au/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10n_au_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_be/__manifest__.py b/addons/l10n_be/__manifest__.py
index 621589ef388..ee5407e817a 100644
--- a/addons/l10n_be/__manifest__.py
+++ b/addons/l10n_be/__manifest__.py
@@ -50,13 +50,11 @@ Wizards provided by this module:
         'data/fiscal_templates_data.xml',
         'data/account_fiscal_position_tax_template_data.xml',
         'data/account_reconcile_model_template.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_configure_data.xml',
         'data/menuitem_data.xml',
     ],
     'demo': [
         'demo/l10n_be_demo.yml',
-        '../account/demo/account_bank_statement.yml',
-        '../account/demo/account_invoice_demo.yml',
     ],
     'website': 'https://www.odoo.com/page/accounting',
     'post_init_hook': 'load_translations',
diff --git a/addons/l10n_be/data/account_chart_template_configure_data.xml b/addons/l10n_be/data/account_chart_template_configure_data.xml
new file mode 100644
index 00000000000..82de3a2f629
--- /dev/null
+++ b/addons/l10n_be/data/account_chart_template_configure_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_be.l10nbe_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_be/data/account_chart_template_data.yml b/addons/l10n_be/data/account_chart_template_data.yml
deleted file mode 100644
index 609acfedd29..00000000000
--- a/addons/l10n_be/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10nbe_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_bo/__manifest__.py b/addons/l10n_bo/__manifest__.py
index 4fa45a2c140..ad79a8369f9 100644
--- a/addons/l10n_bo/__manifest__.py
+++ b/addons/l10n_bo/__manifest__.py
@@ -20,6 +20,6 @@ Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes
         "data/l10n_bo_chart_data.xml",
         'data/account_data.xml',
         "data/account_tax_data.xml",
-        "data/account_chart_template_data.yml",
+        "data/account_chart_template_data.xml",
     ],
 }
diff --git a/addons/l10n_bo/data/account_chart_template_data.xml b/addons/l10n_bo/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..9eb1fa02c77
--- /dev/null
+++ b/addons/l10n_bo/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_bo.bo_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_bo/data/account_chart_template_data.yml b/addons/l10n_bo/data/account_chart_template_data.yml
deleted file mode 100644
index 270d83345be..00000000000
--- a/addons/l10n_bo/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: bo_chart_template}: |
-    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_br/__manifest__.py b/addons/l10n_br/__manifest__.py
index c4e2bd3e17d..acdedd45eef 100644
--- a/addons/l10n_br/__manifest__.py
+++ b/addons/l10n_br/__manifest__.py
@@ -52,6 +52,5 @@ come with any additional paid permission for online use of 'private modules'.
         'data/account_data.xml',
         'data/account_tax_template_data.xml',
         'views/account_view.xml',
-        'data/account_chart_template_data.yml',
     ],
 }
diff --git a/addons/l10n_br/data/account_chart_template_data.yml b/addons/l10n_br/data/account_chart_template_data.yml
deleted file mode 100644
index 749b163b400..00000000000
--- a/addons/l10n_br/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10n_br_account_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_br/data/account_tax_template_data.xml b/addons/l10n_br/data/account_tax_template_data.xml
index 53b892b4aad..78e816f93ff 100644
--- a/addons/l10n_br/data/account_tax_template_data.xml
+++ b/addons/l10n_br/data/account_tax_template_data.xml
@@ -1848,4 +1848,10 @@
 			<field name="tag_ids" eval="[(6,0,[ref('tag_br_14'), ref('tag_br_15')])]"/>
 			<field name="tax_group_id" ref="tax_group_csll_0"/>
         </record>
+
+        <data noupdate="1">
+            <function model="account.chart.template" name="try_loading_for_current_company">
+                <value eval="[ref('l10n_br.l10n_br_account_chart_template')]"/>
+            </function>
+        </data>
 </odoo>
diff --git a/addons/l10n_ca/__manifest__.py b/addons/l10n_ca/__manifest__.py
index 02dc949f977..af125a26f02 100644
--- a/addons/l10n_ca/__manifest__.py
+++ b/addons/l10n_ca/__manifest__.py
@@ -45,7 +45,7 @@ position.
         'data/account_data.xml',
         'data/account_tax_data.xml',
         'data/fiscal_templates_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_configure_data.xml',
         'data/res_company_data.xml',
     ],
     'post_init_hook': 'load_translations',
diff --git a/addons/l10n_ca/data/account_chart_template_configure_data.xml b/addons/l10n_ca/data/account_chart_template_configure_data.xml
new file mode 100644
index 00000000000..91c408dbc51
--- /dev/null
+++ b/addons/l10n_ca/data/account_chart_template_configure_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_ca.ca_en_chart_template_en')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_ca/data/account_chart_template_data.yml b/addons/l10n_ca/data/account_chart_template_data.yml
deleted file mode 100644
index 783649c73ee..00000000000
--- a/addons/l10n_ca/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: ca_en_chart_template_en}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_ch/__manifest__.py b/addons/l10n_ch/__manifest__.py
index b9b586b5112..7c0a0c37e7b 100644
--- a/addons/l10n_ch/__manifest__.py
+++ b/addons/l10n_ch/__manifest__.py
@@ -36,7 +36,7 @@ Here is how it works:
         'data/account_data.xml',
         'data/account_vat2011_data.xml',
         'data/account_fiscal_position_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
         'report/isr_report.xml',
         'views/res_bank_view.xml',
         'views/account_invoice_view.xml',
@@ -44,8 +44,6 @@ Here is how it works:
     ],
 
     'demo': [
-        '../account/demo/account_bank_statement.yml',
-        '../account/demo/account_invoice_demo.yml',
         'demo/account_cash_rounding.xml',
     ],
     'post_init_hook': 'post_init',
diff --git a/addons/l10n_ch/data/account_chart_template_data.xml b/addons/l10n_ch/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..2fe4f7d7bda
--- /dev/null
+++ b/addons/l10n_ch/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_ch.l10nch_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_ch/data/account_chart_template_data.yml b/addons/l10n_ch/data/account_chart_template_data.yml
deleted file mode 100644
index 80b148c7e70..00000000000
--- a/addons/l10n_ch/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10nch_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_cl/__manifest__.py b/addons/l10n_cl/__manifest__.py
index e092e69dc68..d33bffbd621 100644
--- a/addons/l10n_cl/__manifest__.py
+++ b/addons/l10n_cl/__manifest__.py
@@ -20,6 +20,6 @@ Plan contable chileno e impuestos de acuerdo a disposiciones vigentes
         'data/l10n_cl_chart_data.xml',
         'data/account_data.xml',
         'data/account_tax_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
 }
diff --git a/addons/l10n_cl/data/account_chart_template_data.xml b/addons/l10n_cl/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..26ae9d46de9
--- /dev/null
+++ b/addons/l10n_cl/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_cl.cl_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_cl/data/account_chart_template_data.yml b/addons/l10n_cl/data/account_chart_template_data.yml
deleted file mode 100644
index 9002aaa4a76..00000000000
--- a/addons/l10n_cl/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: cl_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_cn_small_business/__manifest__.py b/addons/l10n_cn_small_business/__manifest__.py
index ad7e3922b5e..3a555e6b53c 100644
--- a/addons/l10n_cn_small_business/__manifest__.py
+++ b/addons/l10n_cn_small_business/__manifest__.py
@@ -25,7 +25,7 @@
     'depends': ['l10n_cn'],
     'data': [
         'data/l10n_cn_small_business_chart_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
     'auto_install': True
 }
diff --git a/addons/l10n_cn_small_business/data/account_chart_template_data.xml b/addons/l10n_cn_small_business/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..1d0ab870bd3
--- /dev/null
+++ b/addons/l10n_cn_small_business/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_cn_small_business.l10n_chart_china_small_business')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_cn_small_business/data/account_chart_template_data.yml b/addons/l10n_cn_small_business/data/account_chart_template_data.yml
deleted file mode 100644
index f1d6e114f9d..00000000000
--- a/addons/l10n_cn_small_business/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
- -
-   !python {model: account.chart.template, id: l10n_chart_china_small_business}: |
-     self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_cn_standard/__manifest__.py b/addons/l10n_cn_standard/__manifest__.py
index d770d4eaa0f..4949a111f4d 100644
--- a/addons/l10n_cn_standard/__manifest__.py
+++ b/addons/l10n_cn_standard/__manifest__.py
@@ -34,6 +34,5 @@ Including the following data in the Accounting Standards for Business Enterprise
         'data/account.account.template.csv',
         'data/account_tax_templates.xml',
         'data/account_chart_template_data.xml',
-        'data/account_chart_template_data.yml',
     ],
 }
diff --git a/addons/l10n_cn_standard/data/account_chart_template_data.xml b/addons/l10n_cn_standard/data/account_chart_template_data.xml
index f9c22664671..11a0ad974d6 100644
--- a/addons/l10n_cn_standard/data/account_chart_template_data.xml
+++ b/addons/l10n_cn_standard/data/account_chart_template_data.xml
@@ -10,5 +10,9 @@
             <field name="income_currency_exchange_account_id" ref="account_6061" />
             <field name="expense_currency_exchange_account_id" ref="account_6061" />
         </record>
+
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_cn_standard.l10n_chart_china_standard_business')]"/>
+        </function>
     </data>
 </odoo>
diff --git a/addons/l10n_cn_standard/data/account_chart_template_data.yml b/addons/l10n_cn_standard/data/account_chart_template_data.yml
deleted file mode 100644
index 9b8d7af60aa..00000000000
--- a/addons/l10n_cn_standard/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-   !python {model: account.chart.template, id: l10n_chart_china_standard_business}: |
-     self[0].try_loading_for_current_company()
diff --git a/addons/l10n_co/__manifest__.py b/addons/l10n_co/__manifest__.py
index fea77760864..72a39483284 100644
--- a/addons/l10n_co/__manifest__.py
+++ b/addons/l10n_co/__manifest__.py
@@ -23,7 +23,7 @@
         'data/account_chart_template_data.xml',
         'data/account.tax.group.csv',
         'data/account.tax.template.csv',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_configure_data.xml',
         'views/res_partner.xml',
     ],
 }
diff --git a/addons/l10n_co/data/account_chart_template_configure_data.xml b/addons/l10n_co/data/account_chart_template_configure_data.xml
new file mode 100644
index 00000000000..f21b6f76713
--- /dev/null
+++ b/addons/l10n_co/data/account_chart_template_configure_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_co.l10n_co_chart_template_generic')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_co/data/account_chart_template_data.yml b/addons/l10n_co/data/account_chart_template_data.yml
deleted file mode 100644
index 13972d8a902..00000000000
--- a/addons/l10n_co/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10n_co_chart_template_generic}: |
-    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_cr/__manifest__.py b/addons/l10n_cr/__manifest__.py
index 3ea2e2a711e..b6ffa6576a1 100644
--- a/addons/l10n_cr/__manifest__.py
+++ b/addons/l10n_cr/__manifest__.py
@@ -60,6 +60,6 @@ please go to http://translations.launchpad.net/openerp-costa-rica.
         'data/account_data.xml',
         'data/account_chart_template_data.xml',
         'data/account_tax_template_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_configure_data.xml',
     ],
 }
diff --git a/addons/l10n_cr/data/account_chart_template_configure_data.xml b/addons/l10n_cr/data/account_chart_template_configure_data.xml
new file mode 100644
index 00000000000..6e700000601
--- /dev/null
+++ b/addons/l10n_cr/data/account_chart_template_configure_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_cr.account_chart_template_0')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_cr/data/account_chart_template_data.yml b/addons/l10n_cr/data/account_chart_template_data.yml
deleted file mode 100644
index 6c2eb3eaa7a..00000000000
--- a/addons/l10n_cr/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: account_chart_template_0}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_de_skr03/__manifest__.py b/addons/l10n_de_skr03/__manifest__.py
index 3207bac3adc..19177302ae2 100644
--- a/addons/l10n_de_skr03/__manifest__.py
+++ b/addons/l10n_de_skr03/__manifest__.py
@@ -68,7 +68,7 @@ German accounting chart and localization.
         'data/l10n_de_skr03_chart_data.xml',
         'data/account_data.xml',
         'data/account_tax_fiscal_position_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
     'auto_install': True
 }
diff --git a/addons/l10n_de_skr03/data/account_chart_template_data.xml b/addons/l10n_de_skr03/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..f4eac748632
--- /dev/null
+++ b/addons/l10n_de_skr03/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_de_skr03.l10n_de_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_de_skr03/data/account_chart_template_data.yml b/addons/l10n_de_skr03/data/account_chart_template_data.yml
deleted file mode 100644
index 9fbf6034a6c..00000000000
--- a/addons/l10n_de_skr03/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10n_de_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_de_skr04/__manifest__.py b/addons/l10n_de_skr04/__manifest__.py
index 4a0da9fb838..e56640c713b 100644
--- a/addons/l10n_de_skr04/__manifest__.py
+++ b/addons/l10n_de_skr04/__manifest__.py
@@ -70,6 +70,6 @@ German accounting chart and localization.
         'data/l10n_de_skr04_chart_data.xml',
         'data/account_data.xml',
         'data/account_tax_fiscal_position_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
 }
diff --git a/addons/l10n_de_skr04/data/account_chart_template_data.xml b/addons/l10n_de_skr04/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..df61b216706
--- /dev/null
+++ b/addons/l10n_de_skr04/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_de_skr04.l10n_chart_de_skr04')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_de_skr04/data/account_chart_template_data.yml b/addons/l10n_de_skr04/data/account_chart_template_data.yml
deleted file mode 100644
index aee96ad34d7..00000000000
--- a/addons/l10n_de_skr04/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10n_chart_de_skr04}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_do/__manifest__.py b/addons/l10n_do/__manifest__.py
index 7278c510712..7e88baeb67f 100644
--- a/addons/l10n_do/__manifest__.py
+++ b/addons/l10n_do/__manifest__.py
@@ -100,6 +100,6 @@ en Odoo):
         # Adds fiscal position
         'data/fiscal_position_template.xml',
         # configuration wizard, views, reports...
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_configure_data.xml',
     ],
 }
diff --git a/addons/l10n_do/data/account_chart_template_configure_data.xml b/addons/l10n_do/data/account_chart_template_configure_data.xml
new file mode 100644
index 00000000000..616cf27efaf
--- /dev/null
+++ b/addons/l10n_do/data/account_chart_template_configure_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_do.do_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_do/data/account_chart_template_data.yml b/addons/l10n_do/data/account_chart_template_data.yml
deleted file mode 100644
index bfea5da2ff5..00000000000
--- a/addons/l10n_do/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: do_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_ec/__manifest__.py b/addons/l10n_ec/__manifest__.py
index f923a87de2f..c258c13c62a 100644
--- a/addons/l10n_ec/__manifest__.py
+++ b/addons/l10n_ec/__manifest__.py
@@ -22,6 +22,6 @@ Accounting chart and localization for Ecuador.
         'data/l10n_ec_chart_data.xml',
         'data/account_data.xml',
         'data/account_tax_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
 }
diff --git a/addons/l10n_ec/data/account_chart_template_data.xml b/addons/l10n_ec/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..bacf0d13b91
--- /dev/null
+++ b/addons/l10n_ec/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_ec.ec_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_ec/data/account_chart_template_data.yml b/addons/l10n_ec/data/account_chart_template_data.yml
deleted file mode 100644
index c35e8765fe4..00000000000
--- a/addons/l10n_ec/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: ec_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_es/__manifest__.py b/addons/l10n_es/__manifest__.py
index 186755da36d..152358324b1 100644
--- a/addons/l10n_es/__manifest__.py
+++ b/addons/l10n_es/__manifest__.py
@@ -44,6 +44,6 @@ Spanish charts of accounts (PGCE 2008).
         'data/account_data.xml',
         'data/account_tax_data.xml',
         'data/account_fiscal_position_template_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_configure_data.xml',
     ],
 }
diff --git a/addons/l10n_es/data/account_chart_template_configure_data.xml b/addons/l10n_es/data/account_chart_template_configure_data.xml
new file mode 100644
index 00000000000..8d7178f898b
--- /dev/null
+++ b/addons/l10n_es/data/account_chart_template_configure_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_es.account_chart_template_pymes')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_es/data/account_chart_template_data.yml b/addons/l10n_es/data/account_chart_template_data.yml
deleted file mode 100644
index 724a4dfb162..00000000000
--- a/addons/l10n_es/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: account_chart_template_pymes}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_et/__manifest__.py b/addons/l10n_et/__manifest__.py
index 60aa683d877..4f05b7ece66 100644
--- a/addons/l10n_et/__manifest__.py
+++ b/addons/l10n_et/__manifest__.py
@@ -29,7 +29,7 @@ This is the latest Ethiopian Odoo localization and consists of:
         'data/account_account_tag_data.xml',
         'data/account.tax.group.csv',
         'data/account.tax.template.csv',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_configure_data.xml',
         'data/res.country.state.csv',
     ],
 }
diff --git a/addons/l10n_et/data/account_chart_template_configure_data.xml b/addons/l10n_et/data/account_chart_template_configure_data.xml
new file mode 100644
index 00000000000..d677832c106
--- /dev/null
+++ b/addons/l10n_et/data/account_chart_template_configure_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_et.l10n_et')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_et/data/account_chart_template_data.yml b/addons/l10n_et/data/account_chart_template_data.yml
deleted file mode 100644
index 6c49d6e9165..00000000000
--- a/addons/l10n_et/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10n_et}: |
-    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_fr/__manifest__.py b/addons/l10n_fr/__manifest__.py
index 25c75910a00..ccb89132994 100644
--- a/addons/l10n_fr/__manifest__.py
+++ b/addons/l10n_fr/__manifest__.py
@@ -43,7 +43,7 @@ configuration of their taxes and fiscal positions manually.
         'data/res_country_data.xml',
         'data/account_fiscal_position_template_data.xml',
         'data/account_reconcile_model_template.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_configure_data.xml',
     ],
     'post_init_hook': '_preserve_tag_on_taxes',
 }
diff --git a/addons/l10n_fr/data/account_chart_template_configure_data.xml b/addons/l10n_fr/data/account_chart_template_configure_data.xml
new file mode 100644
index 00000000000..f69b141c297
--- /dev/null
+++ b/addons/l10n_fr/data/account_chart_template_configure_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_fr.l10n_fr_pcg_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_fr/data/account_chart_template_data.yml b/addons/l10n_fr/data/account_chart_template_data.yml
deleted file mode 100644
index 1a13c0f3b3f..00000000000
--- a/addons/l10n_fr/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10n_fr_pcg_chart_template}: |
-    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_generic_coa/__manifest__.py b/addons/l10n_generic_coa/__manifest__.py
index 57d3c444d49..ade2d461007 100644
--- a/addons/l10n_generic_coa/__manifest__.py
+++ b/addons/l10n_generic_coa/__manifest__.py
@@ -17,7 +17,7 @@ Install some generic chart of accounts.
     'data': [
         'data/account_data.xml',
         'data/l10n_generic_coa_chart_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
     'demo': [
         '../account/demo/account_bank_statement.yml',
diff --git a/addons/l10n_generic_coa/data/account_chart_template_data.xml b/addons/l10n_generic_coa/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..0994cd3932e
--- /dev/null
+++ b/addons/l10n_generic_coa/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_generic_coa.configurable_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_generic_coa/data/account_chart_template_data.yml b/addons/l10n_generic_coa/data/account_chart_template_data.yml
deleted file mode 100644
index d00cb6ee528..00000000000
--- a/addons/l10n_generic_coa/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10n_generic_coa.configurable_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_gr/__manifest__.py b/addons/l10n_gr/__manifest__.py
index ab7744883b2..f0c79de6d05 100644
--- a/addons/l10n_gr/__manifest__.py
+++ b/addons/l10n_gr/__manifest__.py
@@ -24,6 +24,6 @@ Greek accounting chart and localization.
               'data/account_chart_template_data.xml',
               'data/account_data.xml',
               'data/account_tax_data.xml',
-              'data/account_chart_template_data.yml'
+              'data/account_chart_template_configure_data.xml'
     ],
 }
diff --git a/addons/l10n_gr/data/account_chart_template_configure_data.xml b/addons/l10n_gr/data/account_chart_template_configure_data.xml
new file mode 100644
index 00000000000..acedd6449e0
--- /dev/null
+++ b/addons/l10n_gr/data/account_chart_template_configure_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_gr.l10n_gr_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_gr/data/account_chart_template_data.yml b/addons/l10n_gr/data/account_chart_template_data.yml
deleted file mode 100644
index f00dca050f5..00000000000
--- a/addons/l10n_gr/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10n_gr_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_gt/__manifest__.py b/addons/l10n_gt/__manifest__.py
index d76f22f5f16..2fd9754ed67 100644
--- a/addons/l10n_gt/__manifest__.py
+++ b/addons/l10n_gt/__manifest__.py
@@ -35,6 +35,5 @@ taxes and the Quetzal currency.""",
         'data/l10n_gt_chart_data.xml',
         'data/account_data.xml',
         'data/account_chart_template_data.xml',
-        'data/account_chart_template_data.yml',
     ],
 }
diff --git a/addons/l10n_gt/data/account_chart_template_data.xml b/addons/l10n_gt/data/account_chart_template_data.xml
index cded0ef8a2e..2106efda97b 100644
--- a/addons/l10n_gt/data/account_chart_template_data.xml
+++ b/addons/l10n_gt/data/account_chart_template_data.xml
@@ -45,5 +45,8 @@
             <field name="tax_group_id" ref="tax_group_iva_12"/>
         </record>
 
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_gt.cuentas_plantilla')]"/>
+        </function>
     </data>
 </odoo>
diff --git a/addons/l10n_gt/data/account_chart_template_data.yml b/addons/l10n_gt/data/account_chart_template_data.yml
deleted file mode 100644
index 339a318d28d..00000000000
--- a/addons/l10n_gt/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: cuentas_plantilla}: |
-    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_hn/__manifest__.py b/addons/l10n_hn/__manifest__.py
index 0efd6838047..f320a9055a3 100644
--- a/addons/l10n_hn/__manifest__.py
+++ b/addons/l10n_hn/__manifest__.py
@@ -25,6 +25,5 @@ and the Lempira currency.""",
         'data/l10n_hn_chart_data.xml',
         'data/account_data.xml',
         'data/account_chart_template_data.xml',
-        'data/account_chart_template_data.yml',
     ],
 }
diff --git a/addons/l10n_hn/data/account_chart_template_data.xml b/addons/l10n_hn/data/account_chart_template_data.xml
index 1badfa8b51e..60bd6f88c6a 100644
--- a/addons/l10n_hn/data/account_chart_template_data.xml
+++ b/addons/l10n_hn/data/account_chart_template_data.xml
@@ -46,5 +46,9 @@
             <field name="tax_group_id" ref="tax_group_iva_15"/>
         </record>
 
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_hn.cuentas_plantilla')]"/>
+        </function>
+
     </data>
 </odoo>
diff --git a/addons/l10n_hn/data/account_chart_template_data.yml b/addons/l10n_hn/data/account_chart_template_data.yml
deleted file mode 100644
index aa01abb2d4f..00000000000
--- a/addons/l10n_hn/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: cuentas_plantilla}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_hr/__manifest__.py b/addons/l10n_hr/__manifest__.py
index 2b3c213260b..4c4d468bcae 100644
--- a/addons/l10n_hr/__manifest__.py
+++ b/addons/l10n_hr/__manifest__.py
@@ -54,7 +54,7 @@ Izvori podataka:
         'data/account.tax.group.csv',
         'data/account.tax.template.csv',
         'data/account_tax_fiscal_position_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
     "active": False,
 }
diff --git a/addons/l10n_hr/data/account_chart_template_data.xml b/addons/l10n_hr/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..1072bc86a25
--- /dev/null
+++ b/addons/l10n_hr/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_hr.l10n_hr_chart_template_rrif')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_hr/data/account_chart_template_data.yml b/addons/l10n_hr/data/account_chart_template_data.yml
deleted file mode 100644
index a2c5593dbd5..00000000000
--- a/addons/l10n_hr/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10n_hr_chart_template_rrif}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_hu/__manifest__.py b/addons/l10n_hu/__manifest__.py
index f3d788c2bfb..547072ba2e5 100644
--- a/addons/l10n_hu/__manifest__.py
+++ b/addons/l10n_hu/__manifest__.py
@@ -31,6 +31,6 @@ This module consists :
         'data/account.fiscal.position.tax.template.csv',
         'data/res.bank.csv',
         'data/account_chart_template_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_configure_data.xml',
     ],
 }
diff --git a/addons/l10n_hu/data/account_chart_template_configure_data.xml b/addons/l10n_hu/data/account_chart_template_configure_data.xml
new file mode 100644
index 00000000000..2ac5a1aa651
--- /dev/null
+++ b/addons/l10n_hu/data/account_chart_template_configure_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_hu.hungarian_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_hu/data/account_chart_template_data.yml b/addons/l10n_hu/data/account_chart_template_data.yml
deleted file mode 100644
index 81c996983b0..00000000000
--- a/addons/l10n_hu/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: hungarian_chart_template}: |
-    self[0].try_loading_for_current_company() 
\ No newline at end of file
diff --git a/addons/l10n_in/__manifest__.py b/addons/l10n_in/__manifest__.py
index 2dd8452e84f..50b6b148623 100644
--- a/addons/l10n_in/__manifest__.py
+++ b/addons/l10n_in/__manifest__.py
@@ -26,7 +26,7 @@ Sheet, now only Vertical format has been permitted Which is Supported By Odoo.
         'data/account_tax_template_data.xml',
         'data/account_fiscal_position_data.xml',
         'data/res_country_state_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
         'views/product_template_view.xml',
         'views/report_invoice.xml',
         'views/res_company_view.xml',
diff --git a/addons/l10n_in/data/account_chart_template_data.xml b/addons/l10n_in/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..b7bfb77d415
--- /dev/null
+++ b/addons/l10n_in/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_in.indian_chart_template_standard')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_in/data/account_chart_template_data.yml b/addons/l10n_in/data/account_chart_template_data.yml
deleted file mode 100644
index ae14e1cfe23..00000000000
--- a/addons/l10n_in/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: indian_chart_template_standard}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_in_schedule6/__manifest__.py b/addons/l10n_in_schedule6/__manifest__.py
index ce04fdd376f..74bc07f56a6 100644
--- a/addons/l10n_in_schedule6/__manifest__.py
+++ b/addons/l10n_in_schedule6/__manifest__.py
@@ -25,7 +25,7 @@ Sheet, now only Vertical format has been permitted Which is Supported By OpenERP
         'account_data.xml',
         'l10n_in_schedule6_chart.xml',
         'l10n_in_schedule6_tax_template.xml',
-        'account_chart_template.yml',
+        'account_chart_template.xml',
     ],
     'auto_install': False,
     'installable': True,
diff --git a/addons/l10n_in_schedule6/account_chart_template.xml b/addons/l10n_in_schedule6/account_chart_template.xml
new file mode 100644
index 00000000000..050d50382ec
--- /dev/null
+++ b/addons/l10n_in_schedule6/account_chart_template.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_in_schedule6.indian_chart_template_schedule6')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_in_schedule6/account_chart_template.yml b/addons/l10n_in_schedule6/account_chart_template.yml
deleted file mode 100644
index e536be4873d..00000000000
--- a/addons/l10n_in_schedule6/account_chart_template.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: indian_chart_template_schedule6}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_it/__manifest__.py b/addons/l10n_it/__manifest__.py
index 9f77e60939f..f78432b06b3 100644
--- a/addons/l10n_it/__manifest__.py
+++ b/addons/l10n_it/__manifest__.py
@@ -25,6 +25,6 @@ Italian accounting chart and localization.
         'data/account.tax.template.csv',
         'data/account.fiscal.position.template.csv',
         'data/account.chart.template.csv',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
         ],
 }
diff --git a/addons/l10n_it/data/account_chart_template_data.xml b/addons/l10n_it/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..0431a234651
--- /dev/null
+++ b/addons/l10n_it/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_it.l10n_it_chart_template_generic')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_it/data/account_chart_template_data.yml b/addons/l10n_it/data/account_chart_template_data.yml
deleted file mode 100644
index 0fbbf562c4b..00000000000
--- a/addons/l10n_it/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10n_it_chart_template_generic}: |
-    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_jp/__manifest__.py b/addons/l10n_jp/__manifest__.py
index d8c07d5e2cc..bf8316f51f8 100644
--- a/addons/l10n_jp/__manifest__.py
+++ b/addons/l10n_jp/__manifest__.py
@@ -37,6 +37,6 @@ need to use these at all under normal circumstances.
         'data/account_chart_template_data.xml',
         'data/account.fiscal.position.template.csv',
         'data/account.fiscal.position.tax.template.csv',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_configure_data.xml',
     ],
 }
diff --git a/addons/l10n_jp/data/account_chart_template_configure_data.xml b/addons/l10n_jp/data/account_chart_template_configure_data.xml
new file mode 100644
index 00000000000..c643e12f4a3
--- /dev/null
+++ b/addons/l10n_jp/data/account_chart_template_configure_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_jp.l10n_jp1')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_jp/data/account_chart_template_data.yml b/addons/l10n_jp/data/account_chart_template_data.yml
deleted file mode 100644
index a95927840ce..00000000000
--- a/addons/l10n_jp/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10n_jp1}: |
-    self[0].try_loading_for_current_company() 
\ No newline at end of file
diff --git a/addons/l10n_lu/__manifest__.py b/addons/l10n_lu/__manifest__.py
index 9fe7e6dfcc9..7e90097a523 100644
--- a/addons/l10n_lu/__manifest__.py
+++ b/addons/l10n_lu/__manifest__.py
@@ -42,7 +42,7 @@ Notes:
         'data/account.fiscal.position.tax.template-2015.csv',
         # configuration wizard, views, reports...
         'data/account.chart.template.csv',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
     'post_init_hook': '_preserve_tag_on_taxes',
 }
diff --git a/addons/l10n_lu/data/account_chart_template_data.xml b/addons/l10n_lu/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..19a25539e32
--- /dev/null
+++ b/addons/l10n_lu/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_lu.lu_2011_chart_1')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_lu/data/account_chart_template_data.yml b/addons/l10n_lu/data/account_chart_template_data.yml
deleted file mode 100644
index 3b2d42c4ddd..00000000000
--- a/addons/l10n_lu/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: lu_2011_chart_1}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_ma/__manifest__.py b/addons/l10n_ma/__manifest__.py
index 712c0720618..b16c00b53c4 100644
--- a/addons/l10n_ma/__manifest__.py
+++ b/addons/l10n_ma/__manifest__.py
@@ -22,6 +22,6 @@ Seddik au cours du troisième trimestre 2010.""",
         'data/l10n_ma_chart_data.xml',
         'data/account_data.xml',
         'data/account_tax_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
 }
diff --git a/addons/l10n_ma/data/account_chart_template_data.xml b/addons/l10n_ma/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..c3ef488c34d
--- /dev/null
+++ b/addons/l10n_ma/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_ma.l10n_kzc_temp_chart')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_ma/data/account_chart_template_data.yml b/addons/l10n_ma/data/account_chart_template_data.yml
deleted file mode 100644
index 907e49e0ebc..00000000000
--- a/addons/l10n_ma/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10n_kzc_temp_chart}: |
-    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_mx/__manifest__.py b/addons/l10n_mx/__manifest__.py
index 68fd9c7d4b0..cfe6dbecae2 100644
--- a/addons/l10n_mx/__manifest__.py
+++ b/addons/l10n_mx/__manifest__.py
@@ -39,7 +39,7 @@ With this module you will have:
         "data/account_data.xml",
         "data/account_tax_data.xml",
         "data/fiscal_position_data.xml",
-        "data/account_chart_template_data.yml",
+        "data/account_chart_template_data.xml",
         "views/res_config_settings_views.xml",
         "views/account_views.xml",
     ],
diff --git a/addons/l10n_mx/data/account_chart_template_data.xml b/addons/l10n_mx/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..8fa6c909bdf
--- /dev/null
+++ b/addons/l10n_mx/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_mx.mx_coa')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_mx/data/account_chart_template_data.yml b/addons/l10n_mx/data/account_chart_template_data.yml
deleted file mode 100644
index a12f32d81ef..00000000000
--- a/addons/l10n_mx/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: mx_coa}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_nl/__manifest__.py b/addons/l10n_nl/__manifest__.py
index cbe2ee4eacd..c13a03ee6ba 100644
--- a/addons/l10n_nl/__manifest__.py
+++ b/addons/l10n_nl/__manifest__.py
@@ -24,7 +24,7 @@
         'data/account_fiscal_position_template.xml',
         'data/account_fiscal_position_tax_template.xml',
         'data/account_fiscal_position_account_template.xml',
-        'data/account_chart_template.yml',
+        'data/account_chart_template_data.xml',
         'data/menuitem.xml',
     ],
     'demo': [],
diff --git a/addons/l10n_nl/data/account_chart_template.yml b/addons/l10n_nl/data/account_chart_template.yml
deleted file mode 100644
index c8402bf62a4..00000000000
--- a/addons/l10n_nl/data/account_chart_template.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10nnl_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_nl/data/account_chart_template_data.xml b/addons/l10n_nl/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..4b6e5e54d1c
--- /dev/null
+++ b/addons/l10n_nl/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_nl.l10nnl_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_no/__manifest__.py b/addons/l10n_no/__manifest__.py
index 670c1bf55d6..2f80ea27f25 100644
--- a/addons/l10n_no/__manifest__.py
+++ b/addons/l10n_no/__manifest__.py
@@ -18,7 +18,7 @@ Updated for Odoo 9 by Bringsvor Consulting AS <www.bringsvor.com>
     "data": ['data/l10n_no_chart_data.xml',
              'data/account_data.xml',
              'data/account_tax_data.xml',
-             'data/account_chart_template_data.yml'],
+             'data/account_chart_template_data.xml'],
     "active": False,
     'post_init_hook': '_preserve_tag_on_taxes',
 }
diff --git a/addons/l10n_no/data/account_chart_template_data.xml b/addons/l10n_no/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..79e27620a9e
--- /dev/null
+++ b/addons/l10n_no/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_no.no_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_no/data/account_chart_template_data.yml b/addons/l10n_no/data/account_chart_template_data.yml
deleted file mode 100644
index f12b8a66afa..00000000000
--- a/addons/l10n_no/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: no_chart_template}: |
-    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_nz/__manifest__.py b/addons/l10n_nz/__manifest__.py
index a421245bc54..a024d0829e4 100644
--- a/addons/l10n_nz/__manifest__.py
+++ b/addons/l10n_nz/__manifest__.py
@@ -28,7 +28,7 @@ Also:
              'data/account.tax.group.csv',
              'data/account.tax.template.csv',
              'data/account_fiscal_position_tax_template_data.xml',
-             'data/account_chart_template_data.yml',
+             'data/account_chart_template_configure_data.xml',
              'data/res_currency_data.xml',
              ],
 }
diff --git a/addons/l10n_nz/data/account_chart_template_configure_data.xml b/addons/l10n_nz/data/account_chart_template_configure_data.xml
new file mode 100644
index 00000000000..1375f755cef
--- /dev/null
+++ b/addons/l10n_nz/data/account_chart_template_configure_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_nz.l10n_nz_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_nz/data/account_chart_template_data.yml b/addons/l10n_nz/data/account_chart_template_data.yml
deleted file mode 100644
index 9d1fe5c179f..00000000000
--- a/addons/l10n_nz/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10n_nz_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_pa/__manifest__.py b/addons/l10n_pa/__manifest__.py
index f6de6cd9fd7..8eaf33615d4 100644
--- a/addons/l10n_pa/__manifest__.py
+++ b/addons/l10n_pa/__manifest__.py
@@ -22,6 +22,6 @@ Con la Colaboración de
         "data/l10n_pa_chart_data.xml",
         "data/account_data.xml",
         "data/account_tax_data.xml",
-        "data/account_chart_template_data.yml",
+        "data/account_chart_template_data.xml",
     ],
 }
diff --git a/addons/l10n_pa/data/account_chart_template_data.xml b/addons/l10n_pa/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..93944567508
--- /dev/null
+++ b/addons/l10n_pa/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_pa.l10npa_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_pa/data/account_chart_template_data.yml b/addons/l10n_pa/data/account_chart_template_data.yml
deleted file mode 100644
index 690f8337414..00000000000
--- a/addons/l10n_pa/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10npa_chart_template}: |
-    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_pe/__manifest__.py b/addons/l10n_pe/__manifest__.py
index a2ce657998b..a9c21153ff0 100644
--- a/addons/l10n_pe/__manifest__.py
+++ b/addons/l10n_pe/__manifest__.py
@@ -21,6 +21,6 @@ SUNAT 2011 (PCGE 2010).
         'data/l10n_pe_chart_data.xml',
         'data/account_data.xml',
         'data/account_tax_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
 }
diff --git a/addons/l10n_pe/data/account_chart_template_data.xml b/addons/l10n_pe/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..6a52638c45f
--- /dev/null
+++ b/addons/l10n_pe/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_pe.pe_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_pe/data/account_chart_template_data.yml b/addons/l10n_pe/data/account_chart_template_data.yml
deleted file mode 100644
index 77294fe9cbc..00000000000
--- a/addons/l10n_pe/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: pe_chart_template}: |
-    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_pl/__manifest__.py b/addons/l10n_pl/__manifest__.py
index da203009525..1c3d8208179 100644
--- a/addons/l10n_pl/__manifest__.py
+++ b/addons/l10n_pl/__manifest__.py
@@ -31,7 +31,7 @@ Wewnętrzny numer wersji OpenGLOBE 1.02
               'data/account_tax_data.xml',
               'data/account_fiscal_position_data.xml',
               'data/res_country_state_data.xml',
-              'data/account_chart_template_data.yml'
+              'data/account_chart_template_data.xml'
     ],
     'post_init_hook': '_preserve_tag_on_taxes',
 }
diff --git a/addons/l10n_pl/data/account_chart_template_data.xml b/addons/l10n_pl/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..d4ac336b746
--- /dev/null
+++ b/addons/l10n_pl/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_pl.pl_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_pl/data/account_chart_template_data.yml b/addons/l10n_pl/data/account_chart_template_data.yml
deleted file mode 100644
index c3399da7918..00000000000
--- a/addons/l10n_pl/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: pl_chart_template}: |
-    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_pt/__manifest__.py b/addons/l10n_pt/__manifest__.py
index 73fc0840662..447b0f24d67 100644
--- a/addons/l10n_pt/__manifest__.py
+++ b/addons/l10n_pt/__manifest__.py
@@ -21,6 +21,6 @@
            'data/account_fiscal_position_template_data.xml',
            'data/account_data.xml',
            'data/account_tax_data.xml',
-           'data/account_chart_template_data.yml',
+           'data/account_chart_template_configure_data.xml',
            ],
 }
diff --git a/addons/l10n_pt/data/account_chart_template_configure_data.xml b/addons/l10n_pt/data/account_chart_template_configure_data.xml
new file mode 100644
index 00000000000..67ccb9ab292
--- /dev/null
+++ b/addons/l10n_pt/data/account_chart_template_configure_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_pt.pt_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_pt/data/account_chart_template_data.yml b/addons/l10n_pt/data/account_chart_template_data.yml
deleted file mode 100644
index bedfeff07f5..00000000000
--- a/addons/l10n_pt/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: pt_chart_template}: |
-    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_ro/__manifest__.py b/addons/l10n_ro/__manifest__.py
index bc1674c449d..025c57bf963 100644
--- a/addons/l10n_ro/__manifest__.py
+++ b/addons/l10n_ro/__manifest__.py
@@ -28,7 +28,7 @@ Romanian accounting chart and localization.
              'data/account_data.xml',
              'data/account_tax_data.xml',
              'data/account_fiscal_position_data.xml',
-             'data/account_chart_template_data.yml',
+             'data/account_chart_template_data.xml',
              'data/res.country.state.csv',
              'data/res.bank.csv',
              ],
diff --git a/addons/l10n_ro/data/account_chart_template_data.xml b/addons/l10n_ro/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..7f22e01478f
--- /dev/null
+++ b/addons/l10n_ro/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_ro.ro_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_ro/data/account_chart_template_data.yml b/addons/l10n_ro/data/account_chart_template_data.yml
deleted file mode 100644
index 9d8901444fe..00000000000
--- a/addons/l10n_ro/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: ro_chart_template}: |
-    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_sa/__manifest__.py b/addons/l10n_sa/__manifest__.py
index 1a1e0bcc8d9..7b3c95cbeb4 100644
--- a/addons/l10n_sa/__manifest__.py
+++ b/addons/l10n_sa/__manifest__.py
@@ -19,7 +19,7 @@ In future this module will include some payroll rules for ME .
         'data/account_chart_template_data.xml',
         'data/account.account.template.csv',
         'data/l10n_sa_chart_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_configure_data.xml',
     ],
     'post_init_hook': 'load_translations',
 }
diff --git a/addons/l10n_sa/data/account_chart_template_configure_data.xml b/addons/l10n_sa/data/account_chart_template_configure_data.xml
new file mode 100644
index 00000000000..44d29a81b00
--- /dev/null
+++ b/addons/l10n_sa/data/account_chart_template_configure_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_sa.account_arabic_coa_general')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_sa/data/account_chart_template_data.yml b/addons/l10n_sa/data/account_chart_template_data.yml
deleted file mode 100644
index d52f71fc946..00000000000
--- a/addons/l10n_sa/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: account_arabic_coa_general}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_sg/__manifest__.py b/addons/l10n_sg/__manifest__.py
index d05a6c0958e..3520aca1721 100644
--- a/addons/l10n_sg/__manifest__.py
+++ b/addons/l10n_sg/__manifest__.py
@@ -31,7 +31,7 @@ After installing this module, the Configuration wizard for accounting is launche
              'data/l10n_sg_chart_data.xml',
              'data/account_data.xml',
              'data/account_tax_data.xml',
-             'data/account_chart_template_data.yml',
+             'data/account_chart_template_data.xml',
     ],
     'post_init_hook': '_preserve_tag_on_taxes',
 }
diff --git a/addons/l10n_sg/data/account_chart_template_data.xml b/addons/l10n_sg/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..8c7abb168cf
--- /dev/null
+++ b/addons/l10n_sg/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_sg.sg_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_sg/data/account_chart_template_data.yml b/addons/l10n_sg/data/account_chart_template_data.yml
deleted file mode 100644
index e7bb9f5aed4..00000000000
--- a/addons/l10n_sg/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: sg_chart_template}: |
-    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_si/__manifest__.py b/addons/l10n_si/__manifest__.py
index 560a4aebeed..81fe932af88 100644
--- a/addons/l10n_si/__manifest__.py
+++ b/addons/l10n_si/__manifest__.py
@@ -25,6 +25,6 @@
         "data/account.fiscal.position.template.csv",
         "data/account.fiscal.position.account.template.csv",
         "data/account.fiscal.position.tax.template.csv",
-        "data/account_chart_template_data.yml",
+        "data/account_chart_template_data.xml",
     ],
 }
diff --git a/addons/l10n_si/data/account_chart_template_data.xml b/addons/l10n_si/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..3e88279c49a
--- /dev/null
+++ b/addons/l10n_si/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_si.gd_chart')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_si/data/account_chart_template_data.yml b/addons/l10n_si/data/account_chart_template_data.yml
deleted file mode 100644
index 87caf7b2f93..00000000000
--- a/addons/l10n_si/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: gd_chart}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_syscohada/__manifest__.py b/addons/l10n_syscohada/__manifest__.py
index 1a3411dbc43..4803d7bfd89 100644
--- a/addons/l10n_syscohada/__manifest__.py
+++ b/addons/l10n_syscohada/__manifest__.py
@@ -29,6 +29,6 @@ Countries that use OHADA are the following:
     'data': [
         'data/account_data.xml',
         'data/l10n_syscohada_chart_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
 }
diff --git a/addons/l10n_syscohada/data/account_chart_template_data.xml b/addons/l10n_syscohada/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..8b945630cb3
--- /dev/null
+++ b/addons/l10n_syscohada/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_syscohada.syscohada_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_syscohada/data/account_chart_template_data.yml b/addons/l10n_syscohada/data/account_chart_template_data.yml
deleted file mode 100644
index ed6dcaaa2b3..00000000000
--- a/addons/l10n_syscohada/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: syscohada_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_th/__manifest__.py b/addons/l10n_th/__manifest__.py
index e283dcfaace..f14d8bae48c 100644
--- a/addons/l10n_th/__manifest__.py
+++ b/addons/l10n_th/__manifest__.py
@@ -17,7 +17,7 @@ Thai accounting chart and localization.
     'data': [
         'data/account_data.xml',
         'data/l10n_th_chart_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
     'post_init_hook': '_preserve_tag_on_taxes',
 }
diff --git a/addons/l10n_th/data/account_chart_template_data.xml b/addons/l10n_th/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..e6dc6ce6b85
--- /dev/null
+++ b/addons/l10n_th/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_th.chart')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_th/data/account_chart_template_data.yml b/addons/l10n_th/data/account_chart_template_data.yml
deleted file mode 100644
index 99bbac243aa..00000000000
--- a/addons/l10n_th/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: chart}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_tr/__manifest__.py b/addons/l10n_tr/__manifest__.py
index 40ed0b77392..6cd7f6b7d96 100644
--- a/addons/l10n_tr/__manifest__.py
+++ b/addons/l10n_tr/__manifest__.py
@@ -23,6 +23,6 @@ Bu modül kurulduktan sonra, Muhasebe yapılandırma sihirbazı çalışır
         'data/l10n_tr_chart_data.xml',
         'data/account_data.xml',
         'data/account_tax_template_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
 }
diff --git a/addons/l10n_tr/data/account_chart_template_data.xml b/addons/l10n_tr/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..b80a32f0229
--- /dev/null
+++ b/addons/l10n_tr/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_tr.l10ntr_tek_duzen_hesap')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_tr/data/account_chart_template_data.yml b/addons/l10n_tr/data/account_chart_template_data.yml
deleted file mode 100644
index 895dbd72db5..00000000000
--- a/addons/l10n_tr/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10ntr_tek_duzen_hesap}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_uk/__manifest__.py b/addons/l10n_uk/__manifest__.py
index 6a5607878a5..e35c1478840 100644
--- a/addons/l10n_uk/__manifest__.py
+++ b/addons/l10n_uk/__manifest__.py
@@ -29,7 +29,7 @@ This is the latest UK Odoo localisation necessary to run Odoo accounting for UK
         'data/account.tax.group.csv',
         'data/account.tax.template.csv',
         'data/res.country.state.csv',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
     'demo' : ['demo/l10n_uk_demo.xml'],
 }
diff --git a/addons/l10n_uk/data/account_chart_template_data.xml b/addons/l10n_uk/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..6eee7a3712a
--- /dev/null
+++ b/addons/l10n_uk/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_uk.l10n_uk')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_uk/data/account_chart_template_data.yml b/addons/l10n_uk/data/account_chart_template_data.yml
deleted file mode 100644
index 5aed3b2afb3..00000000000
--- a/addons/l10n_uk/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: l10n_uk}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_uy/__manifest__.py b/addons/l10n_uy/__manifest__.py
index c1468074630..c24829cc62d 100644
--- a/addons/l10n_uy/__manifest__.py
+++ b/addons/l10n_uy/__manifest__.py
@@ -19,6 +19,6 @@ Provide Templates for Chart of Accounts, Taxes for Uruguay.
         'data/l10n_uy_chart_data.xml',
         'data/account_data.xml',
         'data/account_tax_data.xml',
-        'data/account_chart_template_data.yml',
+        'data/account_chart_template_data.xml',
     ],
 }
diff --git a/addons/l10n_uy/data/account_chart_template_data.xml b/addons/l10n_uy/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..4e1c02a6474
--- /dev/null
+++ b/addons/l10n_uy/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_uy.uy_chart_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_uy/data/account_chart_template_data.yml b/addons/l10n_uy/data/account_chart_template_data.yml
deleted file mode 100644
index a68f874bef3..00000000000
--- a/addons/l10n_uy/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: uy_chart_template}: |
-    self[0].try_loading_for_current_company()
diff --git a/addons/l10n_ve/__manifest__.py b/addons/l10n_ve/__manifest__.py
index faf22590f2c..8ce453ce44e 100644
--- a/addons/l10n_ve/__manifest__.py
+++ b/addons/l10n_ve/__manifest__.py
@@ -46,6 +46,6 @@ but you will need set manually account defaults for taxes.
              'data/l10n_ve_chart_data.xml',
              'data/account_data.xml',
              'data/account_tax_data.xml',
-             'data/account_chart_template_data.yml'
+             'data/account_chart_template_data.xml'
     ],
 }
diff --git a/addons/l10n_ve/data/account_chart_template_data.xml b/addons/l10n_ve/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..254f59a66b3
--- /dev/null
+++ b/addons/l10n_ve/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_ve.ve_chart_template_amd')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_ve/data/account_chart_template_data.yml b/addons/l10n_ve/data/account_chart_template_data.yml
deleted file mode 100644
index f045ff4ccad..00000000000
--- a/addons/l10n_ve/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: ve_chart_template_amd}: |
-    self[0].try_loading_for_current_company()
\ No newline at end of file
diff --git a/addons/l10n_vn/__manifest__.py b/addons/l10n_vn/__manifest__.py
index 7668c3c8dbe..a18061ce284 100644
--- a/addons/l10n_vn/__manifest__.py
+++ b/addons/l10n_vn/__manifest__.py
@@ -27,7 +27,7 @@ with Chart of account under Circular No. 200/2014/TT-BTC
          'data/l10n_vn_chart_data.xml',
          'data/account_data.xml',
          'data/account_tax_data.xml',
-         'data/account_chart_template_data.yml',
+         'data/account_chart_template_data.xml',
     ],
     'post_init_hook': '_preserve_tag_on_taxes',
 }
diff --git a/addons/l10n_vn/data/account_chart_template_data.xml b/addons/l10n_vn/data/account_chart_template_data.xml
new file mode 100644
index 00000000000..1f6bfea02da
--- /dev/null
+++ b/addons/l10n_vn/data/account_chart_template_data.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <function model="account.chart.template" name="try_loading_for_current_company">
+            <value eval="[ref('l10n_vn.vn_template')]"/>
+        </function>
+    </data>
+</odoo>
diff --git a/addons/l10n_vn/data/account_chart_template_data.yml b/addons/l10n_vn/data/account_chart_template_data.yml
deleted file mode 100644
index 1454624dc4c..00000000000
--- a/addons/l10n_vn/data/account_chart_template_data.yml
+++ /dev/null
@@ -1,3 +0,0 @@
--
-  !python {model: account.chart.template, id: vn_template}: |
-    self[0].try_loading_for_current_company()