From 13416c2313ebb4cc757ba26e8c628d8e51498b34 Mon Sep 17 00:00:00 2001 From: Dario Lodeiros Date: Wed, 7 Nov 2018 12:27:17 +0100 Subject: [PATCH] [WIP] Refactoring Code - hotel_floor, hotel_amenitie, aminitie_type, hotel_room_type (+ amenitie_ids), hotel_room (- amenitie_ids) --- hotel/models/__init__.py | 4 +-- hotel/models/hotel_floor.py | 4 +-- hotel/models/hotel_room.py | 6 +--- hotel/models/hotel_room_amenitie.py | 14 +++++++++ hotel/models/hotel_room_amenitie_type.py | 15 ++++++++++ hotel/models/hotel_room_amenities.py | 29 ------------------- hotel/models/hotel_room_amenities_type.py | 26 ----------------- hotel/models/hotel_room_type.py | 5 ++++ .../views/hotel_room_amenities_type_views.xml | 21 +++++++------- hotel/views/hotel_room_type_views.xml | 4 +++ hotel/views/hotel_room_views.xml | 4 --- 11 files changed, 53 insertions(+), 79 deletions(-) create mode 100644 hotel/models/hotel_room_amenitie.py create mode 100644 hotel/models/hotel_room_amenitie_type.py delete mode 100644 hotel/models/hotel_room_amenities.py delete mode 100644 hotel/models/hotel_room_amenities_type.py diff --git a/hotel/models/__init__.py b/hotel/models/__init__.py index 245da9802..8f1d1703a 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_amenities -from . import hotel_room_amenities_type +from . import hotel_room_amenitie +from . import hotel_room_amenitie_type from . import hotel_room_type from . import hotel_service from . import inherited_account_invoice diff --git a/hotel/models/hotel_floor.py b/hotel/models/hotel_floor.py index 2bec212eb..2e1eae288 100644 --- a/hotel/models/hotel_floor.py +++ b/hotel/models/hotel_floor.py @@ -1,6 +1,6 @@ # Copyright 2017 Dario Lodeiros # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from openerp import models, fields, api, _ +from odoo import models, fields class HotelFloor(models.Model): @@ -8,4 +8,4 @@ class HotelFloor(models.Model): _description = "Ubication" name = fields.Char('Ubication Name', size=64, required=True, index=True) - sequence = fields.Integer('Sequence', size=64) + sequence = fields.Integer('Sequence') diff --git a/hotel/models/hotel_room.py b/hotel/models/hotel_room.py index d41608483..c4896cc2e 100644 --- a/hotel/models/hotel_room.py +++ b/hotel/models/hotel_room.py @@ -1,5 +1,6 @@ # Copyright 2017 Alexandre Díaz # Copyright 2017 Dario Lodeiros +# Copyright 2018 Pablo Quesada # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import models, fields, api, _ from odoo.exceptions import ValidationError @@ -18,11 +19,6 @@ class HotelRoom(models.Model): room_type_id = fields.Many2one('hotel.room.type', 'Hotel Room Type') floor_id = fields.Many2one('hotel.floor', 'Ubication', help='At which floor the room is located.') - # TODO Q. Should the amenities be on the Room Type ? - - room_amenities = fields.Many2many('hotel.room.amenities', 'temp_tab', - 'room_amenities', 'rcateg_id', - string='Room Amenities', - help='List of room amenities.') max_adult = fields.Integer('Max Adult') max_child = fields.Integer('Max Child') capacity = fields.Integer('Capacity') diff --git a/hotel/models/hotel_room_amenitie.py b/hotel/models/hotel_room_amenitie.py new file mode 100644 index 000000000..9649e5ee2 --- /dev/null +++ b/hotel/models/hotel_room_amenitie.py @@ -0,0 +1,14 @@ +# Copyright 2017 Alexandre Díaz +# Copyright 2017 Dario Lodeiros +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from odoo import models, fields + +class HotelRoomAmenitie(models.Model): + _name = 'hotel.room.amenitie' + _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', + 'Amenity Catagory') diff --git a/hotel/models/hotel_room_amenitie_type.py b/hotel/models/hotel_room_amenitie_type.py new file mode 100644 index 000000000..08cab2368 --- /dev/null +++ b/hotel/models/hotel_room_amenitie_type.py @@ -0,0 +1,15 @@ +# Copyright 2017 Alexandre Díaz +# Copyright 2017 Dario Lodeiros +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from odoo import models, fields + + +class HotelRoomAmenitieType(models.Model): + _name = 'hotel.room.amenitie.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', + 'Amenities in this category') diff --git a/hotel/models/hotel_room_amenities.py b/hotel/models/hotel_room_amenities.py deleted file mode 100644 index dc0ce906a..000000000 --- a/hotel/models/hotel_room_amenities.py +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2017 Alexandre Díaz -# Copyright 2017 Dario Lodeiros -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import models, fields, api, _ - - -class HotelRoomAmenities(models.Model): - _name = 'hotel.room.amenities' - _description = 'Room amenities' - - # The record's name - name = fields.Char('Amenity Name', required=True) - # Used for activate records - active = fields.Boolean('Active', default=True) - - default_code = fields.Char('Internal Reference', store=True) - - # room_categ_id = fields.Many2one('product.product', 'Product Category', - # required=True, delegate=True, - # ondelete='cascade') - room_amenities_type_id = fields.Many2one('hotel.room.amenities.type', - 'Amenity Catagory') - - # room_ids = fields.Many2man('hotel.room','Rooms') - - # @api.multi - # def unlink(self): - # # self.room_categ_id.unlink() - # return super(HotelRoomAmenities, self).unlink() diff --git a/hotel/models/hotel_room_amenities_type.py b/hotel/models/hotel_room_amenities_type.py deleted file mode 100644 index 4cc3d32ff..000000000 --- a/hotel/models/hotel_room_amenities_type.py +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2017 Alexandre Díaz -# Copyright 2017 Dario Lodeiros -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import models, fields, api, _ - - -class HotelRoomAmenitiesType(models.Model): - _name = 'hotel.room.amenities.type' - _description = 'Amenities Type' - - # The record's name - name = fields.Char('Amenity Name', required=True) - # Used for activate records - active = fields.Boolean('Active', default=True) - - room_amenities_ids = fields.One2many('hotel.room.amenities', - 'room_amenities_type_id', - 'Amenities in this category') - - # cat_id = fields.Many2one('product.category', 'category', required=True, - # delegate=True, ondelete='cascade') - - # @api.multi - # def unlink(self): - # # self.cat_id.unlink() - # return super(HotelRoomAmenitiesType, self).unlink() diff --git a/hotel/models/hotel_room_type.py b/hotel/models/hotel_room_type.py index 5a2cdb122..feeccf893 100644 --- a/hotel/models/hotel_room_type.py +++ b/hotel/models/hotel_room_type.py @@ -18,6 +18,11 @@ 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', + 'hotel_room_type_aminitie_rel', + 'room_type_ids', 'amenitie_ids', + string='Room Type Amenities', + help='List of Amenities.') # TODO Hierarchical relationship for parent-child tree ? # parent_id = fields.Many2one ... diff --git a/hotel/views/hotel_room_amenities_type_views.xml b/hotel/views/hotel_room_amenities_type_views.xml index f7906c879..311cddec0 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_amenities_type_form - hotel.room.amenities.type + + hotel.room_amenitie_type_form + hotel.room.amenitie.type
@@ -20,9 +20,9 @@ - - hotel.room_amenities_type_list - hotel.room.amenities.type + + hotel.room_amenitie_type_list + hotel.room.amenitie.type @@ -31,10 +31,9 @@ - - Hotel Room Amenities Type - hotel.room.amenities.type - + + Hotel Room Amenitie Type + hotel.room.amenitie.type form tree,form @@ -42,7 +41,7 @@ diff --git a/hotel/views/hotel_room_type_views.xml b/hotel/views/hotel_room_type_views.xml index fdaeb9b8d..69ca46232 100644 --- a/hotel/views/hotel_room_type_views.xml +++ b/hotel/views/hotel_room_type_views.xml @@ -31,6 +31,10 @@ + + + +
diff --git a/hotel/views/hotel_room_views.xml b/hotel/views/hotel_room_views.xml index 2fdbc6360..c7abcac07 100644 --- a/hotel/views/hotel_room_views.xml +++ b/hotel/views/hotel_room_views.xml @@ -47,10 +47,6 @@ - - - -