From c1312a5a6f2c652d70e3e2daf2006e269027162d Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Tue, 3 Jun 2025 17:48:14 +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/wizard/hr_employee_wizard.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yuthon_hr_employee/wizard/hr_employee_wizard.py b/yuthon_hr_employee/wizard/hr_employee_wizard.py index bcbccaddf..796a574eb 100644 --- a/yuthon_hr_employee/wizard/hr_employee_wizard.py +++ b/yuthon_hr_employee/wizard/hr_employee_wizard.py @@ -341,8 +341,8 @@ class YuthonHrEmployeeWizard(models.Model): open_start_time = self.employee_date(row[4].value) else: open_start_time = None - interrupt_work_month = row[5].value - salary_group_id = self.env['yuthon.salary.group'].search([('name', '=', row[6].value)]) + interrupt_work_month = row[6].value + salary_group_id = self.env['yuthon.salary.group'].search([('name', '=', row[7].value)]) if employee_id: employee_date = { 'entry_date': entry_date, @@ -350,10 +350,10 @@ class YuthonHrEmployeeWizard(models.Model): 'interrupt_work_month': interrupt_work_month, } employee_id.write(employee_date) - employee_id.contract_id.write({'structure_type_id': structure_type_id.id, - 'salary_group_id': salary_group_id.id, - 'job_id': job_id.id, - }) + employee_id.contract_id.structure_type_id = structure_type_id.id, + employee_id.contract_id.salary_group_id = salary_group_id.id, + employee_id.contract_id.job_id = job_id.id, + From 0f589e1621ac603d0231b2016c8dc09545f636c7 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Tue, 3 Jun 2025 17:54:13 +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_hr_employee/wizard/hr_employee_wizard.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/yuthon_hr_employee/wizard/hr_employee_wizard.py b/yuthon_hr_employee/wizard/hr_employee_wizard.py index 796a574eb..238c4b189 100644 --- a/yuthon_hr_employee/wizard/hr_employee_wizard.py +++ b/yuthon_hr_employee/wizard/hr_employee_wizard.py @@ -331,7 +331,6 @@ class YuthonHrEmployeeWizard(models.Model): def update_lc_employee(self, row): employee_id = self.env['hr.employee'].search([('name', '=', row[0].value)]) - job_id = self.env['hr.job'].search([('name', '=', row[1].value), ('company_id.name', '=', '天河粮储')], limit=1) structure_type_id = self.env['hr.payroll.structure.type'].search([('name', '=', row[2].value), ('company_id.name', '=', '天河粮储')]) if row[3].value: entry_date = self.employee_date(row[3].value) @@ -352,7 +351,6 @@ class YuthonHrEmployeeWizard(models.Model): employee_id.write(employee_date) employee_id.contract_id.structure_type_id = structure_type_id.id, employee_id.contract_id.salary_group_id = salary_group_id.id, - employee_id.contract_id.job_id = job_id.id,