From 1c635c9fc4110c8d7fed590b8ab83536191ccc4b 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: Mon, 2 Feb 2026 12:06:18 +0800
Subject: [PATCH 1/2] =?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

---
 yuthon_hr_attendance/controllers/portal.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/yuthon_hr_attendance/controllers/portal.py b/yuthon_hr_attendance/controllers/portal.py
index 6ab0e0864..37728d31a 100644
--- a/yuthon_hr_attendance/controllers/portal.py
+++ b/yuthon_hr_attendance/controllers/portal.py
@@ -115,17 +115,8 @@ class CustomerPortal(portal.CustomerPortal):
     @http.route('/phone/vacation/self/status', type='http', auth="none", csrf=False, cors='*')
     def phone_vacation_self_status(self, **kw):
         record_id = request.env['yuthon.vacation.reports'].sudo().search([('id', '=', kw.get('id'))])
-        month_start = record_id.vacation_date.replace(day=1)
-        month_end = (month_start + relativedelta(months=1) - relativedelta(days=1))
-        attendance_exception = self.env['hr.attendance'].search([
-            ('employee_id', '=', record_id.employee_id.id),
-            ('current_data', '>=', month_start),
-            ('current_data', '<=', month_end),
-            ('is_abnormal', '=', True)
-        ], limit=1)
-        # 如果考勤异常，则不自动确认
-        if attendance_exception:
-            return json.dumps({'code': 200, 'message': '考勤异常，请先核对考勤记录'})
+        if record_id.is_abnormal:
+            return json.dumps({'code': 500, 'message': '考勤异常，请先核对考勤记录'})
         else:
             record_id.write({'vacation_state': 'confirmed'})
             return json.dumps({'code': 200, 'message': 'OK'})

From c6f28e92c4fb391705b4fe3bc5b0beba91a63596 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: Mon, 2 Feb 2026 15:43:16 +0800
Subject: [PATCH 2/2] =?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

---
 .../wizard/soong_workflow_comment_wizard.py   |  2 ++
 yuthon_contract/__manifest__.py               |  1 -
 yuthon_contract/security/company_rule.xml     |  8 ------
 .../views/yuthon_vacation_reports_views.xml   | 26 +++++++++----------
 4 files changed, 15 insertions(+), 22 deletions(-)
 delete mode 100644 yuthon_contract/security/company_rule.xml

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard.py b/soong_workflow/wizard/soong_workflow_comment_wizard.py
index 5e970b9a6..fd1bf125d 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard.py
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard.py
@@ -451,6 +451,8 @@ class SoongWorkflowCommentWizard(models.TransientModel):
                         if hasattr(related_record, 'self_users_ids'):
                             user_ids = [employee.user_id.id for employee in self.employee_ids if employee.user_id]
                             related_record.self_users_ids = [(6, 0, user_ids)] if user_ids else [(5,)]
+                    if not self.trans_link_id.name:
+                        raise UserError('无转交节点')
                     record_id.write({'state': self.trans_link_id.name})
                     if self.circulated_employee_ids:
                         workflow_record_id.is_log2 = True
diff --git a/yuthon_contract/__manifest__.py b/yuthon_contract/__manifest__.py
index b3ef55074..efa983a9b 100644
--- a/yuthon_contract/__manifest__.py
+++ b/yuthon_contract/__manifest__.py
@@ -13,7 +13,6 @@
     'depends': ['hr_contract', 'yuthon_hr_employee', 'base', 'yuthon_salary'],
     'data': [
         'security/ir.model.access.csv',
-        'security/company_rule.xml',
         'data/contract_code_data.xml',
         'wizard/yuthon_contract_wizard_views.xml',
         'views/inherit_hr_contract_views.xml',
diff --git a/yuthon_contract/security/company_rule.xml b/yuthon_contract/security/company_rule.xml
deleted file mode 100644
index 6df160813..000000000
--- a/yuthon_contract/security/company_rule.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <record model="ir.rule" id="yuthon_hr_contract_rule">
-        <field name="name">合同多公司</field>
-        <field name="model_id" ref="model_hr_contract"/>
-        <field name="domain_force">[('company_id', 'in', company_ids)]</field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
index e6db0e4c9..10bee0c6f 100644
--- a/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
@@ -49,19 +49,6 @@
                 <field name="vacation_date" column_invisible="1"/>
                 <field name="open_start_time"/>
                 <field name="company_old"/>
-                <field name="previous_year"/>
-                <field name="valid_date"/>
-                <field name="year_distribution"/>
-                <field name="used_this_year"/>
-                <field name="remainder_year"/>
-                <field name="last_holiday"/>
-                <field name="last_workday"/>
-                <field name="valid_date1"/>
-                <field name="year_holiday"/>
-                <field name="year_workday"/>
-                <field name="year_sum"/>
-                <field name="used_this_year1"/>
-                <field name="remainder_year1"/>
                 <field name="should_attendance" options='{ "fg_color": "white: should_attendance == False"}'/>
                 <field name="actual_attendance" options='{ "fg_color": "white: actual_attendance == False"}'/>
                 <field name="right_days" options='{ "fg_color": "white: right_days == False"}'/>
@@ -94,6 +81,19 @@
                 <field name="hospital_sick_leave" options='{ "fg_color": "white: hospital_sick_leave == False"}'/>
                 <field name="recovery_sick_leave" options='{ "fg_color": "white: recovery_sick_leave == False"}'/>
                 <field name="exam_leave" options='{ "fg_color": "white: exam_leave == False"}'/>
+                <field name="previous_year"/>
+                <field name="valid_date"/>
+                <field name="year_distribution"/>
+                <field name="used_this_year"/>
+                <field name="remainder_year"/>
+                <field name="last_holiday"/>
+                <field name="last_workday"/>
+                <field name="valid_date1"/>
+                <field name="year_holiday"/>
+                <field name="year_workday"/>
+                <field name="year_sum"/>
+                <field name="used_this_year1"/>
+                <field name="remainder_year1"/>
                 <button name="log" type="object" string="详情" class="oe_highlight"/>
                 <button name="button_put" string="发送" invisible="vacation_state == 'confirmed'" type="object"
                         class="oe_highlight"/>