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

[WIP][IMP][11.0] hotel

Browse Source
This commit is contained in:
QS5ELkMu
2018-09-19 12:56:09 +02:00
parent e7bbc76dab
commit e7faa8476b
29 changed files with 503 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hotel/wizard/massive_changes.py
View File

@@ -5,7 +5,6 @@ from openerp import models, fields, api
from openerp.tools import (
DEFAULT_SERVER_DATE_FORMAT,
DEFAULT_SERVER_DATETIME_FORMAT)
from odoo.addons.hotel import date_utils
class MassiveChangesWizard(models.TransientModel):
@@ -17,8 +16,8 @@ class MassiveChangesWizard(models.TransientModel):
('1', 'Restrictions'),
('2', 'Pricelist'),
], string='Section', default='0')
date_start = fields.Datetime('Start Date', required=True)
date_end = fields.Datetime('End Date', required=True)
date_start = fields.Date('Start Date', required=True)
date_end = fields.Date('End Date', required=True)
dmo = fields.Boolean('Monday', default=True)
dtu = fields.Boolean('Tuesday', default=True)
dwe = fields.Boolean('Wednesday', default=True)
@@ -28,12 +27,11 @@ class MassiveChangesWizard(models.TransientModel):
dsu = fields.Boolean('Sunday', default=True)
applied_on = fields.Selection([
('0', 'Global'),
('1', 'Virtual Room'),
('1', 'Room Type'),
], string='Applied On', default='0')
# room_type_ids = fields.Many2many('hotel.virtual.room',
# string="Virtual Rooms")
room_type_ids = fields.Many2many('hotel.room.type',
string="Room Types")
room_type_ids = fields.Many2many('hotel.room.type', string="Room Types")
# Availability fields
change_avail = fields.Boolean(default=False)
@@ -251,12 +249,10 @@ class MassiveChangesWizard(models.TransientModel):
def _do_massive_change(self):
hotel_room_type_obj = self.env['hotel.room.type']
for record in self:
date_start_dt = date_utils.get_datetime(record.date_start,
hours=False)
date_start_dt = fields.Date.from_string(record.date_start)
date_end_dt = fields.Date.from_string(record.date_end)
# Use min '1' for same date
diff_days = date_utils.date_diff(record.date_start,
record.date_end,
hours=False) + 1
diff_days = abs((date_end_dt - date_start_dt).days) + 1
wedays = (record.dmo, record.dtu, record.dwe, record.dth,
record.dfr, record.dsa, record.dsu)
room_types = record.room_type_id if record.applied_on == '1' \

9
hotel/wizard/split_reservation.py
View File

@@ -21,10 +21,9 @@ class SplitReservationWizard(models.TransientModel):
reservation_id = self.env['hotel.reservation'].browse(
self.env.context.get('active_id'))
if reservation_id:
date_start_dt = date_utils.get_datetime(reservation_id.checkin)
date_end_dt = date_utils.get_datetime(reservation_id.checkout)
date_diff = date_utils.date_diff(date_start_dt, date_end_dt,
hours=False)
date_start_dt = fields.Date.from_string(reservation_id.checkin)
date_end_dt = fields.Date.from_string(reservation_id.checkout)
date_diff = abs((date_end_dt - date_start_dt).days)
for record in self:
new_start_date_dt = date_start_dt + \
timedelta(days=date_diff-record.nights)
@@ -41,7 +40,7 @@ class SplitReservationWizard(models.TransientModel):
tprice = [0.0, 0.0]
div_dt = date_utils.dt_no_hours(new_start_date_dt)
for rline in reservation_id.reservation_lines:
rline_dt = date_utils.get_datetime(rline.date, hours=False)
rline_dt = fields.Date.from_string(rline.date)
if rline_dt >= div_dt:
reservation_lines[1].append((0, False, {
'date': rline.date,