mirror of
https://github.com/OCA/pms.git
synced 2025-01-29 00:17:45 +02:00
[DONE] 14.0 split join swap reservations (#85)
* [REF] pms: change name to reservation wizard * [IMP] pms: operations over reservations (split,join,swap) * [IMP]pms, swap reservation: order reservation by rooms and readonly compute fields * [IMP] wizard split reservation allowed_room_ids domain * [IMP] pms: refactor swap operations and tests cases * [FIX] pms: fix tests and & behaviour * [FIX] rebase code review compatibility Co-authored-by: Darío Lodeiros <dario@commitsun.com>
This commit is contained in:
Miguel Padin
GitHub
@@ -1,4 +1,4 @@
|
||||
from . import wizard_reservation
|
||||
from . import wizard_split_join_swap_reservation
|
||||
from . import wizard_massive_changes
|
||||
from . import wizard_advanced_filters
|
||||
from . import wizard_folio
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
from odoo import fields, models
|
||||
|
||||
|
||||
class ReservationWizard(models.TransientModel):
|
||||
_name = "pms.reservation.wizard"
|
||||
allowed_rooms = fields.One2many("pms.room", compute="_compute_allowed_rooms")
|
||||
options = fields.Many2one("pms.room", string="Room")
|
||||
|
||||
def _compute_allowed_rooms(self):
|
||||
for record in self:
|
||||
record.allowed_rooms = self._context.get("rooms_available")
|
||||
|
||||
def unify(self):
|
||||
if self.options:
|
||||
for line in (
|
||||
self.env["pms.reservation"]
|
||||
.search([("id", "=", self._context.get("active_id"))])
|
||||
.reservation_line_ids
|
||||
):
|
||||
line.room_id = self.options
|
||||
@@ -1,31 +0,0 @@
|
||||
<?xml version="1.0" ?>
|
||||
<odoo>
|
||||
<record id="reservation_wizard" model="ir.ui.view">
|
||||
<field name="name">Reservation Wizard</field>
|
||||
<field name="model">pms.reservation.wizard</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Choose The Details">
|
||||
<group>
|
||||
<field
|
||||
name="options"
|
||||
string="Suggested rooms to unify the reservation:"
|
||||
options="{'no_create': True,'no_open': True}"
|
||||
required="1"
|
||||
domain="[('id', 'in', allowed_rooms)]"
|
||||
/>
|
||||
<field name="allowed_rooms" invisible="1" />
|
||||
</group>
|
||||
<footer>
|
||||
<button
|
||||
name="unify"
|
||||
string="Unify"
|
||||
type="object"
|
||||
class="oe_highlight"
|
||||
/>
|
||||
or
|
||||
<button string="Cancel" class="oe_link" special="cancel" />
|
||||
</footer>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
353
pms/wizards/wizard_split_join_swap_reservation.py
Normal file
353
pms/wizards/wizard_split_join_swap_reservation.py
Normal file
@@ -0,0 +1,353 @@
|
||||
import datetime
|
||||
|
||||
from odoo import _, api, fields, models
|
||||
from odoo.exceptions import UserError
|
||||
|
||||
|
||||
class ReservationSplitJoinSwapWizard(models.TransientModel):
|
||||
_name = "pms.reservation.split.join.swap.wizard"
|
||||
operation = fields.Selection(
|
||||
[
|
||||
("swap", "Swap rooms"),
|
||||
("split", "Split reservation"),
|
||||
("join", "Join reservation"),
|
||||
],
|
||||
string="Operation",
|
||||
help="Operation to be applied on the reservation",
|
||||
default=lambda self: self._context.get("default_operation")
|
||||
if self._context.get("default_operation")
|
||||
else "swap",
|
||||
)
|
||||
reservation_id = fields.Many2one(
|
||||
string="Reservation",
|
||||
comodel_name="pms.reservation",
|
||||
default=lambda self: self.env["pms.reservation"]
|
||||
.browse(self._context.get("active_id"))
|
||||
.id
|
||||
if self._context.get("active_id")
|
||||
else False,
|
||||
)
|
||||
checkin = fields.Date(
|
||||
string="Check In",
|
||||
default=lambda self: self.env["pms.reservation"]
|
||||
.browse(self._context.get("active_id"))
|
||||
.checkin
|
||||
if self._context.get("active_id")
|
||||
else False,
|
||||
)
|
||||
checkout = fields.Date(
|
||||
string="Check Out",
|
||||
default=lambda self: self.env["pms.reservation"]
|
||||
.browse(self._context.get("active_id"))
|
||||
.checkout
|
||||
if self._context.get("active_id")
|
||||
else False,
|
||||
)
|
||||
reservations = fields.Many2many(
|
||||
string="Reservations",
|
||||
comodel_name="pms.reservation",
|
||||
compute="_compute_reservations",
|
||||
readonly=False,
|
||||
store=True,
|
||||
)
|
||||
room_source = fields.Many2one(
|
||||
string="Room Source",
|
||||
comodel_name="pms.room",
|
||||
domain="[('id', 'in', allowed_rooms_sources)]",
|
||||
default=lambda self: self.env["pms.reservation"]
|
||||
.browse(self._context.get("active_id"))
|
||||
.preferred_room_id
|
||||
if self._context.get("active_id")
|
||||
and not self.env["pms.reservation"]
|
||||
.browse(self._context.get("active_id"))
|
||||
.splitted
|
||||
else False,
|
||||
)
|
||||
room_target = fields.Many2one(
|
||||
string="Room Target",
|
||||
comodel_name="pms.room",
|
||||
domain="[('id', 'in', allowed_rooms_target)]",
|
||||
)
|
||||
allowed_rooms_sources = fields.Many2many(
|
||||
string="Allowed rooms source",
|
||||
comodel_name="pms.room",
|
||||
relation="pms_wizard_split_join_swap_reservation_rooms_source",
|
||||
column1="wizard_id",
|
||||
column2="room_id",
|
||||
compute="_compute_allowed_rooms_source",
|
||||
store=True,
|
||||
readonly=False,
|
||||
)
|
||||
allowed_rooms_target = fields.Many2many(
|
||||
string="Allowed rooms target",
|
||||
comodel_name="pms.room",
|
||||
relation="pms_wizard_split_join_swap_reservation_rooms_target",
|
||||
column1="wizard_id",
|
||||
column2="room_id",
|
||||
compute="_compute_allowed_rooms_target",
|
||||
store=True,
|
||||
readonly=False,
|
||||
)
|
||||
reservation_lines_to_change = fields.One2many(
|
||||
comodel_name="pms.wizard.reservation.lines.split",
|
||||
inverse_name="reservation_wizard_id",
|
||||
compute="_compute_reservation_lines",
|
||||
store=True,
|
||||
readonly=False,
|
||||
)
|
||||
|
||||
@api.depends("checkin", "checkout", "room_source", "room_target")
|
||||
def _compute_reservations(self):
|
||||
for record in self:
|
||||
if record.checkin and record.checkout:
|
||||
reservation_ids = list()
|
||||
for date_iterator in [
|
||||
record.checkin + datetime.timedelta(days=x)
|
||||
for x in range(0, (record.checkout - record.checkin).days)
|
||||
]:
|
||||
domain_lines = []
|
||||
if record.room_source and record.room_target:
|
||||
domain_lines.extend(
|
||||
[
|
||||
"|",
|
||||
("room_id", "=", record.room_source.id),
|
||||
("room_id", "=", record.room_target.id),
|
||||
]
|
||||
)
|
||||
|
||||
domain_lines.append(("date", "=", date_iterator))
|
||||
lines = self.env["pms.reservation.line"].search(domain_lines)
|
||||
reservation_ids.extend(lines.mapped("reservation_id.id"))
|
||||
reservations = (
|
||||
self.env["pms.reservation"]
|
||||
.search(
|
||||
[
|
||||
("id", "in", reservation_ids),
|
||||
("rooms", "!=", False),
|
||||
]
|
||||
)
|
||||
.sorted("rooms")
|
||||
)
|
||||
record.reservations = reservations
|
||||
else:
|
||||
record.reservations = False
|
||||
|
||||
@api.depends("reservation_id")
|
||||
def _compute_reservation_lines(self):
|
||||
for record in self:
|
||||
if record.reservation_id:
|
||||
cmds = [(5, 0, 0)]
|
||||
for line in record.reservation_id.reservation_line_ids:
|
||||
cmds.append(
|
||||
(
|
||||
0,
|
||||
0,
|
||||
{
|
||||
"reservation_wizard_id": record.id,
|
||||
"room_id": line.room_id,
|
||||
"date": line.date,
|
||||
},
|
||||
)
|
||||
)
|
||||
record.reservation_lines_to_change = cmds
|
||||
else:
|
||||
record.reservation_lines_to_change = False
|
||||
|
||||
@api.depends("checkin", "checkout")
|
||||
def _compute_allowed_rooms_source(self):
|
||||
for record in self:
|
||||
record.allowed_rooms_sources = (
|
||||
record.reservations.reservation_line_ids.mapped("room_id")
|
||||
)
|
||||
|
||||
@api.depends_context("default_operation")
|
||||
@api.depends("checkin", "checkout", "room_source", "operation")
|
||||
def _compute_allowed_rooms_target(self):
|
||||
for record in self:
|
||||
record.allowed_rooms_target = False
|
||||
record.room_target = False
|
||||
if record.checkin and record.checkout:
|
||||
rooms_available = self.env["pms.availability.plan"].rooms_available(
|
||||
checkin=record.checkin,
|
||||
checkout=record.checkout,
|
||||
room_type_id=False, # Allows to choose any available room
|
||||
current_lines=record.reservation_id.reservation_line_ids.ids,
|
||||
pricelist_id=record.reservation_id.pricelist_id.id,
|
||||
pms_property_id=record.reservation_id.pms_property_id.id,
|
||||
)
|
||||
domain = [("capacity", ">=", record.reservation_id.adults)]
|
||||
if record.room_source:
|
||||
domain.append(("id", "!=", record.room_source.id))
|
||||
|
||||
if record.operation == "swap":
|
||||
domain.append(
|
||||
(
|
||||
"id",
|
||||
"in",
|
||||
record.reservations.reservation_line_ids.mapped(
|
||||
"room_id"
|
||||
).ids,
|
||||
)
|
||||
)
|
||||
else:
|
||||
domain.extend(
|
||||
[
|
||||
("id", "in", rooms_available.ids),
|
||||
]
|
||||
)
|
||||
rooms = self.env["pms.room"].search(domain)
|
||||
record.allowed_rooms_target = rooms
|
||||
|
||||
@api.model
|
||||
def reservation_split(self, reservation, date, room):
|
||||
if not reservation:
|
||||
raise UserError(_("Invalid reservation"))
|
||||
if not reservation or not reservation.reservation_line_ids.filtered(
|
||||
lambda x: x.date == date
|
||||
):
|
||||
raise UserError(_("Invalid date for reservation line "))
|
||||
|
||||
if not self.browse(room.id):
|
||||
raise UserError(_("The room does not exist"))
|
||||
rooms_available = self.env["pms.availability.plan"].rooms_available(
|
||||
checkin=date,
|
||||
checkout=(
|
||||
datetime.datetime(year=date.year, month=date.month, day=date.day)
|
||||
+ datetime.timedelta(days=1)
|
||||
).date(),
|
||||
current_lines=reservation.reservation_line_ids.ids,
|
||||
pricelist_id=reservation.pricelist_id.id,
|
||||
pms_property_id=reservation.pms_property_id.id,
|
||||
)
|
||||
if room not in rooms_available:
|
||||
raise UserError(_("The room is not available"))
|
||||
|
||||
reservation.reservation_line_ids.filtered(
|
||||
lambda x: x.date == date
|
||||
).room_id = room.id
|
||||
|
||||
@api.model
|
||||
def reservation_join(self, reservation, room):
|
||||
rooms_available = self.env["pms.availability.plan"].rooms_available(
|
||||
checkin=reservation.checkin,
|
||||
checkout=reservation.checkout,
|
||||
current_lines=reservation.reservation_line_ids.ids,
|
||||
pricelist_id=reservation.pricelist_id.id,
|
||||
pms_property_id=reservation.pms_property_id.id,
|
||||
)
|
||||
if room in rooms_available:
|
||||
for line in (
|
||||
self.env["pms.reservation"]
|
||||
.search([("id", "=", reservation.id)])
|
||||
.reservation_line_ids
|
||||
):
|
||||
line.room_id = room.id
|
||||
else:
|
||||
raise UserError(_("Room {} not available.".format(room.name)))
|
||||
|
||||
@api.model
|
||||
def reservations_swap(self, checkin, checkout, source, target):
|
||||
reservations = self.env["pms.reservation"].search(
|
||||
[("checkin", ">=", checkin), ("checkout", "<=", checkout)]
|
||||
)
|
||||
lines = self.env["pms.reservation.line"].search_count(
|
||||
[("room_id", "=", source), ("reservation_id", "in", reservations.ids)]
|
||||
)
|
||||
if not lines:
|
||||
raise UserError(_("There's no reservations lines with provided room"))
|
||||
|
||||
for date_iterator in [
|
||||
checkin + datetime.timedelta(days=x)
|
||||
for x in range(0, (checkout - checkin).days)
|
||||
]:
|
||||
line_room_source = self.env["pms.reservation.line"].search(
|
||||
[("date", "=", date_iterator), ("room_id", "=", source)]
|
||||
)
|
||||
line_room_target = self.env["pms.reservation.line"].search(
|
||||
[("date", "=", date_iterator), ("room_id", "=", target)]
|
||||
)
|
||||
if line_room_source and line_room_target:
|
||||
|
||||
# this causes an unique error constraint
|
||||
line_room_target.occupies_availability = False
|
||||
line_room_source.occupies_availability = False
|
||||
|
||||
line_room_target.room_id = source
|
||||
line_room_source.room_id = target
|
||||
|
||||
self.flush()
|
||||
|
||||
line_room_target._compute_occupies_availability()
|
||||
line_room_source._compute_occupies_availability()
|
||||
|
||||
else:
|
||||
line_room_source.room_id = target
|
||||
|
||||
def action_split(self):
|
||||
for record in self:
|
||||
for line in record.reservation_lines_to_change:
|
||||
self.reservation_split(
|
||||
record.reservation_id,
|
||||
line.date,
|
||||
line.room_id,
|
||||
)
|
||||
|
||||
def action_join(self):
|
||||
for record in self:
|
||||
self.reservation_join(record.reservation_id, record.room_target)
|
||||
|
||||
def action_swap(self):
|
||||
self.reservations_swap(
|
||||
self.checkin, self.checkout, self.room_source.id, self.room_target.id
|
||||
)
|
||||
|
||||
|
||||
class ReservationLinesToSplit(models.TransientModel):
|
||||
_name = "pms.wizard.reservation.lines.split"
|
||||
|
||||
reservation_wizard_id = fields.Many2one(
|
||||
comodel_name="pms.reservation.split.join.swap.wizard",
|
||||
)
|
||||
date = fields.Date(
|
||||
string="Date",
|
||||
)
|
||||
room_id = fields.Many2one(
|
||||
string="Room",
|
||||
comodel_name="pms.room",
|
||||
domain="[('id', 'in', allowed_room_ids)]",
|
||||
)
|
||||
allowed_room_ids = fields.Many2many(
|
||||
string="Allowed Rooms",
|
||||
help="It contains all available rooms for this line",
|
||||
comodel_name="pms.room",
|
||||
compute="_compute_allowed_room_ids",
|
||||
store=True,
|
||||
# readonly=False
|
||||
)
|
||||
|
||||
@api.depends(
|
||||
"date",
|
||||
"room_id",
|
||||
"reservation_wizard_id.reservation_id.pricelist_id",
|
||||
)
|
||||
def _compute_allowed_room_ids(self):
|
||||
for line in self:
|
||||
reservation = line.reservation_wizard_id.reservation_id
|
||||
rooms_available = False
|
||||
if line.date and reservation:
|
||||
if reservation.overbooking or reservation.state in ("cancelled"):
|
||||
line.allowed_room_ids = self.env["pms.room"].search(
|
||||
[("active", "=", True)]
|
||||
)
|
||||
return
|
||||
rooms_available = self.env["pms.availability.plan"].rooms_available(
|
||||
checkin=line.date,
|
||||
checkout=line.date + datetime.timedelta(days=1),
|
||||
room_type_id=False, # Allows to choose any available room
|
||||
pricelist_id=reservation.pricelist_id.id,
|
||||
pms_property_id=reservation.pms_property_id.id,
|
||||
)
|
||||
rooms_available += line.room_id
|
||||
line.allowed_room_ids = rooms_available
|
||||
else:
|
||||
line.allowed_room_ids = False
|
||||
127
pms/wizards/wizard_split_join_swap_reservation.xml
Normal file
127
pms/wizards/wizard_split_join_swap_reservation.xml
Normal file
@@ -0,0 +1,127 @@
|
||||
<?xml version="1.0" ?>
|
||||
<odoo>
|
||||
<record id="reservation_wizard" model="ir.ui.view">
|
||||
<field name="name">Split, join or swap reservations</field>
|
||||
<field name="model">pms.reservation.split.join.swap.wizard</field>
|
||||
<field name="arch" type="xml">
|
||||
<form>
|
||||
<div class="row">
|
||||
<div class="col-3">
|
||||
<label for="operation" class="font-weight-bold" />
|
||||
<br />
|
||||
<field name="operation" widget="radio" />
|
||||
<field name="allowed_rooms_sources" invisible="1" />
|
||||
<field name="allowed_rooms_target" invisible="1" />
|
||||
</div>
|
||||
<div class="col-5">
|
||||
<span attrs="{'invisible': [('operation','=','swap')]}">
|
||||
<label for="reservation_id" /> <br />
|
||||
<field name="reservation_id" readonly="1" /><br />
|
||||
</span>
|
||||
<span attrs="{'invisible': [('operation','!=','swap')]}">
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<label for="checkin" /> <br />
|
||||
<field
|
||||
name="checkin"
|
||||
widget="daterange"
|
||||
options="{'related_end_date': 'checkout'}"
|
||||
/><br />
|
||||
<label for="checkout" /> <br />
|
||||
<field
|
||||
name="checkout"
|
||||
widget="daterange"
|
||||
options="{'related_start_date': 'checkin'}"
|
||||
/><br />
|
||||
</div>
|
||||
</div>
|
||||
</span>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<div>
|
||||
<span attrs="{'invisible': [('operation','!=','swap')]}">
|
||||
<label for="room_source" />
|
||||
<br />
|
||||
<field name="room_source" />
|
||||
<br />
|
||||
</span>
|
||||
<label
|
||||
attrs="{'invisible': [('operation','!=','swap')]}"
|
||||
for="room_target"
|
||||
/>
|
||||
<label
|
||||
attrs="{'invisible': [('operation','!=','join')]}"
|
||||
for="room_target"
|
||||
string="Room"
|
||||
/>
|
||||
<br />
|
||||
<field
|
||||
name="room_target"
|
||||
attrs="{'invisible': [('operation','=','split')]}"
|
||||
/>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="col-12"
|
||||
attrs="{'invisible': [('operation','!=','swap')]}"
|
||||
>
|
||||
<field name="reservations" nolabel="1" readonly="1">
|
||||
<tree>
|
||||
<field string="Reservation" name="name" />
|
||||
<field name="checkin" />
|
||||
<field name="checkout" />
|
||||
<field name="rooms" />
|
||||
</tree>
|
||||
</field>
|
||||
</div>
|
||||
<div
|
||||
class="col-12"
|
||||
attrs="{'invisible': [('operation','!=','split')]}"
|
||||
>
|
||||
<field
|
||||
name="reservation_lines_to_change"
|
||||
nolabel="1"
|
||||
default_order="rooms"
|
||||
>
|
||||
<tree editable="bottom" create="false" delete="false">
|
||||
<field name="reservation_wizard_id" invisible="1" />
|
||||
<field name="allowed_room_ids" invisible="1" />
|
||||
<field name="date" readonly="0" />
|
||||
<field
|
||||
name="room_id"
|
||||
domain="[('id', 'in', allowed_room_ids)]"
|
||||
/>
|
||||
</tree>
|
||||
</field>
|
||||
</div>
|
||||
</div>
|
||||
<footer class="text-right">
|
||||
<button string="Cancel" class="oe_link border" special="cancel" />
|
||||
or
|
||||
<button
|
||||
name="action_join"
|
||||
attrs="{'invisible': [('operation','!=','join')]}"
|
||||
string="Join reservation"
|
||||
type="object"
|
||||
class="oe_highlight"
|
||||
/>
|
||||
<button
|
||||
name="action_split"
|
||||
attrs="{'invisible': [('operation','!=','split')]}"
|
||||
string="Split reservation"
|
||||
type="object"
|
||||
class="oe_highlight"
|
||||
/>
|
||||
<button
|
||||
name="action_swap"
|
||||
attrs="{'invisible': [('operation','!=','swap')]}"
|
||||
string="Swap reservation rooms"
|
||||
type="object"
|
||||
class="oe_highlight"
|
||||
/>
|
||||
</footer>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
Reference in New Issue
Block a user