diff --git a/pms/__manifest__.py b/pms/__manifest__.py
index f712f8604..e54b053c7 100644
--- a/pms/__manifest__.py
+++ b/pms/__manifest__.py
@@ -19,9 +19,9 @@
     "depends": [
         "base",
         "mail",
-        # "account_payment_return",
+        #"account_payment_return",
         # "partner_firstname",
-        # "email_template_qweb",
+        #"email_template_qweb",
         "sale",
     ],
     "data": [
@@ -32,7 +32,7 @@
         "data/pms_data.xml",
         "report/pms_folio.xml",
         "report/pms_folio_templates.xml",
-        # "templates/pms_email_template.xml",
+        #"templates/pms_email_template.xml",
         "views/general.xml",
         "data/menus.xml",
         "views/pms_amenity_views.xml",
@@ -61,12 +61,8 @@
         "views/product_pricelist_views.xml",
         "views/product_template_views.xml",
         "views/webclient_templates.xml",
-        "views/ir_sequence_views.xml",
-    ],
-    "demo": [
-        "demo/pms_master_data.xml",
-        "demo/pms_reservation.xml",
-        "demo/pms_folio.xml",
+        "views/ir_sequence_views.xml"
     ],
+    "demo": ["demo/pms_master_data.xml", "demo/pms_reservation.xml"],
     "qweb": ["static/src/xml/pms_base_templates.xml",],
 }
diff --git a/pms/demo/pms_folio.xml b/pms/demo/pms_folio.xml
deleted file mode 100644
index 3514bd01a..000000000
--- a/pms/demo/pms_folio.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/demo/pms_reservation.xml b/pms/demo/pms_reservation.xml
index a6ca3b0e9..91a86d84b 100644
--- a/pms/demo/pms_reservation.xml
+++ b/pms/demo/pms_reservation.xml
@@ -9,6 +9,8 @@
             <field name="adults">1</field>
             <field name="checkin" eval="DateTime.today() + timedelta(8)" />
             <field name="checkout" eval="DateTime.today() + timedelta(9)" />
+            <field name="board_service_room_id" ref="pms_board_service_room_2" />
+
         </record>
         <record id="pms_reservation_1" model="pms.reservation">
             <field name="reservation_type">"out"</field>
@@ -55,27 +57,37 @@
             <field name="partner_id" ref="base.res_partner_address_27" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_1" />
+            <field name="adults">1</field>
             <field name="checkin" eval="DateTime.today()" />
             <field name="checkout" eval="DateTime.today() + timedelta(3)" />
+            <field name="board_service_room_id" ref="pms_board_service_room_2" />
+
         </record>
         <record id="pms_reservation_7" model="pms.reservation">
             <field name="partner_id" ref="base.res_partner_address_10" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_1" />
+            <field name="adults">1</field>
             <field name="checkin" eval="DateTime.today()" />
             <field name="checkout" eval="DateTime.today() + timedelta(3)" />
+            <field name="board_service_room_id" ref="pms_board_service_room_0" />
+
         </record>
         <record id="pms_reservation_8" model="pms.reservation">
             <field name="partner_id" ref="base.res_partner_address_13" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_1" />
+            <field name="adults">1</field>
             <field name="checkin" eval="DateTime.today() + timedelta(7)" />
             <field name="checkout" eval="DateTime.today() + timedelta(8)" />
+            <field name="board_service_room_id" ref="pms_board_service_room_1" />
+
         </record>
         <record id="pms_reservation_9" model="pms.reservation">
             <field name="partner_id" ref="base.res_partner_address_15" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_1" />
+            <field name="adults">1</field>
             <field name="checkin" eval="DateTime.today() + timedelta(9)" />
             <field name="checkout" eval="DateTime.today() + timedelta(13)" />
         </record>
@@ -83,6 +95,8 @@
             <field name="partner_id" ref="base.res_partner_address_10" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_1" />
