From 27d9c80b742dad4bf91c03b017e7263a6a570592 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Mon, 31 Mar 2025 18:47:39 +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

---
 .../views/inherit_hr_payslip_views.xml        | 42 ++++++++++---------
 yuthon_salary/wizard/payroll_labor_wizard.py  | 12 ++++++
 .../wizard/payroll_retired_wizard.py          | 11 +++++
 3 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml
index 92be3b7ed..38ddf821d 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -165,34 +165,36 @@
         <field name="arch" type="xml">
             <tree string="薪资计算" default_order="employee_id" js_class="custom_salary_button" editable="bottom">
                 <field name="employee_id" string="姓名"/>
+                <field name="yuthon_company"/>
+                decoration-info="1"
                 <field name="total_before_tax" decoration-danger="1"/>
                 <field name="company_id" column_invisible="1"/>
-                <field name="base_salary" decoration-info="1"/>
-                <field name="rank_salary" decoration-info="1"/>
-                <field name="post_salary" decoration-info="1"/>
-                <field name="performance_bonuses" decoration-info="1"/>
-                <field name="commuting_allowance" decoration-info="1"/>
-                <field name="seniority_salary" decoration-info="1"/>
-                <field name="full_attendance_award" decoration-info="1"/>
-                <field name="basic_endowment_insurance" decoration-danger="1"/>
-                <field name="basic_medical_insurance" decoration-danger="1"/>
+                <field name="base_salary"/>
+                <field name="rank_salary"/>
+                <field name="post_salary"/>
+                <field name="performance_bonuses"/>
+                <field name="commuting_allowance"/>
+                <field name="seniority_salary"/>
+                <field name="full_attendance_award"/>
+                <field name="overtime_pay" decoration-danger="1"/>
                 <field name="high_temperature_allowance" decoration-danger="1"/>
                 <field name="based_pay" decoration-danger="1"/>
-                <field name="unemployment_insurance" decoration-danger="1"/>
-                <field name="housing_provident_fund" decoration-danger="1"/>
-                <field name="overtime_pay"/>
-                <field name="meal_misunderstanding_fee"/>
-                <field name="performance_deduction" decoration-success="1"/>
-                <field name="commuting_deduction" decoration-success="1"/>
+                <field name="year_compute" decoration-danger="1"/>
+                <field name="year_jie" decoration-danger="1"/>
+                 <field name="jing_te" decoration-danger="1"/>
+                <field name="year_gong" decoration-danger="1"/>
+                <field name="study_on" decoration-danger="1"/>
                 <field name="base_salary_deduction" decoration-success="1"/>
+                <field name="commuting_deduction" decoration-success="1"/>
+                <field name="performance_deduction" decoration-success="1"/>
+                <field name="basic_endowment_insurance"/>
+                <field name="basic_medical_insurance"/>
+                <field name="unemployment_insurance"/>
+                <field name="housing_provident_fund"/>
                 <field name="b_year"/>
                 <field name="union_dues"/>
                 <field name="assessment_reserved_amount"/>
-                <field name="year_compute"/>
-                <field name="year_jie"/>
-                <field name="year_gong"/>
-                <field name="study_on"/>
-                <field name="jing_te"/>
+                <field name="meal_misunderstanding_fee"/>
                 <field name="is_push" column_invisible="1"/>
                 <button name="put_button" string="推送" type="object" class="oe_highlight"/>
             </tree>
diff --git a/yuthon_salary/wizard/payroll_labor_wizard.py b/yuthon_salary/wizard/payroll_labor_wizard.py
index 6682bce98..bb0a7d346 100644
--- a/yuthon_salary/wizard/payroll_labor_wizard.py
+++ b/yuthon_salary/wizard/payroll_labor_wizard.py
@@ -23,3 +23,15 @@ class PayrollLaborWizard(models.Model):
         for rx in range(1, sh.nrows):
             row = sh.row(rx)
             self.yuthon_payroll_data(row)
+
+    def yuthon_payroll_data(self, row):
+        employee_id = self.env['hr.employee'].search([('name', '=', row[0].value)])
+        current_year = row[1].value
+        current_month = row[2].value
+        labor_amount = row[3].value
+        self.env['yuthon.payroll.retired'].create({
+            'name': employee_id.id,
+            'current_year': current_year,
+            'current_month': current_month,
+            'labor_amount': labor_amount,
+        })
\ No newline at end of file
diff --git a/yuthon_salary/wizard/payroll_retired_wizard.py b/yuthon_salary/wizard/payroll_retired_wizard.py
index 2c2c980f1..c384948b8 100644
--- a/yuthon_salary/wizard/payroll_retired_wizard.py
+++ b/yuthon_salary/wizard/payroll_retired_wizard.py
@@ -24,3 +24,14 @@ class PayrollLaborWizard(models.Model):
             row = sh.row(rx)
             self.yuthon_payroll_data(row)
 
+    def yuthon_payroll_data(self, row):
+        name = row[0].value
+        current_year = row[1].value
+        current_month = row[2].value
+        labor_amount = row[3].value
+        self.env['yuthon.payroll.retired'].create({
+            'name': name,
+            'current_year': current_year,
+            'current_month': current_month,
+            'labor_amount': labor_amount,
+        })
\ No newline at end of file