diff --git a/yuthon_holiday/models/yuthon_holiday_type.py b/yuthon_holiday/models/yuthon_holiday_type.py index 6c1791a35..a69cfa7e1 100644 --- a/yuthon_holiday/models/yuthon_holiday_type.py +++ b/yuthon_holiday/models/yuthon_holiday_type.py @@ -6,7 +6,8 @@ class HrLeaveType(models.Model): _inherit = 'hr.leave.type' - holiday_days = fields.Char(string='假期天数', required=True) + holiday_days = fields.Float(string='假期天数') + vacation_days_description = fields.Text(string='假期天数说明') vacation_type_id = fields.Many2one('holiday.type.setting', string='假期类型') travel_leave = fields.Char(string='路程假') treated = fields.Text(string='待遇') diff --git a/yuthon_holiday/views/holiday_type_setting.xml b/yuthon_holiday/views/holiday_type_setting.xml index 060484b18..e622dec72 100644 --- a/yuthon_holiday/views/holiday_type_setting.xml +++ b/yuthon_holiday/views/holiday_type_setting.xml @@ -4,28 +4,15 @@ holiday.type.setting.tree holiday.type.setting - + - - holiday.type.setting.form - holiday.type.setting - -
- - - - - -
-
-
假期类别配置 holiday.type.setting - tree,form + tree diff --git a/yuthon_holiday/views/yuthon_holiday_type.xml b/yuthon_holiday/views/yuthon_holiday_type.xml index e41c1b0ba..ca32a352b 100644 --- a/yuthon_holiday/views/yuthon_holiday_type.xml +++ b/yuthon_holiday/views/yuthon_holiday_type.xml @@ -24,15 +24,22 @@ - - - - + + + + + 1 + + 1 + + + 1 + \ No newline at end of file