From 764813ee77d65aea23340801e55ae39367cf5ae3 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Mon, 24 Mar 2025 17:13:50 +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/wizard/hr_employee_wizard.py | 16 ++++++++--------
 yuthon_salary/models/inherit_hr_payslip.py      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/yuthon_hr_employee/wizard/hr_employee_wizard.py b/yuthon_hr_employee/wizard/hr_employee_wizard.py
index a8ab7af0c..0f8417643 100644
--- a/yuthon_hr_employee/wizard/hr_employee_wizard.py
+++ b/yuthon_hr_employee/wizard/hr_employee_wizard.py
@@ -45,14 +45,14 @@ class YuthonHrEmployeeWizard(models.Model):
             open_start_time = base_date + timedelta(days=row[2].value - 2) if row[2].value > 0 else base_date
         else:
             open_start_time = None
-        if row[6].value:
-            dang_data = base_date + timedelta(days=row[6].value - 2) if row[6].value > 0 else base_date
-        else:
-            dang_data = None
-        political_aspects_dict = {'中共党员': 'cpc_dang', '民盟': 'nld', '共青团员': 'league_member', '群众': 'people', '': ''}
-        political_aspects = political_aspects_dict[row[5].value]
-        card = row[1].value if row[1].value else None
-        last_attendance = row[7].value
+        # if row[6].value:
+        #     dang_data = base_date + timedelta(days=row[6].value - 2) if row[6].value > 0 else base_date
+        # else:
+        #     dang_data = None
+        # political_aspects_dict = {'中共党员': 'cpc_dang', '民盟': 'nld', '共青团员': 'league_member', '群众': 'people', '': ''}
+        # political_aspects = political_aspects_dict[row[5].value]
+        # card = row[1].value if row[1].value else None
+        # last_attendance = row[7].value
         # if row[2].value:
         #     date1 = pd.to_datetime(row[2].value, unit='d', origin='1899-12-30')
         # else:
diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py
index ebfc8e818..a96dd85ca 100644
--- a/yuthon_salary/models/inherit_hr_payslip.py
+++ b/yuthon_salary/models/inherit_hr_payslip.py
@@ -9,7 +9,7 @@ class InheritHrPayslip(models.Model):
     identification_id = fields.Char(string='证件号码', related='employee_id.identification_id', store=True)
     card_type = fields.Char(string='证件类型', store=True, default="居民身份证")
     yuthon_company = fields.Selection([('thtz', '集团本部'), ('thwg', '天河物管'), ('thlc', '天河粮储')],
-                                      related='employee_id.yuthon_company', string="所属公司")
+                                      related='employee_id.yuthon_company', string="所属公司", store=True)
     salary_group_id = fields.Many2one(related='employee_id.salary_group_id', string="工资组", store=True, index=True)
     performance_bonuses = fields.Float(string='预发绩效奖金', compute='_compute_salary', store=True)
     full_attendance_award = fields.Float(string='全勤奖', compute='_compute_salary', store=True)