diff --git a/pms/__manifest__.py b/pms/__manifest__.py
index e54b053c7..e0a4669cb 100644
--- a/pms/__manifest__.py
+++ b/pms/__manifest__.py
@@ -63,6 +63,6 @@
         "views/webclient_templates.xml",
         "views/ir_sequence_views.xml"
     ],
-    "demo": ["demo/pms_master_data.xml", "demo/pms_reservation.xml"],
+    "demo": ["demo/pms_master_data.xml", "demo/pms_folio.xml"],
     "qweb": ["static/src/xml/pms_base_templates.xml",],
 }
diff --git a/pms/demo/pms_folio.xml b/pms/demo/pms_folio.xml
new file mode 100644
index 000000000..6e3b0db7f
--- /dev/null
+++ b/pms/demo/pms_folio.xml
@@ -0,0 +1,702 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data noupdate="1">
+        <!-- pms.folio -->
+        <!-- reservation of 1 economic room for 1 person -->
+        <record id="pms_folio_0" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_address_27" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_0'),
+                    'checkin': (DateTime.today() + timedelta(days=14)),
+                    'checkout': (DateTime.today() + timedelta(days=16)),
+                    'adults': 2,
+                    'state': 'confirm',
+                    'board_service_room_id': ref('pms_board_service_room_1'),
+                    })]"
+            />
+        </record>
+        <!-- reservation of 1 triple room for 3 people on behalf on the company -->
+        <record id="pms_folio_1" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_12" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_3'),
+                    'checkin': (DateTime.today() + timedelta(days=14)),
+                    'checkout': (DateTime.today() + timedelta(days=15)),
+                    'adults': 3,
+                    'board_service_room_id': ref('pms_board_service_room_3'),
+                    })]"
+            />
+        </record>
+        <!-- reservation of 3 single rooms for 3 people with 1 cancelled -->
+        <!-- TODO: The third reservation is marked from State: Cancelled to Pending Entry at Folio creation -->
+        <record id="pms_folio_2" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_address_10" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=14)),
+                    'checkout': (DateTime.today() + timedelta(days=16)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=14)),
+                    'checkout': (DateTime.today() + timedelta(days=16)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=14)),
+                    'checkout': (DateTime.today() + timedelta(days=16)),
+                    'adults': 1,
+                    'state': 'cancelled',
+                    })]"
+            />
+        </record>
+        <!-- reservation of the conference room for 1 day on behalf of a company -->
+        <record id="pms_folio_3" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_12" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_4'),
+                    'checkin': (DateTime.today() + timedelta(days=15)),
+                    'checkout': (DateTime.today() + timedelta(days=16)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    })]"
+            />
+        </record>
+        <!-- out of service room -->
+        <record id="pms_folio_4" model="pms.folio">
+            <field name="partner_id" ref="main_pms_property" />
+            <field name="reservation_type">out</field>
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=16)),
+                    'checkout': (DateTime.today() + timedelta(days=17)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    'reservation_type': 'out',
+                    'closure_reason_id': ref('pms_room_closure_reason_0'),
+                    'out_service_description': 'Change of lighting',
+                    })]"
+            />
+        </record>
+        <!-- reservation of 1 double room for 1 day-->
+        <record id="pms_folio_5" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_address_15" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_2'),
+                    'checkin': (DateTime.today() + timedelta(days=15)),
+                    'checkout': (DateTime.today() + timedelta(days=16)),
+                    'adults': 1,
+                    'children':1,
+                    'state': 'confirm',
+                    'board_service_room_id': ref('pms_board_service_room_1'),
+                    })]"
+            />
+        </record>
+        <!-- reservation of 1 triple room for for 1 person and 1 day-->
+        <record id="pms_folio_6" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_4" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_3'),
+                    'checkin': (DateTime.today() + timedelta(days=15)),
+                    'checkout': (DateTime.today() + timedelta(days=16)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    'board_service_room_id': ref('pms_board_service_room_1'),
+                    })]"
+            />
+        </record>
+        <!-- reservation of all rooms for 1 day on behalf of a company -->
+        <record id="pms_folio_7" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_10" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_0'),
+                    'checkin': (DateTime.today() + timedelta(days=17)),
+                    'checkout': (DateTime.today() + timedelta(days=18)),
+                    'adults': 2,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=17)),
+                    'checkout': (DateTime.today() + timedelta(days=18)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=17)),
+                    'checkout': (DateTime.today() + timedelta(days=18)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=17)),
+                    'checkout': (DateTime.today() + timedelta(days=18)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_2'),
+                    'checkin': (DateTime.today() + timedelta(days=17)),
+                    'checkout': (DateTime.today() + timedelta(days=18)),
+                    'adults': 2,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_2'),
+                    'checkin': (DateTime.today() + timedelta(days=17)),
+                    'checkout': (DateTime.today() + timedelta(days=18)),
+                    'adults': 2,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_3'),
+                    'checkin': (DateTime.today() + timedelta(days=17)),
+                    'checkout': (DateTime.today() + timedelta(days=18)),
+                    'adults': 3,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_4'),
+                    'checkin': (DateTime.today() + timedelta(days=17)),
+                    'checkout': (DateTime.today() + timedelta(days=18)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    })]"
+            />
+        </record>
+        <!-- out of service single-101 room -->
+        <record id="pms_folio_8" model="pms.folio">
+            <field name="partner_id" ref="main_pms_property" />
+            <field name="reservation_type">out</field>
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_id': ref('pms_room_1'),
+                    'checkin': (DateTime.today() + timedelta(days=19)),
+                    'checkout': (DateTime.today() + timedelta(days=20)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    'reservation_type': 'out',
+                    'closure_reason_id': ref('pms_room_closure_reason_0'),
+                    'out_service_description': 'Door arrangement',
+                    })]"
+            />
+        </record>
+        <!--2 reservetions in diferent rooms and diferent days-->
+        <record id="pms_folio_9" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_address_33" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_2'),
+                    'room_id': ref('pms_room_4'),
+                    'checkin': (DateTime.today() + timedelta(days=19)),
+                    'checkout': (DateTime.today() + timedelta(days=20)),
+                    'adults': 2,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_2'),
+                    'checkin': (DateTime.today() + timedelta(days=20)),
+                    'checkout': (DateTime.today() + timedelta(days=21)),
+                    'adults': 2,
+                    'state': 'confirm',
+                    })]"
+            />
+        </record>
+        <!--reservation of the conference room for 3 days-->
+        <record id="pms_folio_10" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_main2" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_4'),
+                    'checkin': (DateTime.today() + timedelta(days=19)),
+                    'checkout': (DateTime.today() + timedelta(days=21)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    })]"
+            />
+        </record>
+        <!--reservation of 2 single rooms and 1 triple room-->
+        <record id="pms_folio_11" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_address_10" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=19)),
+                    'checkout': (DateTime.today() + timedelta(days=20)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=19)),
+                    'checkout': (DateTime.today() + timedelta(days=20)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_3'),
+                    'checkin': (DateTime.today() + timedelta(days=19)),
+                    'checkout': (DateTime.today() + timedelta(days=20)),
+                    'adults': 3,
+                    'state': 'confirm',
+                    })]"
+            />
+        </record>
+        <!--Reservation of economic room-->
+        <record id="pms_folio_12" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_1" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_id': ref('pms_room_0'),
+                    'checkin': (DateTime.today() + timedelta(days=19)),
+                    'checkout': (DateTime.today() + timedelta(days=20)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    })]"
+            />
+        </record>
+        <!--Reservation of the conference room with VIP privacy closure reason-->
+         <record id="pms_folio_13" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_12" />
+            <field name="reservation_type">normal</field>
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_id': ref('pms_room_7'),
+                    'checkin': (DateTime.today() + timedelta(days=21)),
+                    'checkout': (DateTime.today() + timedelta(days=22)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    'closure_reason_id': ref('pms_room_closure_reason_1'),
+                    })]"
+            />
+        </record>
+        <!--Reservation of triple room with 2 adults and 1 children-->
+        <record id="pms_folio_14" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_12" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_3'),
+                    'checkin': (DateTime.today() + timedelta(days=16)),
+                    'checkout': (DateTime.today() + timedelta(days=17)),
+                    'adults': 2,
+                    'children':1,
+                    'board_service_room_id': ref('pms_board_service_room_3'),
+                    })]"
+            />
+        </record>
+        <!--Reservation of the conference room whit cancelled-->
+        <!-- TODO: The reservation is marked from State: Cancelled to Pending Entry at Folio creation -->
+        <record id="pms_folio_15" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_18" />
+            <field name="reservation_type">normal</field>
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref ('pms_room_type_4'),
+                    'checkin': (DateTime.today() + timedelta(days=22)),
+                    'checkout': (DateTime.today() + timedelta(days=23)),
+                    'adults': 1,
+                    'state': 'cancelled',
+                    })]"
+            />
+        </record>
+        <!--Reservation of double room without default hours-->
+        <record id="pms_folio_16" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_18" />
+            <field name="reservation_type">normal</field>
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_2'),
+                    'room_id': ref('pms_room_4'),
+                    'checkin': (DateTime.today() + timedelta(days=21)),
+                    'checkout': (DateTime.today() + timedelta(days=22)),
+                    'adults': 1,
+                    'children': 1,
+                    'state': 'confirm',
+                    'arrival_hour': '12:00',
+                    'departure_hour': '12:30',
+                    'board_service_room_id': ref('pms_board_service_room_1'),
+                    })]"
+            />
+        </record>
+        <!--Reservation of triple room whit draft state-->
+        <!-- TODO: The reservation is marked from State: Pre-reservation to Pending Entry at Folio creation -->
+        <record id="pms_folio_17" model="pms.folio">
+            <field name="partner_id" ref= "base.res_partner_address_32" />
+            <field name="reservation_type">normal</field>
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_id': ref('pms_room_6'),
+                    'checkin': (DateTime.today() + timedelta(days=20)),
+                    'checkout': (DateTime.today() + timedelta(days=21)),
+                    'adults': 3,
+                    'state': 'draft',
+                    })]"
+            />
+        </record>
+        <!--Reservation of 2 double rooms and 1 triple room whith board service-->
+        <record id="pms_folio_18" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_address_30" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_2'),
+                    'room_id': ref('pms_room_4'),
+                    'checkin': (DateTime.today() + timedelta(days=23)),
+                    'checkout': (DateTime.today() + timedelta(days=24)),
+                    'adults': 1,
+                    'children': 1,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_2'),
+                    'checkin': (DateTime.today() + timedelta(days=23)),
+                    'checkout': (DateTime.today() + timedelta(days=24)),
+                    'adults': 1,
+                    'children': 1,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_3'),
+                    'checkin': (DateTime.today() + timedelta(days=23)),
+                    'checkout': (DateTime.today() + timedelta(days=24)),
+                    'adults': 2,
+                    'children': 1,
+                    'state': 'confirm',
+                    'board_service_room_id': ref('pms_board_service_room_2'),
+                    })]"
+            />
+        </record>
+        <!--Reservation of economic room and 3 single rooms whith differents board services-->
+        <record id="pms_folio_19" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_18" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_0'),
+                    'checkin': (DateTime.today() + timedelta(days=23)),
+                    'checkout': (DateTime.today() + timedelta(days=24)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=23)),
+                    'checkout': (DateTime.today() + timedelta(days=24)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    'board_service_room_id': ref('pms_board_service_room_1'),
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=23)),
+                    'checkout': (DateTime.today() + timedelta(days=24)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    'board_service_room_id': ref('pms_board_service_room_3'),
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=23)),
+                    'checkout': (DateTime.today() + timedelta(days=24)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    'board_service_room_id': ref('pms_board_service_room_4'),
+                    })]"
+            />
+        </record>
+        <!--Reservation of 2 single rooms whith differents arrival and departure hours-->
+        <record id="pms_folio_20" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_address_25" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=24)),
+                    'checkout': (DateTime.today() + timedelta(days=25)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    'arrival_hour': '17:00',
+                    'departure_hour': '12:15',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_1'),
+                    'checkin': (DateTime.today() + timedelta(days=24)),
+                    'checkout': (DateTime.today() + timedelta(days=25)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    'arrival_hour': '16:00',
+                    'departure_hour': '11:15',
+                    })]"
+            />
+        </record>
+        <!--Reservation of 2 double rooms whith differents arrival and departure hours and one room whith board service-->
+        <record id="pms_folio_21" model="pms.folio">
+            <field name="partner_id" ref= "base.res_partner_address_32" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_2'),
+                    'checkin': (DateTime.today() + timedelta(days=24)),
+                    'checkout': (DateTime.today() + timedelta(days=25)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    'arrival_hour': '17:00',
+                    'departure_hour': '12:15',
+                    'board_service_room_id': ref('pms_board_service_room_1'),
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_id': ref('pms_room_5'),
+                    'checkin': (DateTime.today() + timedelta(days=24)),
+                    'checkout': (DateTime.today() + timedelta(days=25)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    'arrival_hour': '16:00',
+                    'departure_hour': '11:15',
+                    })]"
+            />
+        </record>
+        <!--Reservation of conference room whith lunch and dinner services-->
+        <record id="pms_folio_22" model="pms.folio">
+            <field name="partner_id" ref= "base.res_partner_10" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_id': ref('pms_room_7'),
+                    'checkin': (DateTime.today() + timedelta(days=24)),
+                    'checkout': (DateTime.today() + timedelta(days=25)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    'arrival_hour': '09:00',
+                    'departure_hour': '12:00',
+                    'board_service_room_id': ref('pms_board_service_room_4'),
+                    })]"
+            />
+        </record>
+        <!--Reservation of economic room for a week-->
+        <record id="pms_folio_23" model="pms.folio">
+            <field name="partner_id" ref= "base.res_partner_4" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_id': ref('pms_room_0'),
+                    'checkin': (DateTime.today() + timedelta(days=25)),
+                    'checkout': (DateTime.today() + timedelta(days=32)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    })]"
+            />
+        </record>
+        <!--Reservation of 1 single room for a week-->
+        <record id="pms_folio_24" model="pms.folio">
+            <field name="partner_id" ref= "base.res_partner_address_27" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_1'),
+                    'room_id': ref('pms_room_1'),
+                    'checkin': (DateTime.today() + timedelta(days=25)),
+                    'checkout': (DateTime.today() + timedelta(days=32)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    })]"
+            />
+        </record>
+        <!--Reservation of 1 single room for a week whith board service-->
+        <record id="pms_folio_25" model="pms.folio">
+            <field name="partner_id" ref= "base.res_partner_12" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_id': ref('pms_room_2'),
+                    'checkin': (DateTime.today() + timedelta(days=25)),
+                    'checkout': (DateTime.today() + timedelta(days=32)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    'board_service_room_id': ref('pms_board_service_room_4'),
+                    })]"
+            />
+        </record>
+        <!--Reservation of 2 double rooms for a week whith diferent checkouts-->
+        <record id="pms_folio_26" model="pms.folio">
+            <field name="partner_id" ref= "base.res_partner_address_27" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_2'),
+                    'room_id': ref('pms_room_5'),
+                    'checkin': (DateTime.today() + timedelta(days=25)),
+                    'checkout': (DateTime.today() + timedelta(days=31)),
+                    'adults': 2,
+                    'state': 'confirm',
+                    }),
+                    (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_2'),
+                    'checkin': (DateTime.today() + timedelta(days=25)),
+                    'checkout': (DateTime.today() + timedelta(days=32)),
+                    'adults': 2,
+                    'state': 'confirm',
+                    })]"
+            />
+        </record>
+        <!--Reservation of the conference room with VIP privacy closure reason and board service-->
+         <record id="pms_folio_27" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_3" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_id': ref('pms_room_7'),
+                    'checkin': (DateTime.today() + timedelta(days=25)),
+                    'checkout': (DateTime.today() + timedelta(days=26)),
+                    'adults': 1,
+                    'state': 'confirm',
+                    'closure_reason_id': ref('pms_room_closure_reason_1'),
+                    'board_service_room_id': ref('pms_board_service_room_4'),
+                    })]"
+            />
+        </record>
+        <!--Reservation of 1 triple room for 1 adult and 2 children whith board service-->
+         <record id="pms_folio_28" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_address_17" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_3'),
+                    'checkin': (DateTime.today() + timedelta(days=25)),
+                    'checkout': (DateTime.today() + timedelta(days=27)),
+                    'adults': 1,
+                    'children': 2,
+                    'board_service_room_id': ref('pms_board_service_room_2'),
+                    })]"
+            />
+        </record>
+        <!--Reservation of 1 triple room for 1 adult and 2 children whith specific arrival and departure hours and whith board service-->
+         <record id="pms_folio_29" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_address_25" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_3'),
+                    'checkin': (DateTime.today() + timedelta(days=27)),
+                    'checkout': (DateTime.today() + timedelta(days=28)),
+                    'adults': 1,
+                    'children': 2,
+                    'arrival_hour': '09:00',
+                    'departure_hour': '11:00',
+                    'board_service_room_id': ref('pms_board_service_room_2'),
+                    })]"
+            />
+        </record>
+        <!-- reservation of 1 triple room for 1 day-->
+        <record id="pms_folio_30" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_address_15" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_3'),
+                    'room_id': ref('pms_room_6'),
+                    'checkin': (DateTime.today() + timedelta(days=29)),
+                    'checkout': (DateTime.today() + timedelta(days=30)),
+                    'adults': 1,
+                    'children':1,
+                    'state': 'confirm',
+                    })]"
+            />
+        </record>
+    </data>
+</odoo>
diff --git a/pms/demo/pms_reservation.xml b/pms/demo/pms_reservation.xml
deleted file mode 100644
index 3514bd01a..000000000
--- a/pms/demo/pms_reservation.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
-        <!-- pms.folio -->
-        <!-- reservation of 1 economic room for 1 person -->
-        <record id="pms_folio_0" model="pms.folio">
-            <field name="partner_id" ref="base.res_partner_address_27" />
-            <field
-                name="reservation_ids"
-                eval="[(5, 0), (0, 0, {
-                    'pricelist_id': 1,
-                    'room_type_id': ref('pms_room_type_0'),
-                    'checkin': DateTime.today(),
-                    'checkout': (DateTime.today() + timedelta(days=2)),
-                    'adults': 2,
-                    'state': 'confirm',
-                    'board_service_room_id': ref('pms_board_service_room_1'),
-                    })]"
-            />
-        </record>
-        <!-- reservation of 1 triple room for 3 people on behalf on the company -->
-        <record id="pms_folio_1" model="pms.folio">
-            <field name="partner_id" ref="base.res_partner_12" />
-            <field
-                name="reservation_ids"
-                eval="[(5, 0), (0, 0, {
-                    'pricelist_id': 1,
-                    'room_type_id': ref('pms_room_type_3'),
-                    'checkin': (DateTime.today() + timedelta(days=2)),
-                    'checkout': (DateTime.today() + timedelta(days=4)),
-                    'adults': 3,
-                    'board_service_room_id': ref('pms_board_service_room_3'),
-                    })]"
-            />
-        </record>
-        <!-- reservation of 3 single rooms for 3 people with 1 cancelled -->
-        <!-- TODO: The third reservation is marked from State: Cancelled to Pending Entry at Folio creation -->
-        <record id="pms_folio_2" model="pms.folio">
-            <field name="partner_id" ref="base.res_partner_address_10" />
-            <field
-                name="reservation_ids"
-                eval="[(5, 0),
-                    (0, 0, {
-                    'pricelist_id': 1,
-                    'room_type_id': ref('pms_room_type_1'),
-                    'checkin': (DateTime.today() + timedelta(days=2)),
-                    'checkout': (DateTime.today() + timedelta(days=4)),
-                    'adults': 1,
-                    'state': 'confirm',
-                    }),
-                    (0, 0, {
-                    'pricelist_id': 1,
-                    'room_type_id': ref('pms_room_type_1'),
-                    'checkin': (DateTime.today() + timedelta(days=2)),
-                    'checkout': (DateTime.today() + timedelta(days=4)),
-                    'adults': 1,
-                    'state': 'confirm',
-                    }),
-                    (0, 0, {
-                    'pricelist_id': 1,
-                    'room_type_id': ref('pms_room_type_1'),
-                    'checkin': (DateTime.today() + timedelta(days=2)),
-                    'checkout': (DateTime.today() + timedelta(days=4)),
-                    'adults': 1,
-                    'state': 'cancelled',
-                    })]"
-            />
-        </record>
-        <!-- reservation of the conference room for 1 day on behalf of a company -->
-        <record id="pms_folio_3" model="pms.folio">
-            <field name="partner_id" ref="base.res_partner_12" />
-            <field
-                name="reservation_ids"
-                eval="[(5, 0), (0, 0, {
-                    'pricelist_id': 1,
-                    'room_type_id': ref('pms_room_type_4'),
-                    'checkin': (DateTime.today() + timedelta(days=3)),
-                    'checkout': (DateTime.today() + timedelta(days=4)),
-                    'adults': 1,
-                    'state': 'confirm',
-                    })]"
-            />
-        </record>
-        <!-- out of service room -->
-        <record id="pms_folio_4" model="pms.folio">
-            <field name="partner_id" ref="main_pms_property" />
-            <field name="reservation_type">out</field>
-            <field
-                name="reservation_ids"
-                eval="[(5, 0), (0, 0, {
-                    'pricelist_id': 1,
-                    'room_type_id': ref('pms_room_type_1'),
-                    'checkin': (DateTime.today() + timedelta(days=5)),
-                    'checkout': (DateTime.today() + timedelta(days=7)),
-                    'adults': 1,
-                    'state': 'confirm',
-                    'reservation_type': 'out',
-                    'closure_reason_id': ref('pms_room_closure_reason_0'),
-                    'out_service_description': 'Change of lighting',
-                    })]"
-            />
-        </record>
-    </data>
-</odoo>
diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py
index a85114b54..b33d8dadb 100644
--- a/pms/models/pms_reservation.py
+++ b/pms/models/pms_reservation.py
@@ -130,7 +130,7 @@ class PmsReservation(models.Model):
         "pms.room.type",
         string="Room Type",
         track_visibility="onchange",
-        required=True,
+        #required=True,
         compute="_compute_room_type_id",
         store=True,
         readonly=False,