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

[UPD] use _convert_time method

parent f1ff22e2
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
import logging import logging
from datetime import date, datetime from datetime import date, datetime
import pytz
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
from odoo import _, fields, models from odoo import _, fields, models
...@@ -263,18 +262,8 @@ class AccOperation(models.Model): ...@@ -263,18 +262,8 @@ class AccOperation(models.Model):
message += "PRM " + usage_point_id.name + "\n" message += "PRM " + usage_point_id.name + "\n"
message += "Appel API ...\n" message += "Appel API ...\n"
# Transformation des dates naives en datetime UTC # Transformation des dates naives en datetime UTC
start_datetime = ( start_datetime = self._convert_time(start_date)
pytz.timezone("Europe/Paris") end_datetime = self._convert_time(end_date)
.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)
)
curves_data = self._get_definitive_load_curves( curves_data = self._get_definitive_load_curves(
self.name, self.name,
start_datetime, start_datetime,
......
# Copyright 2021- Le Filament (https://le-filament.com) # Copyright 2021- Le Filament (https://le-filament.com)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html) # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
import pytz
from odoo import _, fields, models from odoo import _, fields, models
from odoo.exceptions import UserError from odoo.exceptions import UserError
...@@ -105,18 +104,8 @@ class AccOperationWizard(models.TransientModel): ...@@ -105,18 +104,8 @@ class AccOperationWizard(models.TransientModel):
domain_extra_cdc = expression.OR([domain_cons_cdc, domain_prod_cdc]) domain_extra_cdc = expression.OR([domain_cons_cdc, domain_prod_cdc])
domain_periods = expression.AND([domain_base, domain_extra]) domain_periods = expression.AND([domain_base, domain_extra])
start_datetime = ( start_datetime = self.env["acc.operation"]._convert_time(self.start_date)
pytz.timezone("Europe/Paris") end_datetime = self.env["acc.operation"]._convert_time(self.end_date)
.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)
)
domain_date = [ domain_date = [
("date_slot", ">=", start_datetime), ("date_slot", ">=", start_datetime),
("date_slot", "<", end_datetime), ("date_slot", "<", end_datetime),
......
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