From bd3c15b8a8360ec6ea812df6dc3479fe4bef5dd2 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Mon, 9 Jun 2025 15:00:22 +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_salary/wizard/salary_compute_wizard.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yuthon_salary/wizard/salary_compute_wizard.py b/yuthon_salary/wizard/salary_compute_wizard.py index 662d756b6..e5aeb3c50 100644 --- a/yuthon_salary/wizard/salary_compute_wizard.py +++ b/yuthon_salary/wizard/salary_compute_wizard.py @@ -73,9 +73,10 @@ class SalaryComputeWizard(models.Model): else: end_day = 28 end_date = datetime(year, month, end_day).strftime('%Y-%m-%d') - payslip_run_id = self.env['hr.payslip.run'].search([('name', '=', payslip_run_name)], limit=1) + payslip_run_id = self.env['hr.payslip.run'].search([('name', '=', payslip_run_name), ('company_id', '=', employee.company_id.id)], limit=1) if not payslip_run_id: payslip_run_id = self.env['hr.payslip.run'].create({ + 'company_id': employee.company_id.id, 'name': payslip_run_name, 'date_start': start_date, 'date_end': end_date, @@ -87,8 +88,8 @@ class SalaryComputeWizard(models.Model): ('date_from', '<=', end_date), ('date_to', '>=', start_date) ]) - # if existing_payslip: - # raise UserError( f"员工 {employee.name} 在 {start_date} 到 {end_date} 日期范围内已有工资单记录，无法创建新的工资单。") + if existing_payslip: + raise UserError( f"员工 {employee.name} 在 {start_date} 到 {end_date} 日期范围内已有工资单记录，无法创建新的工资单。") payslip = self.env['hr.payslip'].create({ 'is_bold':is_bold, 'name': employee.name,