diff --git a/pms/demo/pms_folio.xml b/pms/demo/pms_folio.xml
index bf9098e29..7873acd14 100644
--- a/pms/demo/pms_folio.xml
+++ b/pms/demo/pms_folio.xml
@@ -7,7 +7,7 @@
             <field name="partner_id" ref="base.res_partner_address_27" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_0"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_0" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -26,7 +26,7 @@
             <field name="partner_id" ref="base.res_partner_12" />
             <field name="user_id" ref="base.user_admin" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_0"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_0" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -45,7 +45,7 @@
             <field name="partner_id" ref="base.res_partner_address_10" />
             <field name="user_id" ref="base.user_admin" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="agency_id" ref="pms.demo_agency_0"/>
+            <field name="agency_id" ref="pms.demo_agency_0" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -80,7 +80,7 @@
             <field name="partner_id" ref="base.res_partner_12" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="agency_id" ref="pms.demo_agency_1"/>
+            <field name="agency_id" ref="pms.demo_agency_1" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -99,7 +99,7 @@
             <field name="user_id" ref="base.user_admin" />
             <field name="reservation_type">out</field>
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -120,7 +120,7 @@
             <field name="partner_id" ref="base.res_partner_address_15" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -140,7 +140,7 @@
             <field name="partner_id" ref="base.res_partner_4" />
             <field name="user_id" ref="base.user_admin" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_2"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_2" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -159,7 +159,7 @@
             <field name="partner_id" ref="base.res_partner_10" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="agency_id" ref="pms.demo_agency_0"/>
+            <field name="agency_id" ref="pms.demo_agency_0" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -235,7 +235,7 @@
             <field name="user_id" ref="base.user_admin" />
             <field name="reservation_type">out</field>
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_0"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_0" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -256,7 +256,7 @@
             <field name="partner_id" ref="base.res_partner_address_33" />
             <field name="user_id" ref="base.user_admin" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -283,7 +283,7 @@
             <field name="partner_id" ref="base.res_partner_main2" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_0"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_0" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -301,7 +301,7 @@
             <field name="partner_id" ref="base.res_partner_address_10" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -336,7 +336,7 @@
             <field name="partner_id" ref="base.res_partner_1" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="agency_id" ref="pms.demo_agency_0"/>
+            <field name="agency_id" ref="pms.demo_agency_0" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -355,7 +355,7 @@
             <field name="user_id" ref="base.user_admin" />
             <field name="reservation_type">normal</field>
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="agency_id" ref="pms.demo_agency_1"/>
+            <field name="agency_id" ref="pms.demo_agency_1" />
             <field name="state">cancel</field>
             <field
                 name="reservation_ids"
@@ -375,7 +375,7 @@
             <field name="partner_id" ref="base.res_partner_12" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_0"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_0" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -396,7 +396,7 @@
             <field name="user_id" ref="base.user_demo" />
             <field name="reservation_type">normal</field>
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="agency_id" ref="pms.demo_agency_0"/>
+            <field name="agency_id" ref="pms.demo_agency_0" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -415,7 +415,7 @@
             <field name="user_id" ref="base.user_demo" />
             <field name="reservation_type">normal</field>
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_2"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_2" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -439,7 +439,7 @@
             <field name="user_id" ref="base.user_admin" />
             <field name="reservation_type">normal</field>
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_2"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_2" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -457,7 +457,7 @@
             <field name="partner_id" ref="base.res_partner_address_30" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -496,7 +496,7 @@
             <field name="partner_id" ref="base.res_partner_18" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="agency_id" ref="pms.demo_agency_0"/>
+            <field name="agency_id" ref="pms.demo_agency_0" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -542,7 +542,7 @@
             <field name="partner_id" ref="base.res_partner_address_25" />
             <field name="user_id" ref="base.user_admin" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_2"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_2" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -575,7 +575,7 @@
             <field name="partner_id" ref="base.res_partner_address_32" />
             <field name="user_id" ref="base.user_admin" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="agency_id" ref="pms.demo_agency_0"/>
+            <field name="agency_id" ref="pms.demo_agency_0" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -607,7 +607,7 @@
             <field name="partner_id" ref="base.res_partner_10" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -629,7 +629,7 @@
             <field name="partner_id" ref="base.res_partner_4" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_2"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_2" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -649,7 +649,7 @@
             <field name="partner_id" ref="base.res_partner_address_27" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -670,7 +670,7 @@
             <field name="partner_id" ref="base.res_partner_12" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -690,7 +690,7 @@
             <field name="partner_id" ref="base.res_partner_address_27" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="agency_id" ref="pms.demo_agency_1"/>
+            <field name="agency_id" ref="pms.demo_agency_1" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0),
@@ -719,7 +719,7 @@
             <field name="partner_id" ref="base.res_partner_3" />
             <field name="user_id" ref="base.user_admin" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_1" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -739,7 +739,7 @@
             <field name="partner_id" ref="base.res_partner_address_17" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_0"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_0" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -758,7 +758,7 @@
             <field name="partner_id" ref="base.res_partner_address_25" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="channel_type_id" ref="pms.main_pms_sale_channel_2"/>
