From ae6ce290b51b729d1d85b4adaaaf2ed127a8ad73 Mon Sep 17 00:00:00 2001 From: Ajmal Cybro Date: Wed, 24 Mar 2021 15:59:23 +0530 Subject: [PATCH] [FIX] Bug Fixed 'employee_vehicle_request' --- employee_vehicle_request/__manifest__.py | 2 +- employee_vehicle_request/doc/RELEASE_NOTES.md | 6 +++ .../models/employee_fleet.py | 40 ++++++++++--------- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/employee_vehicle_request/__manifest__.py b/employee_vehicle_request/__manifest__.py index e6ba1c2e9..59d7fbc86 100644 --- a/employee_vehicle_request/__manifest__.py +++ b/employee_vehicle_request/__manifest__.py @@ -20,7 +20,7 @@ ############################################################################# { 'name': 'Employee Vehicle Request', - 'version': '14.0.1.0.0', + 'version': '14.0.1.0.1', 'summary': """Manage Vehicle Requests From Employee""", 'description': """This module is used for manage vehicle requests from employee. This module also checking the vehicle availability at the requested time slot.""", diff --git a/employee_vehicle_request/doc/RELEASE_NOTES.md b/employee_vehicle_request/doc/RELEASE_NOTES.md index 40375e799..cfde506d1 100644 --- a/employee_vehicle_request/doc/RELEASE_NOTES.md +++ b/employee_vehicle_request/doc/RELEASE_NOTES.md @@ -3,3 +3,9 @@ #### 12.11.2020 #### Version 14.0.1.0.0 #### ADD + + +#### 24.03.2021 +#### Version 14.0.1.0.1 +#### FIX + diff --git a/employee_vehicle_request/models/employee_fleet.py b/employee_vehicle_request/models/employee_fleet.py index e3fe399a1..8ae254ff7 100644 --- a/employee_vehicle_request/models/employee_fleet.py +++ b/employee_vehicle_request/models/employee_fleet.py @@ -61,17 +61,18 @@ class EmployeeFleet(models.Model): check_availability = 0 for i in fleet_obj: for each in i.reserved_time: - if each.date_from <= self.date_from <= each.date_to: - check_availability = 1 - elif self.date_from < each.date_from: - if each.date_from <= self.date_to <= each.date_to: - check_availability = 1 - elif self.date_to > each.date_to: + if each.date_from and each.date_to: + if each.date_from <= self.date_from <= each.date_to: check_availability = 1 + elif self.date_from < each.date_from: + if each.date_from <= self.date_to <= each.date_to: + check_availability = 1 + elif self.date_to > each.date_to: + check_availability = 1 + else: + check_availability = 0 else: check_availability = 0 - else: - check_availability = 0 if check_availability == 0: reserved_id = self.fleet.reserved_time.create({'employee': self.employee.id, 'date_from': self.date_from, @@ -98,7 +99,7 @@ class EmployeeFleet(models.Model): mail_id.mail_message_id.body = mail_content mail_id.send() if self.employee.user_id: - mail_id.mail_message_id.write({'needaction_partner_ids': [(4, self.employee.user_id.partner_id.id)]}) + # mail_id.mail_message_id.write({'notified_partner_ids': [(4, self.employee.user_id.partner_id.id)]}) mail_id.mail_message_id.write({'partner_ids': [(4, self.employee.user_id.partner_id.id)]}) def reject(self): @@ -117,7 +118,7 @@ class EmployeeFleet(models.Model): mail_id.mail_message_id.body = mail_content mail_id.send() if self.employee.user_id: - mail_id.mail_message_id.write({'needaction_partner_ids': [(4, self.employee.user_id.partner_id.id)]}) + # mail_id.mail_message_id.write({'notified_partner_ids': [(4, self.employee.user_id.partner_id.id)]}) mail_id.mail_message_id.write({'partner_ids': [(4, self.employee.user_id.partner_id.id)]}) def cancel(self): @@ -130,7 +131,7 @@ class EmployeeFleet(models.Model): self.returned_date = fields.datetime.now() self.state = 'return' - @api.constrains('date_rom', 'date_to') + @api.constrains('date_from', 'date_to') def onchange_date_to(self): for each in self: if each.date_from > each.date_to: @@ -143,17 +144,18 @@ class EmployeeFleet(models.Model): fleet_obj = self.env['fleet.vehicle'].search([]) for i in fleet_obj: for each in i.reserved_time: - if each.date_from <= self.date_from <= each.date_to: - i.write({'check_availability': False}) - elif self.date_from < each.date_from: - if each.date_from <= self.date_to <= each.date_to: - i.write({'check_availability': False}) - elif self.date_to > each.date_to: + if each.date_from and each.date_to: + if each.date_from <= self.date_from <= each.date_to: i.write({'check_availability': False}) + elif self.date_from < each.date_from: + if each.date_from <= self.date_to <= each.date_to: + i.write({'check_availability': False}) + elif self.date_to > each.date_to: + i.write({'check_availability': False}) + else: + i.write({'check_availability': True}) else: i.write({'check_availability': True}) - else: - i.write({'check_availability': True}) reserved_fleet_id = fields.Many2one('fleet.reserved', invisible=1, copy=False) name = fields.Char(string='Request Number', copy=False)