diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py index 051661af5..9fc7fd241 100644 --- a/yuthon_hr_employee/models/yuthon_hr_employee.py +++ b/yuthon_hr_employee/models/yuthon_hr_employee.py @@ -299,10 +299,10 @@ class YuthonHrEmployee(models.Model): "res_model": "yuthon.renewal.approval", "view_mode": "form", "context": { - "default_employee_id": self.employee_id.id, - "default_current_status": self.employee_id.contract_id.date_end, - "default_department1_id": self.employee_id.department_id.id, - "default_contract_id": self.employee_id.contract_id.id, + "default_employee_id": self.id, + "default_current_status": self.contract_id.date_end, + "default_department1_id": self.department_id.id, + "default_contract_id": self.contract_id.id, }, } diff --git a/yuthon_maintain/views/property_device_repair_views.xml b/yuthon_maintain/views/property_device_repair_views.xml index 43d3dc357..ef7abfd3c 100644 --- a/yuthon_maintain/views/property_device_repair_views.xml +++ b/yuthon_maintain/views/property_device_repair_views.xml @@ -45,6 +45,9 @@ + + + diff --git a/yuthon_maintain/views/property_report_repair.xml b/yuthon_maintain/views/property_report_repair.xml index 1f75d9501..b213ad580 100644 --- a/yuthon_maintain/views/property_report_repair.xml +++ b/yuthon_maintain/views/property_report_repair.xml @@ -47,6 +47,9 @@ + + +