+            <field name="adults">1</field>
+            <field name="children">1</field>
             <field name="checkin" eval="DateTime.today() + timedelta(13)" />
             <field name="checkout" eval="DateTime.today() + timedelta(14)" />
         </record>
@@ -90,13 +104,17 @@
             <field name="partner_id" ref="base.res_partner_address_10" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_1" />
+            <field name="adults">1</field>
             <field name="checkin" eval="DateTime.today()" />
             <field name="checkout" eval="DateTime.today() + timedelta(4)" />
+            <field name="board_service_room_id" ref="pms_board_service_room_2" />
+
         </record>
         <record id="pms_reservation_12" model="pms.reservation">
             <field name="partner_id" ref="base.res_partner_address_10" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_1" />
+            <field name="adults">1</field>
             <field name="checkin" eval="DateTime.today() + timedelta(6)" />
             <field name="checkout" eval="DateTime.today() + timedelta(10)" />
         </record>
@@ -105,13 +123,17 @@
             <field name="partner_id" ref="base.res_partner_12" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_2" />
+            <field name="adults">2</field>
             <field name="checkin" eval="DateTime.today() + timedelta(11)" />
             <field name="checkout" eval="DateTime.today() + timedelta(13)" />
+            <field name="board_service_room_id" ref="pms_board_service_room_0" />
+
         </record>
         <record id="pms_reservation_14" model="pms.reservation">
             <field name="partner_id" ref="base.res_partner_address_33" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_2" />
+            <field name="adults">2</field>
             <field name="checkin" eval="DateTime.today() + timedelta(6)" />
             <field name="checkout" eval="DateTime.today() + timedelta(8)" />
         </record>
@@ -119,13 +141,17 @@
             <field name="partner_id" ref="base.res_partner_address_10" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_2" />
+            <field name="adults">1</field>
+            <field name="children">1</field>
             <field name="checkin" eval="DateTime.today() + timedelta(10)" />
             <field name="checkout" eval="DateTime.today() + timedelta(11)" />
+            <field name="board_service_room_id" ref="pms_board_service_room_3" />
         </record>
         <record id="pms_reservation_16" model="pms.reservation">
             <field name="partner_id" ref="base.res_partner_address_13" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_2" />
+            <field name="adults">2</field>
             <field name="checkin" eval="DateTime.today() + timedelta(4)" />
             <field name="checkout" eval="DateTime.today() + timedelta(6)" />
         </record>
@@ -133,14 +159,17 @@
             <field name="partner_id" ref="base.res_partner_address_15" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_2" />
+            <field name="adults">2</field>
             <field name="checkin" eval="DateTime.today()" />
             <field name="checkout" eval="DateTime.today() + timedelta(4)" />
+            <field name="board_service_room_id" ref="pms_board_service_room_2" />
+
         </record>
-        <!--  -->
         <record id="pms_reservation_18" model="pms.reservation">
             <field name="partner_id" ref="base.res_partner_12" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_2" />
+            <field name="adults">2</field>
             <field name="checkin" eval="DateTime.today() + timedelta(11)" />
             <field name="checkout" eval="DateTime.today() + timedelta(13)" />
         </record>
@@ -148,13 +177,17 @@
             <field name="partner_id" ref="base.res_partner_address_32" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_2" />
+            <field name="adults">2</field>
             <field name="checkin" eval="DateTime.today() + timedelta(6)" />
             <field name="checkout" eval="DateTime.today() + timedelta(8)" />
+            <field name="board_service_room_id" ref="pms_board_service_room_1" />
         </record>
         <record id="pms_reservation_20" model="pms.reservation">
             <field name="partner_id" ref="base.res_partner_address_15" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_2" />
+            <field name="adults">1</field>
+            <field name="children">1</field>
             <field name="checkin" eval="DateTime.today() + timedelta(10)" />
             <field name="checkout" eval="DateTime.today() + timedelta(11)" />
         </record>
@@ -162,13 +195,16 @@
             <field name="partner_id" ref="base.res_partner_3" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_2" />
