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

Merge pull request !10280 from 李鹏宇/dev

yuthon_holiday/models/extended_vacation_approval.py

@@ -13,7 +13,8 @@ class ExtendedVacationApproval(models.Model):
     code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_extended_code'))
     users_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user.id)
     department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
-    company_id = fields.Many2one('res.company', '公司', default=lambda self: self.env.user.company_id)
+    company_id = fields.Many2one(related="users_id.employee_id.company_id", string="公司")
+    is_this_company = fields.Boolean(string='本公司', default=True)  # 是否仅显示本公司员工，勾选后 employee_ids 候选项按 company_id 过滤
     employee_ids = fields.Many2many('hr.employee', string="假期顺延人员")
     type_vacations_ids = fields.Many2many('extended.type', string="假期类型")
     is_issues = fields.Boolean(string='是否上会')

yuthon_holiday/views/extended_vacation_approval_views.xml

@@ -48,7 +48,9 @@
                             <field name="department_id" invisible="1"/>
                             <field name="date_postponed"/>
                             <field name="company_id" invisible="1"/>
-                            <field name="employee_ids" widget="many2many_tags" domain="[('company_id', '=', company_id)]"/>
+                            <field name="is_this_company"/>
+                            <field name="employee_ids" widget="many2many_tags"
+                                   domain="[('company_id', '=', company_id)] if is_this_company else []"/>
                         </group>
                      </group>
                      <group string="延长明细">