From a4583a1aa6415aff275ab37fcfddedd873271de4 Mon Sep 17 00:00:00 2001 From: hupo-odoo Date: Mon, 12 Jun 2023 13:41:59 +0000 Subject: [PATCH] [IMP] l10n_{mx,ua,in,dz,ma}: activate default setting For Mexican localization, activate by default the setting display_invoice_amount_total_words for the Mexican localization. As this localization uses its own amount to words function, the related commit enables an override of the generic function to use it correctly with Mexican localization. For the other mentioned localizations (ua,in,dz,ma), the setting was already activated but overriding the create method was not a proper way of doing. task - 3367243 closes odoo/odoo#124909 X-original-commit: 6ee9842764e0b1244927cb8ece1f6407ccec20d5 Related: odoo/enterprise#42510 Signed-off-by: Laurent Smet Signed-off-by: hupo-odoo --- addons/l10n_dz/models/__init__.py | 1 - addons/l10n_dz/models/company.py | 13 ------------- addons/l10n_dz/models/template_dz.py | 1 + addons/l10n_in/models/company.py | 8 -------- addons/l10n_in/models/template_in.py | 1 + addons/l10n_ma/models/__init__.py | 1 - addons/l10n_ma/models/company.py | 13 ------------- addons/l10n_ma/models/template_ma.py | 1 + addons/l10n_mx/models/template_mx.py | 1 + addons/l10n_ua/models/__init__.py | 1 - addons/l10n_ua/models/company.py | 13 ------------- addons/l10n_ua/models/template_ua_ias.py | 1 + addons/l10n_ua/models/template_ua_psbo.py | 1 + 13 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 addons/l10n_dz/models/company.py delete mode 100644 addons/l10n_ma/models/company.py delete mode 100644 addons/l10n_ua/models/company.py diff --git a/addons/l10n_dz/models/__init__.py b/addons/l10n_dz/models/__init__.py index 80b85929bbf..2715e63c783 100644 --- a/addons/l10n_dz/models/__init__.py +++ b/addons/l10n_dz/models/__init__.py @@ -1,3 +1,2 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import template_dz -from . import company diff --git a/addons/l10n_dz/models/company.py b/addons/l10n_dz/models/company.py deleted file mode 100644 index 6047cda956e..00000000000 --- a/addons/l10n_dz/models/company.py +++ /dev/null @@ -1,13 +0,0 @@ -from odoo import api, models - - -class ResCompany(models.Model): - _inherit = 'res.company' - - @api.model_create_multi - def create(self, vals_list): - companies = super().create(vals_list) - for company in companies: - if company.account_fiscal_country_id.code == 'DZ': - company.display_invoice_amount_total_words = True - return companies diff --git a/addons/l10n_dz/models/template_dz.py b/addons/l10n_dz/models/template_dz.py index b2ae99340b3..e868693fdc0 100644 --- a/addons/l10n_dz/models/template_dz.py +++ b/addons/l10n_dz/models/template_dz.py @@ -14,6 +14,7 @@ class AccountChartTemplate(models.AbstractModel): 'property_account_expense_categ_id': 'l10n_dz_600', 'property_account_income_categ_id': 'l10n_dz_700', 'code_digits': 6, + 'display_invoice_amount_total_words': True, } @template('dz', 'res.company') diff --git a/addons/l10n_in/models/company.py b/addons/l10n_in/models/company.py index 04f533ecd84..3b1cf7e5b1e 100644 --- a/addons/l10n_in/models/company.py +++ b/addons/l10n_in/models/company.py @@ -4,11 +4,3 @@ class ResCompany(models.Model): _inherit = 'res.company' l10n_in_upi_id = fields.Char(string="UPI Id") - - @api.model_create_multi - def create(self, vals_list): - companies = super().create(vals_list) - for company in companies: - if company.account_fiscal_country_id.code == 'IN': - company.display_invoice_amount_total_words = True - return companies diff --git a/addons/l10n_in/models/template_in.py b/addons/l10n_in/models/template_in.py index e7418029311..e341f3f88a7 100644 --- a/addons/l10n_in/models/template_in.py +++ b/addons/l10n_in/models/template_in.py @@ -16,6 +16,7 @@ class AccountChartTemplate(models.AbstractModel): 'property_tax_payable_account_id': 'p11239', 'property_tax_receivable_account_id': 'p10059', 'code_digits': '6', + 'display_invoice_amount_total_words': True, } @template('in', 'res.company') diff --git a/addons/l10n_ma/models/__init__.py b/addons/l10n_ma/models/__init__.py index f89c50d87b8..0f286825e5e 100644 --- a/addons/l10n_ma/models/__init__.py +++ b/addons/l10n_ma/models/__init__.py @@ -1,3 +1,2 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import template_ma -from . import company diff --git a/addons/l10n_ma/models/company.py b/addons/l10n_ma/models/company.py deleted file mode 100644 index c8e6dfc640b..00000000000 --- a/addons/l10n_ma/models/company.py +++ /dev/null @@ -1,13 +0,0 @@ -from odoo import api, models - - -class ResCompany(models.Model): - _inherit = 'res.company' - - @api.model_create_multi - def create(self, vals_list): - companies = super().create(vals_list) - for company in companies: - if company.account_fiscal_country_id.code == 'MA': - company.display_invoice_amount_total_words = True - return companies diff --git a/addons/l10n_ma/models/template_ma.py b/addons/l10n_ma/models/template_ma.py index ca01cdbed92..6749718d610 100644 --- a/addons/l10n_ma/models/template_ma.py +++ b/addons/l10n_ma/models/template_ma.py @@ -14,6 +14,7 @@ class AccountChartTemplate(models.AbstractModel): 'property_account_payable_id': 'pcg_44111', 'property_account_income_categ_id': 'pcg_7111', 'property_account_expense_categ_id': 'pcg_6111', + 'display_invoice_amount_total_words': True, } @template('ma', 'res.company') diff --git a/addons/l10n_mx/models/template_mx.py b/addons/l10n_mx/models/template_mx.py index f1ba0304eb1..b7d23a2ceb3 100644 --- a/addons/l10n_mx/models/template_mx.py +++ b/addons/l10n_mx/models/template_mx.py @@ -11,6 +11,7 @@ class AccountChartTemplate(models.AbstractModel): return { 'code_digits': '3', 'use_anglo_saxon': True, + 'display_invoice_amount_total_words': True, 'property_account_receivable_id': 'cuenta105_01', 'property_account_payable_id': 'cuenta201_01', 'property_account_expense_categ_id': 'cuenta601_84', diff --git a/addons/l10n_ua/models/__init__.py b/addons/l10n_ua/models/__init__.py index 62f370db1bb..6fe749f107e 100644 --- a/addons/l10n_ua/models/__init__.py +++ b/addons/l10n_ua/models/__init__.py @@ -1,4 +1,3 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import template_ua_ias from . import template_ua_psbo -from . import company diff --git a/addons/l10n_ua/models/company.py b/addons/l10n_ua/models/company.py deleted file mode 100644 index 0b6654c3aa1..00000000000 --- a/addons/l10n_ua/models/company.py +++ /dev/null @@ -1,13 +0,0 @@ -from odoo import api, models - - -class ResCompany(models.Model): - _inherit = 'res.company' - - @api.model_create_multi - def create(self, vals_list): - companies = super().create(vals_list) - for company in companies: - if company.account_fiscal_country_id.code == 'UA': - company.display_invoice_amount_total_words = True - return companies diff --git a/addons/l10n_ua/models/template_ua_ias.py b/addons/l10n_ua/models/template_ua_ias.py index 8e2645f5d4b..bc10fcf00cd 100644 --- a/addons/l10n_ua/models/template_ua_ias.py +++ b/addons/l10n_ua/models/template_ua_ias.py @@ -20,6 +20,7 @@ class AccountChartTemplate(models.AbstractModel): 'name': 'План рахунків МСФЗ', 'code_digits': '6', 'use_storno_accounting': True, + 'display_invoice_amount_total_words': True, } @template('ua_ias', 'res.company') diff --git a/addons/l10n_ua/models/template_ua_psbo.py b/addons/l10n_ua/models/template_ua_psbo.py index 2cbb16e7312..5eac8878c13 100644 --- a/addons/l10n_ua/models/template_ua_psbo.py +++ b/addons/l10n_ua/models/template_ua_psbo.py @@ -20,6 +20,7 @@ class AccountChartTemplate(models.AbstractModel): 'name': 'План рахунків ПСБО', 'code_digits': '6', 'use_storno_accounting': True, + 'display_invoice_amount_total_words': True, } @template('ua_psbo', 'res.company')