diff --git a/hotel/models/hotel_checkin_partner.py b/hotel/models/hotel_checkin_partner.py index cc27b8dbe..f8883ecbd 100644 --- a/hotel/models/hotel_checkin_partner.py +++ b/hotel/models/hotel_checkin_partner.py @@ -61,7 +61,6 @@ class HotelCheckinPartner(models.Model): required=True) email = fields.Char('E-mail', related='partner_id.email') mobile = fields.Char('Mobile', related='partner_id.mobile') - gender = fields.Selection('Gender', related='partner_id.gender') reservation_id = fields.Many2one( 'hotel.reservation', default=_default_reservation_id) folio_id = fields.Many2one('hotel.folio', @@ -128,6 +127,8 @@ class HotelCheckinPartner(models.Model): def action_on_board(self): for record in self: record.state = 'booking' + if record.reservation_id.state == 'confirm': + record.reservation_id.state = 'booking' @api.multi def action_done(self): diff --git a/hotel/views/hotel_checkin_partner_views.xml b/hotel/views/hotel_checkin_partner_views.xml index ca50a8536..41f199389 100644 --- a/hotel/views/hotel_checkin_partner_views.xml +++ b/hotel/views/hotel_checkin_partner_views.xml @@ -53,7 +53,6 @@ - @@ -81,7 +80,6 @@ - diff --git a/hotel_calendar/static/src/js/views/calendar/hotel_calendar_controller.js b/hotel_calendar/static/src/js/views/calendar/hotel_calendar_controller.js index ee8b90834..ed22d55d3 100644 --- a/hotel_calendar/static/src/js/views/calendar/hotel_calendar_controller.js +++ b/hotel_calendar/static/src/js/views/calendar/hotel_calendar_controller.js @@ -461,16 +461,7 @@ var PMSCalendarController = AbstractController.extend({ method: 'action_checks', args: [ev.data.reservation_id], }).then(function (result){ - return self.do_action({ - name: result.name, - view_type: result.view_type, - view_mode: result.view_mode, - type: result.type, - res_model: result.res_model, - views: [[false, 'form']], - domain: result.domain, - target: result.target, - }); + return self.do_action(result); }); }); $reservationPopover.data('bs.popover').tip().find(".btn_popover_open_invoice").on('click', diff --git a/hotel_l10n_es/models/inherit_hotel_checkin_partner.py b/hotel_l10n_es/models/inherit_hotel_checkin_partner.py index 3ecdc8600..5314d50ee 100644 --- a/hotel_l10n_es/models/inherit_hotel_checkin_partner.py +++ b/hotel_l10n_es/models/inherit_hotel_checkin_partner.py @@ -29,7 +29,7 @@ class HotelCheckinPartner(models.Model): document_type = fields.Selection(related='partner_id.document_type') document_number = fields.Char(related='partner_id.document_number') document_expedition_date = fields.Date(related='partner_id.document_expedition_date') - + gender = fields.Selection('Gender', related='partner_id.gender') code_ine_id = fields.Many2one(related="partner_id.code_ine_id") #TMP_FIX VAT Validation diff --git a/hotel_l10n_es/views/inherit_hotel_checkin_partner_views.xml b/hotel_l10n_es/views/inherit_hotel_checkin_partner_views.xml index 0130d1a14..ab369ca55 100644 --- a/hotel_l10n_es/views/inherit_hotel_checkin_partner_views.xml +++ b/hotel_l10n_es/views/inherit_hotel_checkin_partner_views.xml @@ -31,6 +31,7 @@ 'hidden_cardex': True, 'edit_cardex': True }"/> + @@ -53,6 +54,7 @@ 'hidden_cardex': True, 'edit_cardex': True }"/> +