ljm 修改备份

yuthon_hr_attendance/security/attendance_security_group.xml

@@ -1,37 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
-    <data noupdate="1">
+    <data>
         <record id="module_category_attendance" model="ir.module.category">
-            <field name="name">排班计划权限</field>
+            <field name="name">行政考勤组</field>
         </record>
-        <record id="group_property_run_admin" model="res.groups">
-            <field name="name">运行班排班计划管理员</field>
-            <field name="category_id" ref="module_category_attendance"/>
-            <field name="users" eval="[(4, ref('base.user_admin'))]"/>
+        <record id="group_hr_attendance_user" model="res.groups">
+            <field name="name">行政考勤用户</field>
+            <field name="category_id" ref="module_hr_attendance"/>
         </record>
-        <record id="group_property_hv_admin" model="res.groups">
-            <field name="name">高压班排班计划管理员</field>
-            <field name="category_id" ref="module_category_attendance"/>
-            <field name="users" eval="[(4, ref('base.user_admin'))]"/>
+        <record id="group_hr_attendance_leader_leader1" model="res.groups">
+            <field name="name">行政考勤天河投资领导</field>
+            <field name="category_id" ref="module_hr_attendance"/>
+            <field name="implied_ids" eval="[(4, ref('group_hr_attendance_user'))]"/>
         </record>
-        <record id="group_property_integrated_admin" model="res.groups">
-            <field name="name">综合班排班计划管理员</field>
-            <field name="category_id" ref="module_category_attendance"/>
-            <field name="users" eval="[(4, ref('base.user_admin'))]"/>
+        <record id="group_hr_attendance_leader_leader2" model="res.groups">
+            <field name="name">行政考勤天河物管领导</field>
+            <field name="category_id" ref="module_hr_attendance"/>
+            <field name="implied_ids" eval="[(4, ref('group_hr_attendance_user'))]"/>
         </record>
-        <record id="group_property_class_a_admin" model="res.groups">
-            <field name="name">班组A排班计划管理员</field>
-            <field name="category_id" ref="module_category_attendance"/>
-            <field name="users" eval="[(4, ref('base.user_admin'))]"/>
+        <record id="group_hr_attendance_leader_leader3" model="res.groups">
+            <field name="name">行政考勤天河粮储领导</field>
+            <field name="category_id" ref="module_hr_attendance"/>
+            <field name="implied_ids" eval="[(4, ref('group_hr_attendance_user'))]"/>
         </record>
-        <record id="group_property_class_b_admin" model="res.groups">
-            <field name="name">班组B排班计划管理员</field>
-            <field name="category_id" ref="module_category_attendance"/>
-            <field name="users" eval="[(4, ref('base.user_admin'))]"/>
-        </record>
-        <record id="group_property_class_c_admin" model="res.groups">
-            <field name="name">班组C排班计划管理员</field>
-            <field name="category_id" ref="module_category_attendance"/>
+        <record id="group_hr_attendance_leader_manager" model="res.groups">
+            <field name="name">行政考勤管理员</field>
+            <field name="category_id" ref="module_hr_attendance"/>
+            <field name="implied_ids" eval="[(4, ref('group_hr_attendance_user')), (4, ref('group_hr_attendance_leader_leader1')),
+            (4, ref('group_hr_attendance_leader_leader2')), (4, ref('group_hr_attendance_leader_leader3'))]"/>
             <field name="users" eval="[(4, ref('base.user_admin'))]"/>
         </record>
     </data>

yuthon_hr_employee/models/yuthon_hr_employee.py

@@ -27,6 +27,7 @@ class YuthonHrEmployee(models.Model):
     _order = 'number asc'
 
     # odoo里是这样做的，一个用户可以多个公司绑定多个员工，每个员工都有自己的部门和岗位
