diff --git a/employee_vehicle_request/__manifest__.py b/employee_vehicle_request/__manifest__.py index d2789d6ca..688c58c04 100644 --- a/employee_vehicle_request/__manifest__.py +++ b/employee_vehicle_request/__manifest__.py @@ -22,7 +22,7 @@ { 'name': 'Employee Vehicle Request', - 'version': '12.0.1.0.0', + 'version': '12.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/models/employee_fleet.py b/employee_vehicle_request/models/employee_fleet.py index ba8fa5edd..3a7504a75 100644 --- a/employee_vehicle_request/models/employee_fleet.py +++ b/employee_vehicle_request/models/employee_fleet.py @@ -39,17 +39,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,