pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!1009 结束

Browse Source 
Merge pull request !1009 from dev
This commit is contained in:
李鹏宇
2024-12-30 08:27:48 +00:00
committed by Gitee
parent 179588940f cd51acb435
commit 0a1ecb0681
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/views/hr_attendance_views.xml
+2
View File
@@ -11,6 +11,7 @@
<field name="check_in" optional="show" widget="time"/>
<field name="check_out" optional="show" widget="time"/>
<field name="planning_slot_id" optional="show"/>
<field name="create_date" optional="hidden"/>
<field name="week" optional="show"/>
<field name="is_clock_card" optional="show" class="list_width"/>
<field name="is_no_card" optional="show" class="list_width"/>
@@ -32,6 +33,7 @@
editable="bottom" banner_route="/attendance/banner/route">
<field name="check_in" optional="show" widget="time"/>
<field name="check_out" optional="show" widget="time"/>
<field name="create_date" optional="hidden"/>
<field name="week" optional="show"/>
<field name="abnormal" optional="show" column_invisible="1"/>
<field name="work_time_type" optional="hidden"/>
yuthon_hr_employee/models/inherit_res_groups.py
+1 -1
View File
@@ -9,7 +9,7 @@ class ResGroups(models.Model):
users_ids = fields.Many2many('res.users', string="权限用户")
employee_ids = fields.Many2many('hr.employee', string="权限员工")
department_ids = fields.Many2many("hr.department", string="权限部门")
user_role_ids = fields.Many2many("soong.user.role", string="权限主角色")
user_role_ids = fields.Many2many("soong.user.role", string="权限主角色", domain=[('user_type', '!=', 'lv_role')])
def users_unlink(self):
users_to_unlink = self.users.filtered(lambda user: user.name != 'Administrator')