From e5fa44dc3ced2c50ffad1efbb999646f18ea603d 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: Thu, 22 Jan 2026 14:48:35 +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
---
room/models/room_booking.py | 2 +-
soong_workflow/views/soong_workflow_record.xml | 2 +-
yuthon_contract/models/inherit_hr_contract.py | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/room/models/room_booking.py b/room/models/room_booking.py
index e0185e2c3..9288d7252 100644
--- a/room/models/room_booking.py
+++ b/room/models/room_booking.py
@@ -92,7 +92,7 @@ class RoomBooking(models.Model):
def _onchange_meeting_type_id(self):
if self.meeting_type_id:
self.room_users_ids = self.meeting_type_id.users_ids
- self.host = self.meeting_type_id.host_user_id if self.meeting_type_id.host_user_id else False
+ self.host = self.meeting_type_id.host_user_id.id if self.meeting_type_id.host_user_id else False
else:
self.room_users_ids = [(5, 0, 0)]
self.host = False
diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml
index 2f82940bd..1392e00a8 100644
--- a/soong_workflow/views/soong_workflow_record.xml
+++ b/soong_workflow/views/soong_workflow_record.xml
@@ -376,7 +376,7 @@
{'header_search_default_approve_state': 1, 'header_search_default_to_do':1,
'check_employee': 1}
- [('is_to_do', '=', True), ('is_company', '=', True)]
+ [('is_to_do', '=', True)]
diff --git a/yuthon_contract/models/inherit_hr_contract.py b/yuthon_contract/models/inherit_hr_contract.py
index f2be7a908..9e7751ef6 100644
--- a/yuthon_contract/models/inherit_hr_contract.py
+++ b/yuthon_contract/models/inherit_hr_contract.py
@@ -111,7 +111,7 @@ class HrContract(models.Model):
'target': 'current',
'context': {
'default_work_end': False,
- 'default_self_users_ids':[(6, 0, [self.employee_id.user_id.id])],
+ 'default_self_users_ids':[(6, 0, [self.env.user.id])],
'default_contract_id': contract_ids.id,
'default_employee_id': contract_ids.employee_id.id
}}
@@ -172,7 +172,7 @@ class HrContract(models.Model):
"default_employee_id": self.employee_id.id,
"default_current_status": self.employee_id.contract_id.date_end,
"default_department1_id": self.employee_id.department_id.id,
- "default_renewal_date": self.employee_id.contract_id.date_end + relativedelta(years=3),
+ "default_renewal_date": self.employee_id.contract_id.date_end + relativedelta(years=3) if self.employee_id.contract_id.date_end else False,
"default_contract_id": self.id,
},
}