diff --git a/pms/i18n/es.po b/pms/i18n/es.po index 7b22c075c..8e101c9fa 100644 --- a/pms/i18n/es.po +++ b/pms/i18n/es.po @@ -5877,11 +5877,6 @@ msgstr "Generica" msgid "Get in" msgstr "Entrar" -#. module: hotel -#: model:ir.model.fields,field_description:hotel.field_hotel_checkin_partner_auto_booking -msgid "Get in Now" -msgstr "Entra ahora!" - #. module: hotel #: model:ir.model.fields,help:hotel.field_hotel_room_type_packaging_ids msgid "Gives the different ways to package the same product." diff --git a/pms/models/pms_checkin_partner.py b/pms/models/pms_checkin_partner.py index 728319274..63c008757 100644 --- a/pms/models/pms_checkin_partner.py +++ b/pms/models/pms_checkin_partner.py @@ -35,7 +35,6 @@ class PmsCheckinPartner(models.Model): mobile = fields.Char("Mobile", related="partner_id.mobile") arrival = fields.Datetime("Enter") departure = fields.Datetime("Exit") - auto_booking = fields.Boolean("Get in Now", default=False) state = fields.Selection( selection=[ ("draft", "Pending arrival"), @@ -105,11 +104,3 @@ class PmsCheckinPartner(models.Model): } record.update(vals) return True - - # ORM Overrides - @api.model - def create(self, vals): - record = super(PmsCheckinPartner, self).create(vals) - if vals.get("auto_booking", False): - record.action_on_board() - return record diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py index 25c872f72..77607787c 100644 --- a/pms/models/pms_reservation.py +++ b/pms/models/pms_reservation.py @@ -707,7 +707,7 @@ class PmsReservation(models.Model): ) ) - @api.constrains("checkin_partner_ids") + @api.constrains("checkin_partner_ids", "adults") def _max_checkin_partner_ids(self): for record in self: if len(record.checkin_partner_ids) > record.adults + record.children: diff --git a/pms/models/pms_reservation_line.py b/pms/models/pms_reservation_line.py index 8391191c4..e61cab552 100644 --- a/pms/models/pms_reservation_line.py +++ b/pms/models/pms_reservation_line.py @@ -250,7 +250,10 @@ class PmsReservationLine(models.Model): line.reservation_id.tax_ids, line.reservation_id.company_id, ) +<<<<<<< HEAD # _logger.info(line.price) +======= +>>>>>>> [DEL] delete auto_booking field # TODO: Out of service 0 amount else: line.price = line._origin.price diff --git a/pms/tests/test_pms_checkin_partner.py b/pms/tests/test_pms_checkin_partner.py index 9049cd3ac..9b3f8638f 100644 --- a/pms/tests/test_pms_checkin_partner.py +++ b/pms/tests/test_pms_checkin_partner.py @@ -27,6 +27,7 @@ class TestPmsCheckinPartner(TestHotel): "checkout": "2012-01-17", "room_type_id": cls.env.ref("pms.pms_room_type_3").id, "partner_id": cls.host1.id, + "adults": 3, "pms_property_id": cls.env.ref("pms.main_pms_property").id, } demo_user = cls.env.ref("base.user_demo") @@ -140,9 +141,17 @@ class TestPmsCheckinPartner(TestHotel): ) # ACT & ASSERT with self.assertRaises(ValidationError), self.cr.savepoint(): - self.env["pms.checkin.partner"].create( + self.reservation_1.write( { - "partner_id": host4.id, - "reservation_id": self.reservation_1.id, + "checkin_partner_ids": [ + ( + 0, + 0, + { + "partner_id": host4.id, + "reservation_id": self.reservation_1.id, + }, + ) + ] } ) diff --git a/pms/views/pms_checkin_partner_views.xml b/pms/views/pms_checkin_partner_views.xml index 0f2392df3..0e4c28b5d 100644 --- a/pms/views/pms_checkin_partner_views.xml +++ b/pms/views/pms_checkin_partner_views.xml @@ -59,7 +59,6 @@ help="Get in" attrs="{'invisible': [('state','!=','draft')]}" /> -