From 4fa6e810f54f095ca7fdc2dafa7b3f70d1ce7e9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Thu, 16 Jul 2026 10:58:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_holiday/models/inherit_hr_leave.py | 4 ++-- .../models/yuthon_onboard_approval.py | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index c2d2a8303..29eecc1c4 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/yuthon_holiday/models/inherit_hr_leave.py @@ -1111,7 +1111,7 @@ class HolidaysRequestBatch(models.Model): ], limit=1) if not reports_id: raise UserError( - '该员工暂无育儿假额度，请在员工档案的紧急联系人中配置子女信息（含身份证号）后重新计算') + '该员工暂无育儿假额度，请在员工档案的紧急联系人中配置子女信息（含身份证号）') remaining_parental = round(reports_id.remaining_parental_leave or 0.0, 1) if total_parental_leave_days > remaining_parental: # 判断是没有分配还是用完了 @@ -1121,7 +1121,7 @@ class HolidaysRequestBatch(models.Model): ) if not valid_parenting_lines: raise UserError( - '该员工暂无育儿假额度，请在员工档案的紧急联系人中配置子女信息（含身份证号）后重新计算') + '该员工暂无育儿假额度，请在员工档案的紧急联系人中配置子女信息（含身份证号）') else: raise UserError( f'育儿假额度不足，无法请假') diff --git a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py index 052bf9781..b43b4b6cd 100644 --- a/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_onboard_approval.py @@ -223,6 +223,12 @@ class YuthonOnboardApproval(models.Model): matched_groups = self.env['res.groups'].sudo().search([ ('department_ids.name', 'ilike', self.company_id.name) ]) + # 排除"用户类型"分类下的组（内部用户/门户/公开），避免触发 _check_one_user_type 约束 + user_type_category = self.env.ref('base.module_category_user_type', raise_if_not_found=False) + if user_type_category: + matched_groups = matched_groups.filtered( + lambda g: g.category_id.id != user_type_category.id + ) if matched_groups: matched_groups.sudo().write({'users': [(4, employee_id.user_id.id)]}) iots = self.env['attendance.iot'].sudo().search([('company_id', '=', self.company_id.id)])