!10120 !10119 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyuse…

Merge pull request !10120 from dev

yuthon_hr_employee/models/inherit_res_groups.py

@@ -46,7 +46,6 @@ class ResGroups(models.Model):
             if not department:
                 return valid_user_ids
 
-            # 安全获取部门ID（自动兼容 int / record）
             dept_id = department.id if isinstance(department, models.Model) else int(department)
 
             # 当前部门员工
@@ -63,9 +62,7 @@ class ResGroups(models.Model):
         for department in self.department_ids:
             all_user_ids.update(get_department_employees(department))
 
-        # 3. 添加选中角色对应的用户（已修复 origin）
         for user_role in self.user_role_ids:
-            # 安全获取ID：有 origin 取 origin，没有就取 id
             role_id = user_role.id.origin if hasattr(user_role.id, 'origin') else user_role.id
             user_employees = self.env['hr.employee'].search([
                 '|',
@@ -74,7 +71,6 @@ class ResGroups(models.Model):
             ])
             all_user_ids.update([emp.user_id.id for emp in user_employees if emp.user_id])
 
-        # 4. 添加角色组对应的用户（已修复 origin）
         group_role_ids = self.users_role_group_ids.user_role_ids
         for user_role in group_role_ids:
             role_id = user_role.id.origin if hasattr(user_role.id, 'origin') else user_role.id

yuthon_hr_employee/models/yuthon_hr_employee.py

@@ -318,26 +318,6 @@ class YuthonHrEmployee(models.Model):
                     btntxt="详细信息"
                 )
 
-
-    @api.onchange('user_role_id', 'user_role_ids')
-    def _onchange_user_roles(self):
-        selected_role_ids = []
-        if self.user_role_id:
-            selected_role_ids.append(self.user_role_id.id)
-
-        if self.user_role_ids:
-            selected_role_ids += self.user_role_ids.ids
-        if not selected_role_ids:
-            self.role_group_ids = [(5,)]
-            return
-        role_groups = self.env['soong.user.role.group'].search([
-            ('user_role_ids', 'in', selected_role_ids)
-        ])
-        if role_groups:
-            self.role_group_ids = [(6, 0, role_groups.ids)]
-        else:
-            self.role_group_ids = [(5,)]
-
     def update_trade_union(self):
         records = self.env['hr.employee'].search([('is_membership', '=', True)])
         for record in records:

yuthon_property_approval/models/inherit_yuthon_property.py

@@ -621,6 +621,7 @@ class PropertyAccountsReceivable(models.Model):
     # company_id1 = fields.Many2one(related='contract_id.admin_id.company_id', string="管理员公司", store=True)
     company_id2 = fields.Many2one("res.company", string="公司", compute='_compute_company_id2', store=True)
     contract_id = fields.Many2one('property.lease.contract', string="关联租赁合同审批")
+    rent_id = fields.Char(string='租金id')
     contract_sort = fields.Selection([('property', '物业'), ('guanggao', '广告位'),('parking', '停车场'), ('guanzi', '管子间'), ('room', '机房'), ('base_station','基站'), ('other', '其他')],
                                      related='contract_id.contract_sort', string="资产类型",  index=True)
     admin_id = fields.Many2one(related='contract_id.admin_id', string="片区管理员", store=True)

yuthon_property_approval/views/property_open_rent_views.xml

@@ -63,7 +63,7 @@
                         <group>
                             <label for="lease_term_year"/>
                             <div class="d-inline-flex w-100">
-                                <field name="lease_term_year" string=" " class="ms-2"
+                                <field name="lease_term_year" string="租期" class="ms-2"
                                        style="max-width: 3rem !important;"/>年
                                 <field name="lease_term_month" string=" " class="ms-2"
                                        style="max-width: 3rem !important;"/>月