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

[ADD] Shared Room Tests & parent/child room fields

Browse Source
This commit is contained in:
Dario Lodeiros
2021-08-09 17:21:05 +02:00
parent 9ccff73fb9
commit bafd2c75bd
11 changed files with 211 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pms/__manifest__.py
View File

@@ -65,7 +65,6 @@
"views/pms_room_type_class_views.xml",
"views/pms_availability_plan_views.xml",
"views/pms_availability_plan_rule_views.xml",
"views/pms_shared_room_views.xml",
"views/res_partner_views.xml",
"views/product_pricelist_views.xml",
"views/product_pricelist_item_views.xml",

1
pms/models/__init__.py
View File

@@ -13,7 +13,6 @@ from . import pms_ubication
from . import pms_folio
from . import pms_reservation
from . import pms_room
from . import pms_shared_room
from . import pms_amenity
from . import pms_amenity_type
from . import pms_room_type

32
pms/models/pms_room.py
View File

@@ -48,12 +48,20 @@ class PmsRoom(models.Model):
ondelete="restrict",
check_pms_properties=True,
)
# TODO: design shared rooms
shared_room_id = fields.Many2one(
string="Shared Room",
help="The room can be sold by beds",
default=False,
comodel_name="pms.shared.room",
parent_id = fields.Many2one(
string="Parent Room",
help="Indicates that this room is a child of another room",
comodel_name="pms.room",
ondelete="restrict",
check_pms_properties=True,
)
child_ids = fields.One2many(
string="Child Rooms",
help="Child rooms of the room",
comodel_name="pms.room",
inverse_name="parent_id",
ondelete="restrict",
check_pms_properties=True,
)
ubication_id = fields.Many2one(
string="Ubication",
@@ -146,10 +154,8 @@ class PmsRoom(models.Model):
def get_capacity(self, extra_bed=0):
for record in self:
if not record.shared_room_id:
if extra_bed > record.extra_beds_allowed:
raise ValidationError(
_("Extra beds can't be greater than allowed beds for this room")
)
return record.capacity + extra_bed
return record.capacity
if extra_bed > record.extra_beds_allowed:
raise ValidationError(
_("Extra beds can't be greater than allowed beds for this room")
)
return record.capacity + extra_bed

6
pms/models/pms_room_type.py
View File

@@ -67,12 +67,6 @@ class PmsRoomType(models.Model):
help="Identification code for a room type",
required=True,
)
# TODO: Session review to define shared room and "sales rooms packs"
is_shared_room = fields.Boolean(
string="Shared Room",
help="This room type is reservation by beds",
default=False,
)
total_rooms_count = fields.Integer(
string="Total Rooms Count",
help="The number of rooms in a room type",

143
pms/models/pms_shared_room.py
View File

@@ -1,143 +0,0 @@
# 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 _, api, fields, models
from odoo.exceptions import ValidationError
class PmsSharedRoom(models.Model):
_name = "pms.shared.room"
_description = "Shared Room"
_order = "room_type_id, name"
_check_pms_properties_auto = True
name = fields.Char(
string="Room Name", help="Name of the shared room", required=True
)
active = fields.Boolean(
string="Active", help="Determines if shared room is active", default=True
)
sequence = fields.Integer(
string="Sequence",
help="Field used to change the position of the shared rooms in tree view."
"Changing the position changes the sequence",
required=True,
)
room_type_id = fields.Many2one(
string="Room Type",
help="Room type which the shared room belongs",
comodel_name="pms.room.type",
required=True,
ondelete="restrict",
domain=[("shared_room", "=", True)],
)
# TODO: properties relation
pms_property_ids = fields.Many2many(
string="Properties",
help="Properties with access to the element;"
" if not set, all properties can access",
comodel_name="pms.property",
relation="pms_shared_room_pms_property_rel",
column1="shared_room_id",
column2="pms_property_id",
check_pms_properties=True,
)
ubication_id = fields.Many2one(
string="Ubication",
help="At which ubication the room is located.",
comodel_name="pms.ubication",
ondelete="restrict",
)
bed_ids = fields.One2many(
string="Beds",
help="Beds in one room",
comodel_name="pms.room",
inverse_name="shared_room_id",
readonly=True,
)
beds = fields.Integer(
string="Number Of Beds", help="Number of beds in a shared room"
)
description_sale = fields.Text(
string="Sale Description",
help="A description of the Product that you want to communicate to "
" your customers. This description will be copied to every Sales "
" Order, Delivery Order and Customer Invoice/Credit Note",
translate=True,
)
@api.constrains("beds")
def _constrain_beds(self):
self.ensure_one()
if self.beds < 1:
raise ValidationError(_("Room beds can't be less than one"))
if len(self.bed_ids) > self.beds:
raise ValidationError(
_(
"If you want to eliminate beds in the \
room you must deactivate the beds from your form"
)
)
beds = []
inactive_beds = self.env["pms.room"].search(
[("active", "=", False), ("shared_room_id", "=", self.id)]
)
for i in range(len(self.bed_ids), self.beds):
if inactive_beds:
bed = inactive_beds[0]
bed.update({"active": True})
inactive_beds -= bed
continue
name = u"{} ({})".format(self.name, i + 1)
bed_vals = {
"name": name,
"capacity": 1,
"room_type_id": self.room_type_id.id,
"sequence": self.sequence,
"ubication_id": self.ubication_id.id if self.ubication_id else False,
"shared_room_id": self.id,
}
beds.append((0, False, bed_vals))
if beds:
self.update({"bed_ids": beds})
@api.constrains("active")
def _constrain_active(self):
self.bed_ids.write(
{
"active": self.active,
}
)
@api.constrains("room_type_id")
def _constrain_room_type_id(self):
self.bed_ids.write(
{
"room_type_id": self.room_type_id.id,
}
)
@api.constrains("ubication_id")
def _constrain_ubication_id(self):
self.bed_ids.write(
{
"ubication_id": self.ubication_id.id,
}
)
@api.constrains("sequence")
def _constrain_sequence(self):
self.bed_ids.write(
{
"sequence": self.sequence,
}
)
@api.constrains("descrition_sale")
def _constrain_descrition_sale(self):
self.bed_ids.write(
{
"description_sale": self.descrition_sale,
}
)

2
pms/security/ir.model.access.csv
View File

@@ -10,7 +10,6 @@ user_access_pms_board_service,user_access_pms_board_service,model_pms_board_serv
user_access_pms_checkin_partner,user_access_pms_checkin_partner,model_pms_checkin_partner,pms.group_pms_user,1,1,1,1
user_access_pms_room_type_class,user_access_pms_room_type_class,model_pms_room_type_class,pms.group_pms_user,1,0,0,0
user_access_pms_room,user_access_pms_room,model_pms_room,pms.group_pms_user,1,0,0,0
user_access_shared_pms_room,user_access_pms_shared_room,model_pms_shared_room,pms.group_pms_user,1,0,0,0
user_access_pms_availability_plan_rule,user_access_pms_availability_plan_rule,model_pms_availability_plan_rule,pms.group_pms_user,1,0,0,0
user_access_pms_availability,user_access_pms_availability,model_pms_availability,pms.group_pms_user,1,1,1,0
user_access_pms_reservation,user_access_pms_reservation,model_pms_reservation,pms.group_pms_user,1,1,1,1
@@ -36,7 +35,6 @@ manager_access_pms_board_service,manager_access_pms_board_service,model_pms_boar
manager_access_pms_checkin_partner,manager_access_pms_checkin_partner,model_pms_checkin_partner,pms.group_pms_manager,1,1,1,1
manager_access_pms_room_type_class,manager_access_pms_room_type_class,model_pms_room_type_class,pms.group_pms_manager,1,1,1,1
manager_access_pms_room,manager_access_pms_room,model_pms_room,pms.group_pms_manager,1,1,1,1
manager_access_pms_shared_room,manager_access_pms_shared_room,model_pms_shared_room,pms.group_pms_manager,1,1,1,1
manager_access_pms_availability_plan_rule,manager_access_pms_availability_plan_rule,model_pms_availability_plan_rule,pms.group_pms_manager,1,1,1,1
manager_access_pms_reservation,manager_access_pms_reservation,model_pms_reservation,pms.group_pms_manager,1,1,1,1
manager_access_pms_availability,manager_access_pms_availability,model_pms_availability,pms.group_pms_manager,1,1,1,0
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
10 user_access_pms_checkin_partner user_access_pms_checkin_partner model_pms_checkin_partner pms.group_pms_user 1 1 1 1
11 user_access_pms_room_type_class user_access_pms_room_type_class model_pms_room_type_class pms.group_pms_user 1 0 0 0
12 user_access_pms_room user_access_pms_room model_pms_room pms.group_pms_user 1 0 0 0
user_access_shared_pms_room user_access_pms_shared_room model_pms_shared_room pms.group_pms_user 1 0 0 0
13 user_access_pms_availability_plan_rule user_access_pms_availability_plan_rule model_pms_availability_plan_rule pms.group_pms_user 1 0 0 0
14 user_access_pms_availability user_access_pms_availability model_pms_availability pms.group_pms_user 1 1 1 0
15 user_access_pms_reservation user_access_pms_reservation model_pms_reservation pms.group_pms_user 1 1 1 1
35 manager_access_pms_checkin_partner manager_access_pms_checkin_partner model_pms_checkin_partner pms.group_pms_manager 1 1 1 1
36 manager_access_pms_room_type_class manager_access_pms_room_type_class model_pms_room_type_class pms.group_pms_manager 1 1 1 1
37 manager_access_pms_room manager_access_pms_room model_pms_room pms.group_pms_manager 1 1 1 1
manager_access_pms_shared_room manager_access_pms_shared_room model_pms_shared_room pms.group_pms_manager 1 1 1 1
38 manager_access_pms_availability_plan_rule manager_access_pms_availability_plan_rule model_pms_availability_plan_rule pms.group_pms_manager 1 1 1 1
39 manager_access_pms_reservation manager_access_pms_reservation model_pms_reservation pms.group_pms_manager 1 1 1 1
40 manager_access_pms_availability manager_access_pms_availability model_pms_availability pms.group_pms_manager 1 1 1 0

1
pms/tests/__init__.py
View File

@@ -37,3 +37,4 @@ from . import test_pms_folio_sale_line
from . import test_pms_wizard_split_join_swap_reservation
from . import test_product_template
from . import test_pms_multiproperty
from . import test_shared_room

185
pms/tests/test_shared_room.py Normal file
View File

@@ -0,0 +1,185 @@
import datetime
from odoo import fields
from .common import TestPms
class TestPmsSharedRoom(TestPms):
def setUp(self):
super().setUp()
# create a room type availability
self.room_type_availability = self.env["pms.availability.plan"].create(
{
"name": "Availability plan for TEST",
"pms_pricelist_ids": [(6, 0, [self.pricelist1.id])],
}
)
self.bed_class = self.env["pms.room.type.class"].create(
{
"name": "Bed Class 1",
"default_code": "B1",
}
)
# create room type
self.room_type_shared = self.env["pms.room.type"].create(
{
"pms_property_ids": [self.pms_property1.id],
"name": "Shared Test",
"default_code": "SHT",
"class_id": self.room_type_class1.id,
}
)
self.room_type_bed = self.env["pms.room.type"].create(
{
"pms_property_ids": [self.pms_property1.id],
"name": "Bed Type Test",
"default_code": "BTT",
"class_id": self.bed_class.id,
}
)
# create shared room
self.room1 = self.env["pms.room"].create(
{
"pms_property_id": self.pms_property1.id,
"name": "Shared 101",
"room_type_id": self.room_type_shared.id,
"capacity": 2,
"extra_beds_allowed": 1,
}
)
# create beds in room1
self.r1bed1 = self.env["pms.room"].create(
{
"pms_property_id": self.pms_property1.id,
"name": "101 (1)",
"room_type_id": self.room_type_bed.id,
"capacity": 1,
"parent_id": self.room1.id,
}
)
self.r1bed2 = self.env["pms.room"].create(
{
"pms_property_id": self.pms_property1.id,
"name": "101 (2)",
"room_type_id": self.room_type_bed.id,
"capacity": 2,
"parent_id": self.room1.id,
}
)
# create partner
self.partner1 = self.env["res.partner"].create(
{
"firstname": "Jaime",
"lastname": "García",
"email": "jaime@example.com",
"birthdate_date": "1983-03-01",
"gender": "male",
}
)
def test_not_avail_beds_with_room_occupied(self):
"""
Check that not allow to create a bed reservation with a room occupied
----------------
Create a room1 reservation and check that the beds room real avail is 0
"""
# ARRANGE
today = fields.date.today()
tomorrow = fields.date.today() + datetime.timedelta(days=1)
# ACT
self.env["pms.reservation"].create(
{
"partner_id": self.partner1.id,
"preferred_room_id": self.room1.id,
"checkin": today,
"checkout": tomorrow,
"pms_property_id": self.pms_property1.id,
}
)
# ASSERT
self.assertEqual(
self.pms_property1.with_context(
checkin=today,
checkout=tomorrow,
room_type_id=self.room_type_bed.id,
).availability,
0,
"Beds avaialbility should be 0 for room occupied",
)
def test_not_avail_shared_room_with_one_bed_occupied(self):
"""
Check that not allow to create a shared room reservation with a bed occupied
----------------
Create a room1's bed reservation and check that the room1 real avail is 0
"""
# ARRANGE
today = fields.date.today()
tomorrow = fields.date.today() + datetime.timedelta(days=1)
# ACT
self.env["pms.reservation"].create(
{
"partner_id": self.partner1.id,
"preferred_room_id": self.r1bed1.id,
"checkin": today,
"checkout": tomorrow,
"pms_property_id": self.pms_property1.id,
}
)
# ASSERT
self.assertEqual(
self.pms_property1.with_context(
checkin=today,
checkout=tomorrow,
room_type_id=self.room_type_shared.id,
).availability,
0,
"Shared Room avaialbility should be 0 if it has a bed occupied",
)
def test_avail_beds_with_one_bed_occupied(self):
"""
Check the avail of a bed when it has a room with other beds occupied
----------------
Create a room1's bed (it has 2 beds) reservation and check that the beds avail = 1
"""
# ARRANGE
today = fields.date.today()
tomorrow = fields.date.today() + datetime.timedelta(days=1)
# ACT
self.env["pms.reservation"].create(
{
"partner_id": self.partner1.id,
"preferred_room_id": self.r1bed1.id,
"checkin": today,
"checkout": tomorrow,
"pms_property_id": self.pms_property1.id,
}
)
# ASSERT
self.assertEqual(
self.pms_property1.with_context(
checkin=today,
checkout=tomorrow,
room_type_id=self.room_type_bed.id,
).availability,
1,
"Shared Room avaialbility should be 0 if it has a bed occupied",
)

1
pms/views/pms_room_type_views.xml
View File

@@ -37,7 +37,6 @@
</group>
<group colspan="2">
<group name="room_ids_group">
<field name="is_shared_room" />
<field name="room_ids" widget="many2many_tags" />
<field name="total_rooms_count" />
</group>

37
pms/views/pms_room_views.xml
View File

@@ -24,15 +24,7 @@
<div class="oe_title">
<label for="name" string="Name" />
<h1>
<field
name="name"
attrs="{'readonly':[('shared_room_id','!=', False)]}"
/>
<field
name="shared_room_id"
string="Ubication"
invisible='True'
/>
<field name="name" />
</h1>
</div>
<notebook>
@@ -43,25 +35,11 @@
invisible="0"
force_save="1"
/>
<field
name="ubication_id"
string="Ubication"
attrs="{'readonly':[('shared_room_id','!=', False)]}"
/>
<field name="ubication_id" string="Ubication" />
<!-- <field name="categ_id" select="1" domain="[('isroomtype','=',True)]" string="Room Type" /> -->
<field
name="room_type_id"
string="Room Type"
attrs="{'readonly':[('shared_room_id','!=', False)]}"
/>
<field
name="capacity"
attrs="{'readonly':[('shared_room_id','!=', False)]}"
/>
<field
name="extra_beds_allowed"
attrs="{'invisible':[('shared_room_id','!=', False)]}"
/>
<field name="room_type_id" string="Room Type" />
<field name="capacity" />
<field name="extra_beds_allowed" />
<!-- <field name="uom_id" invisible="1" /> -->
</group>
<group>
@@ -90,10 +68,7 @@
</page>
</notebook>
<group>
<field
name="sequence"
attrs="{'readonly':[('shared_room_id','!=', False)]}"
/>
<field name="sequence" />
</group>
</sheet>
</form>

133
pms/views/pms_shared_room_views.xml
View File

@@ -1,133 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record model="ir.ui.view" id="pms_shared_room_view_form">
<field name="name">pms.shared.room.form</field>
<field name="model">pms.shared.room</field>
<field name="arch" type="xml">
<form string="Shared Room">
<sheet>
<div class="oe_button_box" name="button_box">
<button
name="toggle_active"
type="object"
class="oe_stat_button"
icon="fa-archive"
>
<field
name="active"
widget="boolean_button"
options='{"terminology": "archive"}'
/>
</button>
</div>
<div class="oe_title">
<label for="name" string="Name" />
<h1>
<field name="name" />
</h1>
</div>
<notebook>
<page
name="information_pms_shared_shared_room"
string="Information"
>
<group colspan="4" col="4">
<field name="ubication_id" string="Ubication" />
<field name="room_type_id" string="Room Type" />
<field name="beds" />
<field name="sequence" />
</group>
<group>
<field name="bed_ids" />
</group>
</page>
<page string="Descriptions">
<group>
<field
name="description_sale"
colspan="2"
string="Name in reports"
/>
</group>
</page>
</notebook>
</sheet>
</form>
</field>
</record>
<record model="ir.ui.view" id="pms_shared_shared_room_view_kanban">
<field name="name">pms.shared.room.kanban</field>
<field name="model">pms.shared.room</field>
<field name="type">kanban</field>
<field name="arch" type="xml">
<kanban class="o_kanban_mobile">
<attribute name="group_create">false</attribute>
<field name="id" />
<field name="name" />
<templates>
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_global_click">
<div class="oe_kanban_details">
<ul>
<li class="mb4">
<strong>
<field name="name" />
</strong>
</li>
<li class="mb4">
Room Type:
<field name="room_type_id" />
</li>
<li class="badge mb4">
<strong>
Beds
<field name="beds" />
</strong>
</li>
</ul>
</div>
</div>
</t>
</templates>
</kanban>
</field>
</record>
<record model="ir.ui.view" id="pms_shared_shared_room_view_search">
<field name="name">pms.shared.room.search</field>
<field name="model">pms.shared.room</field>
<field name="arch" type="xml">
<search string="Shared Room">
<field name="name" />
<field name="room_type_id" />
<field name="beds" />
</search>
</field>
</record>
<record model="ir.ui.view" id="pms_shared_room_view_tree">
<field name="name">pms.shared.room.tree</field>
<field name="model">pms.shared.room</field>
<field name="arch" type="xml">
<tree string="Shared Room">
<field name="name" />
<field name="room_type_id" />
<field name="beds" />
<field name="sequence" />
</tree>
</field>
</record>
<record model="ir.actions.act_window" id="action_pms_shared_room_form">
<field name="name">Shared Room</field>
<field name="res_model">pms.shared.room</field>
<!-- <field name="context">{'default_isroom':1,'default_rental':1}
</field> -->
<field name="view_id" ref="pms_shared_room_view_tree" />
<field name="view_mode">kanban,tree,form</field>
</record>
<menuitem
name="Shared Rooms"
id="menu_open_pms_shared_room_form"
action="action_pms_shared_room_form"
sequence="55"
parent="pms.pms_rooms_menu"
/>
</odoo>