diff --git a/yuthon_approval/models/holiday_setting.py b/yuthon_approval/models/holiday_setting.py index 2a197d217..1d9f7c97a 100644 --- a/yuthon_approval/models/holiday_setting.py +++ b/yuthon_approval/models/holiday_setting.py @@ -9,8 +9,10 @@ class HolidaySetting(models.Model): _rec_name = 'name' name = fields.Char(string="假期名称") + illustrate = fields.Char(string="假期说明") company_id = fields.Many2one('res.company', string='公司', index=True, default=lambda self: self.env.company) department_id = fields.Many2one('hr.department', string='部门') + gender = fields.Selection([('boy', '男'), ('girl', '女')], string="性别") annual = fields.Char(string="年次") holiday_days = fields.Char(string="假期天数") travel_holiday = fields.Char(string="路程假") diff --git a/yuthon_approval/views/holiday_setting.xml b/yuthon_approval/views/holiday_setting.xml index 8b5661197..9a6127639 100644 --- a/yuthon_approval/views/holiday_setting.xml +++ b/yuthon_approval/views/holiday_setting.xml @@ -6,6 +6,7 @@ + @@ -25,6 +26,8 @@ + + diff --git a/yuthon_approval/views/issue_library_views.xml b/yuthon_approval/views/issue_library_views.xml index e57ea2f19..c82aef986 100644 --- a/yuthon_approval/views/issue_library_views.xml +++ b/yuthon_approval/views/issue_library_views.xml @@ -89,7 +89,7 @@ diff --git a/yuthon_approval/views/send_receive_messages_management.xml b/yuthon_approval/views/send_receive_messages_management.xml index 4f7daf98f..fed372af6 100644 --- a/yuthon_approval/views/send_receive_messages_management.xml +++ b/yuthon_approval/views/send_receive_messages_management.xml @@ -22,7 +22,7 @@