diff options
| -rw-r--r-- | indoteknik_custom/models/base_import_import.py | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/indoteknik_custom/models/base_import_import.py b/indoteknik_custom/models/base_import_import.py index 9cffa6e6..bc3b0e37 100644 --- a/indoteknik_custom/models/base_import_import.py +++ b/indoteknik_custom/models/base_import_import.py @@ -1,6 +1,8 @@ +from datetime import datetime + from odoo import models from odoo.exceptions import UserError -from datetime import datetime + class Import(models.TransientModel): _inherit = 'base_import.import' @@ -8,8 +10,8 @@ class Import(models.TransientModel): def _get_config_enable_import(self): return self.env['ir.config_parameter'].sudo().get_param('base_import.import.enable_import', '') - def _get_config_restrict_model(self): - return self.env['ir.config_parameter'].sudo().get_param('base_import.import.restrict_model', '') + def _get_config_allowed_model(self): + return self.env['ir.config_parameter'].sudo().get_param('base_import.import.allowed_model', '') def _check_time_range(self, config_string): current_time = datetime.now().time() @@ -27,19 +29,20 @@ class Import(models.TransientModel): def _check_enable_import(self): enable_import = self._get_config_enable_import() - restrict_model = self._get_config_restrict_model() - - if self.res_model not in restrict_model: - return True + allowed_model = self._get_config_allowed_model() - if enable_import.lower() == 'true': - return True - elif enable_import.lower() == 'false': + is_allowed = False + if (allowed_model != '-' and self.res_model in allowed_model) or allowed_model == 'ALL': + is_allowed = True + + if enable_import.lower() == 'false': return False - elif '-' in enable_import: + elif enable_import.lower() == 'true' and is_allowed: + return True + elif '-' in enable_import and is_allowed: return self._check_time_range(enable_import) - return True + return False def _unable_import_notif(self): enable_import_config = self._get_config_enable_import() |