diff --git a/hotel_calendar/__manifest__.py b/hotel_calendar/__manifest__.py index b85d29a60..cac0ce4b5 100644 --- a/hotel_calendar/__manifest__.py +++ b/hotel_calendar/__manifest__.py @@ -23,8 +23,8 @@ 'views/general.xml', 'views/actions.xml', 'views/inherited_res_users_views.xml', - 'views/inherited_hotel_room_type_views.xml', - 'views/inherited_hotel_room_views.xml', + # 'views/inherited_hotel_room_type_views.xml', + # 'views/inherited_hotel_room_views.xml', 'views/hotel_reservation_views.xml', 'views/hotel_calendar_management_views.xml', 'views/hotel_calendar_views.xml', diff --git a/hotel_calendar/models/__init__.py b/hotel_calendar/models/__init__.py index 55b51d441..cb156d75a 100644 --- a/hotel_calendar/models/__init__.py +++ b/hotel_calendar/models/__init__.py @@ -5,8 +5,8 @@ from . import bus_hotel_calendar from . import hotel_calendar_management from . import inherited_hotel_reservation from . import inherited_res_users -from . import inherited_hotel_room -from . import inherited_hotel_room_type +# from . import inherited_hotel_room +# from . import inherited_hotel_room_type from . import inherited_hotel_room_type_restriction_item from . import inherited_product_pricelist from . import inherited_product_pricelist_item diff --git a/hotel_calendar/models/hotel_calendar_management.py b/hotel_calendar/models/hotel_calendar_management.py index 5c72104ae..cdfcc16d5 100644 --- a/hotel_calendar/models/hotel_calendar_management.py +++ b/hotel_calendar/models/hotel_calendar_management.py @@ -236,7 +236,7 @@ class HotelCalendarManagement(models.TransientModel): if withRooms: room_ids = self.env['hotel.room.type'].search( [], - order='hcal_sequence ASC') + order='sequence ASC') json_rooms = self._hcalendar_room_json_data(room_ids) vals.update({'rooms': json_rooms or []}) diff --git a/hotel_calendar/models/inherited_hotel_reservation.py b/hotel_calendar/models/inherited_hotel_reservation.py index 12559a790..234697d86 100644 --- a/hotel_calendar/models/inherited_hotel_reservation.py +++ b/hotel_calendar/models/inherited_hotel_reservation.py @@ -294,7 +294,7 @@ class HotelReservation(models.Model): json_rooms_rests = {} room_typed_ids = self.env['hotel.room.type'].search( [], - order='hcal_sequence ASC') + order='sequence ASC') room_type_rest_obj = self.env['hotel.room.type.restriction.item'] rtype_rest_ids = room_type_rest_obj.search([ ('room_type_id', 'in', room_typed_ids.ids), @@ -368,7 +368,7 @@ class HotelReservation(models.Model): dfrom_dt = fields.Date.from_string(dfrom) dto_dt = fields.Date.from_string(dto) - rooms = self.env['hotel.room'].search([], order='hcal_sequence ASC') + rooms = self.env['hotel.room'].search([], order='sequence ASC') json_res, json_res_tooltips = self.get_hcalendar_reservations_data( dfrom_dt, dto_dt, rooms) diff --git a/hotel_calendar/models/inherited_hotel_room.py b/hotel_calendar/models/inherited_hotel_room.py index a87c7400f..2a85c788a 100644 --- a/hotel_calendar/models/inherited_hotel_room.py +++ b/hotel_calendar/models/inherited_hotel_room.py @@ -6,4 +6,4 @@ from odoo import models, fields class HotelRoom(models.Model): _inherit = 'hotel.room' - hcal_sequence = fields.Integer('Calendar Sequence', default=0) + # hcal_sequence = fields.Integer('Calendar Sequence', default=0) diff --git a/hotel_calendar/models/inherited_hotel_room_type.py b/hotel_calendar/models/inherited_hotel_room_type.py index e72d30496..afd768d70 100644 --- a/hotel_calendar/models/inherited_hotel_room_type.py +++ b/hotel_calendar/models/inherited_hotel_room_type.py @@ -6,4 +6,4 @@ from odoo import models, fields class HotelRoomType(models.Model): _inherit = 'hotel.room.type' - hcal_sequence = fields.Integer('Calendar Sequence', default=0) + # hcal_sequence = fields.Integer('Calendar Sequence', default=0)