From 943bb5bba5f396f4cd8de3cce84223f1ea7fd462 Mon Sep 17 00:00:00 2001
From: ONION <2275333053@qq.com>
Date: Wed, 10 Jul 2024 12:04:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=93=E5=B1=95=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_approval/models/holiday_setting.py                  | 2 ++
 yuthon_approval/views/holiday_setting.xml                  | 3 +++
 yuthon_approval/views/issue_library_views.xml              | 2 +-
 yuthon_approval/views/send_receive_messages_management.xml | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

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 @@
         <field name="arch" type="xml">
             <tree string="假期类型配置">
                 <field name="name"/>
+                <field name="gender"/>
                 <field name="company_id"/>
                 <field name="department_id"/>
                 <field name="travel_holiday"/>
@@ -25,6 +26,8 @@
                     <group>
                         <group>
                             <field name="name"/>
+                            <field name="illustrate"/>
+                            <field name="gender"/>
                             <field name="company_id"/>
                             <field name="department_id"/>
                         </group>
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 @@
 
     <menuitem
             id="tianhe_issue_library_menu"
-            parent="approvals.approvals_menu_config"
+            parent="approvals.approvals_approval_expansion"
             sequence="5"
             name="议题库"
             action="issue_library_action"/>
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 @@
 
     <menuitem
             id="send_receive_messages_management_menu"
-            parent="approvals.approvals_menu_config"
+            parent="approvals.approvals_approval_expansion"
             sequence="6"
             name="收发文管理"
             action="send_receive_messages_management_action"/>