From 3e30383b81dafeba6cb9c2196afb11fdfffb4576 Mon Sep 17 00:00:00 2001
From: Henrik Norlin <henrik.norl@gmail.com>
Date: Mon, 28 Aug 2023 18:11:50 +0200
Subject: [PATCH] [MIG] resource_booking: Migration to 16.0

---
 resource_booking/__manifest__.py               |  4 ++--
 resource_booking/models/resource_booking.py    |  2 +-
 resource_booking/readme/CONTRIBUTORS.rst       |  1 +
 resource_booking/templates/portal.xml          | 18 +++++++++---------
 .../views/calendar_event_views.xml             |  1 -
 .../views/resource_booking_views.xml           |  6 +-----
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/resource_booking/__manifest__.py b/resource_booking/__manifest__.py
index 06ce5a3e..6b49780a 100644
--- a/resource_booking/__manifest__.py
+++ b/resource_booking/__manifest__.py
@@ -5,12 +5,12 @@
 {
     "name": "Resource booking",
     "summary": "Manage appointments and resource booking",
-    "version": "15.0.1.1.1",
+    "version": "16.0.1.0.0",
     "development_status": "Production/Stable",
     "category": "Appointments",
     "website": "https://github.com/OCA/calendar",
     "author": "Tecnativa, Odoo Community Association (OCA)",
-    "maintainers": ["pedrobaeza"],
+    "maintainers": ["pedrobaeza", "ows-cloud"],
     "license": "AGPL-3",
     "application": True,
     "installable": True,
diff --git a/resource_booking/models/resource_booking.py b/resource_booking/models/resource_booking.py
index 83f6ea71..3fcc0abc 100644
--- a/resource_booking/models/resource_booking.py
+++ b/resource_booking/models/resource_booking.py
@@ -660,7 +660,7 @@ def action_confirm(self):
                         # attendee.state='accepted'
                         attendees_to_confirm |= attendee
             attendees_to_confirm.write({"state": "accepted"})
-        self.recompute()
+        self.env.flush_all()  # booking.meeting_id.partner_ids and attendees_to_confirm
 
     def action_unschedule(self):
         """Remove associated meetings."""
diff --git a/resource_booking/readme/CONTRIBUTORS.rst b/resource_booking/readme/CONTRIBUTORS.rst
index 7ee45dc9..f7145432 100644
--- a/resource_booking/readme/CONTRIBUTORS.rst
+++ b/resource_booking/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Jairo Llopis <jairo.llopis@tecnativa.com> (https://www.tecnativa.com/)
+* Henrik Norlin (https://ows.cloud)
diff --git a/resource_booking/templates/portal.xml b/resource_booking/templates/portal.xml
index 05cf8742..91f576cc 100644
--- a/resource_booking/templates/portal.xml
+++ b/resource_booking/templates/portal.xml
@@ -96,7 +96,7 @@
                                             <button
                                                 class="btn btn-primary dropdown-toggle"
                                                 type="button"
-                                                data-toggle="dropdown"
+                                                data-bs-toggle="dropdown"
                                                 aria-haspopup="true"
                                                 aria-expanded="false"
                                                 t-out="day.day"
@@ -111,8 +111,8 @@
                                                     <button
                                                         class="dropdown-item"
                                                         type="button"
-                                                        data-toggle="modal"
-                                                        t-attf-data-target="#modal-confirm-#{int(slot.timestamp())}"
+                                                        data-bs-toggle="modal"
+                                                        t-attf-data-bs-target="#modal-confirm-#{int(slot.timestamp())}"
                                                         t-out="slot.strftime(time_format)"
                                                     />
                                                 </t>
@@ -200,7 +200,7 @@
                                     <button
                                         type="button"
                                         class="btn btn-secondary"
-                                        data-dismiss="modal"
+                                        data-bs-dismiss="modal"
                                     >Cancel</button>
                                     <button
                                         type="submit"
@@ -436,8 +436,8 @@
                         <a
                             role="button"
                             class="btn btn-danger"
-                            data-toggle="modal"
-                            data-target="#modal_cancel"
+                            data-bs-toggle="modal"
+                            data-bs-target="#modal_cancel"
                             href="#"
                         >
                             <i class="fa fa-times" />
@@ -459,7 +459,7 @@
                             <button
                                 type="button"
                                 class="close"
-                                data-dismiss="modal"
+                                data-bs-dismiss="modal"
                                 aria-label="Close"
                             >
                                 <i class="fa fa-times" />
@@ -486,7 +486,7 @@
                             <button
                                 type="button"
                                 class="btn btn-primary"
-                                data-dismiss="modal"
+                                data-bs-dismiss="modal"
                             >Go back</button>
                         </footer>
                     </div>
@@ -524,7 +524,7 @@
             <button
                 type="button"
                 class="close"
-                data-dismiss="alert"
+                data-bs-dismiss="alert"
                 aria-label="Close"
             > &#215;</button>
         </div>
diff --git a/resource_booking/views/calendar_event_views.xml b/resource_booking/views/calendar_event_views.xml
index 58671981..d3a9021a 100644
--- a/resource_booking/views/calendar_event_views.xml
+++ b/resource_booking/views/calendar_event_views.xml
@@ -6,7 +6,6 @@
         <field name="name">calendar.event.view.form.inherit</field>
         <field name="model">calendar.event</field>
         <field name="inherit_id" ref="calendar.view_calendar_event_form" />
-        <field name="groups_id" eval="[(4, ref('group_user'), 0)]" />
         <field name="arch" type="xml">
             <form position="inside">
                 <field name="resource_booking_ids" invisible="1" />
diff --git a/resource_booking/views/resource_booking_views.xml b/resource_booking/views/resource_booking_views.xml
index 4fbf8902..4f30bcbf 100644
--- a/resource_booking/views/resource_booking_views.xml
+++ b/resource_booking/views/resource_booking_views.xml
@@ -159,11 +159,7 @@
                             <field name="categ_ids" widget="many2many_tags" />
                         </group>
                         <group name="meeting" string="Meeting">
-                            <field
-                                name="meeting_id"
-                                groups="base.group_no_one"
-                                readonly="1"
-                            />
+                            <field name="meeting_id" readonly="1" />
                             <field name="user_id" />
                             <field name="is_overdue" invisible="1" />
                             <field name="is_modifiable" invisible="1" />