audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] reservation and folio views

Browse Source
This commit is contained in:
Dario Lodeiros
2021-06-19 11:34:53 +02:00
parent fbe8d2bef3
commit 771d249143
3 changed files with 98 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pms/models/pms_reservation.py
View File

@@ -480,6 +480,13 @@ class PmsReservation(models.Model):
readonly=False,
compute="_compute_mobile",
)
partner_internal_comment = fields.Text(
string="Internal Partner Notes",
help="Internal reservation comment",
store=True,
readonly=False,
compute="_compute_partner_internal_comment",
)
partner_incongruences = fields.Char(
string="partner_incongruences",
help="indicates that some partner fields \
@@ -487,11 +494,6 @@ class PmsReservation(models.Model):
the associated partner",
compute="_compute_partner_incongruences",
)
partner_internal_comment = fields.Text(
string="Internal Partner Notes",
help="Internal reservation comment",
related="partner_id.comment",
)
partner_requests = fields.Text(
string="Partner Requests",
help="Guest requests",
@@ -1183,6 +1185,14 @@ class PmsReservation(models.Model):
elif not record.partner_mobile:
record.partner_mobile = False
@api.depends("partner_id", "partner_id.comment")
def _compute_partner_internal_comment(self):
for record in self:
if record.partner_id and not record.partner_internal_comment:
record.partner_internal_comment = record.partner_id.comment
elif not record.partner_internal_comment:
record.partner_internal_comment = False
@api.depends(
"partner_name",
"partner_email",
@@ -1478,6 +1488,7 @@ class PmsReservation(models.Model):
if not (name == "" and operator == "ilike"):
args += [
"|",
("name", operator, name),
("folio_id.name", operator, name),
("preferred_room_id.name", operator, name),
]
@@ -1488,9 +1499,7 @@ class PmsReservation(models.Model):
def name_get(self):
result = []
for res in self:
name = u"{} ({})".format(
res.folio_id.name, res.rooms if res.rooms else "No room"
)
name = u"{} ({})".format(res.name, res.rooms if res.rooms else "No room")
result.append((res.id, name))
return result

41
pms/views/pms_folio_views.xml
View File

@@ -172,18 +172,6 @@
<h2>
<field name="name" />
</h2>
<h1>
<field
name="partner_name"
placeholder="Guest"
attrs="{'invisible':[('reservation_type','in',('out'))]}"
/>
<field
name="closure_reason_id"
placeholder="Closure reason"
attrs="{'invisible':[('reservation_type','not in',('out'))]}"
/>
</h1>
<group col="8">
<group
colspan="2"
@@ -191,9 +179,32 @@
string="General Info"
name="contact_details"
>
<field name="email" placeholder="email" />
<field name="mobile" placeholder="mobile" />
<field name="partner_internal_comment" />
<field
name="partner_name"
placeholder="Guest"
attrs="{'invisible':[('reservation_type','in',('out'))]}"
/>
<field
name="email"
placeholder="email"
widget="email"
attrs="{'invisible':[('reservation_type','in',('out'))]}"
/>
<field
name="mobile"
placeholder="mobile"
attrs="{'invisible':[('reservation_type','in',('out'))]}"
/>
<field
name="partner_internal_comment"
placeholder="Comments about the customer"
attrs="{'invisible':[('reservation_type','in',('out'))]}"
/>
<field
name="closure_reason_id"
placeholder="Closure reason"
attrs="{'invisible':[('reservation_type','not in',('out'))]}"
/>
<field
name="segmentation_ids"
widget="many2many_tags"

116
pms/views/pms_reservation_views.xml
View File

@@ -130,8 +130,8 @@
type="object"
icon="fa-print"
attrs="{'invisible':[
('checkin_partner_ids','=', [])
]}"
('checkin_partner_ids','=', [])
]}"
/>
<button
name="preview_reservation"
@@ -221,55 +221,26 @@
bg_color="bg-warning"
attrs="{'invisible': [('folio_payment_state', '!=', 'partial')]}"
/>
<span
class="label label-danger"
<div
class="card bg-danger mb8"
attrs="{'invisible': [('state', 'not in', ('cancelled'))]}"
>
Cancelled Reservation!
</span>
<span
class="label label-warning"
<div class="card-body bg-danger">
<i class="fa fa-danger" /> Cancelled Reservation!
</div>
</div>
<div
class="card bg-warning mb8"
attrs="{'invisible': [('overbooking', '=', False)]}"
>
OverBooking!
</span>
<div class="card-body bg-warning">
<i class="fa fa-warning" /> OverBooking
</div>
</div>
<h1>
<field nolabel="1" colspan="2" name="name" />
<field
name="room_type_id"
placeholder="Room Type"
on_change="1"
nolabel="1"
context="{'checkin': checkin, 'checkout': checkout, 'pms_property_id':pms_property_id, 'pricelist_id':pricelist_id}"
options="{'no_create': True,'no_open': True}"
style="margin-right: 30px;"
/>
<field
name="partner_name"
default_focus="1"
placeholder="Lastname, Firstname"
attrs="{'invisible':[('reservation_type','in',('out'))]}"
required="1"
/>
<field name="partner_id" invisible="1" />
<field
name="closure_reason_id"
default_focus="1"
options="{'no_create': True,'no_open': True}"
placeholder="Closure Reason"
attrs="{'invisible':[('reservation_type','not in',('out'))]}"
/>
<field nolabel="1" name="name" />
</h1>
<h3>
<field
name="preferred_room_id"
select="1"
nolabel="1"
options="{'no_create': True,'no_open': True}"
placeholder="Room"
style="margin-right: 30px;"
attrs="{'invisible': [('splitted','=',True)]}"
/>
<field
name="checkin"
widget="daterange"
@@ -290,6 +261,30 @@
options="{'related_start_date': 'checkin'}"
/>
</h3>
<h3>
<field
name="room_type_id"
placeholder="Room Type"
on_change="1"
nolabel="1"
context="{'checkin': checkin, 'checkout': checkout, 'pms_property_id':pms_property_id, 'pricelist_id':pricelist_id}"
options="{'no_create': True,'no_open': True}"
/>
<i
class="fa fa-long-arrow-right mx-2"
aria-label="Arrow icon"
title="Arrow"
/>
<field
name="preferred_room_id"
select="1"
nolabel="1"
options="{'no_create': True,'no_open': True}"
placeholder="Room"
style="margin-right: 30px;"
attrs="{'invisible': [('splitted','=',True)]}"
/>
</h3>
<field
name="out_service_description"
placeholder="Out service description"
@@ -302,35 +297,33 @@
string="General Info"
name="contact_details"
>
<field name="partner_id" invisible="1" />
<field
name="partner_name"
placeholder="Guest"
attrs="{'invisible':[('reservation_type','in',('out'))]}"
/>
<field
name="partner_email"
colspan="2"
nolabel="1"
placeholder="email"
widget="email"
force_save="1"
attrs="{'invisible': [('reservation_type','in',('out'))],
'readonly': [('partner_id', '!=', False),
('partner_email','!=', False)]}"
attrs="{'invisible':[('reservation_type','in',('out'))]}"
/>
<field
name="partner_mobile"
colspan="2"
nolabel="1"
placeholder="mobile"
widget="phone"
force_save="1"
attrs="{'invisible': [('reservation_type','in',('out'))],
'readonly': [('partner_id', '!=', False),
('partner_mobile','!=', False)]}"
attrs="{'invisible':[('reservation_type','in',('out'))]}"
/>
<field
placeholder="Partner Notes"
colspan="2"
nolabel="1"
name="partner_internal_comment"
string="Partner Note"
attrs="{'invisible': [('reservation_type','in',('out'))]}"
placeholder="Comments about the customer"
attrs="{'invisible':[('reservation_type','in',('out'))]}"
/>
<field
name="closure_reason_id"
placeholder="Closure reason"
attrs="{'invisible':[('reservation_type','not in',('out'))]}"
/>
<field name="nights" />
<field placeholder="Arrival Hour" name="arrival_hour" />
@@ -786,6 +779,7 @@
<field name="model">pms.reservation</field>
<field name="arch" type="xml">
<search string="Reservation Detail">
<field name="name" />
<field name="partner_id" />
<field name="folio_id" />
<field name="agency_id" />