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] Minor cleanup

Browse Source
This commit is contained in:
Pablo Quesada Barriuso
2018-07-27 19:36:55 +02:00
parent a03920f93b
commit 5bd6c1ddbf
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hotel/models/hotel_room_type.py
View File

@@ -49,8 +49,6 @@ class HotelRoomType(models.Model):
'code must be unique!')] 'code must be unique!')]
# total number of rooms in this type # total number of rooms in this type
total_rooms_count = fields.Integer(compute='_compute_total_rooms') total_rooms_count = fields.Integer(compute='_compute_total_rooms')
# FIXING rename to default rooms ?
max_real_rooms = fields.Integer('Default Max Room Allowed')
@api.depends('room_ids') @api.depends('room_ids')
def _compute_total_rooms(self): def _compute_total_rooms(self):
@@ -63,15 +61,6 @@ class HotelRoomType(models.Model):
# FIXME Using a Many2one relationship duplicated should not been possible # FIXME Using a Many2one relationship duplicated should not been possible
pass pass
@api.constrains('max_real_rooms', 'room_ids')
def _check_max_rooms(self):
warning_msg = ""
# for r in self:
if self.max_real_rooms > self.total_rooms_count:
warning_msg += _('The Maxime rooms allowed can not be greate \
than total rooms count')
raise models.ValidationError(warning_msg)
@api.multi @api.multi
def get_capacity(self): def get_capacity(self):
# WARNING use selg.capacity directly ? # WARNING use selg.capacity directly ?

9
hotel/views/hotel_room_type.xml
View File

@@ -20,13 +20,9 @@
<field name="name" /> <field name="name" />
<field name="code_type" /> <field name="code_type" />
<field name="list_price" widget='monetary' options="{'currency_field': 'currency_id', 'field_digits': True}"/> <field name="list_price" widget='monetary' options="{'currency_field': 'currency_id', 'field_digits': True}"/>
<!-- <field name="parent_id" domain="[('isroomtype','=',True)]"
select="1" />
<field name="isroomtype" invisible="1" /> -->
</group> </group>
<group> <group>
<field name="total_rooms_count"/> <field name="total_rooms_count"/>
<field name="max_real_rooms"/>
<!-- <field name="room_type_ids" widget="many2many_tags" options="{'no_create': True}"/> --> <!-- <field name="room_type_ids" widget="many2many_tags" options="{'no_create': True}"/> -->
</group> </group>
</group> </group>
@@ -34,9 +30,6 @@
<group> <group>
<field name="room_ids" widget="many2many"/> <field name="room_ids" widget="many2many"/>
</group> </group>
<!-- <group>
<field name="service_ids"/>
</group> -->
</group> </group>
</sheet> </sheet>
</form> </form>
@@ -55,7 +48,6 @@
<field name="list_price"/> <field name="list_price"/>
<field name="room_ids"/> <field name="room_ids"/>
<field name="total_rooms_count"/> <field name="total_rooms_count"/>
<field name="max_real_rooms"/>
</tree> </tree>
</field> </field>
</record> </record>
@@ -65,7 +57,6 @@
<field name="name">Room Type</field> <field name="name">Room Type</field>
<field name="res_model">hotel.room.type</field> <field name="res_model">hotel.room.type</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<!-- <field name="context">{'default_isroomtype':1}</field> -->
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
</record> </record>
<menuitem id="menu_hotel_room" name="Room" <menuitem id="menu_hotel_room" name="Room"