diff --git a/addons/maintenance/models/maintenance.py b/addons/maintenance/models/maintenance.py index 7234ab7da..14bf65ae8 100644 --- a/addons/maintenance/models/maintenance.py +++ b/addons/maintenance/models/maintenance.py @@ -148,6 +148,7 @@ class MaintenanceEquipment(models.Model): location = fields.Char('Location') model = fields.Char('Model') serial_no = fields.Char('Serial Number', copy=False) + mac_address = fields.Char('MAC address', copy=False) assign_date = fields.Date('Assigned Date', tracking=True) cost = fields.Float('Cost') note = fields.Html('Note') diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml index 17c1e6f95..44322adbd 100644 --- a/addons/maintenance/views/maintenance_views.xml +++ b/addons/maintenance/views/maintenance_views.xml @@ -416,6 +416,7 @@ + @@ -494,13 +495,13 @@ - - + + + - diff --git a/addons_extensions/hr_emp_dashboard/controllers/employee_dashboard.py b/addons_extensions/hr_emp_dashboard/controllers/employee_dashboard.py index ecc081858..56f69bbfd 100644 --- a/addons_extensions/hr_emp_dashboard/controllers/employee_dashboard.py +++ b/addons_extensions/hr_emp_dashboard/controllers/employee_dashboard.py @@ -24,7 +24,7 @@ class EmployeeDashboard(http.Controller): taken_leaves = request.env['hr.leave'].search([ ('employee_id', '=', employee.id), ('holiday_status_id', '=', leave_type.id), - ('state', '=', 'validate'), + ('state', 'in', ['validate','validate1','confirm']), ]) total_allocated = sum(a.number_of_days for a in allocations)