From 8cdbcbc775467ac1559a1360b036410cba3df99c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Wed, 1 Jul 2026 17:38:10 +0800 Subject: [PATCH 1/4] =?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_contract/models/inherit_hr_contract.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/yuthon_contract/models/inherit_hr_contract.py b/yuthon_contract/models/inherit_hr_contract.py index d107bfa85..835ccc7f4 100644 --- a/yuthon_contract/models/inherit_hr_contract.py +++ b/yuthon_contract/models/inherit_hr_contract.py @@ -481,6 +481,19 @@ class HrContract(models.Model): }) contracts._sync_party_company() + # 创建合同时自动初始化异动信息明细行 + for contract in contracts: + if not contract.change_ids: + self.env['hr.contract.change.line'].create({ + 'contract_id': contract.id, + 'department_id': contract.department_id.id, + 'job_id': contract.job_id.id, + 'structure_type_id': contract.structure_type_id.id, + 'salary_group_id': contract.salary_group_id.id, + 'change_start_date': contract.date_start, + 'change_end_date': contract.date_end, + }) + return contracts From 06b60a46117d604dae751d3e4c6043fac9724433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Wed, 1 Jul 2026 18:24:09 +0800 Subject: [PATCH 2/4] =?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_property_approval/wizard/property_rental_wizard.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yuthon_property_approval/wizard/property_rental_wizard.py b/yuthon_property_approval/wizard/property_rental_wizard.py index b1a6c4d68..1b20961a8 100644 --- a/yuthon_property_approval/wizard/property_rental_wizard.py +++ b/yuthon_property_approval/wizard/property_rental_wizard.py @@ -125,11 +125,9 @@ class PropertyRentalWizard(models.Model): ] # 判断是否有已生成押金 first_day_of_month = due_date.replace(day=1) - last_day_of_month = first_day_of_month + relativedelta(months=1) - timedelta(days=1) existing_receivable = self.env['property.accounts.receivable'].search([ ('lessee_id', '=', record.lessee_id.id), - ('due_date', '>=', first_day_of_month), - ('due_date', '<=', last_day_of_month), + ('due_date', '=', first_day_of_month), ('management_type_id.name', '=', '押金'), ('company_id', '=', record.lessor_id.id), ('contract_id.contract_code', '=', record.contract_code), @@ -292,6 +290,7 @@ class PropertyRentalWizard(models.Model): records = self.env['property.lease.contract'].search(domain +[ ('actual_start_time', '<', next_month_first_day), ('actual_end_time', '>=', first_day), + ('contract_code', '=', '租（2023）22号') ]) if not records: records = self.env['property.lease.contract'].search(domain +[ From af6a5e2f8b40f7b63372b71a9bf7f3cb7ca28987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Wed, 1 Jul 2026 18:27:02 +0800 Subject: [PATCH 3/4] =?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_property_approval/wizard/property_rental_wizard.py | 1 - 1 file changed, 1 deletion(-) diff --git a/yuthon_property_approval/wizard/property_rental_wizard.py b/yuthon_property_approval/wizard/property_rental_wizard.py index 1b20961a8..9bfa5c01a 100644 --- a/yuthon_property_approval/wizard/property_rental_wizard.py +++ b/yuthon_property_approval/wizard/property_rental_wizard.py @@ -290,7 +290,6 @@ class PropertyRentalWizard(models.Model): records = self.env['property.lease.contract'].search(domain +[ ('actual_start_time', '<', next_month_first_day), ('actual_end_time', '>=', first_day), - ('contract_code', '=', '租（2023）22号') ]) if not records: records = self.env['property.lease.contract'].search(domain +[ From f331cbd3dfaaa54e37bf1628541fac0a0ae08933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= <9664676+pengyuthon@user.noreply.gitee.com> Date: Wed, 1 Jul 2026 18:41:34 +0800 Subject: [PATCH 4/4] =?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_attendance/models/yuthon_vacation_reports.py | 1 + 1 file changed, 1 insertion(+) diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py index c0db69c17..3a1842fc8 100644 --- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py +++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py @@ -2756,6 +2756,7 @@ class YuthonVacationReports(models.Model): pending = self.env['soong.workflow.record'].sudo().search_count([ ('users_ids', 'in', user.id), ('approvals_group_id.name', '=', '考勤'), + ('reclaim_state', '=', False), ('approve_state', '=', 'pending'), ('workflow_happen_date', '>=', month_start), ('workflow_happen_date', '<=', month_end),