Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions resource_booking/controllers/portal.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright 2022 Tecnativa - Pedro M. Baeza
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).

from datetime import datetime
from datetime import datetime, timezone

from dateutil.parser import isoparse

Expand Down Expand Up @@ -128,7 +128,9 @@ def portal_booking_confirm(self, booking_id, access_token, when, **kwargs):
"""Confirm a booking in a given datetime."""
booking_sudo = self._get_booking_sudo(booking_id, access_token)
when_tz_aware = isoparse(when)
when_naive = datetime.utcfromtimestamp(when_tz_aware.timestamp())
when_naive = datetime.fromtimestamp(
when_tz_aware.timestamp(), timezone.utc
).replace(tzinfo=None)
try:
booking_sudo.start = when_naive
except ValidationError as error:
Expand Down
5 changes: 4 additions & 1 deletion resource_booking/tests/test_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -787,8 +787,11 @@ def test_suggested_and_subscribed_recipients(self):
# Requester and combination must be suggested
recipients_info = rb._message_get_suggested_recipients()
self.assertEqual(len(recipients_info), 1)
recipient_info = recipients_info[0]
if "display_name" in recipient_info:
recipient_info["name"] = recipient_info.pop("display_name")
self.assertEqual(
recipients_info[0],
recipient_info,
{
"lang": None,
"partner_id": rb.partner_ids.id,
Expand Down
Loading