From 7880bf43ccbc9de24765ce2aae106cfbf1004fb7 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Wed, 14 May 2025 18:11:01 +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 --- soong_workflow/models/soong_workflow.py | 3 +-- .../models/property_lease_contract.py | 6 +++--- yuthon_salary/models/inherit_hr_payslip.py | 2 +- yuthon_salary/models/yuthon_salary_year.py | 1 + yuthon_salary/wizard/salary_compute_wizard.py | 19 +------------------ 5 files changed, 7 insertions(+), 24 deletions(-) diff --git a/soong_workflow/models/soong_workflow.py b/soong_workflow/models/soong_workflow.py index 6e387dc8f..1cfd43a58 100644 --- a/soong_workflow/models/soong_workflow.py +++ b/soong_workflow/models/soong_workflow.py @@ -51,8 +51,7 @@ class SoongWorkflow(models.Model): is_enable_return_button = fields.Boolean(string="是否启用收回", default=True) is_enable_transmitted_button = fields.Boolean(string="是否启用转交", default=True) approvals_group_id = fields.Many2one('soong.approval.group', string="审批分组") - user_role_ids = fields.Many2many('soong.user.role', string="授权范围", store=True, - default=lambda self: [(6, 0, [self.env.ref('soong_workflow.soong_user_role_workflow_admin').id])]) + user_role_ids = fields.Many2many('soong.user.role', string="授权范围", store=True) department_role_ids = fields.Many2many('hr.department', string="授权部门范围", store=True) is_user_department_role = fields.Boolean(string="是否有权限查看", store=False, search="_search_is_user_department_role") diff --git a/yuthon_property_approval/models/property_lease_contract.py b/yuthon_property_approval/models/property_lease_contract.py index fb2536e21..31fd0b3ee 100644 --- a/yuthon_property_approval/models/property_lease_contract.py +++ b/yuthon_property_approval/models/property_lease_contract.py @@ -68,9 +68,9 @@ class PropertyLeaseContract(models.Model): active = fields.Boolean('Active', default=True, tracking=True) lease_term = fields.Float(string="租期") - lease_term_year = fields.Integer(string="租期(年)") - lease_term_month = fields.Integer(string="租期(月)") - lease_term_day = fields.Integer(string="租期(日)") + lease_term_year = fields.Integer(string="租期(年)",default=lambda self: datetime.now().year) + lease_term_month = fields.Integer(string="租期(月)",default=lambda self: datetime.now().month) + lease_term_day = fields.Integer(string="租期(日)",default=lambda self: datetime.now().day) term_start_time = fields.Date(string="合约开始时间", default=fields.Datetime.now) term_end_time = fields.Date(string="合约结束时间") actual_start_time = fields.Date(string="实际开始时间") diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py index c877bbe93..3007716bb 100644 --- a/yuthon_salary/models/inherit_hr_payslip.py +++ b/yuthon_salary/models/inherit_hr_payslip.py @@ -317,7 +317,7 @@ class InheritHrPayslip(models.Model): "target": "new", } - def compute_sheet_new(self): + def compute_sheet(self): payslips = self.filtered(lambda slip: slip.state in ['draft', 'verify']) # delete old payslip lines payslips.line_ids.unlink() diff --git a/yuthon_salary/models/yuthon_salary_year.py b/yuthon_salary/models/yuthon_salary_year.py index abe6a4160..26dbcfffc 100644 --- a/yuthon_salary/models/yuthon_salary_year.py +++ b/yuthon_salary/models/yuthon_salary_year.py @@ -6,6 +6,7 @@ class YuthonSalaryYear(models.Model): _description = '年终奖金计算' employee_id = fields.Many2one('hr.employee', string="姓名") + salary_group_id = fields.Many2one(related='employee_id.salary_group_id', string="工资单分组", store=True) # 本部 on_year_balance = fields.Float(string="上年结余") former_year_balance = fields.Float(string="前年结余") diff --git a/yuthon_salary/wizard/salary_compute_wizard.py b/yuthon_salary/wizard/salary_compute_wizard.py index df384752d..72a3e4b4d 100644 --- a/yuthon_salary/wizard/salary_compute_wizard.py +++ b/yuthon_salary/wizard/salary_compute_wizard.py @@ -91,24 +91,7 @@ class SalaryComputeWizard(models.Model): 'payslip_run_id': payslip_run_id.id, 'state': 'draft', }) - payslip.compute_sheet_new() - month = int(self.select_time) - month_mapping = { - 1: '一月', 2: '二月', 3: '三月', 4: '四月', - 5: '五月', 6: '六月', 7: '七月', 8: '八月', - 9: '九月', 10: '十月', 11: '十一月', 12: '十二月' - } - month_name = month_mapping.get(month, '一月') - payslip_records = self.env['hr.payslip'].search([ - ('is_push', '=', False), - ('payslip_run_id.name', 'like', f'%年-{month_name}') # 匹配格式："2025年-一月" - ]) - for pay in payslip_records: - pay.mapped('worked_days_line_ids').unlink() - pay.mapped('line_ids').unlink() - pay._compute_worked_days_line_ids() - pay.compute_sheet() - + payslip.compute_sheet() internship_ids = self.env['hr.payslip'].search([ ('employee_id.contract_id.is_probation', '=', True), ('date_from', '<=', end_date),