From 26456b41be21e5b7492b806b8d9c35195222b91b Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 31 Jul 2025 10:39:29 +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_employee/views/yuthon_hr_employee_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index 2689e364b..32fe41573 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -29,7 +29,7 @@
                 <attribute name="invisible">1</attribute>
             </xpath>
             <xpath expr="//field[@name='work_email']" position="after">
-                <field name="user_state" readonly="1"/>
+                <field name="user_state"/>
             </xpath>
             <xpath expr="//field[@name='department_id']" position="attributes">
                 <attribute name="widget">ztree_select</attribute>

From 0ae4b5175ede37815852786af573a9549c5bd0b7 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 31 Jul 2025 10:44:24 +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

---
 yuthon_salary/views/inherit_hr_payslip_views.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml
index 249ae5326..9b8657f15 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -268,7 +268,7 @@
                 <field name="last_year_jie"/>
                 <field name="rank_salary" required="1"/>
                 <field name="performance_bonuses" required="1"/>
-                <field name="based_pay" required="1"/>
+                <field name="temporary_performance_bonus" required="1"/>
                 <field name="seniority_salary" required="1"/>
                 <field name="commuting_allowance" required="1"/>
                 <field name="full_attendance_award"/>
@@ -390,7 +390,7 @@
                 <field name="position_subsidy"/>
                 <field name="position_salary"/>
                 <field name="performance_bonuses" required="1"/>
-                <field name="based_pay" required="1"/>
+                <field name="temporary_performance_bonus" required="1"/>
                 <field name="environmental_allowance"/>
                 <field name="quality_allowance"/>
                 <field name="high_subsidy"/>
@@ -433,7 +433,7 @@
                 <field name="base_salary" required="1"/>
                 <field name="rank_salary" required="1"/>
                 <field name="performance_bonuses" required="1"/>
-                <field name="based_pay" required="1"/>
+                <field name="temporary_performance_bonus" required="1"/>
                 <field name="seniority_salary" required="1"/>
                 <field name="commuting_allowance" required="1"/>
 
@@ -565,7 +565,7 @@
                 <field name="position_salary"/>
                 <field name="position_subsidy"/>
                 <field name="performance_bonuses" required="1"/>
-                <field name="based_pay" required="1"/>
+                <field name="temporary_performance_bonus" required="1"/>
                 <field name="environmental_allowance"/>
                 <field name="quality_allowance"/>
                 <field name="high_subsidy"/>