diff --git a/addons/l10n_fr/models/account_chart_template.py b/addons/l10n_fr/models/account_chart_template.py index c71d881785f..9af2615a40a 100644 --- a/addons/l10n_fr/models/account_chart_template.py +++ b/addons/l10n_fr/models/account_chart_template.py @@ -11,7 +11,10 @@ class AccountChartTemplate(models.Model): def _prepare_all_journals(self, acc_template_ref, company, journals_dict=None): journal_data = super(AccountChartTemplate, self)._prepare_all_journals( acc_template_ref, company, journals_dict) + if company.country_id.code != 'FR': + return journal_data + for journal in journal_data: - if journal['type'] in ('sale', 'purchase') and company.country_id.code == "FR": + if journal['type'] in ('sale', 'purchase'): journal.update({'refund_sequence': True}) return journal_data diff --git a/addons/l10n_fr/models/l10n_fr.py b/addons/l10n_fr/models/l10n_fr.py index 40acbb6fd66..d90cdee4478 100644 --- a/addons/l10n_fr/models/l10n_fr.py +++ b/addons/l10n_fr/models/l10n_fr.py @@ -8,14 +8,3 @@ class ResPartner(models.Model): siret = fields.Char(string='SIRET', size=14) -class ChartTemplate(models.Model): - _inherit = 'account.chart.template' - - def _prepare_all_journals(self, acc_template_ref, company, journals_dict=None): - journals = super(ChartTemplate, self)._prepare_all_journals(acc_template_ref, company, journals_dict) - if company.country_id.code == "FR": - #For France, sale/purchase journals must have a dedicated sequence for refunds - for journal in journals: - if journal['type'] in ['sale', 'purchase']: - journal['refund_sequence'] = True - return journals