[FIX] Conflict Merge Folio view button

pms/models/pms_reservation.py

@@ -846,6 +846,19 @@ class PmsReservation(models.Model):
                 else False
             )
 
+    def _compute_access_url(self):
+        super(PmsReservation, self)._compute_access_url()
+        for reservation in self:
+            reservation.access_url = "/my/reservations/%s" % (reservation.id)
+
+    def preview_reservation(self):
+        self.ensure_one()
+        return {
+            "type": "ir.actions.act_url",
+            "target": "self",
+            "url": self.get_portal_url(),
+        }
+
     def _search_left_for_checkin(self, operator, value):
         if operator not in ("=",):
             raise UserError(