diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index 301390ccf..d9ed545e0 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -59,7 +59,7 @@
decoration-danger="approve_state == 'end'"
create="false" default_order="write_date2 desc" expand="1">
diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index 88ebde08e..3a130e23b 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -1,7 +1,7 @@
- hr.employee.inherit.del.form
+ hr.employee.inherit.del.form.inherit
hr.employee
@@ -443,7 +443,7 @@
hr.employee.inherit.del.form
hr.employee
-
+
@@ -458,7 +458,7 @@
hr.employee.member
hr.employee
-
+
diff --git a/yuthon_maintain/__manifest__.py b/yuthon_maintain/__manifest__.py
index 256159366..92f99702d 100644
--- a/yuthon_maintain/__manifest__.py
+++ b/yuthon_maintain/__manifest__.py
@@ -10,7 +10,7 @@
'category': 'Human Resources/Attendances',
'version': '0.1',
'license': 'LGPL-3',
- 'depends': ['documents', 'maintenance', 'hr', 'base', 'soong_workflow'],
+ 'depends': ['documents', 'maintenance', 'hr', 'base', 'soong_workflow','hr_maintenance'],
'data': [
'security/ir.model.access.csv',
'data/yuthon_maintain_code_data.xml',
diff --git a/yuthon_maintain/views/maintenance_equipment_views.xml b/yuthon_maintain/views/maintenance_equipment_views.xml
index bd2c45d25..bb85eac1f 100644
--- a/yuthon_maintain/views/maintenance_equipment_views.xml
+++ b/yuthon_maintain/views/maintenance_equipment_views.xml
@@ -13,7 +13,8 @@
-
+
管理员
@@ -24,13 +25,13 @@
- 型号
+ 型号
- 原值
+ 原值
- 寿命
+ 寿命
@@ -79,39 +80,54 @@
- maintenance.equipment.tree.inherit
- maintenance.equipment
-
-
-
-
-
-
-
-
-
-
-
- 1
-
-
- 1
-
-
-
-
-
-
- 1
-
-
- 购入日期
-
-
- 资产编号
-
-
+ maintenance.equipment.tree.inherit
+ maintenance.equipment
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 购入日期
+
+
+ 资产编号
+
+
+
+
+
+ maintenance.equipment.view.tree.inherit.hr
+ maintenance.equipment
+
+
+
+ 1
+
+
+ 1
+
+
+
+
+
+
+
+
+ 1
+
+
+
+
+
maintain.equipment.kanban.inherit.hr
maintenance.equipment
diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml b/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml
index 54d2ab7c9..0219d6228 100644
--- a/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml
+++ b/yuthon_property_approval/wizard/property_reconciliation_wizard_views.xml
@@ -19,6 +19,7 @@
+
diff --git a/yuthon_salary/views/yuthon_salary_project_views.xml b/yuthon_salary/views/yuthon_salary_project_views.xml
index b97feebf7..d765dfdd7 100644
--- a/yuthon_salary/views/yuthon_salary_project_views.xml
+++ b/yuthon_salary/views/yuthon_salary_project_views.xml
@@ -4,7 +4,7 @@
yuthon.salary.project.tree
yuthon.salary.project
-
+