From 95d6ada4dc345d4cbcdf1ad5e34ae2f1eccbd12e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Thu, 29 Jan 2026 18:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/yuthon_overtime_line.py                 |  2 +-
 yuthon_hr_employee/data/abnormal_time_data.xml     | 14 ++++++++++++++
 yuthon_trade/views/yuthon_trade_setting_views.xml  |  2 +-
 yuthon_will_task/models/yuthon_will_task.py        |  2 +-
 yuthon_work_brand/views/hr_menus.xml               |  5 +++++
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/yuthon_hr_attendance/models/yuthon_overtime_line.py b/yuthon_hr_attendance/models/yuthon_overtime_line.py
index 9fb3c7a27..eea18462f 100644
--- a/yuthon_hr_attendance/models/yuthon_overtime_line.py
+++ b/yuthon_hr_attendance/models/yuthon_overtime_line.py
@@ -25,7 +25,7 @@ class YuthonOvertimeLine(models.Model):
     carry_forward_quantity = fields.Float(string="结转时长")
     carry_forward_date = fields.Date(string="结转日期")
     archive_state = fields.Selection([('to_do', '待归档'), ('done', '已归档')], default='to_do', string='状态')
-    remaining_quantity = fields.Float(string="剩余数")
+    remaining_quantity = fields.Float(string="剩余数", compute='_compute_vacation_sum', store=True)
 
     @api.depends('workday', 'public_holidays',  'carry_forward_quantity')
     def _compute_vacation_sum(self):
diff --git a/yuthon_hr_employee/data/abnormal_time_data.xml b/yuthon_hr_employee/data/abnormal_time_data.xml
index c6a475226..e7d91b434 100644
--- a/yuthon_hr_employee/data/abnormal_time_data.xml
+++ b/yuthon_hr_employee/data/abnormal_time_data.xml
@@ -15,6 +15,20 @@
             <field name="numbercall">-1</field>
             <field eval="False" name="doall"/>
         </record>
+        <record forcecreate="True" id="yuthon_medical_manage_data" model="ir.cron">
+            <field name="name">定时任务:发放体检费</field>
+            <field name="model_id" ref="model_yuthon_medical_manage"/>
+            <field name="state">code</field>
+            <field name="code">model.medical_manage()</field>
+            <field eval="True" name="active"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">year</field>
+            <field name="nextcall"
+                   eval="(DateTime.now() + relativedelta(day=1)).strftime('%Y-%m-%d 00:00:00')"/>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall"/>
+        </record>
         <record forcecreate="True" id="late_arrivals_are_allowed" model="ir.cron">
             <field name="name">定时任务:重置物管允许迟到次数</field>
             <field name="model_id" ref="model_hr_employee"/>
diff --git a/yuthon_trade/views/yuthon_trade_setting_views.xml b/yuthon_trade/views/yuthon_trade_setting_views.xml
index 7a2eab8a0..bbc012d22 100644
--- a/yuthon_trade/views/yuthon_trade_setting_views.xml
+++ b/yuthon_trade/views/yuthon_trade_setting_views.xml
@@ -61,7 +61,7 @@
         <field name="name">用章类型</field>
         <field name="res_model">seals.type.setting</field>
         <field name="view_mode">tree</field>
-        <field name="context">{'group_by': 'scope_setting_id'}</field>
+        <field name="context">{'search_default_group_by_scope': 1}</field>
         <field name="domain">[('start_date', '&lt;=', context_today().strftime('%Y-%m-%d'))]</field>
     </record>
     <record id="view_seals_scope_setting_tree" model="ir.ui.view">
diff --git a/yuthon_will_task/models/yuthon_will_task.py b/yuthon_will_task/models/yuthon_will_task.py
index 17ff93d1d..babad47a7 100644
--- a/yuthon_will_task/models/yuthon_will_task.py
+++ b/yuthon_will_task/models/yuthon_will_task.py
@@ -175,7 +175,7 @@ class YuthonWillTask(models.Model):
                     data_user_ids = '参与人: ' + ', '.join(will_id.employee_ids.mapped('name')) + '\n'
                     data_employee_id = ('司机:' + ', '.join(will_id.employee_ids2.mapped('name')) + '\n') if will_id.employee_ids2 else ''
                     data_nota = ('备注:' + will_id.remarks) if will_id.remarks else ('') + '\n'
-                    data = data_date + data_name + data_user_ids + data_nota + data_employee_id
+                    data = data_date + data_name + data_user_ids + data_employee_id + data_nota
                     # url = f'https://phone.thtzjt.com/phone/Schedule/{will_id.id}/{employee_id.id}'
                     self.sudo().env["wecom.apps"].sync_send_message_textcard(category='task', user_id=employee_id.wecom_userid, title="日程事项提醒", description=data,
                                                                              url=url, btntxt="详细信息")
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index 9d89f5109..a0438f04c 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -526,6 +526,11 @@
               parent="hr_menu_root_board"
               action="yuthon_hr_employee.view_yuthon_medical_rule_action"
               sequence="15"/>
+    <menuitem id="yuthon_medical_line_menu_root_board"
+              name="体检报销费"
+              parent="hr_menu_root_board"
+              action="yuthon_hr_employee.yuthon_medical_line_action"
+              sequence="15"/>
 <!--    <menuitem id="hr_set_process_menu_root_board"-->
 <!--              name="流程"-->
 <!--              parent="hr_menu_root_board"-->