audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #106 into 14.0

Browse Source 
Signed-off-by DarioLodeiros
This commit is contained in:
OCA-git-bot
2021-12-18 16:20:25 +00:00
parent 2cb6f104d9 81c33456c6
commit c1acc77bbb
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pms/models/pms_property.py
View File

@@ -418,7 +418,7 @@ class PmsProperty(models.Model):
tz_property = self.tz tz_property = self.tz
dt = pytz.timezone(tz_property).localize(dt) dt = pytz.timezone(tz_property).localize(dt)
dt = dt.replace(tzinfo=None) dt = dt.replace(tzinfo=None)
dt = pytz.timezone(self.env.user.tz).localize(dt) dt = pytz.timezone(self.env.user.tz or "UTC").localize(dt)
dt = dt.astimezone(pytz.utc) dt = dt.astimezone(pytz.utc)
dt = dt.replace(tzinfo=None) dt = dt.replace(tzinfo=None)
return dt return dt

6
pms/models/pms_reservation.py
View File

@@ -940,9 +940,15 @@ class PmsReservation(models.Model):
reservation.pricelist_id = ( reservation.pricelist_id = (
reservation.agency_id.property_product_pricelist reservation.agency_id.property_product_pricelist
) )
# only change de pricelist if the reservation is not yet saved
# and the partner has a pricelist default
elif ( elif (
reservation.partner_id reservation.partner_id
and reservation.partner_id.property_product_pricelist and reservation.partner_id.property_product_pricelist
and (
not reservation.pricelist_id
or not isinstance(reservation.id, models.NewId)
)
): ):
reservation.pricelist_id = ( reservation.pricelist_id = (
reservation.partner_id.property_product_pricelist reservation.partner_id.property_product_pricelist

3
pms/wizards/pms_booking_engine.py
View File

@@ -424,13 +424,14 @@ class AvailabilityWizard(models.TransientModel):
): ):
room_type_total_price_per_room = 0 room_type_total_price_per_room = 0
room_type = self.env["pms.room.type"].browse(room_type_id) room_type = self.env["pms.room.type"].browse(room_type_id)
pms_property = self.env["pms.property"].browse(pms_property_id)
for date_iterator in [ for date_iterator in [
checkin + datetime.timedelta(days=x) checkin + datetime.timedelta(days=x)
for x in range(0, (checkout - checkin).days) for x in range(0, (checkout - checkin).days)
]: ]:
product = room_type.product_id product = room_type.product_id
product = product.with_context( product = product.with_company(pms_property.company_id).with_context(
quantity=1, quantity=1,
date=fields.Date.today(), date=fields.Date.today(),
consumption_date=date_iterator, consumption_date=date_iterator,