!8208 添加功能

Merge pull request !8208 from 李鹏宇/dev_zhou

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

soong_workflow/views/soong_workflow_record.xml

@@ -376,7 +376,7 @@
             <field name="context">{'header_search_default_approve_state': 1, 'header_search_default_to_do':1,
                 'check_employee': 1}
             </field>
-            <field name="domain">[('is_to_do', '=', True), ('is_company', '=', True)]</field>
+            <field name="domain">[('is_to_do', '=', True)]</field>
             <field name="search_view_id" ref="soong_workflow_record_search1"/>
             <field name="view_id" ref="soong_workflow_record_my_tree"/>
         </record>

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,
             },
         }