diff --git a/pms/demo/pms_folio.xml b/pms/demo/pms_folio.xml
index b8945aeb8..7873acd14 100644
--- a/pms/demo/pms_folio.xml
+++ b/pms/demo/pms_folio.xml
@@ -7,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -25,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -43,6 +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="reservation_ids"
                 eval="[(5, 0),
@@ -77,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -95,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -115,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -134,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -152,6 +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="reservation_ids"
                 eval="[(5, 0),
@@ -227,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -247,6 +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="reservation_ids"
                 eval="[(5, 0),
@@ -273,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -290,6 +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="reservation_ids"
                 eval="[(5, 0),
@@ -324,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -342,6 +355,8 @@
             <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="state">cancel</field>
             <field
                 name="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -360,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -380,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -398,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -421,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -438,6 +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="reservation_ids"
                 eval="[(5, 0),
@@ -476,6 +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="reservation_ids"
                 eval="[(5, 0),
@@ -521,6 +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="reservation_ids"
                 eval="[(5, 0),
@@ -533,6 +555,7 @@
                     'state': 'confirm',
                     'arrival_hour': '17:00',
                     'departure_hour': '12:15',
+                    'board_service_room_id': ref('pms_board_service_room_10'),
                     }),
                     (0, 0, {
                     'pricelist_id': ref('product.list0'),
@@ -543,6 +566,7 @@
                     'state': 'confirm',
                     'arrival_hour': '16:00',
                     'departure_hour': '11:15',
+                    'board_service_room_id': ref('pms_board_service_room_10'),
                     })]"
             />
         </record>
@@ -551,6 +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="reservation_ids"
                 eval="[(5, 0),
@@ -582,6 +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="reservation_ids"
                 eval="[(5, 0),
@@ -603,6 +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="reservation_ids"
                 eval="[(5, 0),
@@ -613,6 +640,7 @@
                     'checkout': (DateTime.today() + timedelta(days=32)),
                     'adults': 1,
                     'state': 'confirm',
+                    'board_service_room_id': ref('pms_board_service_room_2'),
                     })]"
             />
         </record>
@@ -621,6 +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="reservation_ids"
                 eval="[(5, 0),
@@ -632,6 +661,7 @@
                     'checkout': (DateTime.today() + timedelta(days=32)),
                     'adults': 1,
                     'state': 'confirm',
+                    'board_service_room_id': ref('pms_board_service_room_9'),
                     })]"
             />
         </record>
@@ -640,6 +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="reservation_ids"
                 eval="[(5, 0),
@@ -659,6 +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="reservation_ids"
                 eval="[(5, 0),
@@ -669,6 +701,7 @@
                     'checkout': (DateTime.today() + timedelta(days=31)),
                     'adults': 2,
                     'state': 'confirm',
+                    'board_service_room_id': ref('pms_board_service_room_6'),
                     }),
                     (0, 0, {
                     'pricelist_id': ref('product.list0'),
@@ -677,6 +710,7 @@
                     'checkout': (DateTime.today() + timedelta(days=32)),
                     'adults': 2,
                     'state': 'confirm',
+                    'board_service_room_id': ref('pms_board_service_room_7'),
                     })]"
             />
         </record>
@@ -685,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -704,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -722,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -742,6 +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="reservation_ids"
                 eval="[(5, 0), (0, 0, {
@@ -756,5 +794,70 @@
                     })]"
             />
         </record>
+        <!-- Cancelled Folio-->
+        <record id="pms_folio_31" 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, {
+                    '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=-5)),
+                    'checkout': (DateTime.today() + timedelta(days=-3)),
+                    'adults': 1,
+                    'children':1,
+                    })]"
+            />
+        </record>
+        <function model="pms.folio" name="action_cancel">
+            <value eval="[ref('pms_folio_31')]" />
+        </function>
+        <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="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, {
+                    '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=-5)),
+                    'checkout': (DateTime.today() + timedelta(days=-3)),
+                    'adults': 1,
+                    'children':1,
+                    })]"
+            />
+        </record>
+        <function model="pms.folio" name="action_done">
+            <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 026af4f80..1f69016b2 100644
--- a/pms/demo/pms_master_data.xml
+++ b/pms/demo/pms_master_data.xml
@@ -390,6 +390,34 @@
             <field name="pms_board_service_id" ref="pms_board_service_2" />
             <field name="pms_room_type_id" ref="pms_room_type_3" />
         </record>
