diff --git a/models/acc_operation.py b/models/acc_operation.py index d29e4ac8a6839308248c847712617dbcdc6a2c8a..e846519ddfe3e8733bbe704c5bfffa91b4fb4d51 100644 --- a/models/acc_operation.py +++ b/models/acc_operation.py @@ -144,7 +144,7 @@ class AccOperation(models.Model): # Vérification si des données existent déjà # pour cet intervalle de date rec_ids = self.env[model].search( - self.env[model]._get_curves_domain( + self.env[model].get_curves_domain( acc_operation_id=self.id, start_date=date_begin_obj, end_date=date_end_obj, diff --git a/wizard/acc_operation_import_wizard.py b/wizard/acc_operation_import_wizard.py index 5f2bc243bf4b1a9c5d3d3f4d263113d5c7a61d9c..6909f2e9e0824842ec8640e86f66d87d8b79f278 100644 --- a/wizard/acc_operation_import_wizard.py +++ b/wizard/acc_operation_import_wizard.py @@ -77,7 +77,7 @@ class AccOperationImportWizard(models.TransientModel): # Vérification si des données existent déjà pour cet intervalle de date rec_ids = self.env[self.model].search( - self.env[self.model]._get_curves_domain( + self.env[self.model].get_curves_domain( acc_operation_id=self.operation_id.id, start_date=date_begin_obj, end_date=date_end_obj, @@ -213,12 +213,17 @@ class AccOperationImportWizard(models.TransientModel): _logger.debug(f"Processing file {file.name} - Generating daily curves") message += "Génération des données agrégées au jour<br/>" - self.env["acc.enedis.cdc.day"].generate( + self.env["acc.enedis.cdc.day"].populate_daily_aggregated_data( acc_operation_id=self.operation_id.id, acc_counter_id=counter_id, start_date=start_date, end_date=end_date, ) + self.env["acc.enedis.cdc.prorata"].populate_daily_prorata( + acc_operation_id=self.operation_id.id, + start_date=start_date, + end_date=end_date, + ) message += "Fin de l'import des données OK<br/>" # Suppression du fichier après création des enregistrements