From 5aa9fbc7d34a09561eb67f72da972e3e9c795a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dar=C3=ADo=20Lodeiros?= Date: Thu, 15 Sep 2022 16:40:49 +0200 Subject: [PATCH] [FIX] timedelta use --- pms/models/pms_checkin_partner.py | 4 ++-- pms/models/pms_folio.py | 4 ++-- pms/models/pms_reservation_line.py | 6 ++++++ pms/tests/__init__.py | 1 + pms/views/pms_reservation_views.xml | 5 ++++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pms/models/pms_checkin_partner.py b/pms/models/pms_checkin_partner.py index c05df60c7..9b6886662 100644 --- a/pms/models/pms_checkin_partner.py +++ b/pms/models/pms_checkin_partner.py @@ -952,7 +952,7 @@ class PmsCheckinPartner(models.Model): )[self.id] self.reservation_id.message_post(body=body) - if self.reservation_id.to_send_mail: + if self.reservation_id.to_send_exit_mail: emails = self.reservation_id.checkin_partner_ids.mapped("email") if ( self.reservation_id.partner_id @@ -972,4 +972,4 @@ class PmsCheckinPartner(models.Model): "body_html", [6, 0, self.id], compute_lang=True, post_process=True )[self.id] self.reservation_id.message_post(body=body) - self.reservation_id.to_send_mail = False + self.reservation_id.to_send_exit_mail = False diff --git a/pms/models/pms_folio.py b/pms/models/pms_folio.py index 7547b7604..469b0ae19 100644 --- a/pms/models/pms_folio.py +++ b/pms/models/pms_folio.py @@ -1391,7 +1391,7 @@ class PmsFolio(models.Model): record.days_to_checkin = (record.first_checkin - fields.Date.today()).days def _search_days_to_checkin(self, operator, value): - target_date = fields.Date.today() + timedelta(days=value) + target_date = fields.Date.today() + datetime.timedelta(days=value) if operator in ("=", ">=", ">", "<=", "<"): return [("first_checkin", operator, target_date)] raise UserError( @@ -1410,7 +1410,7 @@ class PmsFolio(models.Model): record.days_to_checkout = (record.last_checkout - fields.Date.today()).days def _search_days_to_checkout(self, operator, value): - target_date = fields.Date.today() + timedelta(days=value) + target_date = fields.Date.today() + datetime.timedelta(days=value) if operator in ("=", ">=", ">", "<=", "<"): return [("last_checkout", operator, target_date)] raise UserError( diff --git a/pms/models/pms_reservation_line.py b/pms/models/pms_reservation_line.py index 0a56ca085..19a7d1fcc 100644 --- a/pms/models/pms_reservation_line.py +++ b/pms/models/pms_reservation_line.py @@ -497,6 +497,12 @@ class PmsReservationLine(models.Model): @api.model_create_multi def create(self, vals_list): + for vals in vals_list: + if vals.get("reservation_id") and not vals.get("sale_channel_id"): + reservation = self.env["pms.reservation"].browse( + vals.get("reservation_id") + ) + vals["sale_channel_id"] = reservation.sale_channel_origin_id.id records = super().create(vals_list) for line in records: reservation = line.reservation_id diff --git a/pms/tests/__init__.py b/pms/tests/__init__.py index a0857b137..4d084fc6c 100644 --- a/pms/tests/__init__.py +++ b/pms/tests/__init__.py @@ -38,5 +38,6 @@ from . import test_pms_wizard_split_join_swap_reservation from . import test_product_template from . import test_pms_multiproperty from . import test_shared_room + # from . import test_automated_mails from . import test_pms_service diff --git a/pms/views/pms_reservation_views.xml b/pms/views/pms_reservation_views.xml index 4506bd8e2..a273e7d42 100644 --- a/pms/views/pms_reservation_views.xml +++ b/pms/views/pms_reservation_views.xml @@ -455,7 +455,10 @@ name="force_update_origin" attrs="{'invisible': [('is_origin_channel_check_visible','=',False)]}" /> - +