From b0f3954810cdfc21422318aba46a0f1c517a8f89 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Mon, 23 Jun 2025 11:51:02 +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/models/yuthon_hr_employee.py | 3 ++- yuthon_salary/wizard/salary_compute_wizard.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py index 0db386f64..e19c35787 100644 --- a/yuthon_hr_employee/models/yuthon_hr_employee.py +++ b/yuthon_hr_employee/models/yuthon_hr_employee.py @@ -244,8 +244,9 @@ class YuthonHrEmployee(models.Model): @api.depends('converted', 'salary_year_jin_ids') def _compute_total_coefficients(self): for record in self: + company_employees = self.env['hr.employee'].search([]) record.total_coefficients = sum(employee.converted for employee in self.salary_year_jin_ids) - record.calculation_totals = sum(employee.conversion_factor for employee in self.salary_year_jin_ids) + record.calculation_totals = sum(employee.conversion_factor for employee in company_employees) @api.depends('contract_id') def _compute_resource_calendar_id(self): diff --git a/yuthon_salary/wizard/salary_compute_wizard.py b/yuthon_salary/wizard/salary_compute_wizard.py index c3f7e20ae..f25b20e67 100644 --- a/yuthon_salary/wizard/salary_compute_wizard.py +++ b/yuthon_salary/wizard/salary_compute_wizard.py @@ -35,7 +35,7 @@ class SalaryComputeWizard(models.Model): employees = self.env['hr.employee'].search([ ('company_id', '=', self.company_id.id), ('is_salary', '=', True), - ('contract_id.state', 'not in', ['draft', 'cancel']), + ('contract_id.state', 'not in', ['draft', 'cancel']), # 改一下逻辑 要按入职时间和薪资计算选择的年月 ('contract_id', '!=', False), ]) self.employee_ids = [(6, 0, employees.ids)]