diff --git a/hotel/models/__init__.py b/hotel/models/__init__.py index 8f1d1703a..84c6f0088 100644 --- a/hotel/models/__init__.py +++ b/hotel/models/__init__.py @@ -7,8 +7,8 @@ from . import hotel_floor from . import hotel_folio from . import hotel_reservation from . import hotel_room -from . import hotel_room_amenitie -from . import hotel_room_amenitie_type +from . import hotel_amenity +from . import hotel_amenity_type from . import hotel_room_type from . import hotel_service from . import inherited_account_invoice diff --git a/hotel/models/hotel_room_amenitie.py b/hotel/models/hotel_amenity.py similarity index 81% rename from hotel/models/hotel_room_amenitie.py rename to hotel/models/hotel_amenity.py index 9649e5ee2..3198dfdae 100644 --- a/hotel/models/hotel_room_amenitie.py +++ b/hotel/models/hotel_amenity.py @@ -4,11 +4,11 @@ from odoo import models, fields class HotelRoomAmenitie(models.Model): - _name = 'hotel.room.amenitie' + _name = 'hotel.amenity' _description = 'Room amenities' name = fields.Char('Amenity Name', required=True) active = fields.Boolean('Active', default=True) default_code = fields.Char('Internal Reference') - room_amenitie_type_id = fields.Many2one('hotel.room.amenitie.type', + room_amenity_type_id = fields.Many2one('hotel.amenity.type', 'Amenity Catagory') diff --git a/hotel/models/hotel_room_amenitie_type.py b/hotel/models/hotel_amenity_type.py similarity index 71% rename from hotel/models/hotel_room_amenitie_type.py rename to hotel/models/hotel_amenity_type.py index 08cab2368..466520036 100644 --- a/hotel/models/hotel_room_amenitie_type.py +++ b/hotel/models/hotel_amenity_type.py @@ -5,11 +5,11 @@ from odoo import models, fields class HotelRoomAmenitieType(models.Model): - _name = 'hotel.room.amenitie.type' + _name = 'hotel.amenity.type' _description = 'Amenities Type' name = fields.Char('Amenity Name', required=True) active = fields.Boolean('Active', default=True) - room_amenitie_ids = fields.One2many('hotel.room.amenitie', - 'room_amenitie_type_id', + room_amenity_ids = fields.One2many('hotel.amenity', + 'room_amenity_type_id', 'Amenities in this category') diff --git a/hotel/models/hotel_room_type.py b/hotel/models/hotel_room_type.py index feeccf893..0908740af 100644 --- a/hotel/models/hotel_room_type.py +++ b/hotel/models/hotel_room_type.py @@ -18,9 +18,9 @@ class HotelRoomType(models.Model): ondelete='cascade') room_ids = fields.One2many('hotel.room', 'room_type_id', 'Rooms') class_id = fields.Many2one('hotel.room.type.class', 'Hotel Type Class') - room_amenitie_ids = fields.Many2many('hotel.room.amenitie', + room_amenity_ids = fields.Many2many('hotel.amenity', 'hotel_room_type_aminitie_rel', - 'room_type_ids', 'amenitie_ids', + 'room_type_ids', 'amenity_ids', string='Room Type Amenities', help='List of Amenities.') diff --git a/hotel/views/hotel_board_service_views.xml b/hotel/views/hotel_board_service_views.xml index ba37c0cee..0dbc15fba 100644 --- a/hotel/views/hotel_board_service_views.xml +++ b/hotel/views/hotel_board_service_views.xml @@ -3,7 +3,7 @@ - + hotel.board.service.form hotel.board.service @@ -22,7 +22,7 @@ - + hotel.board.service.tree hotel.board.service diff --git a/hotel/views/hotel_checkin_partner_views.xml b/hotel/views/hotel_checkin_partner_views.xml index b72f62bce..91ce85e65 100644 --- a/hotel/views/hotel_checkin_partner_views.xml +++ b/hotel/views/hotel_checkin_partner_views.xml @@ -19,7 +19,7 @@ sequence="25" action="action_checkin_partner" /> - + Checkin Form hotel.checkin.partner @@ -40,7 +40,7 @@ - + Checkin Tree hotel.checkin.partner diff --git a/hotel/views/hotel_floor_views.xml b/hotel/views/hotel_floor_views.xml index 39012071a..871ff17ae 100644 --- a/hotel/views/hotel_floor_views.xml +++ b/hotel/views/hotel_floor_views.xml @@ -3,7 +3,7 @@ - + hotel.floor.form hotel.floor @@ -19,7 +19,7 @@ - + hotel.floor.tree hotel.floor diff --git a/hotel/views/hotel_folio_views.xml b/hotel/views/hotel_folio_views.xml index 8a03b03be..1be4326db 100644 --- a/hotel/views/hotel_folio_views.xml +++ b/hotel/views/hotel_folio_views.xml @@ -3,7 +3,7 @@ - + hotel.folio.form hotel.folio @@ -483,7 +483,7 @@ - + hotel.folio.tree hotel.folio @@ -501,7 +501,7 @@ - + hotel.folio.kanban hotel.folio @@ -543,7 +543,7 @@ - + hotel.folio.search hotel.folio @@ -558,7 +558,7 @@ - + view.hotel.folio.graph hotel.folio diff --git a/hotel/views/hotel_reservation_views.xml b/hotel/views/hotel_reservation_views.xml index 53638760e..543754875 100644 --- a/hotel/views/hotel_reservation_views.xml +++ b/hotel/views/hotel_reservation_views.xml @@ -1,20 +1,9 @@ - - - Hotel Reservation - hotel.reservation - form - tree,form,graph,pivot - - - - - + hotel.reservation.form hotel.reservation @@ -306,7 +295,7 @@ - + hotel.reservation.tree hotel.reservation @@ -370,7 +359,7 @@ - + hotel.reservation.search hotel.reservation @@ -456,4 +445,15 @@ + + + Hotel Reservation + hotel.reservation + form + tree,form,graph,pivot + + + + diff --git a/hotel/views/hotel_room_amenities_type_views.xml b/hotel/views/hotel_room_amenities_type_views.xml index 311cddec0..6ab1d4d82 100644 --- a/hotel/views/hotel_room_amenities_type_views.xml +++ b/hotel/views/hotel_room_amenities_type_views.xml @@ -3,9 +3,9 @@ - - hotel.room_amenitie_type_form - hotel.room.amenitie.type + + hotel.room_amenity_type_form + hotel.amenity.type
@@ -20,9 +20,9 @@ - - hotel.room_amenitie_type_list - hotel.room.amenitie.type + + hotel.room_amenity_type_list + hotel.amenity.type @@ -31,9 +31,9 @@ - - Hotel Room Amenitie Type - hotel.room.amenitie.type + + Hotel Room amenity Type + hotel.amenity.type form tree,form @@ -41,7 +41,7 @@ diff --git a/hotel/views/hotel_room_amenities_views.xml b/hotel/views/hotel_room_amenities_views.xml index 0daa83a39..3c34e30ae 100644 --- a/hotel/views/hotel_room_amenities_views.xml +++ b/hotel/views/hotel_room_amenities_views.xml @@ -3,9 +3,9 @@ - - hotel.room.amenitie.form - hotel.room.amenitie + + hotel.amenity.form + hotel.amenity @@ -19,7 +19,7 @@ - + @@ -63,13 +63,13 @@ - - hotel.room_amenitie_search - hotel.room.amenitie + + hotel.room_amenity_search + hotel.amenity - + @@ -82,28 +82,28 @@ - - hotel.room_amenitie_list - hotel.room.amenitie + + hotel.room_amenity_list + hotel.amenity - + - + Hotel Room Amenities - hotel.room.amenitie + hotel.amenity form tree,form - + - diff --git a/hotel/views/hotel_room_closure_reason_views.xml b/hotel/views/hotel_room_closure_reason_views.xml index 12b010ad2..f63f39102 100644 --- a/hotel/views/hotel_room_closure_reason_views.xml +++ b/hotel/views/hotel_room_closure_reason_views.xml @@ -2,21 +2,21 @@ - + hotel.room.closure.reason.form room.closure.reason - + - + - + >hotel.room.closure.reason.tree room.closure.reason diff --git a/hotel/views/hotel_room_type_class_views.xml b/hotel/views/hotel_room_type_class_views.xml index 4414b4f04..75b3c34e0 100644 --- a/hotel/views/hotel_room_type_class_views.xml +++ b/hotel/views/hotel_room_type_class_views.xml @@ -2,7 +2,7 @@ - + hotel.room.type.class.form hotel.room.type.class @@ -18,7 +18,7 @@ - + @@ -32,7 +32,7 @@ - + hotel.room.type.class.tree hotel.room.type.class diff --git a/hotel/views/hotel_room_type_views.xml b/hotel/views/hotel_room_type_views.xml index 69ca46232..c7e8a2de4 100644 --- a/hotel/views/hotel_room_type_views.xml +++ b/hotel/views/hotel_room_type_views.xml @@ -2,7 +2,7 @@ - + hotel.room_type.form hotel.room.type @@ -41,7 +41,7 @@ - + hotel.room_type.tree hotel.room.type diff --git a/hotel/views/hotel_room_views.xml b/hotel/views/hotel_room_views.xml index c7abcac07..c4788e508 100644 --- a/hotel/views/hotel_room_views.xml +++ b/hotel/views/hotel_room_views.xml @@ -3,7 +3,7 @@ - + hotel.room.form hotel.room @@ -63,7 +63,7 @@ - + hotel.room.search hotel.room @@ -81,7 +81,7 @@ - + hotel.room.tree hotel.room diff --git a/hotel/views/hotel_service_line_views.xml b/hotel/views/hotel_service_line_views.xml index f10d988de..6f77df65c 100644 --- a/hotel/views/hotel_service_line_views.xml +++ b/hotel/views/hotel_service_line_views.xml @@ -3,7 +3,7 @@ - + hotel.service.line.form hotel.service.line @@ -35,7 +35,7 @@ - + hotel.service.line.tree hotel.service.line diff --git a/hotel/views/hotel_service_type_views.xml b/hotel/views/hotel_service_type_views.xml index c657d358b..5b2ba1823 100644 --- a/hotel/views/hotel_service_type_views.xml +++ b/hotel/views/hotel_service_type_views.xml @@ -3,7 +3,7 @@ - + hotel.service_type.form hotel.service.type @@ -21,7 +21,7 @@ - + hotel.service_type.tree hotel.service.type diff --git a/hotel/views/hotel_service_views.xml b/hotel/views/hotel_service_views.xml index c6c65a540..e3741c27b 100644 --- a/hotel/views/hotel_service_views.xml +++ b/hotel/views/hotel_service_views.xml @@ -2,7 +2,7 @@ - + .hotel.service.form hotel.service @@ -64,7 +64,7 @@ - + hotel.service.search hotel.service @@ -83,7 +83,7 @@ - + hotel.service.tree hotel.service