Skip to content

Commit

Permalink
[BOT] post-merge updates
Browse files Browse the repository at this point in the history
  • Loading branch information
OCA-git-bot committed Jan 31, 2025
1 parent a194ef5 commit c8a8233
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 42 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ TODO: add repo description.

[//]: # (addons)

This part will be replaced when running the oca-gen-addons-table script from OCA/maintainer-tools.
Available addons
----------------
addon | version | maintainers | summary
--- | --- | --- | ---
[resource_booking](resource_booking/) | 17.0.1.0.0 | [![pedrobaeza](https://github.com/pedrobaeza.png?size=30px)](https://github.com/pedrobaeza) [![ows-cloud](https://github.com/ows-cloud.png?size=30px)](https://github.com/ows-cloud) | Manage appointments and resource booking

[//]: # (end addons)

Expand Down
75 changes: 37 additions & 38 deletions resource_booking/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Resource booking
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:59ca230a37d737431cbc0df890d5f8ed789435503c356ddc3142d2f11e4b3ed1
!! source digest: sha256:4a14fac49f44fba51455196379766c311bc9309f3a0fa4a047870e428087ceef
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
Expand All @@ -33,27 +33,27 @@ given schedules.

Example use cases:

- Management of consultations in a clinic.
- Salesman appointments.
- Classroom and projector reservations.
- Hotel room booking.
- Management of consultations in a clinic.
- Salesman appointments.
- Classroom and projector reservations.
- Hotel room booking.

Among the things you can do:

- Specify the type of booking, which includes a calendar of
availability.
- Specify which resources can be booked together. All of them must be
free to be booked.
- Place pending bookings, effectively giving permissions to someone to
see the availability calendar and choose one slot.
- Partners can do that from their portals.
- If a partner has no user, he can still do the same via a tokenized
URL.
- Backend users can also do that from the backend.
- Booking lifecycle with computed states.
- Automatic meeting creation and deletion.
- Automatic conflict detection.
- Deadline to block modifications.
- Specify the type of booking, which includes a calendar of
availability.
- Specify which resources can be booked together. All of them must be
free to be booked.
- Place pending bookings, effectively giving permissions to someone to
see the availability calendar and choose one slot.
- Partners can do that from their portals.
- If a partner has no user, he can still do the same via a tokenized
URL.
- Backend users can also do that from the backend.
- Booking lifecycle with computed states.
- Automatic meeting creation and deletion.
- Automatic conflict detection.
- Deadline to block modifications.

**Table of contents**

Expand All @@ -73,12 +73,12 @@ Configuration*, where he will be able to configure resources, leaves and
schedules. This menu is just provided as a shortcut. However, if you
want to manage that stuff more comfortably:

- To manage human resources, install
`hr <https://apps.odoo.com/app/employees>`__.
- To manage their leaves, install
`hr_holidays <https://apps.odoo.com/app/time-off>`__.
- To manage work centers, install
`mrp <https://apps.odoo.com/app/manufacturing>`__.
- To manage human resources, install
`hr <https://apps.odoo.com/app/employees>`__.
- To manage their leaves, install
`hr_holidays <https://apps.odoo.com/app/time-off>`__.
- To manage work centers, install
`mrp <https://apps.odoo.com/app/manufacturing>`__.

Configuration
=============
Expand Down Expand Up @@ -126,9 +126,9 @@ This module installs a new app, "Resource bookings".

Bookings may involve you:

- Maybe because you requested to book something.
- Maybe because you are one of the booked resources, if a booking
represents some kind of appointment.
- Maybe because you requested to book something.
- Maybe because you are one of the booked resources, if a booking
represents some kind of appointment.

To see which bookings involve you:

Expand Down Expand Up @@ -169,13 +169,13 @@ To invite someone to book a resource combination from the portal:
Known issues / Roadmap
======================

- Allow combination auto-assignment based on least used combination.
- Allow customer to choose combination.
- Some error messages would be a bit more helpful if they specify the
schedule impossibility reason, but that should be done without
affecting performance.
- Optimize ``_calendar_event_busy_intervals()`` to make it work in
batch.
- Allow combination auto-assignment based on least used combination.
- Allow customer to choose combination.
- Some error messages would be a bit more helpful if they specify the
schedule impossibility reason, but that should be done without
affecting performance.
- Optimize ``_calendar_event_busy_intervals()`` to make it work in
batch.

Bug Tracker
===========
Expand All @@ -198,9 +198,8 @@ Authors
Contributors
------------

- Jairo Llopis <jairo.llopis@tecnativa.com>
(https://www.tecnativa.com/)
- Henrik Norlin (https://ows.cloud)
- Jairo Llopis <jairo.llopis@tecnativa.com> (https://www.tecnativa.com/)
- Henrik Norlin (https://ows.cloud)

Maintainers
-----------
Expand Down
5 changes: 2 additions & 3 deletions resource_booking/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ <h1 class="title">Resource booking</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:59ca230a37d737431cbc0df890d5f8ed789435503c356ddc3142d2f11e4b3ed1
!! source digest: sha256:4a14fac49f44fba51455196379766c311bc9309f3a0fa4a047870e428087ceef
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/calendar/tree/17.0/resource_booking"><img alt="OCA/calendar" src="https://img.shields.io/badge/github-OCA%2Fcalendar-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/calendar-17-0/calendar-17-0-resource_booking"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/calendar&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module adds a new app to allow you to book resource combinations in
Expand Down Expand Up @@ -548,8 +548,7 @@ <h2><a class="toc-backref" href="#toc-entry-7">Authors</a></h2>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#toc-entry-8">Contributors</a></h2>
<ul class="simple">
<li>Jairo Llopis &lt;<a class="reference external" href="mailto:jairo.llopis&#64;tecnativa.com">jairo.llopis&#64;tecnativa.com</a>&gt;
(<a class="reference external" href="https://www.tecnativa.com/">https://www.tecnativa.com/</a>)</li>
<li>Jairo Llopis &lt;<a class="reference external" href="mailto:jairo.llopis&#64;tecnativa.com">jairo.llopis&#64;tecnativa.com</a>&gt; (<a class="reference external" href="https://www.tecnativa.com/">https://www.tecnativa.com/</a>)</li>
<li>Henrik Norlin (<a class="reference external" href="https://ows.cloud">https://ows.cloud</a>)</li>
</ul>
</div>
Expand Down
11 changes: 11 additions & 0 deletions setup/_metapackage/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[project]
name = "odoo-addons-oca-calendar"
version = "17.0.20250131.0"
dependencies = [
"odoo-addon-resource_booking>=17.0dev,<17.1dev",
]
classifiers=[
"Programming Language :: Python",
"Framework :: Odoo",
"Framework :: Odoo :: 17.0",
]

0 comments on commit c8a8233

Please sign in to comment.