Merge pull request #103 from hootel/task_51

Task 51 :: Review Calendar Management Wizard
This commit is contained in:
Darío Lodeiros
2019-03-30 12:50:46 +01:00
committed by GitHub
5 changed files with 80 additions and 54 deletions

View File

@@ -1,8 +1,8 @@
# Copyright 2017 Alexandre Díaz
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from datetime import timedelta
from openerp import models, fields, api
from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
from odoo import models, fields, api
from odoo.tools import DEFAULT_SERVER_DATE_FORMAT
class MassiveChangesWizard(models.TransientModel):
@@ -26,8 +26,7 @@ class MassiveChangesWizard(models.TransientModel):
('0', 'Global'),
('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")
# Restriction fields
@@ -157,11 +156,10 @@ class MassiveChangesWizard(models.TransientModel):
def _save_restrictions(self, ndate, room_types, record):
hotel_room_type_re_it_obj = self.env['hotel.room.type.restriction.item']
domain = [
('date_start', '>=', ndate.strftime(DEFAULT_SERVER_DATE_FORMAT)),
('date_end', '<=', ndate.strftime(DEFAULT_SERVER_DATE_FORMAT)),
('date', '>=', ndate.strftime(DEFAULT_SERVER_DATE_FORMAT)),
('date', '<=', ndate.strftime(DEFAULT_SERVER_DATE_FORMAT)),
('restriction_id', '=', record.restriction_id.id),
]
for room_type in room_types:
vals = self._get_restrictions_values(record)
if not any(vals):
@@ -173,8 +171,7 @@ class MassiveChangesWizard(models.TransientModel):
rrest_item_ids.write(vals)
else:
vals.update({
'date_start': ndate.strftime(DEFAULT_SERVER_DATE_FORMAT),
'date_end': ndate.strftime(DEFAULT_SERVER_DATE_FORMAT),
'date': ndate.strftime(DEFAULT_SERVER_DATE_FORMAT),
'restriction_id': record.restriction_id.id,
'room_type_id': room_type.id,
})

View File

@@ -16,13 +16,13 @@
<group colspan="8" col="8">
<field name="date_start" required="1" colspan="4"/>
<field name="date_end" required="1" colspan="4" />
<field name="dmo" colspan="1" />
<field name="dtu" colspan="1" />
<field name="dwe" colspan="1" />
<field name="dth" colspan="1" />
<field name="dfr" colspan="1" />
<field name="dsa" colspan="1" />
<field name="dsu" colspan="1" />
<field name="dmo" />
<field name="dtu" />
<field name="dwe" />
<field name="dth" />
<field name="dfr" />
<field name="dsa" />
<field name="dsu" />
</group>
<!-- Restricion Fields -->
<group col="4" colspan="4" attrs="{'invisible':[('section', '!=', 'restrictions')]}">