From 360dab6f9cb8064b02532bcf65cf30ccaeae620e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Tue, 16 Jan 2024 18:10:26 +0100
Subject: [PATCH] [UPD] use _convert_time method
---
models/acc_operation.py | 15 ++-------------
wizards/acc_operation_wizard.py | 15 ++-------------
2 files changed, 4 insertions(+), 26 deletions(-)
diff --git a/models/acc_operation.py b/models/acc_operation.py
index 4842f2a..560cb83 100644
--- a/models/acc_operation.py
+++ b/models/acc_operation.py
@@ -3,7 +3,6 @@
import logging
from datetime import date, datetime
-import pytz
from dateutil.relativedelta import relativedelta
from odoo import _, fields, models
@@ -263,18 +262,8 @@ class AccOperation(models.Model):
message += "PRM " + usage_point_id.name + "\n"
message += "Appel API ...\n"
# Transformation des dates naives en datetime UTC
- start_datetime = (
- pytz.timezone("Europe/Paris")
- .localize(fields.Datetime.to_datetime(start_date))
- .astimezone(pytz.UTC)
- .replace(tzinfo=None)
- )
- end_datetime = (
- pytz.timezone("Europe/Paris")
- .localize(fields.Datetime.to_datetime(start_date))
- .astimezone(pytz.UTC)
- .replace(tzinfo=None)
- )
+ start_datetime = self._convert_time(start_date)
+ end_datetime = self._convert_time(end_date)
curves_data = self._get_definitive_load_curves(
self.name,
start_datetime,
diff --git a/wizards/acc_operation_wizard.py b/wizards/acc_operation_wizard.py
index a5029de..e368b45 100644
--- a/wizards/acc_operation_wizard.py
+++ b/wizards/acc_operation_wizard.py
@@ -1,6 +1,5 @@
# Copyright 2021- Le Filament (https://le-filament.com)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
-import pytz
from odoo import _, fields, models
from odoo.exceptions import UserError
@@ -105,18 +104,8 @@ class AccOperationWizard(models.TransientModel):
domain_extra_cdc = expression.OR([domain_cons_cdc, domain_prod_cdc])
domain_periods = expression.AND([domain_base, domain_extra])
- start_datetime = (
- pytz.timezone("Europe/Paris")
- .localize(fields.Datetime.to_datetime(self.start_date))
- .astimezone(pytz.UTC)
- .replace(tzinfo=None)
- )
- end_datetime = (
- pytz.timezone("Europe/Paris")
- .localize(fields.Datetime.to_datetime(self.end_date))
- .astimezone(pytz.UTC)
- .replace(tzinfo=None)
- )
+ start_datetime = self.env["acc.operation"]._convert_time(self.start_date)
+ end_datetime = self.env["acc.operation"]._convert_time(self.end_date)
domain_date = [
("date_slot", ">=", start_datetime),
("date_slot", "<", end_datetime),
--
GitLab