diff --git a/hotel_management_odoo/__manifest__.py b/hotel_management_odoo/__manifest__.py
index c952cd12d..b45c6f9e2 100644
--- a/hotel_management_odoo/__manifest__.py
+++ b/hotel_management_odoo/__manifest__.py
@@ -21,7 +21,7 @@
###############################################################################
{
'name': 'Odoo17 Hotel Management',
- 'version': '17.0.1.0.2',
+ 'version': '17.0.1.1.3',
'category': 'Industries',
'summary': """Hotel Management, Odoo Hotel Management, Hotel, Room Booking odoo, Amenities Odoo, Event management, Rooms, Events, Food, Booking, Odoo Hotel, Odoo17, Odoo Apps""",
'description': """The module helps you to manage rooms, amenities,
diff --git a/hotel_management_odoo/doc/RELEASE_NOTES.md b/hotel_management_odoo/doc/RELEASE_NOTES.md
index b702b6a88..3fa57ab68 100644
--- a/hotel_management_odoo/doc/RELEASE_NOTES.md
+++ b/hotel_management_odoo/doc/RELEASE_NOTES.md
@@ -13,4 +13,9 @@
#### 27.06.2024
#### Version 17.0.1.0.2
#### UPDATE
- - Corrected the work flow of deleting and canceling records in room booking model
\ No newline at end of file
+ - Corrected the work flow of deleting and canceling records in room booking model
+
+#### 04.07.2024
+#### Version 17.0.1.1.3
+#### UPDATE
+ - Updated the workflow maintenance request and cleaning request model(removed a field from each)
\ No newline at end of file
diff --git a/hotel_management_odoo/models/cleaning_request.py b/hotel_management_odoo/models/cleaning_request.py
index 8e07fa7be..efcb43308 100644
--- a/hotel_management_odoo/models/cleaning_request.py
+++ b/hotel_management_odoo/models/cleaning_request.py
@@ -68,9 +68,16 @@ class CleaningRequest(models.Model):
assigned_id = fields.Many2one('res.users', string="Assigned To",
help="The team member to whom the request is"
"Assigned To")
- domain_partner_ids = fields.Many2many('res.partner',
- string="Domain Partner",
- help="Choose the Domain Partner")
+ team_member_ids = fields.Many2many('res.users', compute='_compute_team_member_ids', store=False,
+ help='For filtering Users')
+
+ @api.depends('team_id')
+ def _compute_team_member_ids(self):
+ for record in self:
+ if record.team_id:
+ record.team_member_ids = record.team_id.member_ids.ids
+ else:
+ record.team_member_ids = []
@api.model
def create(self, vals_list):
@@ -80,12 +87,6 @@ class CleaningRequest(models.Model):
'cleaning.request')
return super().create(vals_list)
- @api.onchange('team_id')
- def _onchange_team_id(self):
- """Function for updating the domain partner ids"""
- self.update(
- {'domain_partner_ids': self.team_id.member_ids.ids})
-
def action_assign_cleaning(self):
"""Button action for updating the state to assign"""
self.update({'state': 'assign'})
diff --git a/hotel_management_odoo/models/maintenance_request.py b/hotel_management_odoo/models/maintenance_request.py
index e742fc085..7b45d1eb6 100644
--- a/hotel_management_odoo/models/maintenance_request.py
+++ b/hotel_management_odoo/models/maintenance_request.py
@@ -85,9 +85,16 @@ class MaintenanceRequest(models.Model):
support_reason = fields.Char(string='Support',
help="Reason for adding Support")
remarks = fields.Char(string='Remarks', help="Add Remarks")
- domain_partner_ids = fields.Many2many('res.partner',
- string="Partner",
- help="For filtering Users")
+ team_member_ids = fields.Many2many('res.users', compute='_compute_team_member_ids', store=False,
+ help='For filtering Users')
+
+ @api.depends('team_id')
+ def _compute_team_member_ids(self):
+ for record in self:
+ if record.team_id:
+ record.team_member_ids = record.team_id.member_ids.ids
+ else:
+ record.team_member_ids = []
@api.model
def create(self, vals_list):
@@ -97,13 +104,6 @@ class MaintenanceRequest(models.Model):
'maintenance.request')
return super().create(vals_list)
- @api.onchange('team_id')
- def _onchange_team_id(self):
- """Function for filtering the maintenance team user"""
- self.update({
- 'domain_partner_ids': self.team_id.member_ids.ids
- })
-
def action_assign_team(self):
"""Button action for changing the state to team_leader_approve"""
if self.team_id:
diff --git a/hotel_management_odoo/views/cleaning_request_views.xml b/hotel_management_odoo/views/cleaning_request_views.xml
index c95387926..9bdbaae4d 100644
--- a/hotel_management_odoo/views/cleaning_request_views.xml
+++ b/hotel_management_odoo/views/cleaning_request_views.xml
@@ -67,13 +67,13 @@
+
-
+ invisible="state != 'ongoing'"/>
+
+ invisible="state == 'draft' " domain="[('id', 'in',team_member_ids)]"/>
-
+