[FIX] account,l10n_es: revert commit cf00ac4be7
We chose a different solution to handle default chart_template. This is more robust and explicit since we define a sequence on chart_template, instead of relying on import order. New solution commit: https://github.com/odoo/odoo/commit/41794859a85bacbf16604ffd37c7f1b0a358e196 Old solution commit: https://github.com/odoo/odoo/commit/cf00ac4be7cd8f936803dde75966203191b37ed8 opw-3329987 closes odoo/odoo#126649 Signed-off-by: William André (wan) <wan@odoo.com> Signed-off-by: Claire Bretton (clbr) <clbr@odoo.com>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
from importlib import import_module
|
||||
from inspect import getmembers, ismodule, isclass, isfunction, getsourcelines
|
||||
from inspect import getmembers, ismodule, isclass, isfunction
|
||||
|
||||
from odoo import api, models, fields
|
||||
from odoo.tools import get_flag
|
||||
@@ -37,9 +37,6 @@ class IrModule(models.Model):
|
||||
except ModuleNotFoundError:
|
||||
templates = {}
|
||||
else:
|
||||
#This will allow to get the order of the init file, This will be useful for locations with several
|
||||
#templates, one or more of which you want to prioritize.
|
||||
module_order = {w: i for i, w in enumerate(''.join(getsourcelines(python_module)[0]).split())}
|
||||
templates = {
|
||||
fct._l10n_template[0]: {
|
||||
'name': fct(ChartTemplate).get('name'),
|
||||
@@ -50,7 +47,7 @@ class IrModule(models.Model):
|
||||
'installed': module.state == "installed",
|
||||
'module': module.name,
|
||||
}
|
||||
for _name, mdl in sorted(getmembers(python_module, template_module), key=(lambda mdl: module_order[mdl[0]]))
|
||||
for _name, mdl in getmembers(python_module, template_module)
|
||||
for _name, cls in getmembers(mdl, template_class)
|
||||
for _name, fct in getmembers(cls, template_function)
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||
from . import template_es_pymes
|
||||
from . import template_es_full
|
||||
from . import template_es_assec
|
||||
from . import template_es_common
|
||||
from . import template_es_full
|
||||
from . import template_es_pymes
|
||||
|
||||
Reference in New Issue
Block a user