From 276470017ce6943ef59a4b3b7b39179073740aff Mon Sep 17 00:00:00 2001 From: miguelpadin Date: Wed, 13 Apr 2022 14:11:47 +0100 Subject: [PATCH] [FIX] pms-api-rest: fix service reservation lines (prev. loading cancel res. lines) --- pms_api_rest/services/pms_calendar_service.py | 1 + pms_api_rest/services/pms_login_service.py | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pms_api_rest/services/pms_calendar_service.py b/pms_api_rest/services/pms_calendar_service.py index 4b9eec975..dd6e0b56c 100644 --- a/pms_api_rest/services/pms_calendar_service.py +++ b/pms_api_rest/services/pms_calendar_service.py @@ -29,6 +29,7 @@ class PmsCalendarService(Component): domain.append(("date", ">=", calendar_search_param.date_from)) domain.append(("date", "<=", calendar_search_param.date_to)) domain.append(("pms_property_id", "=", calendar_search_param.pms_property_id)) + domain.append(("state", "!=", "cancel")) result_lines = [] PmsCalendarInfo = self.env.datamodels["pms.calendar.info"] for line in self.env["pms.reservation.line"].search( diff --git a/pms_api_rest/services/pms_login_service.py b/pms_api_rest/services/pms_login_service.py index 81bfd6558..3a3aa3839 100644 --- a/pms_api_rest/services/pms_login_service.py +++ b/pms_api_rest/services/pms_login_service.py @@ -1,5 +1,4 @@ import time -from math import ceil from jose import jwt @@ -38,7 +37,7 @@ class PmsLoginService(Component): ) # formula = ms_now + ms in 1 sec * secs in 1 min minutes = 10 - timestamp_expire_in_a_min = int(time.time()*1000.0) + 1000 * 60 * minutes + timestamp_expire_in_a_min = int(time.time() * 1000.0) + 1000 * 60 * minutes if not user_record: raise ValidationError(_("user or password not valid"))