+            <field name="adults">2</field>
             <field name="checkin" eval="DateTime.today() + timedelta(4)" />
             <field name="checkout" eval="DateTime.today() + timedelta(6)" />
+             <field name="board_service_room_id" ref="pms_board_service_room_0" />
         </record>
         <record id="pms_reservation_22" model="pms.reservation">
             <field name="partner_id" ref="base.res_partner_12" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_2" />
+            <field name="adults">2</field>
             <field name="checkin" eval="DateTime.today()" />
             <field name="checkout" eval="DateTime.today() + timedelta(4)" />
         </record>
@@ -177,13 +213,16 @@
             <field name="partner_id" ref="base.res_partner_4" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_3" />
+            <field name="adults">3</field>
             <field name="checkin" eval="DateTime.today() + timedelta(11)" />
             <field name="checkout" eval="DateTime.today() + timedelta(13)" />
+            <field name="board_service_room_id" ref="pms_board_service_room_2" />
         </record>
         <record id="pms_reservation_24" model="pms.reservation">
             <field name="partner_id" ref="base.res_partner_12" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_3" />
+            <field name="adults">3</field>
             <field name="checkin" eval="DateTime.today() + timedelta(6)" />
             <field name="checkout" eval="DateTime.today() + timedelta(8)" />
         </record>
@@ -191,13 +230,17 @@
             <field name="partner_id" ref="base.res_partner_address_28" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_3" />
+            <field name="adults">1</field>
+            <field name="children">2</field>
             <field name="checkin" eval="DateTime.today() + timedelta(10)" />
             <field name="checkout" eval="DateTime.today() + timedelta(11)" />
+            <field name="board_service_room_id" ref="pms_board_service_room_3" />
         </record>
         <record id="pms_reservation_26" model="pms.reservation">
             <field name="partner_id" ref="base.res_partner_address_16" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_3" />
+            <field name="adults">3</field>
             <field name="checkin" eval="DateTime.today() + timedelta(4)" />
             <field name="checkout" eval="DateTime.today() + timedelta(6)" />
         </record>
@@ -205,8 +248,12 @@
             <field name="partner_id" ref="base.res_partner_12" />
             <field name="pricelist_id" ref="product.list0" />
             <field name="room_type_id" ref="pms_room_type_3" />
+            <field name="adults">2</field>
+            <field name="children">1</field>
+            <field name="state">onboard</field>
             <field name="checkin" eval="DateTime.today()" />
             <field name="checkout" eval="DateTime.today() + timedelta(4)" />
+            <field name="board_service_room_id" ref="pms_board_service_room_2" />
         </record>
         <!-- Open talk away -->
         <record id="pms_reservation_28" model="pms.reservation">
@@ -215,7 +262,7 @@
             <field name="room_type_id" ref="pms_room_type_4" />
             <field name="checkin" eval="DateTime.today() + timedelta(10)" />
             <field name="checkout" eval="DateTime.today() + timedelta(12)" />
-            <field name="board_service_room_id" ref="pms_board_service_room_2" />
+
         </record>
         <record id="pms_reservation_29" model="pms.reservation">
             <field name="partner_id" ref="base.res_partner_address_32" />
@@ -223,7 +270,7 @@
             <field name="room_type_id" ref="pms_room_type_4" />
             <field name="checkin" eval="DateTime.today() + timedelta(1)" />
             <field name="checkout" eval="DateTime.today() + timedelta(4)" />
-            <field name="board_service_room_id" ref="pms_board_service_room_3" />
+
         </record>
         <record id="pms_reservation_30" model="pms.reservation">
             <field name="partner_id" ref="base.res_partner_address_33" />
@@ -231,7 +278,7 @@
             <field name="room_type_id" ref="pms_room_type_4" />
             <field name="checkin" eval="DateTime.today() + timedelta(6)" />
             <field name="checkout" eval="DateTime.today() + timedelta(8)" />
-            <field name="board_service_room_id" ref="pms_board_service_room_2" />
+
         </record>
     </data>
 </odoo>