+    user_role_ids_changed = fields.Boolean(string="xxx")  # bug
     wecom_userid = fields.Char(string="成员UserID", default="")
     number = fields.Char(string="序号", store=True)
     user_number = fields.Char(string="员工编号", default=lambda self: self.env['ir.sequence'].next_by_code('employee_code'))

yuthon_will_task/security/yuthon_will_task_security.xml

@@ -4,18 +4,30 @@
         <record id="module_yuthon_will_task" model="ir.module.category">
             <field name="name">日程组</field>
         </record>
-        <record id="group_yuthon_will_task_leader" model="res.groups">
-            <field name="name">领导</field>
-            <field name="category_id" ref="module_yuthon_will_task"/>
-        </record>
         <record id="group_yuthon_will_task_user" model="res.groups">
             <field name="name">用户</field>
             <field name="category_id" ref="module_yuthon_will_task"/>
         </record>
+        <record id="group_yuthon_will_task_leader" model="res.groups">
+            <field name="name">天河投资领导</field>
+            <field name="category_id" ref="module_yuthon_will_task"/>
+            <field name="implied_ids" eval="[(4, ref('group_yuthon_will_task_user'))]"/>
+        </record>
+        <record id="group_yuthon_will_task_leader2" model="res.groups">
+            <field name="name">天河物管领导</field>
+            <field name="category_id" ref="module_yuthon_will_task"/>
+            <field name="implied_ids" eval="[(4, ref('group_yuthon_will_task_user'))]"/>
+        </record>
+        <record id="group_yuthon_will_task_leader3" model="res.groups">
+            <field name="name">天河粮储领导</field>
+            <field name="category_id" ref="module_yuthon_will_task"/>
+            <field name="implied_ids" eval="[(4, ref('group_yuthon_will_task_user'))]"/>
+        </record>
         <record id="group_yuthon_will_task_manager" model="res.groups">
             <field name="name">管理者</field>
             <field name="category_id" ref="module_yuthon_will_task"/>
-            <field name="implied_ids" eval="[(4, ref('group_yuthon_will_task_user')), (4, ref('group_yuthon_will_task_leader'))]"/>
+            <field name="implied_ids" eval="[(4, ref('group_yuthon_will_task_user')), (4, ref('group_yuthon_will_task_leader')),
+            (4, ref('group_yuthon_will_task_leader2')), (4, ref('group_yuthon_will_task_leader3'))]"/>
             <field name="users" eval="[(4, ref('base.user_admin'))]"/>
         </record>
     </data>

yuthon_will_task/views/yuthon_task_menu.xml

@@ -11,29 +11,41 @@
               action='view_yuthon_will_task_action'
               groups="group_yuthon_will_task_user"
               sequence='1'/>
-    <menuitem id='menu_yuthon_will_task_root2'
-              name='领导日程'
+    <menuitem id='menu_yuthon_will_task_root21'
+              name='天河投资领导日程'
               parent='menu_yuthon_will_task'
-              action='view_yuthon_will_task_action2'
+              action='view_yuthon_will_task_action21'
               groups="group_yuthon_will_task_leader"
               sequence='2'/>
+    <menuitem id='menu_yuthon_will_task_root22'
+              name='天河物管领导日程'
+              parent='menu_yuthon_will_task'
+              action='view_yuthon_will_task_action22'
+              groups="group_yuthon_will_task_leader2"
+              sequence='3'/>
+    <menuitem id='menu_yuthon_will_task_root23'
+              name='天河粮储领导日程'
+              parent='menu_yuthon_will_task'
+              action='view_yuthon_will_task_action23'
+              groups="group_yuthon_will_task_leader3"
+              sequence='4'/>
     <menuitem id='menu_yuthon_will_task_root4'
               name='全部领导日程'
               parent='menu_yuthon_will_task'
               action='view_yuthon_will_task_action4'
               groups="group_yuthon_will_task_manager"
-              sequence='3'/>
+              sequence='8'/>
     <menuitem id='menu_yuthon_will_task_roo3'
               name='全部日程'
               parent='menu_yuthon_will_task'
               action='view_yuthon_will_task_action3'
               groups="group_yuthon_will_task_manager"
