diff --git a/tianhe_approvals/__manifest__.py b/tianhe_approvals/__manifest__.py
index 8c4b1e53d..ac8935199 100644
--- a/tianhe_approvals/__manifest__.py
+++ b/tianhe_approvals/__manifest__.py
@@ -13,6 +13,8 @@
'security/ir.model.access.csv',
'data/approval_category_type_data.xml',
'data/approval_group_data.xml',
+ 'views/generic_forms_overtime.xml',
+ 'views/wuguan_leave_registration_approval.xml',
# 'views/tianhe_dsh_issues_declarations.xml',
# 'views/tianhe_construction_business_approval.xml',
# 'views/tianhe_management_declare_approval.xml',
@@ -25,7 +27,6 @@
# 'views/tianhe_rental_receipt_approval.xml',
# 'views/tianhe_meeting_file.xml',
# 'views/generic_forms_replacement_card.xml',
- 'views/generic_forms_overtime.xml',
# 'views/generic_forms_outing.xml',
# 'views/generic_forms_remove_holiday.xml',
# 'views/tianhe_dimission_approval.xml',
@@ -36,7 +37,6 @@
# 'views/tianhe_shift_registration_form.xml',
# 'views/tianhe_engineering_approval.xml',
# 'views/wuguan_property_right_alter_approval.xml',
- 'views/wuguan_leave_registration_approval.xml',
# 'views/wuguan_property_management_application.xml',
# 'views/tianhe_property_management_reporting.xml',
# 'views/tianhe_fire_safety_management.xml',
diff --git a/tianhe_approvals/models/__init__.py b/tianhe_approvals/models/__init__.py
index af497c9e9..a12c826eb 100644
--- a/tianhe_approvals/models/__init__.py
+++ b/tianhe_approvals/models/__init__.py
@@ -2,6 +2,7 @@
from . import inherit_approval_category
from . import inherit_approval_request
from . import overtime_approval
+from . import holiday_approval
# from . import tianhe_construction_business_approval
# from . import tianhe_process_change_approval
# from . import tianhe_contentious_matter_approval
@@ -22,7 +23,6 @@ from . import overtime_approval
# from . import generic_forms_reassignment
# from . import tianhe_engineering_approval
# from . import wuguan_property_right_alter_approval
-from . import wuguan_leave_registration_approval
# from . import wuguan_property_management_application
# from . import tianhe_fire_safety_management
# from . import tianhe_information_ublish_approval_form
diff --git a/tianhe_approvals/models/wuguan_leave_registration_approval.py b/tianhe_approvals/models/holiday_approval.py
similarity index 100%
rename from tianhe_approvals/models/wuguan_leave_registration_approval.py
rename to tianhe_approvals/models/holiday_approval.py
diff --git a/yuthon_hr_attendance/controllers/http.py b/yuthon_hr_attendance/controllers/http.py
index 2a768a954..b13daa378 100644
--- a/yuthon_hr_attendance/controllers/http.py
+++ b/yuthon_hr_attendance/controllers/http.py
@@ -2,6 +2,10 @@ from odoo.http import JsonRPCDispatcher
class CustomJsonRPCDispatcher(JsonRPCDispatcher):
+ """
+ 继承odoo底层源码http.py
+ 因为odoo本身会给对应的接口请求进行自动包装，通过判断做设备区分
+ """
def _response(self, result=None, error=None):
if 'api/v1' in self.request.httprequest.headers.environ.get('PATH_INFO'):
return self.request.make_json_response(result)
diff --git a/yuthon_hr_attendance/views/hr_attendance_views.xml b/yuthon_hr_attendance/views/hr_attendance_views.xml
index b35744ded..9c08ceb83 100644
--- a/yuthon_hr_attendance/views/hr_attendance_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_views.xml
@@ -34,45 +34,11 @@
tree,form
-
- 加班申请
- approval.request
- tree,form,kanban
- [('approval_category_name','=','generic_forms_overtime')]
-
-
-
- 外出申请
- approval.request
- tree,form,kanban
- [('approval_category_name','=','generic_forms_outing')]
-
-
-
- 值班申请
- approval.request
- tree,form,kanban
- [('approval_category_name','=','generic_forms_duty')]
-
-
-
- 调休申请
- approval.request
- tree,form,kanban
- [('approval_category_name','=','generic_forms_compensatory')]
-
-
-
- 请假申请
- approval.request
- tree,form,kanban
- [('approval_category_name','=','generic_forms_leave')]
-
-
+
+