Merge PR #295 into 14.0

Signed-off-by DarioLodeiros

pms/models/pms_reservation.py

@@ -209,7 +209,7 @@ class PmsReservation(models.Model):
         store=True,
         comodel_name="pms.service",
         inverse_name="reservation_id",
-        compute="_compute_service_ids",
+        compute="_compute_board_service_ids",
         check_company=True,
         check_pms_properties=True,
     )
@@ -986,8 +986,8 @@ class PmsReservation(models.Model):
             reservation.check_in_out_dates()
 
     @api.depends("board_service_room_id")
-    def _compute_service_ids(self):
-        if self.env.context.get("skip_compute_service_ids", False):
+    def _compute_board_service_ids(self):
+        if self.env.context.get("skip_compute_board_service_ids", False):
             return
         for reservation in self:
             board_services = []
@@ -2259,7 +2259,7 @@ class PmsReservation(models.Model):
         # compute_service_ids dont run (compute with readonly to False),
         # and we must force it to compute the services linked with the board service:
         if "board_service_room_id" in vals and "service_ids" in vals:
-            self._compute_service_ids()
+            self._compute_board_service_ids()
 
     def get_folios_to_update_channel(self, vals):
         folios_to_update_channel = self.env["pms.folio"]

pms/models/pms_service.py

@@ -332,6 +332,14 @@ class PmsService(models.Model):
     )
     # flake8:noqa=C901
     def _compute_service_line_ids(self):
+        if (
+            self.env.context.get("skip_compute_board_service_ids", False)
+            and self.is_board_service
+        ) or (
+            self.env.context.get("skip_compute_service_line_ids", False)
+            and not self.is_board_service
+        ):
+            return
         for service in self:
             if service.no_auto_add_lines:
                 continue