diff --git a/yuthon_holiday/views/hr_leave_batch.xml b/yuthon_holiday/views/hr_leave_batch.xml index 17d808b87..23857a80a 100644 --- a/yuthon_holiday/views/hr_leave_batch.xml +++ b/yuthon_holiday/views/hr_leave_batch.xml @@ -94,7 +94,7 @@ context="{'employee_id': employee_id}" options="{'no_create': True, 'no_open': True, 'request_type': 'leave'}" readonly="state in ['cancel', 'refuse', 'validate', 'validate1']" - width="200px" + width="300px" /> @@ -114,7 +114,7 @@ - + @@ -154,9 +154,9 @@ context="{'employee_id': employee_id}" options="{'no_create': True, 'no_open': True, 'request_type': 'leave'}" readonly="state in ['cancel', 'refuse', 'validate', 'validate1']" - width="200px" + width="300px" /> - + diff --git a/yuthon_hr_employee/views/inherit_hr_applicant_views.xml b/yuthon_hr_employee/views/inherit_hr_applicant_views.xml index 898163717..bd70e3f07 100644 --- a/yuthon_hr_employee/views/inherit_hr_applicant_views.xml +++ b/yuthon_hr_employee/views/inherit_hr_applicant_views.xml @@ -63,9 +63,9 @@ 1 - - - + + 1 + 1 @@ -80,6 +80,7 @@ + 创建时间 @@ -101,7 +102,7 @@ 面试信息 hr.applicant - kanban,tree,form,pivot,graph,calendar,activity + tree,kanban,form,pivot,graph,calendar,activity {'search_default_stage':1} diff --git a/yuthon_hr_employee/views/inherit_hr_job_views.xml b/yuthon_hr_employee/views/inherit_hr_job_views.xml index 1090a015c..d1f928954 100644 --- a/yuthon_hr_employee/views/inherit_hr_job_views.xml +++ b/yuthon_hr_employee/views/inherit_hr_job_views.xml @@ -159,9 +159,6 @@ action_create_new_job object - - 新建人员信息 - diff --git a/yuthon_hr_employee_approval/models/inherit_hr_applicant.py b/yuthon_hr_employee_approval/models/inherit_hr_applicant.py index e1e0c2101..c9c55be91 100644 --- a/yuthon_hr_employee_approval/models/inherit_hr_applicant.py +++ b/yuthon_hr_employee_approval/models/inherit_hr_applicant.py @@ -36,7 +36,7 @@ class HrApplicant(models.Model): 'res_model': 'yuthon.interview.approval', "views": [[form_id, "form"]], "context": { - 'default_name': ','.join(name_list) + '面试申请表', + 'default_name': ','.join(name_list) + '面试申请', 'default_job_id': self.job_id.id, 'default_department_id': self.department_id.id, 'default_applicant_ids': hr_applicant_list, diff --git a/yuthon_hr_employee_approval/models/yuthon_interview_approval.py b/yuthon_hr_employee_approval/models/yuthon_interview_approval.py index babe02a88..fef60f288 100644 --- a/yuthon_hr_employee_approval/models/yuthon_interview_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_interview_approval.py @@ -20,10 +20,10 @@ class YuthonInterviewApproval(models.Model): code = fields.Char(string="编号", default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_interview_approval_code')) applicant_ids = fields.One2many('interview.approval.line', 'interview_approval_id', string='应聘面试信息') is_issues = fields.Boolean(string='是否上会') - yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'), - ('thlc', '天河粮储')], string="公司") + yuthon_company = fields.Selection(related='users_id.employee_id.yuthon_company', string="公司") related_issues_id = fields.Many2one('issue.library', string="关联议题") active = fields.Boolean('Active', default=True, tracking=True) + room_id = fields.Many2one('room.booking', string="会议室") def _get_default_name_title(self): return self._description if self._description else self._name @@ -31,6 +31,7 @@ class YuthonInterviewApproval(models.Model): def scheduling_of_meetings(self): form_id = self.env.ref("room.room_booking_view_form").id + meeting_type_id = self.sudo().env["room.meeting.type"].search([("name", "=", "面试")], limit=1) employee_ids = [] for applicant in self.applicant_ids: for employee_id in applicant.employee_ids: @@ -41,6 +42,10 @@ class YuthonInterviewApproval(models.Model): 'res_model': 'room.booking', "views": [[form_id, "form"]], "context": { + 'default_name': self.name, + 'default_yuthon_company': self.yuthon_company, + 'default_interview_id': self.id, + 'default_meeting_type_id': meeting_type_id.id, 'default_room_users_ids': [(6, 0, employee_ids)], } } @@ -95,7 +100,7 @@ class InterviewApprovalLine(models.Model): def button_applicant_ids(self): self.ensure_one() - applicant = self.env['hr.applicant'].search([('name', '=', self.name)], limit=1) + applicant = self.env['hr.applicant'].search([('partner_name', '=', self.name)], limit=1) if applicant: return { 'type': 'ir.actions.act_window', diff --git a/yuthon_hr_employee_approval/views/inherit_hr_job_views.xml b/yuthon_hr_employee_approval/views/inherit_hr_job_views.xml index e3924bad5..805b87c8f 100644 --- a/yuthon_hr_employee_approval/views/inherit_hr_job_views.xml +++ b/yuthon_hr_employee_approval/views/inherit_hr_job_views.xml @@ -22,6 +22,9 @@
+ + 1 + diff --git a/yuthon_issue/models/inherit_room_booking.py b/yuthon_issue/models/inherit_room_booking.py index 4046e78a2..e625ab5e2 100644 --- a/yuthon_issue/models/inherit_room_booking.py +++ b/yuthon_issue/models/inherit_room_booking.py @@ -8,7 +8,8 @@ class RoomBooking(models.Model): is_issue = fields.Boolean(string="是否关联议题") issue_meeting_line_ids = fields.One2many('issue.meeting.line', 'meeting_booking_id', string="关联议题明细行") number_of_meetings = fields.Integer(string='会议次数') - company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储')], string="公司") + yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'), ('thlc', '天河粮储')], + string='公司') def bottom_meeting_approval(self): library_data = [] @@ -31,7 +32,7 @@ class RoomBooking(models.Model): 'default_meeting_type_id': self.meeting_type_id.id, 'default_meeting_date': self.start_datetime, 'default_number_of_meetings': self.number_of_meetings, - 'default_company_page':self.company_page, + 'default_yuthon_company':self.yuthon_company, 'default_meeting_minutes_ids': library_data }} diff --git a/yuthon_issue/models/issue_meeting_minutes.py b/yuthon_issue/models/issue_meeting_minutes.py index 4eba4a2c6..2b1cfa259 100644 --- a/yuthon_issue/models/issue_meeting_minutes.py +++ b/yuthon_issue/models/issue_meeting_minutes.py @@ -11,7 +11,8 @@ class IssueMeetingMinutes(models.Model): name = fields.Char(string='名称') number_of_meetings = fields.Integer(string='会议次数') - company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储')], string="公司") + yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'), ('thlc', '天河粮储')], + string='公司') meeting_id = fields.Many2one('room.booking', string='会议名称', required=True) meeting_type_id = fields.Many2one('room.meeting.type', string="会议类型") meeting_date = fields.Datetime(string="会议时间") diff --git a/yuthon_issue/views/inherit_room_booking.xml b/yuthon_issue/views/inherit_room_booking.xml index 92abcfa74..14fb876f0 100644 --- a/yuthon_issue/views/inherit_room_booking.xml +++ b/yuthon_issue/views/inherit_room_booking.xml @@ -9,7 +9,7 @@ - + diff --git a/yuthon_issue/views/issue_meeting_minutes_views.xml b/yuthon_issue/views/issue_meeting_minutes_views.xml index a079fc545..e9759063e 100644 --- a/yuthon_issue/views/issue_meeting_minutes_views.xml +++ b/yuthon_issue/views/issue_meeting_minutes_views.xml @@ -30,7 +30,7 @@ - + diff --git a/yuthon_property/views/yuthon_property_views.xml b/yuthon_property/views/yuthon_property_views.xml index 330b8d066..71f6cf0cf 100644 --- a/yuthon_property/views/yuthon_property_views.xml +++ b/yuthon_property/views/yuthon_property_views.xml @@ -7,6 +7,7 @@
+
@@ -16,6 +17,7 @@ +