-              sequence='4'/>
+              sequence='10'/>
     <menuitem id="task_type_menu"
               name="配置"
               parent="menu_yuthon_will_task"
               groups="group_yuthon_will_task_manager"
-              sequence="5"/>
+              sequence="100"/>
     <menuitem id="task_type_setting_menu"
               name="任务类型"
               parent="task_type_menu"

yuthon_will_task/views/yuthon_will_task_views.xml

@@ -90,11 +90,25 @@
         <field name='domain'>[('users_ids', 'in', [uid])]</field>
         <field name="context">{'search_default_next_seven_days': 1}</field>
     </record>
-    <record id='view_yuthon_will_task_action2' model='ir.actions.act_window'>
-        <field name='name'>领导日程</field>
+    <record id='view_yuthon_will_task_action21' model='ir.actions.act_window'>
+        <field name='name'>天河投资领导日程</field>
         <field name='res_model'>yuthon.will.task</field>
         <field name='view_mode'>tree,calendar</field>
-        <field name='domain'>[('user_role_ids.name', 'in', ['董事长', '分管领导', '总经理'])]</field>
+        <field name='domain'>[('user_role_ids.name', 'in', ['董事长', '分管领导', '总经理']), ('yuthon_company', '=' 'thtz')]</field>
+        <field name="context">{'search_default_next_seven_days': 1}</field>
+    </record>
+    <record id='view_yuthon_will_task_action22' model='ir.actions.act_window'>
+        <field name='name'>天河物管领导日程</field>
+        <field name='res_model'>yuthon.will.task</field>
+        <field name='view_mode'>tree,calendar</field>
+        <field name='domain'>[('user_role_ids.name', 'in', ['董事长', '分管领导', '总经理']), ('yuthon_company', '=' 'thwg')]</field>
+        <field name="context">{'search_default_next_seven_days': 1}</field>
+    </record>
+    <record id='view_yuthon_will_task_action23' model='ir.actions.act_window'>
+        <field name='name'>天河粮储领导日程</field>
+        <field name='res_model'>yuthon.will.task</field>
+        <field name='view_mode'>tree,calendar</field>
+        <field name='domain'>[('user_role_ids.name', 'in', ['董事长', '分管领导', '总经理']), ('yuthon_company', '=' 'thlc')]</field>
         <field name="context">{'search_default_next_seven_days': 1}</field>
     </record>
     <record id='view_yuthon_will_task_action4' model='ir.actions.act_window'>

yuthon_work_brand/views/attendance_menu.xml

@@ -4,41 +4,37 @@
     <menuitem id="hr_attendance_root_board"
               name="考勤管理"
               web_icon="yuthon_work_brand,static/description/attendance.png"
+              groups="yuthon_hr_attendance. group_hr_attendance_user"
               sequence="7"/>
     <menuitem id="menu_hr_attendance_my_record_board"
               name="我的考勤"
               parent="hr_attendance_root_board"
               action="yuthon_hr_attendance.hr_attendance_action1"
+              groups="yuthon_hr_attendance. group_hr_attendance_user"
               sequence="1"/>
     <menuitem id="menu_hr_attendance_is_abnormal_board"
               name="我的异常"
               parent="hr_attendance_root_board"
               action="yuthon_hr_attendance.hr_attendance_action_is_abnormal"
+              groups=" group_hr_attendance_user"
               sequence="2"/>
-    <menuitem id="menu_hr_attendance_card_remind_form_board"
-              name="测试表单"
-              parent="hr_attendance_root_board"
-              action="yuthon_hr_attendance.view_action_card_remind"
-              sequence="3"/>
-
-    <menuitem id="hr_attendance_record_root_board"
-              name="考勤记录"
-              parent="hr_attendance_root_board"
-              sequence="4"/>
     <menuitem id="menu_hr_attendance_tt_record_board"
               name="天河投资"
