diff --git a/models/acc_operation.py b/models/acc_operation.py index 50b6dae001f76a52b57920f5fdb167ab0248f6d7..d29e4ac8a6839308248c847712617dbcdc6a2c8a 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -8,8 +8,6 @@ from dateutil.relativedelta import relativedelta from odoo import _, models from odoo.exceptions import UserError, ValidationError -from odoo.addons.api_connector.tools.date_utils import local_to_utc - class AccOperation(models.Model): _inherit = "acc.operation" @@ -145,17 +143,16 @@ class AccOperation(models.Model): # Vérification si des données existent déjà # pour cet intervalle de date - start_datetime = local_to_utc(date_begin_obj, "Europe/Paris") - end_datetime = local_to_utc(date_end_obj, "Europe/Paris") - - domain_all = [ - ("date_slot", ">=", start_datetime), - ("date_slot", "<", end_datetime), - ("acc_operation_id", "=", self.id), - ("comp_data_type", "=", computed_data_type), - ("acc_counter_id", "=", counter_id.id), - ] - rec_ids = self.env[model].search(domain_all) + rec_ids = self.env[model].search( + self.env[model]._get_curves_domain( + acc_operation_id=self.id, + start_date=date_begin_obj, + end_date=date_end_obj, + prm_id=counter_id.id, + values_type=[computed_data_type], + exclude_empty_partner=False, + ) + ) if rec_ids: mess += ( "<p>Fichier " diff --git a/wizard/acc_operation_import_wizard.py b/wizard/acc_operation_import_wizard.py index e28d7eaa1a383243d1efbe515e20c14f7adbadcc..b8f06deda9c6427f73045ceba5c121d58f89a35f 100644 --- a/wizard/acc_operation_import_wizard.py +++ b/wizard/acc_operation_import_wizard.py @@ -81,6 +81,7 @@ class AccOperationImportWizard(models.TransientModel): acc_operation_id=self.operation_id.id, start_date=date_begin_obj, end_date=date_end_obj, + prm_id=counter_id, values_type=[computed_data_type], exclude_empty_partner=False, )