diff options
| author | Victor Feyens <vfe@odoo.com> | 2020-09-15 13:55:09 +0000 |
|---|---|---|
| committer | Victor Feyens <vfe@odoo.com> | 2020-10-22 13:10:54 +0000 |
| commit | 037012bc4e2935eb00a7f353529bb7ec55066733 (patch) | |
| tree | 3aa2efc3cfb905e9c15d382e9751cd15bdacc2db /addons/l10n_fr/models | |
| parent | 4ff9ff09193390d9b39b15046855f94a98ad8409 (diff) | |
[FIX] *: avoid direct references to countries
Ensure the code works fine even if countries are deleted.
Also consider "re"-created countries after deletion, by only considering
the country code, not the data reference.
This should reduce support requests related to deleted countries, and
ease the resolution of such problems by the users themselves.
TASK ID - 2368842
closes odoo/odoo#57837
Related: odoo/enterprise#13275
Signed-off-by: Victor Feyens (vfe) <vfe@odoo.com>
Diffstat (limited to 'addons/l10n_fr/models')
| -rw-r--r-- | addons/l10n_fr/models/account_chart_template.py | 2 | ||||
| -rw-r--r-- | addons/l10n_fr/models/l10n_fr.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/l10n_fr/models/account_chart_template.py b/addons/l10n_fr/models/account_chart_template.py index 21a35704b99..c71d881785f 100644 --- a/addons/l10n_fr/models/account_chart_template.py +++ b/addons/l10n_fr/models/account_chart_template.py @@ -12,6 +12,6 @@ class AccountChartTemplate(models.Model): journal_data = super(AccountChartTemplate, self)._prepare_all_journals( acc_template_ref, company, journals_dict) for journal in journal_data: - if journal['type'] in ('sale', 'purchase') and company.country_id == self.env.ref('base.fr'): + if journal['type'] in ('sale', 'purchase') and company.country_id.code == "FR": 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 9d6fee4ef9b..40acbb6fd66 100644 --- a/addons/l10n_fr/models/l10n_fr.py +++ b/addons/l10n_fr/models/l10n_fr.py @@ -13,7 +13,7 @@ class ChartTemplate(models.Model): 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 == self.env.ref('base.fr'): + 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']: |