diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py
index 8013248968e57a804d46f689a779293849c2f6c7..9c93c4bbec6c62c07b4a2ecb170fb799026e8f66 100644
--- a/addons/account/models/chart_template.py
+++ b/addons/account/models/chart_template.py
@@ -164,21 +164,24 @@ class AccountChartTemplate(models.Model):
'chart_template_id': self.id,
}
- def try_loading_for_current_company(self):
+ def try_loading(self, company=False):
""" Installs this chart of accounts for the current company if not chart
of accounts had been created for it yet.
"""
# do not use `request.env` here, it can cause deadlocks
- if request and hasattr(request, 'allowed_company_ids'):
- company = self.env['res.company'].browse(request.allowed_company_ids[0])
- else:
- company = self.env.company
+ if not company:
+ if request and hasattr(request, 'allowed_company_ids'):
+ company = self.env['res.company'].browse(request.allowed_company_ids[0])
+ else:
+ company = self.env.company
# If we don't have any chart of account on this company, install this chart of account
if not company.chart_template_id and not self.existing_accounting(company):
for template in self:
- template.load_for_current_company(15.0, 15.0)
+ template.with_context(default_company_id=company.id)._load(15.0, 15.0, company)
+
+ try_loading_for_current_company = try_loading
- def load_for_current_company(self, sale_tax_rate, purchase_tax_rate):
+ def _load(self, sale_tax_rate, purchase_tax_rate, company):
""" Installs this chart of accounts on the current company, replacing
the existing one if it had already one defined. If some accounting entries
had already been made, this function fails instead, triggering a UserError.
@@ -188,12 +191,8 @@ class AccountChartTemplate(models.Model):
"""
self.ensure_one()
# do not use `request.env` here, it can cause deadlocks
- if request and hasattr(request, 'allowed_company_ids'):
- company = self.env['res.company'].browse(request.allowed_company_ids[0])
- else:
- company = self.env.company
# Ensure everything is translated to the company's language, not the user's one.
- self = self.with_context(lang=company.partner_id.lang)
+ self = self.with_context(lang=company.partner_id.lang, company=company)
if not self.env.is_admin():
raise AccessError(_("Only administrators can load a charf of accounts"))
diff --git a/addons/account/models/res_config_settings.py b/addons/account/models/res_config_settings.py
index 35d3c83a1b1ac4420a58a343a892f3c03ee96250..c6b8b09c1754caa00c35d040281c38e43fcbd1cd 100644
--- a/addons/account/models/res_config_settings.py
+++ b/addons/account/models/res_config_settings.py
@@ -94,7 +94,7 @@ class ResConfigSettings(models.TransientModel):
self.env.ref('base.group_user').write({'implied_ids': [(4, self.env.ref('product.group_sale_pricelist').id)]})
""" install a chart of accounts for the given company (if required) """
if self.chart_template_id and self.chart_template_id != self.company_id.chart_template_id:
- self.chart_template_id.load_for_current_company(15.0, 15.0)
+ self.chart_template_id._load(15.0, 15.0, self.env.company)
@api.depends('company_id')
def _compute_has_chart_of_accounts(self):
diff --git a/addons/account/tests/account_test_savepoint.py b/addons/account/tests/account_test_savepoint.py
index 7cea2de366d73c852a77646386916c420b9350db..a5e0b2f2082c0770f825e55a5d3a45edb4360e9b 100644
--- a/addons/account/tests/account_test_savepoint.py
+++ b/addons/account/tests/account_test_savepoint.py
@@ -56,7 +56,7 @@ class AccountingSavepointCase(SavepointCase):
cls.env.user.company_id = company
chart_template = cls.env['account.chart.template'].browse(chart_template.id)
- chart_template.load_for_current_company(15.0, 15.0)
+ chart_template.try_loading()
# The currency could be different after the installation of the chart template.
company.write({'currency_id': kwargs.get('currency_id', cls.env.user.company_id.currency_id.id)})
diff --git a/addons/account/tests/test_account_all_l10n.py b/addons/account/tests/test_account_all_l10n.py
index 7e916ba60bbd194815949e8fb7927b282fab8229..58ac29937d8365bfcb86647d4fc52846160b9200 100644
--- a/addons/account/tests/test_account_all_l10n.py
+++ b/addons/account/tests/test_account_all_l10n.py
@@ -48,4 +48,4 @@ class TestAllL10n(SingleTransactionCase):
_logger.info(msg)
with self.subTest(msg=msg):
with self.cr.savepoint():
- coa.try_loading_for_current_company()
+ coa.try_loading()
diff --git a/addons/l10n_ae/data/account_chart_template_data.xml b/addons/l10n_ae/data/account_chart_template_data.xml
index 9e6ae93bbcdba67f1302e4c30748078d5ed6ca57..bdabb13a9e4d6a90dc0ba0686823ca3ca3d880f5 100644
--- a/addons/l10n_ae/data/account_chart_template_data.xml
+++ b/addons/l10n_ae/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_ae.uae_chart_template_standard')]"/>
</function>
</data>
diff --git a/addons/l10n_ar/data/account_chart_template_data.xml b/addons/l10n_ar/data/account_chart_template_data.xml
index 073f46b83f41ddb08f495446cfcb448c22e6bdc7..fcb4816262066672bf110e1e2ba944a3b8f18413 100644
--- a/addons/l10n_ar/data/account_chart_template_data.xml
+++ b/addons/l10n_ar/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_ar.ar_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_at/data/account_chart_template_data.xml b/addons/l10n_at/data/account_chart_template_data.xml
index cca117de2c5348fc650286c661baa16e08e91cc1..0a9c7739c0e732a8febdc71b34a50d02ab6fd943 100644
--- a/addons/l10n_at/data/account_chart_template_data.xml
+++ b/addons/l10n_at/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_at.austria_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_au/data/account_chart_template_configure_data.xml b/addons/l10n_au/data/account_chart_template_configure_data.xml
index 12e91eb5d94517a712e4a923c75fc705328a6c50..e0e45b0c7e928cbb19b0eaf9bc5858315706ebb1 100644
--- a/addons/l10n_au/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_au/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_au.l10n_au_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_be/data/account_chart_template_configure_data.xml b/addons/l10n_be/data/account_chart_template_configure_data.xml
index 82de3a2f629a4d65c3957429e796129781a47b0b..9dd509d1ff4e646918880f1d7e33d3a8436b9863 100644
--- a/addons/l10n_be/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_be/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_be.l10nbe_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_be_edi/tests/test_ubl.py b/addons/l10n_be_edi/tests/test_ubl.py
index 37f40aced7c5a2b476f49d40ae373569dd495de1..0fa29858416360388af02a1ad4d4b53704d9eb2e 100644
--- a/addons/l10n_be_edi/tests/test_ubl.py
+++ b/addons/l10n_be_edi/tests/test_ubl.py
@@ -10,7 +10,7 @@ class TestUBL(common.TransactionCase):
# Force user Belgium country.
self.env.user.company_id = self.env['res.company'].create({'name': 'MyCompany'})
self.env.user.company_id.country = self.env.ref('base.be')
- self.env.ref('l10n_be.l10nbe_chart_template').load_for_current_company(False, False)
+ self.env.ref('l10n_be.l10nbe_chart_template').try_loading()
self.partner_id = self.env['res.partner'].create({'name': 'TestUser', 'vat': 'BE0123456789'})
def test_ubl_invoice_import(self):
diff --git a/addons/l10n_bo/data/account_chart_template_data.xml b/addons/l10n_bo/data/account_chart_template_data.xml
index 9eb1fa02c7714282d4e965f8a18cdf85a002f28f..7db442fa001324e469ad393e2dfb9dedac0158ef 100644
--- a/addons/l10n_bo/data/account_chart_template_data.xml
+++ b/addons/l10n_bo/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_bo.bo_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_br/data/account_tax_template_data.xml b/addons/l10n_br/data/account_tax_template_data.xml
index 1038d1f82c1c4675b1f733f5d0a1bc63db389e86..33e74f2a0f23a6e887a99ecec322748f60cda270 100644
--- a/addons/l10n_br/data/account_tax_template_data.xml
+++ b/addons/l10n_br/data/account_tax_template_data.xml
@@ -3182,7 +3182,7 @@
</record>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_br.l10n_br_account_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_ca/data/account_chart_template_configure_data.xml b/addons/l10n_ca/data/account_chart_template_configure_data.xml
index 91c408dbc51190726a188f8728371f19cba13bd1..1f7f726a60aee15ed4f5e443eebf0551f9f0bcf7 100644
--- a/addons/l10n_ca/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_ca/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_ca.ca_en_chart_template_en')]"/>
</function>
</data>
diff --git a/addons/l10n_ch/data/account_chart_template_data.xml b/addons/l10n_ch/data/account_chart_template_data.xml
index 2fe4f7d7bda808d9cd45e1d132505e3eef1a5f76..837cc9915e9326b3bf939840135385f36c228f1b 100644
--- a/addons/l10n_ch/data/account_chart_template_data.xml
+++ b/addons/l10n_ch/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_ch.l10nch_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_cl/data/account_chart_template_data.xml b/addons/l10n_cl/data/account_chart_template_data.xml
index 26ae9d46de931666afd1aef8d6da45efa5f752d9..8094f1f14bf5f946308d8b2327d0d7d2bccc4bfc 100644
--- a/addons/l10n_cl/data/account_chart_template_data.xml
+++ b/addons/l10n_cl/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_cl.cl_chart_template')]"/>
</function>
</data>
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
index 1d0ab870bd33c77858128f01d449ff3938bc9662..87bfa0a65939f366bbb18e7016b067f7c96fcc8b 100644
--- a/addons/l10n_cn_small_business/data/account_chart_template_data.xml
+++ b/addons/l10n_cn_small_business/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_cn_small_business.l10n_chart_china_small_business')]"/>
</function>
</data>
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 6ece644774e7b5fa2c2f6f17e5983d66d619f544..47c03074e57ec05a60d865787ca021cfd9d69290 100644
--- a/addons/l10n_cn_standard/data/account_chart_template_data.xml
+++ b/addons/l10n_cn_standard/data/account_chart_template_data.xml
@@ -12,7 +12,7 @@
<field name="default_pos_receivable_account_id" ref="account_1124" />
</record>
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_cn_standard.l10n_chart_china_standard_business')]"/>
</function>
</data>
diff --git a/addons/l10n_co/data/account_chart_template_configure_data.xml b/addons/l10n_co/data/account_chart_template_configure_data.xml
index f21b6f7671311b04d7a249dfd0b22b7c20a997c2..cf74e0e9c1f45cd513962fb1c6112fba3f5f090e 100644
--- a/addons/l10n_co/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_co/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_co.l10n_co_chart_template_generic')]"/>
</function>
</data>
diff --git a/addons/l10n_cr/data/account_chart_template_configure_data.xml b/addons/l10n_cr/data/account_chart_template_configure_data.xml
index 6e7000006011b347263db3b7a486819d0d2e1384..638cae329808f33d7ed5e8163d5d418513e596cc 100644
--- a/addons/l10n_cr/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_cr/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_cr.account_chart_template_0')]"/>
</function>
</data>
diff --git a/addons/l10n_de/models/chart_template.py b/addons/l10n_de/models/chart_template.py
index 22c1b18af7456d082842ccf704d1261c637014c0..b62a5c2d313247285df901a4287952fe494d91da 100644
--- a/addons/l10n_de/models/chart_template.py
+++ b/addons/l10n_de/models/chart_template.py
@@ -15,9 +15,8 @@ class AccountChartTemplate(models.Model):
return res
# Write paperformat and report template used on company
- def load_for_current_company(self, sale_tax_rate, purchase_tax_rate):
- res = super(AccountChartTemplate, self).load_for_current_company(sale_tax_rate, purchase_tax_rate)
- company = self.env.company
+ def _load(self, sale_tax_rate, purchase_tax_rate, company):
+ res = super(AccountChartTemplate, self)._load(sale_tax_rate, purchase_tax_rate, company)
if company.country_id.code == 'DE':
company.write({'external_report_layout_id': self.env.ref('l10n_de.external_layout_din5008').id,
'paperformat_id': self.env.ref('l10n_de.paperformat_euro_din').id})
diff --git a/addons/l10n_de_skr03/data/account_chart_template_data.xml b/addons/l10n_de_skr03/data/account_chart_template_data.xml
index f4eac748632fb6904f245014517514bcbeeba80f..f0455a1e85d4e945dd698a9525640838a731c8cf 100644
--- a/addons/l10n_de_skr03/data/account_chart_template_data.xml
+++ b/addons/l10n_de_skr03/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_de_skr03.l10n_de_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_de_skr04/data/account_chart_template_data.xml b/addons/l10n_de_skr04/data/account_chart_template_data.xml
index df61b21670643ff77d7ec2a63fb6a112078c9c08..072b66a8bba1e9db8461d571fd8f40e8e7ecf17e 100644
--- a/addons/l10n_de_skr04/data/account_chart_template_data.xml
+++ b/addons/l10n_de_skr04/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_de_skr04.l10n_chart_de_skr04')]"/>
</function>
</data>
diff --git a/addons/l10n_do/data/account_chart_template_configure_data.xml b/addons/l10n_do/data/account_chart_template_configure_data.xml
index 616cf27efaf4ed9196e85dc7004d4a5cc9cf27db..a7671ce1e7000deb5ee27fa7acc3922ea0364b5d 100644
--- a/addons/l10n_do/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_do/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_do.do_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_ec/data/account_chart_template_data.xml b/addons/l10n_ec/data/account_chart_template_data.xml
index bacf0d13b918812e8de1c436cc573177165a39a9..ce15e3baa2ec4c59baf73d28ac2d1636ed40595d 100644
--- a/addons/l10n_ec/data/account_chart_template_data.xml
+++ b/addons/l10n_ec/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_ec.ec_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_es/data/account_chart_template_configure_data.xml b/addons/l10n_es/data/account_chart_template_configure_data.xml
index 8d7178f898b0046819326af408af38cd8006eb3d..dd409269cb8d480ff69c3bac0a33171f63b344e5 100644
--- a/addons/l10n_es/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_es/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_es.account_chart_template_pymes')]"/>
</function>
</data>
diff --git a/addons/l10n_et/data/account_chart_template_configure_data.xml b/addons/l10n_et/data/account_chart_template_configure_data.xml
index d677832c106d726fb9c1146562c80234657e89e2..9e9f702c5d0fb0fb0f246d140c8ca00316e79ad4 100644
--- a/addons/l10n_et/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_et/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_et.l10n_et')]"/>
</function>
</data>
diff --git a/addons/l10n_fr/data/account_chart_template_configure_data.xml b/addons/l10n_fr/data/account_chart_template_configure_data.xml
index f69b141c2975c3b7f460c292df2aa85b98ccbc7b..a96b3e05d633e501e1e6b6668ead73113eaf9821 100644
--- a/addons/l10n_fr/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_fr/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_fr.l10n_fr_pcg_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_generic_coa/data/account_chart_template_data.xml b/addons/l10n_generic_coa/data/account_chart_template_data.xml
index 0994cd3932e2c2fe21696b3b6ec78157a0211841..c3309d4673585f462c4e6d3d8224a633b16a0608 100644
--- a/addons/l10n_generic_coa/data/account_chart_template_data.xml
+++ b/addons/l10n_generic_coa/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_generic_coa.configurable_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_gr/data/account_chart_template_configure_data.xml b/addons/l10n_gr/data/account_chart_template_configure_data.xml
index acedd6449e07f63f857a1fb64a7b4c1bc1ce62dd..2084c0fdd33fa40f42f35c993c79beced07322b4 100644
--- a/addons/l10n_gr/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_gr/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_gr.l10n_gr_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_gt/data/account_chart_template_data.xml b/addons/l10n_gt/data/account_chart_template_data.xml
index 37d5540256ace857ec27fefc5a343e4256a92019..7ca7eed66cbd04929037d785102c661bfb56c0dd 100644
--- a/addons/l10n_gt/data/account_chart_template_data.xml
+++ b/addons/l10n_gt/data/account_chart_template_data.xml
@@ -72,7 +72,7 @@
]"/>
</record>
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_gt.cuentas_plantilla')]"/>
</function>
</data>
diff --git a/addons/l10n_hk/data/account_chart_template_configure_data.xml b/addons/l10n_hk/data/account_chart_template_configure_data.xml
index b42fde69af0079176d6f6273b72579449b6e56c0..f6f61f2037edc3db3fb28d07831c029205b65306 100644
--- a/addons/l10n_hk/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_hk/data/account_chart_template_configure_data.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_hk.l10n_hk_chart_template')]"/>
</function>
</odoo>
diff --git a/addons/l10n_hn/data/account_chart_template_data.xml b/addons/l10n_hn/data/account_chart_template_data.xml
index bfeafbd48dd21a1637b5551eb7f84f56578676b2..f0f99df704b8bfe3c5f7415eadb96dadc80a5433 100644
--- a/addons/l10n_hn/data/account_chart_template_data.xml
+++ b/addons/l10n_hn/data/account_chart_template_data.xml
@@ -72,7 +72,7 @@
]"/>
</record>
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_hn.cuentas_plantilla')]"/>
</function>
diff --git a/addons/l10n_hr/data/account_chart_template_data.xml b/addons/l10n_hr/data/account_chart_template_data.xml
index 1072bc86a250886bf69618e2bb6785a4e80d83d8..0677e042ffb53bb081020ea9cd486c17a36c9336 100644
--- a/addons/l10n_hr/data/account_chart_template_data.xml
+++ b/addons/l10n_hr/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_hr.l10n_hr_chart_template_rrif')]"/>
</function>
</data>
diff --git a/addons/l10n_hu/data/account_chart_template_configure_data.xml b/addons/l10n_hu/data/account_chart_template_configure_data.xml
index 2ac5a1aa65137c64916f36725c12abd872c3b6ff..07c8ba83ba132e365f75f4546f4f45d8543189a8 100644
--- a/addons/l10n_hu/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_hu/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_hu.hungarian_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_ie/data/account_chart_template_configuration_data.xml b/addons/l10n_ie/data/account_chart_template_configuration_data.xml
index 3a690fc26129ee71af266d4e2768fdfe1c9eca61..f354fff9a51471d971e9ccb76c5aefdf73b64854 100644
--- a/addons/l10n_ie/data/account_chart_template_configuration_data.xml
+++ b/addons/l10n_ie/data/account_chart_template_configuration_data.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_ie.l10n_ie')]"/>
</function>
</odoo>
diff --git a/addons/l10n_in/data/account_chart_template_data.xml b/addons/l10n_in/data/account_chart_template_data.xml
index b7bfb77d415a7d8aa95baaa13a72650c866fa21a..5a035de6ac575d17c6d2bc705839609e7865179b 100644
--- a/addons/l10n_in/data/account_chart_template_data.xml
+++ b/addons/l10n_in/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_in.indian_chart_template_standard')]"/>
</function>
</data>
diff --git a/addons/l10n_it/data/account_chart_template_data.xml b/addons/l10n_it/data/account_chart_template_data.xml
index 0431a234651eb77dc2eac8b677ef3dfcf0af18f0..fc8295229235a8d18b499a17101e75b6ae76fe05 100644
--- a/addons/l10n_it/data/account_chart_template_data.xml
+++ b/addons/l10n_it/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_it.l10n_it_chart_template_generic')]"/>
</function>
</data>
diff --git a/addons/l10n_jp/data/account_chart_template_configure_data.xml b/addons/l10n_jp/data/account_chart_template_configure_data.xml
index c643e12f4a3666b2e80f8cc86454f1ac08dba10f..2bad92eda93aea22be2b6924be91b33fea20d6ef 100644
--- a/addons/l10n_jp/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_jp/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_jp.l10n_jp1')]"/>
</function>
</data>
diff --git a/addons/l10n_lu/data/account_chart_template_data.xml b/addons/l10n_lu/data/account_chart_template_data.xml
index 19a25539e32b6c247c83f298609ecdd8e7b0fe81..cccc1bbb267628ca1c9f1bd796f347718be48dc6 100644
--- a/addons/l10n_lu/data/account_chart_template_data.xml
+++ b/addons/l10n_lu/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_lu.lu_2011_chart_1')]"/>
</function>
</data>
diff --git a/addons/l10n_ma/data/account_chart_template_data.xml b/addons/l10n_ma/data/account_chart_template_data.xml
index c3ef488c34d9cf95fb3b4919edf8d1f831e70271..3865913ff555f99be23d85758dcefbdcfe826379 100644
--- a/addons/l10n_ma/data/account_chart_template_data.xml
+++ b/addons/l10n_ma/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_ma.l10n_kzc_temp_chart')]"/>
</function>
</data>
diff --git a/addons/l10n_mn/data/account_chart_template_configuration_data.xml b/addons/l10n_mn/data/account_chart_template_configuration_data.xml
index 2de735fa360b17fc30b623060d525ab5df6a07cf..35d6a4de9522a6f66f84ea15cfc4620f50d63ee3 100644
--- a/addons/l10n_mn/data/account_chart_template_configuration_data.xml
+++ b/addons/l10n_mn/data/account_chart_template_configuration_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_mn.mn_chart_1')]"/>
</function>
diff --git a/addons/l10n_mx/data/account_chart_template_data.xml b/addons/l10n_mx/data/account_chart_template_data.xml
index 8fa6c909bdf9fc02b6324a713dff2ccc5ae3ca71..b6ec19f31177064bea875d4869117a5637c21b60 100644
--- a/addons/l10n_mx/data/account_chart_template_data.xml
+++ b/addons/l10n_mx/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_mx.mx_coa')]"/>
</function>
</data>
diff --git a/addons/l10n_nl/data/account_chart_template_data.xml b/addons/l10n_nl/data/account_chart_template_data.xml
index 4b6e5e54d1c526977c395205f1dbc326ecf995e2..2c70d1f26df2d733f5a03e4aedc802642b6702fb 100644
--- a/addons/l10n_nl/data/account_chart_template_data.xml
+++ b/addons/l10n_nl/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_nl.l10nnl_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_nl/models/account_chart_template.py b/addons/l10n_nl/models/account_chart_template.py
index 17c494c0481b98f5447eed4ad7e007164d459979..bd196fdbc0de6d01ff483107a94def62acbe6506 100644
--- a/addons/l10n_nl/models/account_chart_template.py
+++ b/addons/l10n_nl/models/account_chart_template.py
@@ -6,10 +6,10 @@ from odoo import api, fields, models, _
class AccountChartTemplate(models.Model):
_inherit = 'account.chart.template'
- def load_for_current_company(self, sale_tax_rate, purchase_tax_rate):
+ def _load(self, sale_tax_rate, purchase_tax_rate, company):
# Add tag to 999999 account
- res = super(AccountChartTemplate, self).load_for_current_company(sale_tax_rate, purchase_tax_rate)
- if self.env.company.country_id.code == 'NL':
+ res = super(AccountChartTemplate, self)._load(sale_tax_rate, purchase_tax_rate, company)
+ if company.country_id.code == 'NL':
account = self.env['account.account'].search([('code', '=', '999999'), ('company_id', '=', self.env.company.id)])
if account:
account.tag_ids = [(4, self.env.ref('l10n_nl.account_tag_12').id)]
diff --git a/addons/l10n_no/data/account_chart_template_data.xml b/addons/l10n_no/data/account_chart_template_data.xml
index 79e27620a9e85f7d7e195daede034dd59f5e9781..3297a6725b3f2555a1753b76d507d3c12348dc7e 100644
--- a/addons/l10n_no/data/account_chart_template_data.xml
+++ b/addons/l10n_no/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_no.no_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_nz/data/account_chart_template_configure_data.xml b/addons/l10n_nz/data/account_chart_template_configure_data.xml
index 1375f755cef3e36cf188958b83bd2ced09c2d361..f54ef641dc27e567a4ad3bed52cca1173556a17b 100644
--- a/addons/l10n_nz/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_nz/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_nz.l10n_nz_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_pa/data/account_chart_template_data.xml b/addons/l10n_pa/data/account_chart_template_data.xml
index 93944567508700be3a2ddaef0959ea4d27c4e3d1..e32e919d29d0f114c73f4d1c89a848f369ed5ec9 100644
--- a/addons/l10n_pa/data/account_chart_template_data.xml
+++ b/addons/l10n_pa/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_pa.l10npa_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_pe/data/account_chart_template_data.xml b/addons/l10n_pe/data/account_chart_template_data.xml
index 6a52638c45f7d0fecff82f96c31f933596128b22..b25c6f524943034dbcc9aba9832b76a96fb98f91 100644
--- a/addons/l10n_pe/data/account_chart_template_data.xml
+++ b/addons/l10n_pe/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_pe.pe_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_pl/data/account_chart_template_data.xml b/addons/l10n_pl/data/account_chart_template_data.xml
index d4ac336b7463d5e9ab109fdce2029693f9e0fb53..524733982d0eceadd3d48fdd9790bc4a52e9562a 100644
--- a/addons/l10n_pl/data/account_chart_template_data.xml
+++ b/addons/l10n_pl/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_pl.pl_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_pt/data/account_chart_template_configure_data.xml b/addons/l10n_pt/data/account_chart_template_configure_data.xml
index 67ccb9ab2920b1c1744b0a0285d14114f1d7b138..a238410ca58f5d64133ce757a6a8f64a39b0b552 100644
--- a/addons/l10n_pt/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_pt/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_pt.pt_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_ro/data/account_chart_template_data.xml b/addons/l10n_ro/data/account_chart_template_data.xml
index 7f22e01478fea3cc370d137c416491e92372040f..8a48ab0931b8e8c50cdceda6e3a0cb5dff5cf992 100644
--- a/addons/l10n_ro/data/account_chart_template_data.xml
+++ b/addons/l10n_ro/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_ro.ro_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_sa/data/account_chart_template_configure_data.xml b/addons/l10n_sa/data/account_chart_template_configure_data.xml
index 44d29a81b007add0277522396a489c1c20930983..db97c58fc0b8785e73bdb025b04853001b493cde 100644
--- a/addons/l10n_sa/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_sa/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_sa.account_arabic_coa_general')]"/>
</function>
</data>
diff --git a/addons/l10n_sg/data/account_chart_template_data.xml b/addons/l10n_sg/data/account_chart_template_data.xml
index 8c7abb168cfe42bb0284c268b466145a10bf02be..9fff6f40e3c8dba4d820458c160ee1d913cd94dd 100644
--- a/addons/l10n_sg/data/account_chart_template_data.xml
+++ b/addons/l10n_sg/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_sg.sg_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_si/data/account_chart_template_data.xml b/addons/l10n_si/data/account_chart_template_data.xml
index 3e88279c49a63d7adba54952ec274d713f452c0b..fefd11b2909fe5bed5d1bce0224bbbc6780ae790 100644
--- a/addons/l10n_si/data/account_chart_template_data.xml
+++ b/addons/l10n_si/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_si.gd_chart')]"/>
</function>
</data>
diff --git a/addons/l10n_syscohada/data/account_chart_template_data.xml b/addons/l10n_syscohada/data/account_chart_template_data.xml
index 8b945630cb36ac4bc283ab64fc2f0473527d0d07..585021d0b5ad17444fde44a9f97d21378d0708c9 100644
--- a/addons/l10n_syscohada/data/account_chart_template_data.xml
+++ b/addons/l10n_syscohada/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_syscohada.syscohada_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_th/data/account_chart_template_data.xml b/addons/l10n_th/data/account_chart_template_data.xml
index e6dc6ce6b85ff4a0f5b7c971a0081ce73de47246..942a9fffe1fc366e8652d13383828dd9096c4451 100644
--- a/addons/l10n_th/data/account_chart_template_data.xml
+++ b/addons/l10n_th/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_th.chart')]"/>
</function>
</data>
diff --git a/addons/l10n_tr/data/account_chart_template_data.xml b/addons/l10n_tr/data/account_chart_template_data.xml
index b80a32f02292972208482ce261a55932f4dce076..1815ac4e4b7e05d145facca4becebd1fa4546def 100644
--- a/addons/l10n_tr/data/account_chart_template_data.xml
+++ b/addons/l10n_tr/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_tr.l10ntr_tek_duzen_hesap')]"/>
</function>
</data>
diff --git a/addons/l10n_ua/data/account_chart_template_config.xml b/addons/l10n_ua/data/account_chart_template_config.xml
index f4a9dbfb06a25fcba343a5ba899e0d435d818c40..bd08adc885571eb0835186a7c12c366cec8153aa 100644
--- a/addons/l10n_ua/data/account_chart_template_config.xml
+++ b/addons/l10n_ua/data/account_chart_template_config.xml
@@ -31,7 +31,7 @@
<field name="default_pos_receivable_account_id" ref="ua_ias_1122" />
</record>
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_ua.l10n_ua_psbo_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_uk/data/account_chart_template_data.xml b/addons/l10n_uk/data/account_chart_template_data.xml
index 6eee7a3712a43a7e4611e0361212490a80109d86..6ad3b918e71d5e04c9a54d1a95d75b6bd32f38e1 100644
--- a/addons/l10n_uk/data/account_chart_template_data.xml
+++ b/addons/l10n_uk/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_uk.l10n_uk')]"/>
</function>
</data>
diff --git a/addons/l10n_uy/data/account_chart_template_data.xml b/addons/l10n_uy/data/account_chart_template_data.xml
index 4e1c02a6474d3bb5ec96e7cc6d03ca1ac6d46613..9034bbd86690fa2752d6c3b1aeb6049a05563252 100644
--- a/addons/l10n_uy/data/account_chart_template_data.xml
+++ b/addons/l10n_uy/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_uy.uy_chart_template')]"/>
</function>
</data>
diff --git a/addons/l10n_ve/data/account_chart_template_data.xml b/addons/l10n_ve/data/account_chart_template_data.xml
index 254f59a66b33444ac278e08347e37b6abe046637..6d63e187e2bb6d54f4fffcabaa6d8e8486aba458 100644
--- a/addons/l10n_ve/data/account_chart_template_data.xml
+++ b/addons/l10n_ve/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_ve.ve_chart_template_amd')]"/>
</function>
</data>
diff --git a/addons/l10n_vn/data/account_chart_template_data.xml b/addons/l10n_vn/data/account_chart_template_data.xml
index 1f6bfea02da657885c74ae34369f84f78740a744..85a9bf1bd841eaa6c8983b068ee89272f412e77f 100644
--- a/addons/l10n_vn/data/account_chart_template_data.xml
+++ b/addons/l10n_vn/data/account_chart_template_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_vn.vn_template')]"/>
</function>
</data>
diff --git a/addons/l10n_za/data/account_chart_template_configure_data.xml b/addons/l10n_za/data/account_chart_template_configure_data.xml
index 6a3db99a6d5658de0afa1eacd314a79f578aa5a6..b4579c80195a048bf40a530bf9bc9114288d7214 100644
--- a/addons/l10n_za/data/account_chart_template_configure_data.xml
+++ b/addons/l10n_za/data/account_chart_template_configure_data.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo noupdate="1">
- <function model="account.chart.template" name="try_loading_for_current_company">
+ <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_za.default_chart_template')]"/>
</function>
diff --git a/addons/purchase/tests/test_purchase_order_report.py b/addons/purchase/tests/test_purchase_order_report.py
index b78a83d98290636acbae29a59051b9e2497ffe6c..f2110c9612468c627615592928ff265844a76136 100644
--- a/addons/purchase/tests/test_purchase_order_report.py
+++ b/addons/purchase/tests/test_purchase_order_report.py
@@ -18,7 +18,7 @@ class TestPurchaseOrderReport(common.TransactionCase):
# Create a new company and set CoA
self.company_id = self.env['res.company'].create({'name': 'new_company'})
self.env.user.company_id = self.company_id
- self.env.ref('l10n_generic_coa.configurable_chart_template').load_for_current_company(False, False)
+ self.env.ref('l10n_generic_coa.configurable_chart_template').try_loading()
def test_00_purchase_order_report(self):
uom_dozen = self.env.ref('uom.product_uom_dozen')