[WIP][IMP][11.0] hotel

hotel_calendar/models/hotel_calendar_management.py

@@ -5,9 +5,8 @@ from datetime import datetime, timedelta
 from odoo.tools import (
     DEFAULT_SERVER_DATE_FORMAT,
     DEFAULT_SERVER_DATETIME_FORMAT)
-from odoo import models, api, _
+from odoo import models, api, _, fields
 from odoo.exceptions import ValidationError
-from odoo.addons.hotel import date_utils
 _logger = logging.getLogger(__name__)
 
 
@@ -176,8 +175,9 @@ class HotelCalendarManagement(models.TransientModel):
 
     @api.model
     def _hcalendar_availability_json_data(self, dfrom, dto):
-        date_start = date_utils.get_datetime(dfrom, hours=False)
-        date_diff = date_utils.date_diff(dfrom, dto, hours=False) + 1
+        date_start = fields.Date.from_string(dfrom)
+        date_end = fields.Date.from_string(dto)
+        date_diff = abs((date_end - date_start).days) + 1
         room_types = self.env['hotel.room.type'].search([])
         json_data = {}
 
@@ -208,7 +208,7 @@ class HotelCalendarManagement(models.TransientModel):
 
     @api.model
     def _hcalendar_events_json_data(self, dfrom, dto):
-        date_start = date_utils.get_datetime(dfrom, hours=False) - timedelta(days=1)
+        date_start = fields.Date.from_string(dfrom) - timedelta(days=1)
         date_start_str = date_start.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
         user_id = self.env['res.users'].browse(self.env.uid)
         domain = []
@@ -239,8 +239,9 @@ class HotelCalendarManagement(models.TransientModel):
 
     @api.model
     def _hcalendar_get_count_reservations_json_data(self, dfrom, dto):
-        date_start = date_utils.get_datetime(dfrom, hours=False)
-        date_diff = date_utils.date_diff(dfrom, dto, hours=False) + 1
+        date_start = fields.Date.from_string(dfrom)
+        date_end = fields.Date.from_string(dto)
+        date_diff = abs((date_end - date_start).days) + 1
         room_type_obj = self.env['hotel.room.type']
         room_types = room_type_obj.search([])
         json_data = {}

hotel_calendar/models/inherited_hotel_reservation.py

@@ -7,7 +7,6 @@ from odoo.exceptions import ValidationError
 from odoo.tools import (
     DEFAULT_SERVER_DATE_FORMAT,
     DEFAULT_SERVER_DATETIME_FORMAT)
-from odoo.addons.hotel import date_utils
 _logger = logging.getLogger(__name__)
 
 
@@ -95,8 +94,7 @@ class HotelReservation(models.Model):
 
     @api.model
     def get_hcalendar_reservations_data(self, dfrom, dto, rooms):
-        date_start = date_utils.get_datetime(dfrom, hours=False) \
-            - timedelta(days=1)
+        date_start = fields.Date.from_string(dfrom) - timedelta(days=1)
         date_start_str = date_start.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
         reservations_raw = self.env['hotel.reservation'].search(
             [
@@ -122,9 +120,9 @@ class HotelReservation(models.Model):
             'res.config.settings', 'parity_pricelist_id')
         if pricelist_id:
             pricelist_id = int(pricelist_id)
-        date_start = date_utils.get_datetime(dfrom, hours=False) \
-            - timedelta(days=1)
-        date_diff = date_utils.date_diff(date_start, dto, hours=False) + 1
+        date_start = fields.Date.from_string(dfrom) - timedelta(days=1)
+        date_end = fields.Date.from_string(dto)
+        date_diff = abs((date_end - date_start).days) + 1
         # Get Prices
         json_rooms_prices = {pricelist_id: []}
         room_typed_ids = self.env['hotel.room.type'].search(
@@ -162,9 +160,9 @@ class HotelReservation(models.Model):
             'res.config.settings', 'parity_restrictions_id')
         if restriction_id:
             restriction_id = int(restriction_id)
-        date_start = date_utils.get_datetime(dfrom, hours=False) \
-            - timedelta(days=1)
-        date_diff = date_utils.date_diff(dfrom, dto, hours=False) + 1
+        date_start = fields.Date.from_string(dfrom) - timedelta(days=1)
+        date_end = fields.Date.from_string(dto)
+        date_diff = abs((date_end - date_sart).days) + 1
         # Get Prices
         json_rooms_rests = {}
         room_types = self.env['hotel.room.type'].search(
@@ -202,8 +200,7 @@ class HotelReservation(models.Model):
 
     @api.model
     def get_hcalendar_events_data(self, dfrom, dto):
-        date_start = date_utils.get_datetime(dfrom, hours=False) \
-            - timedelta(days=1)
+        date_start = fields.Date.from_string(dfrom) - timedelta(days=1)
         date_start_str = date_start.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
         user_id = self.env['res.users'].browse(self.env.uid)
         domain = []

hotel_calendar/models/inherited_ir_default.py

@@ -2,7 +2,6 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import models, fields, api
 from odoo.tools import DEFAULT_SERVER_DATETIME_FORMAT
-from odoo.addons.hotel import date_utils
 
 
 class IrDefault(models.Model):
@@ -26,8 +25,7 @@ class IrDefault(models.Model):
                 fixed_price = pitem.fixed_price
                 room_type = room_type_obj.search([
                     ('product_id.product_tmpl_id', '=', product_tmpl_id),
-                    ('date_start', '>=', date_utils.now().strftime(
-                        DEFAULT_SERVER_DATETIME_FORMAT))
+                    ('date_start', '>=', fields.Date.today())
                 ], limit=1)
                 room_pr_cached_obj.create({
                     'room_type_id': room_type.id,

hotel_calendar/models/res_config.py

@@ -1,7 +1,6 @@
 # Copyright 2018 Alexandre Díaz <dev@redneboa.es>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from odoo import models, fields, api
-from odoo.addons.hotel import date_utils
 
 
 class HotelConfiguration(models.TransientModel):