diff --git a/hotel/models/hotel_reservation.py b/hotel/models/hotel_reservation.py index 0f5c8da8a..881aa9b5e 100644 --- a/hotel/models/hotel_reservation.py +++ b/hotel/models/hotel_reservation.py @@ -494,9 +494,8 @@ class HotelReservation(models.Model): def _computed_nights(self): for res in self: if res.checkin and res.checkout: - timedelta = fields.Date.from_string(res.checkout) - \ - fields.Date.from_string(res.checkin) - res.nights = timedelta.days + res.nights = (fields.Date.from_string(res.checkout) - \ + fields.Date.from_string(res.checkin)).days @api.model def recompute_reservation_totals(self): @@ -940,17 +939,6 @@ class HotelReservation(models.Model): }) return res - # @api.multi - # def uos_change(self, product_uos, product_uos_qty=0, product_id=None): - # ''' - # @param self: object pointer - # ''' - # # for folio in self: - # # line = folio.order_line_id - # # line.uos_change(product_uos, product_uos_qty=0, - # # product_id=None) - # return True - # FIXME add room.id to on change after removing inheritance @api.onchange('adults', 'children') def check_capacity(self): @@ -963,8 +951,8 @@ class HotelReservation(models.Model): _('%s people do not fit in this room! ;)') % (persons)) @api.onchange('room_type_id') - # def on_change_virtual_room_id(self): def on_change_room_type_id(self): + # import wdb; wdb.set_trace() if not self.checkin: self.checkin = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT) if not self.checkout: @@ -1013,6 +1001,7 @@ class HotelReservation(models.Model): # UTC -> Hotel tz tz = self.env['ir.default'].sudo().get('res.config.settings', 'tz_hotel') + # import wdb; wdb.set_trace() chkin_utc_dt = date_utils.get_datetime(self.checkin) chkout_utc_dt = date_utils.get_datetime(self.checkout) @@ -1281,6 +1270,7 @@ class HotelReservation(models.Model): Checkout date should be greater than the checkin date. 3.-Check the reservation dates are not occuped """ + _logger.info('check_dates') # chkin_utc_dt = date_utils.get_datetime(self.checkin) # chkout_utc_dt = date_utils.get_datetime(self.checkout) if self.checkin >= self.checkout: diff --git a/hotel/models/hotel_room_type.py b/hotel/models/hotel_room_type.py index 3ab86f464..e86221153 100644 --- a/hotel/models/hotel_room_type.py +++ b/hotel/models/hotel_room_type.py @@ -85,8 +85,6 @@ class HotelRoomType(models.Model): @param notthis: Array excluding Room Types @return: A recordset of free rooms ? """ - # occupied = self.env['hotel.reservation'].get_reservations(dfrom, dto) - # rooms_occupied = occupied.mapped('product_id.id') reservations = self.env['hotel.reservation'].get_reservations(dfrom, dto) reservations_rooms = reservations.mapped('room_id.id') free_rooms = self.env['hotel.room'].search([ @@ -94,14 +92,10 @@ class HotelRoomType(models.Model): ('id', 'not in', notthis) ]) if room_type_id: - # hotel_room_obj = self.env['hotel.room'] room_type_id = self.env['hotel.room.type'].search([ ('id', '=', room_type_id) ]) - # room_categories = virtual_room.room_type_ids.mapped('room_ids.id') - # rooms_linked = virtual_room.room_ids | hotel_room_obj.search([ - # ('categ_id.id', 'in', room_categories)]) - # rooms_linked = room_type_id.room_ids + # QUESTION What linked represent? Rooms in this type ? rooms_linked = self.room_ids free_rooms = free_rooms & rooms_linked return free_rooms.sorted(key=lambda r: r.sequence)