Skip to content
Extraits de code Groupes Projets
Valider 090a4a79 rédigé par Rémi - Le Filament's avatar Rémi - Le Filament
Parcourir les fichiers

[FIX] import curves was deleting all other from operation

parent f1c7b0e4
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -8,8 +8,6 @@ from dateutil.relativedelta import relativedelta ...@@ -8,8 +8,6 @@ from dateutil.relativedelta import relativedelta
from odoo import _, models from odoo import _, models
from odoo.exceptions import UserError, ValidationError from odoo.exceptions import UserError, ValidationError
from odoo.addons.api_connector.tools.date_utils import local_to_utc
class AccOperation(models.Model): class AccOperation(models.Model):
_inherit = "acc.operation" _inherit = "acc.operation"
...@@ -145,17 +143,16 @@ class AccOperation(models.Model): ...@@ -145,17 +143,16 @@ class AccOperation(models.Model):
# Vérification si des données existent déjà # Vérification si des données existent déjà
# pour cet intervalle de date # pour cet intervalle de date
start_datetime = local_to_utc(date_begin_obj, "Europe/Paris") rec_ids = self.env[model].search(
end_datetime = local_to_utc(date_end_obj, "Europe/Paris") self.env[model]._get_curves_domain(
acc_operation_id=self.id,
domain_all = [ start_date=date_begin_obj,
("date_slot", ">=", start_datetime), end_date=date_end_obj,
("date_slot", "<", end_datetime), prm_id=counter_id.id,
("acc_operation_id", "=", self.id), values_type=[computed_data_type],
("comp_data_type", "=", computed_data_type), exclude_empty_partner=False,
("acc_counter_id", "=", counter_id.id), )
] )
rec_ids = self.env[model].search(domain_all)
if rec_ids: if rec_ids:
mess += ( mess += (
"<p>Fichier " "<p>Fichier "
......
...@@ -81,6 +81,7 @@ class AccOperationImportWizard(models.TransientModel): ...@@ -81,6 +81,7 @@ class AccOperationImportWizard(models.TransientModel):
acc_operation_id=self.operation_id.id, acc_operation_id=self.operation_id.id,
start_date=date_begin_obj, start_date=date_begin_obj,
end_date=date_end_obj, end_date=date_end_obj,
prm_id=counter_id,
values_type=[computed_data_type], values_type=[computed_data_type],
exclude_empty_partner=False, exclude_empty_partner=False,
) )
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter