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

Merge pull request !10093 from 李鹏宇/dev

yuthon_holiday/models/inherit_hr_leave.py

@@ -332,6 +332,7 @@ class HolidaysRequestBatch(models.Model):
     days = fields.Float(string='天数')
     hours = fields.Float(string='小时')
     text = fields.Text(string='申请事由')
+    main_stay_place = fields.Char(string='主要停留地')
     is_day = fields.Boolean(string='按天请假')
     is_hour = fields.Boolean(string='按小时请假')
     leave_ids = fields.One2many(string='按天请假详情', comodel_name='hr.leave', inverse_name='batch_id')

yuthon_holiday/views/hr_leave_batch.xml

@@ -58,6 +58,7 @@
                                        domain="[('employee_id.department_id', '=', department_id)]"/>
                                 <field name="days" invisible="1"/>
                                 <field name="employee_id" invisible="1" force_save="1"/>
+                                <field name="main_stay_place" string="主要停留地"/>
                                 <field name="text"/>
                                 <field name="create_date" invisible="1"/>
                                 <field name="work_end" invisible="1"/>

yuthon_hr_attendance/views/yuthon_holiday_statement.xml

@@ -46,17 +46,18 @@
         <field name="model">hr.leave</field>
         <field name="arch" type="xml">
             <search string="请假情况">
-                <field name="employee_id"/>
+                <field name="employee_id" domain="[('company_id', '=', company_id)]"/>
                 <field name="caption"/>
                 <filter string="员工" name="group_by_employee_id" domain="[]" context="{'group_by': 'employee_id'}"/>
                 <filter name="now_month" string="当月"  domain="[('date_from', '&gt;=', (context_today() + relativedelta(day=1)).strftime('%Y-%m-%d')),
                         ('date_from', '&lt;', (context_today() + relativedelta(months=+1, day=1)).strftime('%Y-%m-%d'))]"/>
                 <header_search class="header-search-inline">
                     <field name="date_from"/>
-                    <field name="employee_id"/>
+                    <field name="employee_id" domain="[('company_id', '=', company_id)]"/>
                 </header_search>
                 <searchpanel>
                     <field name="department_id" string="部门" enable_counters="1" select="multi"/>
+                    <field name="holiday_status_id" string="假期类型" enable_counters="1" select="multi"/>
                 </searchpanel>
             </search>
         </field>