-              parent="hr_attendance_record_root_board"
+              parent="hr_attendance_root_board"
               action="yuthon_hr_attendance.action_attendance_yuthon_company_form1"
+              groups="yuthon_hr_attendance.group_hr_attendance_leader_leader1"
               sequence="3"/>
     <menuitem id="menu_hr_attendance_lc_record_board"
               name="天河粮储"
-              parent="hr_attendance_record_root_board"
+              parent="hr_attendance_root_board"
               action="yuthon_hr_attendance.action_attendance_yuthon_company_form2"
+              groups="yuthon_hr_attendance.group_hr_attendance_leader_leader2"
               sequence="5"/>
     <menuitem id="menu_hr_attendance_wg_record_board"
               name="天河物管"
-              parent="hr_attendance_record_root_board"
+              parent="hr_attendance_root_board"
               action="yuthon_hr_attendance.action_attendance_yuthon_company_form3"
+              groups="yuthon_hr_attendance.group_hr_attendance_leader_leader3"
               sequence="7"/>
 
     <!--  计划相关  -->
@@ -66,11 +62,11 @@
               parent="menu_hr_attendance_approval_request_board"
               sequence="7"
               action="yuthon_hr_attendance.approval_request_leave"/>
-    <menuitem id="menu_yuthon_shift_approval_board"
-              name="调替班申请"
-              parent="menu_hr_attendance_approval_request_board"
-              sequence="5"
-              action="yuthon_hr_attendance.view_yuthon_shift_approval_action"/>
+<!--    <menuitem id="menu_yuthon_shift_approval_board"-->
+<!--              name="调替班申请"-->
+<!--              parent="menu_hr_attendance_approval_request_board"-->
+<!--              sequence="5"-->
+<!--              action="yuthon_hr_attendance.view_yuthon_shift_approval_action"/>-->
     <menuitem id="menu_hr_attendance_remove_holiday_board"
               name="销假申请"
               parent="menu_hr_attendance_approval_request_board"
@@ -81,19 +77,20 @@
               parent="menu_hr_attendance_approval_request_board"
               sequence="13"
               action="yuthon_hr_attendance.approval_request_card"/>
-    <menuitem id="menu_hr_attendance_special_approval_board"
-              name="特殊加班申请"
-              parent="menu_hr_attendance_approval_request_board"
-              sequence="15"
-              action="yuthon_hr_attendance.view_special_approval_action"/>
-    <menuitem id="menu_hr_customer_approval_board"
-              name="客服值班审批"
-              parent="menu_hr_attendance_approval_request_board"
-              sequence="17"
-              action="yuthon_hr_attendance.action_yuthon_customer_approval"/>
+<!--    <menuitem id="menu_hr_attendance_special_approval_board"-->
+<!--              name="特殊加班申请"-->
+<!--              parent="menu_hr_attendance_approval_request_board"-->
+<!--              sequence="15"-->
+<!--              action="yuthon_hr_attendance.view_special_approval_action"/>-->
+<!--    <menuitem id="menu_hr_customer_approval_board"-->
+<!--              name="客服值班审批"-->
+<!--              parent="menu_hr_attendance_approval_request_board"-->
+<!--              sequence="17"-->
+<!--              action="yuthon_hr_attendance.action_yuthon_customer_approval"/>-->
     <menuitem id="attendance_resources_setting_root_board"
               name="配置"
               parent="hr_attendance_root_board"
+              groups="yuthon_hr_attendance.group_hr_attendance_leader_manager"
               sequence="99"/>
     <menuitem id="menu_hr_attendance_work_board"
               name="考勤时间表"
@@ -106,6 +103,9 @@
               sequence="4"
               action="yuthon_hr_attendance.view_overtime_page_action"/>
 
+    
+    
+    
     <menuitem id="yuthon_attendance_planning_board"
               name="计划考勤"
               web_icon="yuthon_work_brand,static/description/planning.png"