audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] Refactoring Code - hotel_floor, hotel_amenitie, aminitie_type, hotel_room_type (+ amenitie_ids), hotel_room (- amenitie_ids)

Browse Source
This commit is contained in:
Dario Lodeiros
2018-11-07 12:27:17 +01:00
parent ebae747a1a
commit 13416c2313
11 changed files with 53 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hotel/models/__init__.py
View File

@@ -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

4
hotel/models/hotel_floor.py
View File

@@ -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')

6
hotel/models/hotel_room.py
View File

@@ -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')

14
hotel/models/hotel_room_amenitie.py Normal file
View File

@@ -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')

15
hotel/models/hotel_room_amenitie_type.py Normal file
View File

@@ -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')

29
hotel/models/hotel_room_amenities.py
View File

@@ -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()

26
hotel/models/hotel_room_amenities_type.py
View File

@@ -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()

5
hotel/models/hotel_room_type.py
View File

@@ -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 ...

21
hotel/views/hotel_room_amenities_type_views.xml
View File

@@ -3,9 +3,9 @@
<!--==== Amenities Type ==== -->
<!-- Form view of hotel room amenities type -->
<record model="ir.ui.view" id="view_hotel_room_amenities_type_form">
<field name="name">hotel.room_amenities_type_form</field>
<field name="model">hotel.room.amenities.type</field>
<record model="ir.ui.view" id="view_hotel_room_amenitie_type_form">
<field name="name">hotel.room_amenitie_type_form</field>
<field name="model">hotel.room.amenitie.type</field>
<field name="arch" type="xml">
<form string="Hotel Room Amenities Type">
<sheet>
@@ -20,9 +20,9 @@
</record>
<!-- Tree view of hotel room amenities type -->
<record model="ir.ui.view" id="view_hotel_room_amenities_type_list">
<field name="name">hotel.room_amenities_type_list</field>
<field name="model">hotel.room.amenities.type</field>
<record model="ir.ui.view" id="view_hotel_room_amenitie_type_list">
<field name="name">hotel.room_amenitie_type_list</field>
<field name="model">hotel.room.amenitie.type</field>
<field name="arch" type="xml">
<tree string="Hotel Room Amenities Type">
<field name="name" />
@@ -31,10 +31,9 @@
</record>
<!-- Action for hotel room amenities type -->
<record model="ir.actions.act_window" id="action_hotel_room_amenities_type_view_form">
<field name="name">Hotel Room Amenities Type</field>
<field name="res_model">hotel.room.amenities.type</field>
<!-- <field name="context">{'default_isamenitytype':1}</field> -->
<record model="ir.actions.act_window" id="action_hotel_room_amenitie_type_view_form">
<field name="name">Hotel Room Amenitie Type</field>
<field name="res_model">hotel.room.amenitie.type</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
</record>
@@ -42,7 +41,7 @@
<menuitem id="menu_amenity" name="Amenity"
parent="hotel.hotel_configuration_menu" sequence="2" />
<menuitem name="Amenity Types"
id="menu_action_hotel_room_amenities_type_view_form" action="action_hotel_room_amenities_type_view_form"
id="menu_action_hotel_room_amenitie_type_view_form" action="action_hotel_room_amenitie_type_view_form"
sequence="3" parent="hotel.menu_amenity" />
</odoo>

4
hotel/views/hotel_room_type_views.xml
View File

@@ -31,6 +31,10 @@
<field name="room_ids" widget="many2many"/>
</group>
</group>
<page string="Room Amenities">
<separator string=" Room Amenities" />
<field name="room_amenities" colspan="4" nolabel="1" />
</page>
</sheet>
</form>
</field>

4
hotel/views/hotel_room_views.xml
View File

@@ -47,10 +47,6 @@
<!-- <field name="taxes_id" colspan="4" nolabel='1'
help='Customer taxes apply on the perticular room. ' /> -->
</page>
<page string="Room Amenities">
<separator string=" Room Amenities" />
<field name="room_amenities" colspan="4" nolabel="1" />
</page>
<page string="Descriptions">
<group>
<field name="description_sale" colspan="2" string="Name in reports"/>