+            <field name="channel_type_id" ref="pms.main_pms_sale_channel_2" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -779,7 +779,7 @@
             <field name="partner_id" ref="base.res_partner_address_15" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="agency_id" ref="pms.demo_agency_1"/>
+            <field name="agency_id" ref="pms.demo_agency_1" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -799,7 +799,7 @@
             <field name="partner_id" ref="base.res_partner_address_15" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="agency_id" ref="pms.demo_agency_1"/>
+            <field name="agency_id" ref="pms.demo_agency_1" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -814,14 +814,35 @@
             />
         </record>
         <function model="pms.folio" name="action_cancel">
-            <value eval="[ref('pms_folio_31')]"/>
+            <value eval="[ref('pms_folio_31')]" />
         </function>
-        <!-- Done folio-->
         <record id="pms_folio_32" model="pms.folio">
             <field name="partner_id" ref="base.res_partner_address_15" />
             <field name="user_id" ref="base.user_demo" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
-            <field name="agency_id" ref="pms.demo_agency_1"/>
+            <field name="agency_id" ref="pms.demo_agency_1" />
+            <field
+                name="reservation_ids"
+                eval="[(5, 0), (0, 0, {
+                    'pricelist_id': ref('product.list0'),
+                    'room_type_id': ref('pms_room_type_3'),
+                    'preferred_room_id': ref('pms_room_6'),
+                    'checkin': (DateTime.today() + timedelta(days=-10)),
+                    'checkout': (DateTime.today() + timedelta(days=-7)),
+                    'adults': 1,
+                    'children':1,
+                    })]"
+            />
+        </record>
+        <function model="pms.folio" name="action_cancel">
+            <value eval="[ref('pms_folio_31')]" />
+        </function>
+        <!-- Done folio-->
+        <record id="pms_folio_33" model="pms.folio">
+            <field name="partner_id" ref="base.res_partner_address_15" />
+            <field name="user_id" ref="base.user_demo" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
+            <field name="agency_id" ref="pms.demo_agency_1" />
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -836,7 +857,7 @@
             />
         </record>
         <function model="pms.folio" name="action_done">
-            <value eval="[ref('pms_folio_31')]"/>
+            <value eval="[ref('pms_folio_31')]" />
         </function>
     </data>
 </odoo>
diff --git a/pms/demo/pms_master_data.xml b/pms/demo/pms_master_data.xml
index 3372958f8..1f69016b2 100644
--- a/pms/demo/pms_master_data.xml
+++ b/pms/demo/pms_master_data.xml
@@ -455,27 +455,35 @@
         <!-- Agencies -->
         <record id="demo_agency_0" model="res.partner">
             <field name="is_agency">True</field>
-            <field name="sale_channel_id" ref="pms.main_pms_sale_channel_3"/>
+            <field name="sale_channel_id" ref="pms.main_pms_sale_channel_3" />
             <field name="name">Agency 000</field>
             <field name="street">1st St</field>
             <field name="city">Fremont</field>
             <field name="phone">(870)-333-0515</field>
-            <field name="country_id" ref="base.us"/>
+            <field name="country_id" ref="base.us" />
             <field name="email">agency000@example.com</field>
             <field name="website">http://www.agency000travel.com</field>
-            <field name="image_1920" type="base64" file="pms/static/description/agency_logo.png"/>
+            <field
+                name="image_1920"
+                type="base64"
+                file="pms/static/description/agency_logo.png"
+            />
         </record>
         <record id="demo_agency_1" model="res.partner">
             <field name="is_agency">True</field>
-            <field name="sale_channel_id" ref="pms.main_pms_sale_channel_3"/>
+            <field name="sale_channel_id" ref="pms.main_pms_sale_channel_3" />
             <field name="name">Agency 111</field>
             <field name="street">2st St</field>
             <field name="city">Stockton</field>
             <field name="phone">(872)-941-0441</field>
-            <field name="country_id" ref="base.us"/>
+            <field name="country_id" ref="base.us" />
             <field name="email">agency111@example.com</field>
             <field name="website">http://www.agency1travel.com</field>
-            <field name="image_1920" type="base64" file="pms/static/description/agency_logo1.png"/>
+            <field
+                name="image_1920"
+                type="base64"
+                file="pms/static/description/agency_logo1.png"
+            />
         </record>
     </data>
 </odoo>
diff --git a/pms/demo/pms_reservation.xml b/pms/demo/pms_reservation.xml
index 32aa26396..643ef417d 100644
--- a/pms/demo/pms_reservation.xml
+++ b/pms/demo/pms_reservation.xml
@@ -462,7 +462,7 @@
             />
         </record>
         <function model="pms.reservation" name="action_cancel">
-            <value eval="[ref('pms_reservation_32')]"/>
+            <value eval="[ref('pms_reservation_32')]" />
         </function>
     </data>
 </odoo>