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] Refactoring Code - hotel_room_clousure_reason

Browse Source
This commit is contained in:
Dario Lodeiros
2018-11-07 12:43:07 +01:00
parent 13416c2313
commit 51eb60fda3
4 changed files with 14 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hotel/models/hotel_room_closure_reason.py
View File

@@ -1,7 +1,6 @@
# Copyright 2017 Dario Lodeiros # Copyright 2017 Dario Lodeiros
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from openerp import models, fields, api, _ from odoo import models, fields
class RoomClosureReason(models.Model): class RoomClosureReason(models.Model):
_name = "room.closure.reason" _name = "room.closure.reason"

44
hotel/models/hotel_room_type_availability.py
View File

@@ -1,25 +1,17 @@
# Copyright 2017 Alexandre Díaz # Copyright 2017 Alexandre Díaz
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
import logging
from odoo import models, fields, api, _ from odoo import models, fields, api, _
from odoo.exceptions import ValidationError from odoo.exceptions import ValidationError
_logger = logging.getLogger(__name__)
class HotelRoomTypeAvailability(models.Model): class HotelRoomTypeAvailability(models.Model):
_inherit = 'mail.thread'
_name = 'hotel.room.type.availability' _name = 'hotel.room.type.availability'
_inherit = 'mail.thread'
# room_type_id = fields.Many2one('hotel.virtual.room', 'Virtual Room',
# required=True, track_visibility='always',
# ondelete='cascade')
room_type_id = fields.Many2one('hotel.room.type', 'Room Type', room_type_id = fields.Many2one('hotel.room.type', 'Room Type',
required=True, track_visibility='always', required=True, track_visibility='always',
ondelete='cascade') ondelete='cascade')
avail = fields.Integer('Avail', default=0, track_visibility='always') avail = fields.Integer('Avail', default=0, track_visibility='always')
no_ota = fields.Boolean('No OTA', default=False, track_visibility='always')
booked = fields.Boolean('Booked', default=False, readonly=True,
track_visibility='always')
date = fields.Date('Date', required=True, track_visibility='always') date = fields.Date('Date', required=True, track_visibility='always')
_sql_constraints = [ _sql_constraints = [
@@ -30,25 +22,15 @@ class HotelRoomTypeAvailability(models.Model):
@api.constrains('avail') @api.constrains('avail')
def _check_avail(self): def _check_avail(self):
if self.avail < 0: for record in self:
self.avail = 0 if record.avail < 0:
record.avail = 0
room_type_obj = self.env['hotel.room.type'] else:
cavail = len(room_type_obj.check_availability_room( room_type_obj = self.env['hotel.room.type']
self.date, cavail = len(room_type_obj.check_availability_room(
self.date, record.date,
room_type_id=self.room_type_id.id)) record.date,
max_avail = min(cavail, room_type_id=record.room_type_id.id))
self.room_type_id.total_rooms_count) max_avail = min(cavail, record.room_type_id.total_rooms_count)
if self.avail > max_avail: if record.avail > max_avail:
self.avail = max_avail record.avail = max_avail
@api.constrains('date', 'room_type_id')
def _check_date_room_type_id(self):
count = self.search_count([
('date', '=', self.date),
('room_type_id', '=', self.room_type_id.id)
])
if count > 1:
raise ValidationError(_("can't assign the same date to more than \
one room type"))

4
hotel/wizard/massive_changes.py
View File

@@ -36,8 +36,6 @@ class MassiveChangesWizard(models.TransientModel):
# Availability fields # Availability fields
change_avail = fields.Boolean(default=False) change_avail = fields.Boolean(default=False)
avail = fields.Integer('Avail', default=0) avail = fields.Integer('Avail', default=0)
change_no_ota = fields.Boolean(default=False)
no_ota = fields.Boolean('No OTA', default=False)
# Restriction fields # Restriction fields
restriction_id = fields.Many2one('hotel.room.type.restriction', restriction_id = fields.Many2one('hotel.room.type.restriction',
@@ -195,8 +193,6 @@ class MassiveChangesWizard(models.TransientModel):
def _get_availability_values(self, ndate, room_type, record): def _get_availability_values(self, ndate, room_type, record):
hotel_room_type_obj = self.env['hotel.room.type'] hotel_room_type_obj = self.env['hotel.room.type']
vals = {} vals = {}
if record.change_no_ota:
vals.update({'no_ota': record.no_ota})
if record.change_avail: if record.change_avail:
cavail = len(hotel_room_type_obj.check_availability_room( cavail = len(hotel_room_type_obj.check_availability_room(
ndate.strftime(DEFAULT_SERVER_DATETIME_FORMAT), ndate.strftime(DEFAULT_SERVER_DATETIME_FORMAT),

4
hotel/wizard/massive_changes.xml
View File

@@ -36,10 +36,6 @@
<td class="oe_form_group_cell oe_form_group_cell_label"><field name="change_avail" /> <strong> Avail</strong></td> <td class="oe_form_group_cell oe_form_group_cell_label"><field name="change_avail" /> <strong> Avail</strong></td>
<td class="oe_form_group_cell" colspan="3"><field name="avail" attrs="{'readonly':[('change_avail', '=', False)]}" /></td> <td class="oe_form_group_cell" colspan="3"><field name="avail" attrs="{'readonly':[('change_avail', '=', False)]}" /></td>
</tr> </tr>
<tr class="oe_form_group_row">
<td class="oe_form_group_cell oe_form_group_cell_label"><field name="change_no_ota" /> <strong> No OTA</strong></td>
<td class="oe_form_group_cell"><field name="no_ota" attrs="{'readonly':[('change_no_ota', '=', False)]}" /></td>
</tr>
</tbody> </tbody>
</table> </table>
</group> </group>