Skip to content

Commit

Permalink
[MIG] resource_booking: Migration to 16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
norlinhenrik committed Nov 27, 2023
1 parent 4356c87 commit 3e30383
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 18 deletions.
4 changes: 2 additions & 2 deletions resource_booking/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion resource_booking/models/resource_booking.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."""
Expand Down
1 change: 1 addition & 0 deletions resource_booking/readme/CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
* Jairo Llopis <[email protected]> (https://www.tecnativa.com/)
* Henrik Norlin (https://ows.cloud)
18 changes: 9 additions & 9 deletions resource_booking/templates/portal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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>
Expand Down Expand Up @@ -200,7 +200,7 @@
<button
type="button"
class="btn btn-secondary"
data-dismiss="modal"
data-bs-dismiss="modal"
>Cancel</button>
<button
type="submit"
Expand Down Expand Up @@ -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" />
Expand All @@ -459,7 +459,7 @@
<button
type="button"
class="close"
data-dismiss="modal"
data-bs-dismiss="modal"
aria-label="Close"
>
<i class="fa fa-times" />
Expand All @@ -486,7 +486,7 @@
<button
type="button"
class="btn btn-primary"
data-dismiss="modal"
data-bs-dismiss="modal"
>Go back</button>
</footer>
</div>
Expand Down Expand Up @@ -524,7 +524,7 @@
<button
type="button"
class="close"
data-dismiss="alert"
data-bs-dismiss="alert"
aria-label="Close"
> &#215;</button>
</div>
Expand Down
1 change: 0 additions & 1 deletion resource_booking/views/calendar_event_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
6 changes: 1 addition & 5 deletions resource_booking/views/resource_booking_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down

0 comments on commit 3e30383

Please sign in to comment.