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

Merge PR #24 into 14.0

Browse Source 
Signed-off-by DarioLodeiros
This commit is contained in:
OCA-git-bot
2021-06-23 07:47:47 +00:00
parent fec516969a f647f03150
commit 39436e0771
6 changed files with 79 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pms/models/pms_checkin_partner.py
View File

@@ -606,7 +606,7 @@ class PmsCheckinPartner(models.Model):
def open_partner(self):
""" Utility method used to add an "View Customer" button in folio views """
self.ensure_one()
partner_form_id = self.env.ref("base.view_partner_address_form").id
partner_form_id = self.env.ref("pms.view_partner_data_form").id
return {
"type": "ir.actions.act_window",
"res_model": "res.partner",

2
pms/models/pms_reservation.py
View File

@@ -1474,7 +1474,7 @@ class PmsReservation(models.Model):
checkins = self.env["pms.checkin.partner"]
for record in self:
checkins += record.checkin_partner_ids.filtered(
lambda s: s.state in ("onboard", "done")
lambda s: s.state in ("precheckin", "onboard", "done")
)
if checkins:
return self.env.ref("pms.action_traveller_report").report_action(checkins)

7
pms/tests/test_pms_checkin_partner.py
View File

@@ -824,7 +824,7 @@ class TestPmsCheckinPartner(TestPms):
# ASSERT
self.assertTrue(self.host1.mobile, "Partner mobile must be added")
def _test_partner_id_numbers_created_from_checkin(self):
def test_partner_id_numbers_created_from_checkin(self):
"""
Some of the required data of the checkin_partner to create the partner are document_type
and document_number, with them an id_number is created associated with the partner that
@@ -842,6 +842,8 @@ class TestPmsCheckinPartner(TestPms):
}
)
checkin.flush()
# ASSERT
self.assertTrue(
checkin.partner_id.id_numbers,
@@ -864,12 +866,13 @@ class TestPmsCheckinPartner(TestPms):
"Checkin partner email and partner email shouldn't match",
)
def _test_partner_modified_previous_checkin_not_modified(self):
def test_partner_modified_previous_checkin_not_modified(self):
"""
If a partner modifies any of its fields, these change mustn't be reflected
in the previous checkins associated with it
"""
# ARRANGE
self.checkin1.flush()
self.host1.gender = "female"
# ASSERT
self.assertNotEqual(

2
pms/views/pms_checkin_partner_views.xml
View File

@@ -73,7 +73,7 @@
icon="fa-file-pdf-o"
name="%(action_traveller_report)d"
string="Print in PDF"
attrs="{'invisible': [('state','not in', ('onboard','done'))]}"
attrs="{'invisible': [('state','not in', ('precheckin','onboard','done'))]}"
/>
</sheet>
</form>

38
pms/views/res_partner_views.xml
View File

@@ -93,6 +93,44 @@
</xpath>
</field>
</record>
<record id="view_partner_data_form" model="ir.ui.view">
<field name="name">res.partner.form.data</field>
<field name="model">res.partner</field>
<field name="priority" eval="20" />
<field name="arch" type="xml">
<form string="Partner">
<field
name="image_1920"
widget='image'
class="oe_avatar"
options='{"preview_image": "image_128"}'
readonly="1"
/>
<div class="oe_title">
<h1>
<field name="name" readonly="1" />
</h1>
</div>
<group>
<group name="group_top">
<group name="group_left">
<field name="firstname" />
<field name="lastname" />
<field name="lastname2" />
<field name="gender" />
<field name="birthdate_date" />
<field name="id_numbers" />
<field name="nationality_id" />
<field name="email" />
<field name="mobile" />
</group>
</group>
</group>
</form>
</field>
</record>
<menuitem
id="pms_customer_meu"
name="Customers"

46
pms/views/traveller_report_template.xml
View File

@@ -7,18 +7,18 @@
t-attf-src="data:image/*;base64,{{docs.pms_property_id.company_id.logo}}"
t-att-alt="docs.pms_property_id.company_id.name"
/>
<p>PART OF TRAVELERS ENTRY</p>
<p>Document number:
<p class="title">PART OF TRAVELERS ENTRY</p>
<p class="checknumber">Document number:
<strong><span t-field="docs.id" /></strong>/
<span t-field="docs.reservation_id" />
</p>
<p>
<p class="amount">
Total amount (Reservation Card):
<strong><span
t-field="docs.reservation_id.folio_id.amount_total"
/></strong>
</p>
<div class="property">
<div class="property amount">
<strong><span t-field="docs.pms_property_id.name" /></strong><br />
<strong>CIF:
<span t-field="docs.pms_property_id.company_id.vat" /></strong><br
@@ -32,7 +32,7 @@
<span t-field="docs.pms_property_id.company_id.city" /></strong><b
/>
</div>
<p>TRAVELER'S DOCUMENT</p>
<p class="title2">TRAVELER'S DOCUMENT</p>
<table>
<tr>
@@ -106,7 +106,7 @@
/>
</p>
<div class="firma" /><br />
<p>Traveler's signature</p>
<p class="signature">Traveler's signature</p>
<p><span t-field="docs.pms_property_id.cardex_warning" /></p>
<p><span t-field="docs.pms_property_id.company_id.privacy_policy" /></p>
</div>
@@ -115,18 +115,18 @@
t-attf-src="data:image/*;base64,{{docs.pms_property_id.company_id.logo}}"
t-att-alt="docs.pms_property_id.company_id.name"
/>
<p>PART OF TRAVELERS ENTRY</p>
<p>Document number:
<p class="title">PART OF TRAVELERS ENTRY</p>
<p class="checknumber">Document number:
<strong><span t-field="docs.id" /></strong>/
<span t-field="docs.reservation_id" />
</p>
<p>
<p class="amount">
Total amount (Reservation Card):
<strong><span
t-field="docs.reservation_id.folio_id.amount_total"
/></strong>
</p>
<div class="property">
<div class="property amount">
<strong><span t-field="docs.pms_property_id.name" /></strong><br />
<strong>CIF:
<span t-field="docs.pms_property_id.company_id.vat" /></strong><br
@@ -140,7 +140,7 @@
<span t-field="docs.pms_property_id.company_id.city" /></strong><b
/>
</div>
<p>TRAVELER'S DOCUMENT</p>
<p class="title2">TRAVELER'S DOCUMENT</p>
<table>
<tr>
@@ -224,7 +224,7 @@
width: 100%;
border: 1;
border-style: double;
margin-top:8px;
margin-top:12px;
}
td:first-child{
width:40%;
@@ -251,7 +251,27 @@
.date{
margin-top:8px;
}
.title{
font-size:1.9em;
}
.title2{
font-size:1.32em;
}
.amount{
font-size:1.8em;
}
.checknumber{
font-size:1.81em;
}
td{
font-size:180%;
}
p, span{
font-size:1.2em;
}
.signature, .date{
font-size: 1.2em;
}
</style>
</t>
</t>