diff --git a/yuthon_holiday/models/inherit_hr_leave.py b/yuthon_holiday/models/inherit_hr_leave.py index 2f8002795..627c009e3 100644 --- a/yuthon_holiday/models/inherit_hr_leave.py +++ b/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') diff --git a/yuthon_holiday/views/hr_leave_batch.xml b/yuthon_holiday/views/hr_leave_batch.xml index caa79ef6d..36680c7bd 100644 --- a/yuthon_holiday/views/hr_leave_batch.xml +++ b/yuthon_holiday/views/hr_leave_batch.xml @@ -58,6 +58,7 @@ domain="[('employee_id.department_id', '=', department_id)]"/> + diff --git a/yuthon_hr_attendance/views/yuthon_holiday_statement.xml b/yuthon_hr_attendance/views/yuthon_holiday_statement.xml index c4578b7ae..b16fa415c 100644 --- a/yuthon_hr_attendance/views/yuthon_holiday_statement.xml +++ b/yuthon_hr_attendance/views/yuthon_holiday_statement.xml @@ -46,17 +46,18 @@ hr.leave - + - + +