From a495caa38b0cf2f0ac1a3dea292185612290beb4 Mon Sep 17 00:00:00 2001 From: Dario Lodeiros Date: Wed, 7 Nov 2018 17:47:54 +0100 Subject: [PATCH] [DEL] fields checkin/out anda DailyPlan - hotel --- hotel/models/hotel_folio.py | 27 ------------ hotel/models/hotel_reservation.py | 70 ------------------------------- hotel/views/hotel_folio_views.xml | 2 - hotel/wizard/checkinwizard.py | 3 -- 4 files changed, 102 deletions(-) diff --git a/hotel/models/hotel_folio.py b/hotel/models/hotel_folio.py index 6b77000ed..4dc186c0a 100644 --- a/hotel/models/hotel_folio.py +++ b/hotel/models/hotel_folio.py @@ -110,8 +110,6 @@ class HotelFolio(models.Model): compute='_compute_checkin_partner_count') checkin_partner_pending_count = fields.Integer('Checkin Pending', compute='_compute_checkin_partner_count') - checkins_reservations = fields.Integer('checkins reservations') - checkouts_reservations = fields.Integer('checkouts reservations') partner_internal_comment = fields.Text(string='Internal Partner Notes', related='partner_id.comment') internal_comment = fields.Text(string='Internal Folio Notes') @@ -476,31 +474,6 @@ class HotelFolio(models.Model): 'target': 'new', } - @api.model - def daily_plan(self): - _logger.info('daily_plan') - self._cr.execute("update hotel_folio set checkins_reservations = 0, \ - checkouts_reservations = 0 where checkins_reservations > 0 \ - or checkouts_reservations > 0") - folios_in = self.env['hotel.folio'].search([ - ('room_lines.is_checkin', '=', True) - ]) - folios_out = self.env['hotel.folio'].search([ - ('room_lines.is_checkout', '=', True) - ]) - for fol in folios_in: - count_checkin = fol.room_lines.search_count([ - ('is_checkin', '=', True), ('folio_id.id', '=', fol.id) - ]) - fol.write({'checkins_reservations': count_checkin}) - for fol in folios_out: - count_checkout = fol.room_lines.search_count([ - ('is_checkout', '=', True), - ('folio_id.id', '=', fol.id) - ]) - fol.write({'checkouts_reservations': count_checkout}) - return True - @api.multi def _compute_checkin_partner_count(self): _logger.info('_compute_checkin_partner_amount') diff --git a/hotel/models/hotel_reservation.py b/hotel/models/hotel_reservation.py index eb084652b..0e8537204 100644 --- a/hotel/models/hotel_reservation.py +++ b/hotel/models/hotel_reservation.py @@ -189,8 +189,6 @@ class HotelReservation(models.Model): compute='_compute_checkin_partner_count', search='_search_checkin_partner_pending') # check_rooms = fields.Boolean('Check Rooms') - is_checkin = fields.Boolean() - is_checkout = fields.Boolean() splitted = fields.Boolean('Splitted', default=False) parent_reservation = fields.Many2one('hotel.reservation', 'Parent Reservation') @@ -644,11 +642,6 @@ class HotelReservation(models.Model): vals.update({'state': 'booking'}) else: vals.update({'state': 'confirm'}) - if record.checkin_is_today(): - vals.update({'is_checkin': True}) - folio = hotel_folio_obj.browse(record.folio_id.id) - folio.checkins_reservations = folio.room_lines.search_count([ - ('folio_id', '=', folio.id), ('is_checkin', '=', True)]) record.write(vals) if record.splitted: @@ -681,14 +674,6 @@ class HotelReservation(models.Model): 'state': 'cancelled', 'discount': 100.0, }) - if record.checkin_is_today: - record.is_checkin = False - folio = self.env['hotel.folio'].browse(record.folio_id.id) - folio.checkins_reservations = folio.room_lines.search_count([ - ('folio_id', '=', folio.id), - ('is_checkin', '=', True) - ]) - if record.splitted: master_reservation = record.parent_reservation or record splitted_reservs = self.env['hotel.reservation'].search([ @@ -924,61 +909,6 @@ class HotelReservation(models.Model): def action_reservation_checkout(self): for record in self: record.state = 'done' - if record.checkout_is_today(): - record.is_checkout = False - folio = self.env['hotel.folio'].browse(self.folio_id.id) - folio.checkouts_reservations = folio.room_lines.search_count([ - ('folio_id', '=', folio.id), - ('is_checkout', '=', True) - ]) - - @api.model - def daily_plan(self): - _logger.info('daily_plan') - today_str = fields.Date.today() - yesterday_utc_dt = datetime.now() - timedelta(days=1) - yesterday_str = yesterday_utc_dt.strftime(DEFAULT_SERVER_DATE_FORMAT) - reservations_to_checkout = self.env['hotel.reservation'].search([ - ('state', 'not in', ['done']), - ('checkout', '<', today_str) - ]) - for res in reservations_to_checkout: - res.action_reservation_checkout() - - reservations = self.env['hotel.reservation'].search([ - ('reservation_line_ids.date', 'in', [today_str, yesterday_str]), - ('state', 'in', ['confirm', 'booking']) - ]) - self._cr.execute("update hotel_reservation set is_checkin = False, \ - is_checkout = False where is_checkin = True or \ - is_checkout = True") - checkins_res = reservations.filtered(lambda x: ( - x.state in ('confirm','draft') - and x.checkin == today_str,) - and x.reservation_type == 'normal')) - checkins_res.write({'is_checkin': True}) - checkouts_res = reservations.filtered(lambda x: ( - x.state not in ('done','cancelled') - and x.checkout == today_str - and x.reservation_type == 'normal')) - checkouts_res.write({'is_checkout': True}) - self.env['hotel.folio'].daily_plan() - return True - - @api.model - def checkin_is_today(self): - self.ensure_one() - tz_hotel = self.env['ir.default'].sudo().get('res.config.settings', 'tz_hotel') - today = fields.Date.context_today(self.with_context(tz=tz_hotel)) - return self.checkin == today - - @api.model - def checkout_is_today(self): - self.ensure_one() - tz_hotel = self.env['ir.default'].sudo().get( - 'res.config.settings', 'tz_hotel') - today = fields.Date.context_today(self.with_context(tz=tz_hotel)) - return self.checkout == today @api.multi def action_checks(self): diff --git a/hotel/views/hotel_folio_views.xml b/hotel/views/hotel_folio_views.xml index 8a03b03be..b410a798c 100644 --- a/hotel/views/hotel_folio_views.xml +++ b/hotel/views/hotel_folio_views.xml @@ -516,8 +516,6 @@ - - diff --git a/hotel/wizard/checkinwizard.py b/hotel/wizard/checkinwizard.py index c648f3270..2ce8cce0b 100644 --- a/hotel/wizard/checkinwizard.py +++ b/hotel/wizard/checkinwizard.py @@ -175,9 +175,6 @@ class Wizard(models.TransientModel): # update the state of the current reservation if record_id.checkin_partner_count > 0: record_id.state = 'booking' - record_id.is_checkin = False - folio = self.env['hotel.folio'].browse(self.reservation_id.folio_id.id) - folio.checkins_reservations -= 1 @api.onchange('reservation_id') def change_enter_exit_date(self):