+       <!-- Room 2 Double -->
+        <record id="pms_board_service_room_5" model="pms.board.service.room.type">
+            <field name="pms_board_service_id" ref="pms_board_service_0" />
+            <field name="pms_room_type_id" ref="pms_room_type_2" />
+        </record>
+        <record id="pms_board_service_room_6" model="pms.board.service.room.type">
+            <field name="pms_board_service_id" ref="pms_board_service_1" />
+            <field name="pms_room_type_id" ref="pms_room_type_2" />
+        </record>
+        <record id="pms_board_service_room_7" model="pms.board.service.room.type">
+            <field name="pms_board_service_id" ref="pms_board_service_2" />
+            <field name="pms_room_type_id" ref="pms_room_type_2" />
+        </record>
+        <!-- Room 2 Single -->
+        <record id="pms_board_service_room_8" model="pms.board.service.room.type">
+            <field name="pms_board_service_id" ref="pms_board_service_0" />
+            <field name="pms_room_type_id" ref="pms_room_type_1" />
+        </record>
+        <record id="pms_board_service_room_9" model="pms.board.service.room.type">
+            <field name="pms_board_service_id" ref="pms_board_service_1" />
+            <field name="pms_room_type_id" ref="pms_room_type_1" />
+        </record>
+        <record id="pms_board_service_room_10" model="pms.board.service.room.type">
+            <field name="pms_board_service_id" ref="pms_board_service_2" />
+            <field name="pms_room_type_id" ref="pms_room_type_1" />
+        </record>
+
+
         <!-- room.closure.reason -->
         <record id="pms_room_closure_reason_0" model="room.closure.reason">
             <field name="name">Maintenance</field>
@@ -424,5 +452,38 @@
                 eval="[(4, ref('pms_amenity_0')), (4, ref('pms_amenity_4'))]"
             />
         </record>
+        <!-- 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="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="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"
+            />
+        </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="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="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"
+            />
+        </record>
     </data>
 </odoo>
diff --git a/pms/demo/pms_reservation.xml b/pms/demo/pms_reservation.xml
index 37992ef94..643ef417d 100644
--- a/pms/demo/pms_reservation.xml
+++ b/pms/demo/pms_reservation.xml
@@ -413,5 +413,56 @@
             <field name="checkout" eval="DateTime.today() + timedelta(8)" />
             <field name="pms_property_id" ref="pms.main_pms_property" />
         </record>
+        <!-- Past Reservation -->
+         <record id="pms_reservation_31" model="pms.reservation">
+            <field name="partner_id" ref="base.res_partner_address_33" />
+            <field name="user_id" ref="base.user_admin" />
+            <field name="pricelist_id" ref="product.list0" />
+            <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(-5)" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
+            <field name="allowed_checkout">True</field>
+            <field name="checkin_partner_pending_count">0</field>
+            <field name="folio_payment_state">paid</field>
+            <field
+                name="checkin_partner_ids"
+                eval="[(5, 0),
+                (0, 0, {
+                    'partner_id': ref('base.res_partner_12'),
+                    'state': 'done'
+                    }),
+                (0, 0, {
+                    'partner_id': ref('base.res_partner_2'),
+                    'state': 'done'
+                    }),
+                ]"
+            />
+            <field name="state">done</field>
+        </record>
+        <!-- Cancelled Reservation -->
+        <record id="pms_reservation_32" model="pms.reservation">
+            <field name="partner_id" ref="base.res_partner_address_32" />
+            <field name="user_id" ref="base.user_admin" />
+            <field name="pricelist_id" ref="product.list0" />
+            <field name="room_type_id" ref="pms_room_type_2" />
+            <field name="checkin" eval="DateTime.today() + timedelta(50)" />
+            <field name="checkout" eval="DateTime.today() + timedelta(53)" />
+            <field name="pms_property_id" ref="pms.main_pms_property" />
+            <field
+                name="checkin_partner_ids"
+                eval="[(5, 0),
+                (0, 0, {
+                    'partner_id': ref('base.res_partner_3'),
+                    }),
+                (0, 0, {
+                    'partner_id': ref('base.res_partner_4'),
+                    }),
+                ]"
+            />
+        </record>
+        <function model="pms.reservation" name="action_cancel">
+            <value eval="[ref('pms_reservation_32')]" />
+        </function>
     </data>
 </odoo>
diff --git a/pms/static/description/agency_logo.png b/pms/static/description/agency_logo.png
new file mode 100644
index 000000000..bffa2c63a
Binary files /dev/null and b/pms/static/description/agency_logo.png differ
diff --git a/pms/static/description/agency_logo1.png b/pms/static/description/agency_logo1.png
new file mode 100644
index 000000000..d20ba13b3
Binary files /dev/null and b/pms/static/description/agency_logo1.png differ