From ec3bdecf42f93867dba62cd0a31002852ec242ad Mon Sep 17 00:00:00 2001 From: Sara Lago Date: Mon, 21 Jun 2021 11:00:39 +0200 Subject: [PATCH 1/4] [IMP] pms: change font size in checkin report --- pms/views/traveller_report_template.xml | 46 ++++++++++++++++++------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/pms/views/traveller_report_template.xml b/pms/views/traveller_report_template.xml index 2c40db7ab..8d3460eee 100644 --- a/pms/views/traveller_report_template.xml +++ b/pms/views/traveller_report_template.xml @@ -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" /> -

PART OF TRAVELERS ENTRY

-

Document number: +

PART OF TRAVELERS ENTRY

+

Document number: /

-

+

Total amount (Reservation Card):

-
+

CIF:
-

TRAVELER'S DOCUMENT

+

TRAVELER'S DOCUMENT

@@ -106,7 +106,7 @@ />


-

Traveler's signature

+

Traveler's signature

@@ -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" /> -

PART OF TRAVELERS ENTRY

-

Document number: +

PART OF TRAVELERS ENTRY

+

Document number: /

-

+

Total amount (Reservation Card):

-
+

CIF:
-

TRAVELER'S DOCUMENT

+

TRAVELER'S DOCUMENT

@@ -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; + } From 3f7309fe25a13789b03c4212cd890e2a37e3949f Mon Sep 17 00:00:00 2001 From: Sara Lago Date: Mon, 21 Jun 2021 11:27:12 +0200 Subject: [PATCH 2/4] [FIX] pms: fix some test in test_pms_checkin_partner --- pms/tests/test_pms_checkin_partner.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pms/tests/test_pms_checkin_partner.py b/pms/tests/test_pms_checkin_partner.py index f6257edd8..2ea0502ba 100644 --- a/pms/tests/test_pms_checkin_partner.py +++ b/pms/tests/test_pms_checkin_partner.py @@ -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( From 4e2402c7ead7f75ae0b33d4c90b1da5a1b006516 Mon Sep 17 00:00:00 2001 From: Sara Lago Date: Mon, 21 Jun 2021 12:45:10 +0200 Subject: [PATCH 3/4] [FIX] pms: show print checkin report button when checkin state is precheckin --- pms/models/pms_reservation.py | 2 +- pms/views/pms_checkin_partner_views.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py index 6ad6ccb8a..f11df9899 100644 --- a/pms/models/pms_reservation.py +++ b/pms/models/pms_reservation.py @@ -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) diff --git a/pms/views/pms_checkin_partner_views.xml b/pms/views/pms_checkin_partner_views.xml index e7c562442..116113283 100644 --- a/pms/views/pms_checkin_partner_views.xml +++ b/pms/views/pms_checkin_partner_views.xml @@ -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'))]}" /> From f647f0315070c9a6b25cfa3c3c85462c73d5e29f Mon Sep 17 00:00:00 2001 From: Sara Lago Date: Mon, 21 Jun 2021 12:59:33 +0200 Subject: [PATCH 4/4] [IMP] pms: add partner view when there are incongruences with checkin partner --- pms/models/pms_checkin_partner.py | 2 +- pms/views/res_partner_views.xml | 38 +++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/pms/models/pms_checkin_partner.py b/pms/models/pms_checkin_partner.py index 08af80e57..9f6228501 100644 --- a/pms/models/pms_checkin_partner.py +++ b/pms/models/pms_checkin_partner.py @@ -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", diff --git a/pms/views/res_partner_views.xml b/pms/views/res_partner_views.xml index 1d1eae5e4..5ab2c6581 100644 --- a/pms/views/res_partner_views.xml +++ b/pms/views/res_partner_views.xml @@ -93,6 +93,44 @@ + + res.partner.form.data + res.partner + + +
+ +
+

+ +

+
+ + + + + + + + + + + + + + + + + + + +