From 37e8dfc36f0ebc14b9f5cdfc8e3b6d5a2cc309d7 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 12 Jun 2025 12:22:53 +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

---
 yuthon_hr_employee/views/yuthon_hr_employee_views.xml | 2 +-
 yuthon_salary/models/yuthon_payroll_project.py        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
index 4ee8ee20f..8303b85b4 100644
--- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
+++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml
@@ -164,8 +164,8 @@
                     </group>
                     <group>
                         <field name="converted"/>
-                        <field name="conversion_factor"/>
                         <field name="total_coefficients"/>
+                        <field name="conversion_factor"/>
                         <field name="calculation_totals"/>
                     </group>
                 </group>
diff --git a/yuthon_salary/models/yuthon_payroll_project.py b/yuthon_salary/models/yuthon_payroll_project.py
index 2aec63331..0a84904b5 100644
--- a/yuthon_salary/models/yuthon_payroll_project.py
+++ b/yuthon_salary/models/yuthon_payroll_project.py
@@ -229,7 +229,7 @@ class YuthonPayrollInsurances (models.Model):
                     code = 'GHHF'
                     formula_salary = "result = round((payslip.base_salary * 0.005), 2)"
                 if ins.name == '企业(职业)年金':
-                    if ins.company_id == '天河物管':
+                    if ins.company_id.name == '天河物管':
                         code = 'WGQYNJ'
                         formula_salary = "result = round((employee.converted/total_coefficients * conversion_factor * 0.08 * 0.5)/12, 2)"
                     else: