From 60e82d576b55d4c9026255df32f3416468546f61 Mon Sep 17 00:00:00 2001 From: Dario Lodeiros Date: Mon, 12 Jul 2021 12:16:37 +0200 Subject: [PATCH] [IMP] Avoid splitted reservation in intemediate calculation room lines --- pms/models/pms_reservation.py | 2 +- pms/models/pms_reservation_line.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pms/models/pms_reservation.py b/pms/models/pms_reservation.py index 2bc22d09f..4df0b83cc 100644 --- a/pms/models/pms_reservation.py +++ b/pms/models/pms_reservation.py @@ -1123,7 +1123,7 @@ class PmsReservation(models.Model): # REVIEW: Updating preferred_room_id here avoids cyclical dependency for reservation in self: room_ids = reservation.reservation_line_ids.mapped("room_id.id") - if len(room_ids) > 1: + if len(room_ids) > 1 and not self._context.get("not_split"): reservation.splitted = True reservation.preferred_room_id = False else: diff --git a/pms/models/pms_reservation_line.py b/pms/models/pms_reservation_line.py index d0533224d..3d5e2b641 100644 --- a/pms/models/pms_reservation_line.py +++ b/pms/models/pms_reservation_line.py @@ -199,7 +199,9 @@ class PmsReservationLine(models.Model): manual_assigned = True # if there is availability for the entire stay if rooms_available: - + # Avoid that reservation._compute_splitted set the + # reservation like splitted in intermediate calculations + reservation = reservation.with_context(not_split=True) # if the reservation has a preferred room if reservation.preferred_room_id: