Browse Source

[FIX[ Bug fixed 'employee_vehicle_request'

pull/176/head
Ajmal Cybro 4 years ago
parent
commit
826165c1ab
  1. 2
      employee_vehicle_request/__manifest__.py
  2. 17
      employee_vehicle_request/models/employee_fleet.py

2
employee_vehicle_request/__manifest__.py

@ -22,7 +22,7 @@
{ {
'name': 'Employee Vehicle Request', 'name': 'Employee Vehicle Request',
'version': '12.0.1.0.0', 'version': '12.0.1.0.1',
'summary': """Manage Vehicle Requests From Employee""", 'summary': """Manage Vehicle Requests From Employee""",
'description': """This module is used for 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.""", This module also checking the vehicle availability at the requested time slot.""",

17
employee_vehicle_request/models/employee_fleet.py

@ -39,17 +39,18 @@ class EmployeeFleet(models.Model):
check_availability = 0 check_availability = 0
for i in fleet_obj: for i in fleet_obj:
for each in i.reserved_time: for each in i.reserved_time:
if each.date_from <= self.date_from <= each.date_to: if each.date_from and each.date_to:
check_availability = 1 if each.date_from <= self.date_from <= each.date_to:
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 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: else:
check_availability = 0 check_availability = 0
else:
check_availability = 0
if check_availability == 0: if check_availability == 0:
reserved_id = self.fleet.reserved_time.create({'employee': self.employee.id, reserved_id = self.fleet.reserved_time.create({'employee': self.employee.id,
'date_from': self.date_from, 'date_from': self.date_from,

Loading…
Cancel
Save