Skip to content
Extraits de code Groupes Projets

Review enercoop

Fusionnées
Julien - Le Filamentrequested to merge
16.0-review-enercoop into 16.0
2 open threads
3 files
+ 43
11
Comparer les modifications
  • Côte à côte
  • En ligne

Fichiers

+ 6
6
@@ -106,9 +106,9 @@ class AccEnedisCdc(models.Model):
("date_slot", ">=", start_date_tz),
("date_slot", "<", end_date_tz),
]
if partner_id and isinstance(partner_id, int):
if partner_id:
partner_domain = [("partner_id", "=", partner_id)]
if prm_id and isinstance(prm_id, int):
if prm_id:
partner_domain = expression.AND(
[partner_domain, [("acc_counter_id", "=", prm_id)]]
)
@@ -263,10 +263,10 @@ class AccEnedisCdc(models.Model):
AND cdc.date_slot < '{end_datetime}'
"""
if partner_id and isinstance(partner_id, int):
result += f" AND ((cdc.partner_id = {partner_id} "
if prm_id and isinstance(prm_id, int):
result += f" AND cdc.acc_counter_id = {prm_id}) "
if partner_id:
result += f" AND ((cdc.partner_id = {int(partner_id)} "
if prm_id:
result += f" AND cdc.acc_counter_id = {int(prm_id)}) "
else:
result = f"{result})"
if extra_curve_type and extra_curve_type in (
Chargement en cours