From ca7231ee2ed6466c0c31330e02ac31dde2ed9f67 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: Tue, 3 Mar 2026 21:05:19 +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/models/yuthon_vacation_reports.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
index b5099ac09..ebf14aa10 100644
--- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py
+++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py
@@ -704,6 +704,9 @@ class YuthonVacationReports(models.Model):
             'views': [(False, 'form')],
             'view_mode': 'form',
             'target': 'current',
+            'flags': {
+                'keepPrevious': False,
+            },
         })
         return action
 

From 74ace6d58d921824c8c62c8655d26287229785cb 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: Wed, 4 Mar 2026 10:48:43 +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

---
 .../{salary_party.xlsx => 党费-模板v1.0.xlsx}   | Bin
 yuthon_salary/wizard/salary_party_wizard.py         |   4 ++--
 yuthon_salary/wizard/salary_party_wizard_views.xml  |   2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename yuthon_salary/static/others/{salary_party.xlsx => 党费-模板v1.0.xlsx} (100%)

diff --git a/yuthon_salary/static/others/salary_party.xlsx b/yuthon_salary/static/others/党费-模板v1.0.xlsx
similarity index 100%
rename from yuthon_salary/static/others/salary_party.xlsx
rename to yuthon_salary/static/others/党费-模板v1.0.xlsx
diff --git a/yuthon_salary/wizard/salary_party_wizard.py b/yuthon_salary/wizard/salary_party_wizard.py
index 3777e1880..e2476153d 100644
--- a/yuthon_salary/wizard/salary_party_wizard.py
+++ b/yuthon_salary/wizard/salary_party_wizard.py
@@ -24,8 +24,8 @@ class SalaryPartyWizard(models.TransientModel):
             self.salary_party_data(row)
 
     def salary_party_data(self, row):
-        select_year = int(row[0].value)
-        select_time = int(row[1].value)
+        select_year = str(int(row[0].value))
+        select_time = str(int(row[1].value))
         employee_id = self.env['hr.employee'].search([('identification_id', '=', row[3].value)], limit=1)
         card = row[3].value
         fee = row[4].value
diff --git a/yuthon_salary/wizard/salary_party_wizard_views.xml b/yuthon_salary/wizard/salary_party_wizard_views.xml
index b743419b9..670f29632 100644
--- a/yuthon_salary/wizard/salary_party_wizard_views.xml
+++ b/yuthon_salary/wizard/salary_party_wizard_views.xml
@@ -3,7 +3,7 @@
     <record id="salary_party_wizard_downloads_action" model="ir.actions.act_url">
         <field name="name">模板下载</field>
         <field name="target">self</field>
-        <field name="url">/yuthon_salary/static/others/salary_party.xlsx</field>
+        <field name="url">/yuthon_salary/static/others/党费-模板v1.0.xlsx</field>
     </record>
     <record id="salary_party_wizard_form" model="ir.ui.view">
         <field name="name">弹窗</field>