03-06-2025

Merge branch 'develop'

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')

addons/maintenance/views/maintenance_views.xml

@@ -416,6 +416,7 @@
                                     <field name="partner_ref"/>
                                     <field name="model"/>
                                     <field name="serial_no"/>
+                                    <field name="mac_address"/>
                                 </group><group>
                                     <field name="effective_date"/>
                                     <field name="cost" groups="maintenance.group_equipment_manager"/>
@@ -494,13 +495,13 @@
         <field name="arch" type="xml">
             <list string="Assign To User" sample="1">
                 <field name="message_needaction" column_invisible="True"/>
-                <field name="name"/>
-                <!-- <field name="active" invisible="1"/> -->
                 <field name="owner_user_id" string="Owner"/>
+                <field name="name"/>
+                <field name="category_id"/>
+                <!-- <field name="active" invisible="1"/> -->
                 <field name="assign_date" groups="base.group_no_one"/>
                 <field name="serial_no"/>
                 <field name="technician_user_id"/>
-                <field name="category_id"/>
                 <field name="partner_id" column_invisible="True"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <field name="activity_exception_decoration" widget="activity_exception"/>

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)