议题管理

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

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

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)

yuthon_hr_attendance/views/hr_attendance_views.xml

@@ -34,45 +34,11 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-    <record id="approval_request_overtime" model="ir.actions.act_window">
-        <field name="name">加班申请</field>
-        <field name="res_model">approval.request</field>
-        <field name="view_mode">tree,form,kanban</field>
-        <field name="domain">[('approval_category_name','=','generic_forms_overtime')]</field>
-    </record>
-
-    <record id="approval_request_going" model="ir.actions.act_window">
-        <field name="name">外出申请</field>
-        <field name="res_model">approval.request</field>
-        <field name="view_mode">tree,form,kanban</field>
-        <field name="domain">[('approval_category_name','=','generic_forms_outing')]</field>
-    </record>
-
-    <record id="approval_request_duty" model="ir.actions.act_window">
-        <field name="name">值班申请</field>
-        <field name="res_model">approval.request</field>
-        <field name="view_mode">tree,form,kanban</field>
-        <field name="domain">[('approval_category_name','=','generic_forms_duty')]</field>
-    </record>
-
-    <record id="approval_request_leave" model="ir.actions.act_window">
-        <field name="name">调休申请</field>
-        <field name="res_model">approval.request</field>
-        <field name="view_mode">tree,form,kanban</field>
-        <field name="domain">[('approval_category_name','=','generic_forms_compensatory')]</field>
-    </record>
-
-    <record id="approval_request_holiday" model="ir.actions.act_window">
-        <field name="name">请假申请</field>
-        <field name="res_model">approval.request</field>
-        <field name="view_mode">tree,form,kanban</field>
-        <field name="domain">[('approval_category_name','=','generic_forms_leave')]</field>
-    </record>
-
     <!--  Menus  -->
     <menuitem id="menu_hr_attendance_manager" name="经理" parent="hr_attendance.menu_hr_attendance_root" sequence="12"/>
     <menuitem id="menu_hr_attendance_manager_going" name="出勤" parent="menu_hr_attendance_manager" sequence="1"
               action="view_attendance_going_action"/>
+<!--  !!!!!  -->
     <menuitem id="menu_hr_attendance_approval_request" name="考勤审批记录"
               parent="hr_attendance.menu_hr_attendance_root" sequence="13"/>
     <menuitem id="menu_hr_attendance_overtime" name="加班申请"
@@ -85,6 +51,7 @@
               parent="menu_hr_attendance_approval_request" sequence="6" action="approval_request_leave"/>
     <menuitem id="menu_hr_attendance_holiday" name="请假申请"
               parent="menu_hr_attendance_approval_request" sequence="8" action="approval_request_holiday"/>
+<!--  !!!!!  -->
     <menuitem id="menu_hr_attendance_work" name="考勤时间表配置" parent="hr_attendance.menu_hr_attendance_root"
               sequence="18" action="resource.action_resource_calendar_form"/>
 </odoo>