From d4009b80c3c940bef0254d17134c98f0c1b1d977 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sun, 23 Mar 2025 16:51:57 +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_contract/models/inherit_hr_contract.py       | 9 ---------
 yuthon_contract/views/inherit_hr_contract_views.xml | 3 +++
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/yuthon_contract/models/inherit_hr_contract.py b/yuthon_contract/models/inherit_hr_contract.py
index 50f0962e5..ed0612499 100644
--- a/yuthon_contract/models/inherit_hr_contract.py
+++ b/yuthon_contract/models/inherit_hr_contract.py
@@ -19,7 +19,6 @@ class HrContract(models.Model):
         ('attendance', 'Attendances'),
         ('planning', '特殊排版')])
     is_probation = fields.Boolean(string="试用期")
-    wage = fields.Float(string="基本工资", compute='_compute_wage', store=True)
     start_date = fields.Date(string="开始日期", required=True, default=fields.Date.today)
     end_date = fields.Date(string="结束日期", required=True,
                            default=lambda self: fields.Date.today() + relativedelta(months=+3))
@@ -43,14 +42,6 @@ class HrContract(models.Model):
             else:
                 record.name = ' '
 
-    @api.depends('structure_type_id')
-    def _compute_wage(self):
-        for record in self:
-            if record.structure_type_id and record.yuthon_company:
-                wage_id = self.env['hr.salary.rule'].search([('struct_id', '=', record.structure_type_id.default_struct_id.id),
-                                                             ('yuthon_company','=', record.yuthon_company), ('name', '=','基本工资')])
-                if wage_id:
-                    record.wage = wage_id.amount_fix
 
     def action_hr_contract(self):
         return {
diff --git a/yuthon_contract/views/inherit_hr_contract_views.xml b/yuthon_contract/views/inherit_hr_contract_views.xml
index 888a17ab5..07c77f0ba 100644
--- a/yuthon_contract/views/inherit_hr_contract_views.xml
+++ b/yuthon_contract/views/inherit_hr_contract_views.xml
@@ -42,6 +42,9 @@
             <xpath expr="//field[@name='resource_calendar_id']" position="attributes">
                 <attribute name="string">工作日历</attribute>
             </xpath>
+            <xpath expr="//notebook" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
             <xpath expr="//group[@name='top_info']" position="before">
                 <group string="甲方信息">
                     <field name="party_id"/>

From a0f1b7296224b66f347e894a667621c16c9a7d9d Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sun, 23 Mar 2025 17:54:53 +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/models/inherit_hr_payslip.py    | 22 ++++++-------------
 .../views/inherit_hr_payslip_views.xml        |  1 +
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py
index 943701615..c57d2c1f0 100644
--- a/yuthon_salary/models/inherit_hr_payslip.py
+++ b/yuthon_salary/models/inherit_hr_payslip.py
@@ -43,13 +43,15 @@ class InheritHrPayslip(models.Model):
     work_injury_insurance = fields.Float(string='工伤保险费', compute='_compute_salary', store=True)
     housing_provident_fund = fields.Float(string='住房公积金', compute='_compute_salary', store=True)
     total_before_tax = fields.Float(string='税前合计', compute='_compute_total_before_tax', store=True)
-    year_compute = fields.Float(string='年度清算', compute='_compute_salary', store=True)
-    year_jie = fields.Float(string='年度结余', compute='_compute_salary', store=True)
-    year_gong = fields.Float(string='年功奖', compute='_compute_salary', store=True)
-    study_on = fields.Float(string='学习进步奖', compute='_compute_salary', store=True)
-    jing_te = fields.Float(string='经营特别奖', compute='_compute_salary', store=True)
+    year_compute = fields.Float(string='年度清算')
+    year_jie = fields.Float(string='年度结余')
+    year_gong = fields.Float(string='年功奖')
+    study_on = fields.Float(string='学习进步奖')
+    jing_te = fields.Float(string='经营特别奖')
+    temporary_performance_bonus = fields.Float(string='临时绩效奖')
     attendance_deduction_total = fields.Float(string='考勤扣款合计')
     assessment_reserved_amount = fields.Float(string='考核保留量')
+    reimburse_performance_bonus = fields.Float(string='上个月多扣绩效补回')
     is_push = fields.Boolean(string='推送')
     is_salary_push = fields.Boolean(string='工资推送')
 
@@ -112,16 +114,6 @@ class InheritHrPayslip(models.Model):
                         rec.work_injury_insurance = line.total
                     if line.name == '住房公积金':
                         rec.housing_provident_fund = line.total
-                    if line.name == '年度清算':
-                        rec.year_compute = line.total
-                    if line.name == '年度结余':
-                        rec.year_jie = line.total
-                    if line.name == '年功奖':
-                        rec.year_gong = line.total
-                    if line.name == '学习进步奖':
-                        rec.study_on = line.total
-                    if line.name == '经营特别奖':
-                        rec.jing_te = line.total
 
 
     def put_payslip(self):
diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml
index 06adbe270..1eaa5e3fc 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -49,6 +49,7 @@
                 <field name="year_gong"/>
                 <field name="study_on"/>
                 <field name="jing_te"/>
+                <field name="reimburse_performance_bonus"/>
                 <field name="is_salary_push" column_invisible="1"/>
             </xpath>
             <xpath expr="//field[@name='state']" position="after">