Maintainers
+Maintainers
This module is maintained by the OCA.
diff --git a/pms/tests/test_pms_reservation.py b/pms/tests/test_pms_reservation.py
index 5fcb297d97..3bc109fbff 100644
--- a/pms/tests/test_pms_reservation.py
+++ b/pms/tests/test_pms_reservation.py
@@ -816,6 +816,39 @@ def test_split_reservation07(self):
}
)
+ def _children_occupy_capacity(self):
+ """Count children towards the capacity, which is off by default."""
+ self.env["ir.config_parameter"].sudo().set_param(
+ "pms.children_occupy_capacity", "True"
+ )
+
+ @freeze_time("2012-01-14")
+ def test_children_do_not_occupy_by_default(self):
+ """Children take no place unless the property says otherwise.
+
+ Properties have been taking these reservations all along, so counting
+ children is theirs to turn on and never something an upgrade does.
+ """
+ # NO ARRANGE
+ # ACT
+ reservation = self.env["pms.reservation"].create(
+ {
+ "adults": 2,
+ "children": 3,
+ "checkin": datetime.datetime.now(),
+ "checkout": datetime.datetime.now() + datetime.timedelta(days=1),
+ "preferred_room_id": self.room1.id,
+ "partner_id": self.partner1.id,
+ "pms_property_id": self.pms_property1.id,
+ "sale_channel_origin_id": self.sale_channel_direct.id,
+ }
+ )
+ reservation.flush_recordset()
+ # ASSERT
+ self.assertEqual(
+ reservation.children, 3, "The children should fit in a double room"
+ )
+
@freeze_time("2012-01-14")
def test_manage_children_raise(self):
# TEST CASE
@@ -823,24 +856,106 @@ def test_manage_children_raise(self):
Check if the error occurs when trying to put more people than the
capacity of the room.
--------------
- Create a reservation with a double room whose capacity is two and try to create
- it with two adults and a child occupying the room.
+ Create a reservation with a double room whose capacity is two and no
+ children places, and try to create it with two adults and a child.
"""
- # NO ARRANGE
+ # ARRANGE
+ self._children_occupy_capacity()
# ACT & ASSERT
- with self.assertRaises(
+ with self.assertRaisesRegex(
ValidationError,
+ "capacity",
msg="The number of people is greater than the capacity of the room",
):
reservation = self.env["pms.reservation"].create(
{
"adults": 2,
- "children_occupying": 1,
+ "children": 1,
"checkin": datetime.datetime.now(),
"checkout": datetime.datetime.now() + datetime.timedelta(days=1),
"preferred_room_id": self.room1.id,
"partner_id": self.partner1.id,
"pms_property_id": self.pms_property1.id,
+ "sale_channel_origin_id": self.sale_channel_direct.id,
+ }
+ )
+ reservation.flush_recordset()
+
+ @freeze_time("2012-01-14")
+ def test_children_use_children_capacity(self):
+ """
+ Check that children overflow into the children places of the room.
+ --------------
+ Create a room with two regular places and one children place, and a
+ reservation with two adults and one child: the child does not fit in
+ the regular places but takes the children one.
+ """
+ # ARRANGE
+ self._children_occupy_capacity()
+ room = self.env["pms.room"].create(
+ {
+ "pms_property_id": self.pms_property1.id,
+ "name": "Double with bunk bed",
+ "room_type_id": self.room_type_double.id,
+ "capacity": 2,
+ "children_capacity": 1,
+ }
+ )
+ # ACT
+ reservation = self.env["pms.reservation"].create(
+ {
+ "adults": 2,
+ "children": 1,
+ "checkin": datetime.datetime.now(),
+ "checkout": datetime.datetime.now() + datetime.timedelta(days=1),
+ "preferred_room_id": room.id,
+ "partner_id": self.partner1.id,
+ "pms_property_id": self.pms_property1.id,
+ "sale_channel_origin_id": self.sale_channel_direct.id,
+ }
+ )
+ reservation.flush_recordset()
+ # ASSERT
+ self.assertEqual(
+ reservation.children,
+ 1,
+ "The child should take the children place of the room",
+ )
+
+ @freeze_time("2012-01-14")
+ def test_adults_do_not_use_children_capacity(self):
+ """
+ Check that adults never take the children places of the room.
+ --------------
+ Create a room with two regular places and two children places, and try
+ to book it for three adults: the room holds four guests but only two
+ of them can be adults.
+ """
+ # ARRANGE
+ room = self.env["pms.room"].create(
+ {
+ "pms_property_id": self.pms_property1.id,
+ "name": "Double with two bunk beds",
+ "room_type_id": self.room_type_double.id,
+ "capacity": 2,
+ "children_capacity": 2,
+ }
+ )
+ # ACT & ASSERT
+ with self.assertRaisesRegex(
+ ValidationError,
+ "capacity",
+ msg="Adults cannot occupy the children places of the room",
+ ):
+ reservation = self.env["pms.reservation"].create(
+ {
+ "adults": 3,
+ "checkin": datetime.datetime.now(),
+ "checkout": datetime.datetime.now() + datetime.timedelta(days=1),
+ "preferred_room_id": room.id,
+ "partner_id": self.partner1.id,
+ "pms_property_id": self.pms_property1.id,
+ "sale_channel_origin_id": self.sale_channel_direct.id,
}
)
reservation.flush_recordset()
diff --git a/pms/views/pms_reservation_views.xml b/pms/views/pms_reservation_views.xml
index 96b783bc38..9e711a25c0 100644
--- a/pms/views/pms_reservation_views.xml
+++ b/pms/views/pms_reservation_views.xml
@@ -443,10 +443,6 @@
name="children"
attrs="{'invisible': [('reservation_type','in',('out'))]}"
/>
-