diff --git a/hotel_management_odoo/__manifest__.py b/hotel_management_odoo/__manifest__.py index 1ae1816d2..afdad24b3 100644 --- a/hotel_management_odoo/__manifest__.py +++ b/hotel_management_odoo/__manifest__.py @@ -21,8 +21,8 @@ ############################################################################# { - 'name': 'Hotel Management V15', - 'version': '15.0.1.0.0', + 'name': 'Hotel Management', + 'version': '15.0.1.0.1', 'summary': 'Hotel Management Application for odoo 15', 'description': """The module helps you to manage rooms,amenities,services,restaurants. End Users can book rooms and reserve foods from hotel restaurant.""", diff --git a/hotel_management_odoo/doc/RELEASE_NOTES.md b/hotel_management_odoo/doc/RELEASE_NOTES.md index b275eede6..6f22e386b 100644 --- a/hotel_management_odoo/doc/RELEASE_NOTES.md +++ b/hotel_management_odoo/doc/RELEASE_NOTES.md @@ -4,3 +4,8 @@ #### Version 15.0.1.0.0 ##### ADD - Initial Commit for hotel_management_odoo + +#### 2.8.2022 +#### Version 15.0.1.0.1 +#### UPDT +- room reservation-number of persons validation issue diff --git a/hotel_management_odoo/models/res_settings.py b/hotel_management_odoo/models/res_settings.py index 461cfb02b..c97bbbff0 100644 --- a/hotel_management_odoo/models/res_settings.py +++ b/hotel_management_odoo/models/res_settings.py @@ -50,7 +50,6 @@ class Rooms(models.Model): status = fields.Selection([("available", "Available"), ("occupied", "Occupied"), ('book', 'Booked')], default="available") manager_id = fields.Many2one('res.users', string='Manager') - num_person = fields.Integer(string='Number of Persons') @api.model def create(self, vals): @@ -77,6 +76,7 @@ class RoomTypes(models.Model): room_type_id = fields.Many2one("room.types", "Types") categ_id = fields.Many2one('product.category', "Product Category", delegate=True, copy=False, ondelete="cascade") + num_person = fields.Integer(string='Number of persons',required=True) @api.model def create(self, vals): diff --git a/hotel_management_odoo/models/room_reservation.py b/hotel_management_odoo/models/room_reservation.py index d845e6f1d..57c454d5d 100644 --- a/hotel_management_odoo/models/room_reservation.py +++ b/hotel_management_odoo/models/room_reservation.py @@ -43,7 +43,7 @@ class Reservation(models.Model): name = fields.Char(string='Booking Reference', required=True, copy=False, readonly=True, default=lambda self: _('New')) - num_person = fields.Integer(string='Number of Persons', default=1) + num_person = fields.Integer(string='Number of Persons', default=1,required=True) reservation_line_ids = fields.One2many('room.reservation.line', "reservation_id", string='Booking Info') state = fields.Selection([('draft', 'Draft'), ('confirm', 'Confirm'), ('occupied', 'Occupied'), ('done', 'Done'), @@ -69,7 +69,12 @@ class Reservation(models.Model): if vals.get('name', _('New')) == _('New'): vals['name'] = self.env['ir.sequence'].next_by_code( 'room.reservation') or _('New') - + persons = 0 + for rec in vals['reservation_line_ids']: + room_type = self.env['room.types'].sudo().search([('categ_id','=',rec[2]['type_id'])]) + persons += room_type.num_person + if vals.get('num_person') > persons: + raise ValidationError(_("Number of persons out of limit!")) return super(Reservation, self).create(vals) diff --git a/hotel_management_odoo/static/description/assets/screenshots/4.png b/hotel_management_odoo/static/description/assets/screenshots/4.png index 07145e335..bb637f9bd 100644 Binary files a/hotel_management_odoo/static/description/assets/screenshots/4.png and b/hotel_management_odoo/static/description/assets/screenshots/4.png differ diff --git a/hotel_management_odoo/static/description/assets/screenshots/5.png b/hotel_management_odoo/static/description/assets/screenshots/5.png index 292e50ff8..49a996c00 100644 Binary files a/hotel_management_odoo/static/description/assets/screenshots/5.png and b/hotel_management_odoo/static/description/assets/screenshots/5.png differ diff --git a/hotel_management_odoo/views/res_settings.xml b/hotel_management_odoo/views/res_settings.xml index 493faa83e..9b3a12847 100644 --- a/hotel_management_odoo/views/res_settings.xml +++ b/hotel_management_odoo/views/res_settings.xml @@ -48,7 +48,6 @@ - @@ -103,6 +102,7 @@ + @@ -115,6 +115,7 @@ + diff --git a/hotel_management_odoo/views/room_reservation.xml b/hotel_management_odoo/views/room_reservation.xml index aef3ede60..63d87a5aa 100644 --- a/hotel_management_odoo/views/room_reservation.xml +++ b/hotel_management_odoo/views/room_reservation.xml @@ -106,6 +106,9 @@ + + +