diff --git a/pms/data/pms_data.xml b/pms/data/pms_data.xml
index 57bd9e782..66c9b3053 100644
--- a/pms/data/pms_data.xml
+++ b/pms/data/pms_data.xml
@@ -36,19 +36,19 @@
-
+
Door
direct
-
+
Phone
direct
-
+
Mail
direct
-
+
Agency
indirect
diff --git a/pms/demo/airbnb-logo.jpg b/pms/demo/airbnb-logo.jpg
new file mode 100644
index 000000000..aacc8d011
Binary files /dev/null and b/pms/demo/airbnb-logo.jpg differ
diff --git a/pms/demo/booking-logo.jpg b/pms/demo/booking-logo.jpg
new file mode 100644
index 000000000..c6ea979ef
Binary files /dev/null and b/pms/demo/booking-logo.jpg differ
diff --git a/pms/demo/pms_folio.xml b/pms/demo/pms_folio.xml
index d5edeabd7..e19972f61 100644
--- a/pms/demo/pms_folio.xml
+++ b/pms/demo/pms_folio.xml
@@ -1,171 +1,260 @@
+
-
-
-
+
-
-
-
-
-
-
-
-
-
+
-
-
-
+
-
+
-
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Each guest pays his bill
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- out
+
+
+
-
+
+
+
+
+
+ out
+
+
+
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
-
+
+ Do not allow guests to pay anything. The company pays for everything.
-
-
-
-
- out
+
+
+
-
+
+
+
+
+
+ out
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+ Each guest pays his bill
-
-
-
-
+
+
+
-
+
+ Each guest pays his bill
-
-
-
-
-
- normal
-
-
- cancel
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- normal
-
-
-
+
-
-
-
+
+
- normal
-
+
-
-
-
+
normal
-
+
-
-
-
+
+
+
+ normal
+
+
+
+
+
+
+
+ normal
+
+
+ cancel
+
+
+
+
+
+ normal
+
+
+
+
+
+
-
+
+ Each guest pays his bill
+
+
+
+
+
+
+ Each guest pays his bill
+
-
-
-
-
-
-
-
-
-
-
+
-
+
+ Each guest pays his bill
-
-
+
-
+
+ Each guest pays his bill
-
-
+
-
+
-
-
+
-
+
-
-
+
-
+
-
-
+
-
+
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pms/demo/pms_master_data.xml b/pms/demo/pms_master_data.xml
index 685355325..7100c0861 100644
--- a/pms/demo/pms_master_data.xml
+++ b/pms/demo/pms_master_data.xml
@@ -24,7 +24,6 @@
4
-
PMS Reservation 2
pms.reservation
@@ -33,7 +32,6 @@
4
-
PMS Checkin 2
pms.checkin.partner
@@ -42,9 +40,8 @@
4
-
-
+
San Carlos
@@ -52,31 +49,13 @@
-
- Algalia
-
-
-
-
-
-
-
- Pilgrim Leon
-
-
-
-
-
-
@@ -85,9 +64,7 @@
@@ -106,178 +83,632 @@
name="pms_property_ids"
eval="[
(4, ref('main_pms_property')),
- (4, ref('demo_pms_property')),
- (4, ref('demo_pms_property2')),
- (4, ref('demo_pms_property3')),
+ (4, ref('san_carlos_property')),
]"
/>
-
- Ground Floor
+
+ Ground floor
-
- First Floor
+
+ First floor
-
- Second Floor
+
+ Second floor
+
+
+ Third floor
+
+
+ Fourth floor
-
+
Toiletries
-
+
Connectivity
-
+
Kitchen facilities
-
+
Shampoo and Soap
-
+
-
+
High-quality Shampoo and Soap Essential Herbs
-
+
-
+
Hair Dryer
-
+
-
+
High speed Wired Internet access
-
+
-
+
Wi-Fi
-
+
-
+
Microwave oven
-
+
-
+
Half-sized Refrigerator
-
+
-
+
Room
RO
-
+
Conference
CO
-
-
+
+
Economic
ECO
21.00
-
-
+
+
-
+
Single
SNG
20.00
-
+
-
+
Double
DBL
25.00
-
+
-
+
Triple
TRP
35.00
-
+
-
- Conference Room
- CFR
- 80.00
-
+
+ Quadruple
+ QDR
+ 45.00
+
+
+
+ Conference Room
+ CFR
+ 50.00
+
+
+
+
+
+
+ Grand suite
+ GRSUI
+ 100.00
+
+
+
+
+
+ Junior suite
+ JUSUI
+ 70.00
+
+
-
+
+
Economic-101
-
-
+
+
2
-
- Single-101
-
-
+
+ Economic-102
+
+
+ 2
+
+
+
+ Economic-103
+
+
+ 2
+
+
+
+ Economic-104
+
+
+ 2
+
+
+
+ Economic-105
+
+
+ 2
+
+
+
+
+ Single-106
+
+
1
-
- Single-102
-
-
+
+ Single-107
+
+
1
-
- Single-103
-
-
+
+ Single-108
+
+
1
-
+
+ Single-109
+
+
+ 1
+
+
+
+ Single-110
+
+
+ 1
+
+
+
+
Double-201
-
-
+
+
2
1
-
+
Double-202
-
-
+
+
2
-
- Triple-203
-
-
+
+ Double-203
+
+
+ 2
+
+
+
+ Double-204
+
+
+ 2
+
+
+
+ Double-205
+
+
+ 2
+
+
+
+
+ Triple-206
+
+
3
-
- Open Talk Away Room
-
-
+
+ Triple-207
+
+
+ 3
+
+
+
+ Triple-208
+
+
+ 3
+
+
+
+ Triple-209
+
+
+ 3
+
+
+
+ Triple-210
+
+
+ 3
+
+
+
+
+ Quadruple-301
+
+
+ 4
+
+
+
+ Quadruple-302
+
+
+ 4
+
+
+
+ Quadruple-303
+
+
+ 4
+
+
+
+ Quadruple-304
+
+
+ 4
+
+
+
+ Quadruple-305
+
+
+ 4
+
+
+
+
+ Open Talk Away Room 1
+
+
10
+
+ Open Talk Away Room 2
+
+
+ 8
+
+
+
+ Open Talk Away Room 3
+
+
+ 6
+
+
+
+ Open Talk Away Room 4
+
+
+ 5
+
+
+
+ Open Talk Away Room 5
+
+
+ 8
+
+
+
+
+ Grand Suite-401
+
+
+ 2
+
+
+
+ Grand Suite-402
+
+
+ 2
+
+
+
+ Grand Suite-403
+
+
+ 2
+
+
+
+ Grand Suite-404
+
+
+ 2
+
+
+
+ Grand Suite-405
+
+
+ 2
+
+
+
+
+ Junior Suite-406
+
+
+ 2
+
+
+
+ Junior Suite-407
+
+
+ 2
+
+
+
+ Junior Suite-408
+
+
+ 2
+
+
+
+ Junior Suite-409
+
+
+ 2
+
+
+
+ Junior Suite-410
+
+
+ 2
+
+
+
+
+ Economic-101
+
+
+ 2
+
+
+
+ Economic-102
+
+
+ 2
+
+
+
+ Economic-103
+
+
+ 2
+
+
+
+ Economic-104
+
+
+ 2
+
+
+
+ Economic-105
+
+
+ 2
+
+
+
+
+ Double-201
+
+
+ 2
+ 1
+
+
+
+ Double-202
+
+
+ 2
+
+
+
+ Double-203
+
+
+ 2
+
+
+
+ Double-204
+
+
+ 2
+
+
+
+ Double-205
+
+
+ 2
+
+
+
+
+ Triple-206
+
+
+ 3
+
+
+
+ Triple-207
+
+
+ 3
+
+
+
+ Triple-208
+
+
+ 3
+
+
+
+ Triple-209
+
+
+ 3
+
+
+
+ Triple-210
+
+
+ 3
+
+
+
+
+ Open Talk Away Room 1
+
+
+ 10
+
+
+
+ Open Talk Away Room 2
+
+
+ 8
+
+
+
+ Open Talk Away Room 3
+
+
+ 6
+
+
+
+ Open Talk Away Room 4
+
+
+ 5
+
+
+
+ Open Talk Away Room 5
+
+
+ 8
+
+
-
+
Breakfast Buffet
5.0
service
@@ -286,7 +717,7 @@
True
after
-
+
-
+
Late Check-out
10.0
service
@@ -304,7 +735,7 @@
False
False
-
+
Lunch
15.0
service
@@ -312,7 +743,7 @@
True
True
-
+
Dinner
20.0
service
@@ -320,7 +751,7 @@
True
True
-
+
Free Bar
40.0
service
@@ -329,161 +760,216 @@
True
-
+
BreakFast
BB
-
+
Half Board
HB
-
- FullBoard
+
+ Full Board
FB
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
Maintenance
- Used for closing of rooms which require a maintenance. You can specify
+ Used for closing rooms which requires a maintenance. You can specify
the reason in the own reservation.
-
+
VIP Privacy
- Used for closing of rooms for extra privacy.
+ Used for closing rooms for extra privacy.
-
-
-
- Prop. Demo Suite
- SUI
- 21.00
-
-
-
-
-
- Prop. Demo Views
- VIE
- 20.00
-
-
-
-
+
True
-
- Agency 000
- 1st St
- Fremont
- (870)-333-0515
-
- agency000@example.com
- http://www.agency000travel.com
-
+
+ Booking.com
+ Herengracht 597
+ Amsterdam
+ +31 20 712 5609
+
+ info@booking.com
+ http://www.booking.com
+
-
+
True
-
- Agency 111
- 2st St
- Stockton
- (872)-941-0441
-
- agency111@example.com
- http://www.agency1travel.com
-
+
+ Airbnb.com
+ 8 Hanover Quay
+ Dublin
+ (+34) 91 123 45 67.
+
+ info@airbnb.com
+ http://www.airbnb.com
+
diff --git a/pms/demo/pms_reservation.xml b/pms/demo/pms_reservation.xml
index 17976e55d..12efd62aa 100644
--- a/pms/demo/pms_reservation.xml
+++ b/pms/demo/pms_reservation.xml
@@ -1,33 +1,209 @@
-
-
-
-
-
-
- 1
-
-
-
-
-
-
+
+
+
out
-
+
-
+
-
+
+
+
+
+ out
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+ done
+ Lactose intolerant, soy milk for breakfast.
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+ done
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+ done
+ Breakfast at 5:00 am.
+
+
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+ done
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+ done
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+ done
+ Need lunchs to take away.
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
-
+
2
onboard
-
+
+
-
+
+
+
+
+
+
+
+
+
+ Need 1 extra towel.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Need 2 extra towel.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
+ Need 2 extra towels.
+ Friend of manager
+
+ The guests assume the splitted reservation because they want to stay the first
+ nights in room 105.
+
+
+
+
-
+
1
+
-
+
+
-
+
2
+
+ Preferably street view.
-
+
+
-
+
1
+
-
-
+
+
+
-
+
+ 1
+
+
+
+
+
+ done
+ Late for dinner. Cold dinner needed.
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
+ done
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
1
-
-
-
+
+
+
+
+ breakfast at 5:00 am
-
+
+
-
+
1
-
+
+
-
+
+
+
+
+
+
+ 1
+
+
+
+
+
+ Breakfast to take away.
+
+
+
-
+
1
-
+
+
-
+
+
+
+
+
+
+ 1
+
+
+
+
+ preferably street view
+
+
+
-
+
1
+
-
+
+
-
+
1
1
+
+ Preferably street view.
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
- 2
-
-
-
-
-
-
-
-
-
-
- 2
-
-
-
-
-
-
-
-
-
-
- 1
- 1
-
-
-
-
-
-
-
-
-
-
- 2
-
-
-
-
-
-
-
-
-
- 2
-
-
-
-
-
-
-
-
-
-
- 2
-
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
+ 1 bottle of champagne upon check-in
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+ 3 extra towels
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+ Vegan breakfast
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
2
-
+
+
+ Help needed with the luggage.
-
+
+
+
+
+
+
+ 1
+ 1
+
+
+
+
+
+
+
+
-
+
1
1
+
+ Need 1 extra set of bedclothes
-
-
+
+
+
-
+
2
-
-
-
+
+
+
-
+
+
-
+
-
+
2
-
-
+
+
+
+
+ welcome cocktail
-
-
+
+
+
-
- 3
-
-
-
-
-
-
-
-
-
-
+
3
+
+
-
-
+
+ done
-
-
-
-
-
- 1
-
- 2
-
-
-
-
+
+
+
+
+
+ onboard
-
-
-
-
-
- 3
-
-
-
-
-
-
+
+
+
+
+
-
+
2
1
onboard
@@ -382,110 +767,489 @@
/>
-
+
+
+ Vegetarian food for all guests.
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
-
-
+
+
+
-
+
+ 3
+
+
+
+
+
+ 3 set of keys needed.
+
+
+
+
+
+
+
+ 3
+
+
-
-
+
+
+
+
+
+
+ 1
+
+ 2
+
+
+
+
+
+ Celiac breakfast
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ room with low noise 24x7
+
+
+
+
+
+
+
+
+
+
+
+ done
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+ done
+ Italian guests, they don't speak english
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+ done
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Allergic to chemicals
+ done
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Hard mattress needed.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
True
0
paid
-
+ done
+
+
+ done
+ 2 bottles of water each 2 hours.
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Projector needed
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
done
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ onboard
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ Need 1 extra shampoo
+ done
-
-
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+
+
+ done
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Welcome cocktail.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Basket fruit at bedroom
+
+
+
+
+
+
+
+
+
+
+
+ done
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+ allergic to chemicals
+ done
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+ done
+
+
+
+
+
+
+ onboard
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Smoking room.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ two bottles of moët
+
diff --git a/pms/static/description/agency_logo.png b/pms/static/description/agency_logo.png
deleted file mode 100644
index bffa2c63a..000000000
Binary files a/pms/static/description/agency_logo.png and /dev/null differ
diff --git a/pms/static/description/agency_logo1.png b/pms/static/description/agency_logo1.png
deleted file mode 100644
index d20ba13b3..000000000
Binary files a/pms/static/description/agency_logo1.png and /dev/null differ
diff --git a/pms/views/pms_reservation_views.xml b/pms/views/pms_reservation_views.xml
index 9cf82c060..45234e545 100644
--- a/pms/views/pms_reservation_views.xml
+++ b/pms/views/pms_reservation_views.xml
@@ -3,7 +3,7 @@
Reservation
pms.reservation
- tree,form,graph,pivot
+ tree,form,graph,pivot,calendar
pms.reservation.form
@@ -706,7 +706,7 @@
-
+
pms.reservation.tree
pms.reservation