From fe210369fc07fa4d14d2551e209e622c40fd2dd4 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Mon, 31 Mar 2025 11:40:53 +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 --- yuthon_contract/views/inherit_hr_contract_views.xml | 4 ++-- yuthon_hr_attendance/models/hr_attendance_month.py | 2 +- yuthon_hr_employee/models/inherit_hr_job.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yuthon_contract/views/inherit_hr_contract_views.xml b/yuthon_contract/views/inherit_hr_contract_views.xml index 355a99d1e..312d3df43 100644 --- a/yuthon_contract/views/inherit_hr_contract_views.xml +++ b/yuthon_contract/views/inherit_hr_contract_views.xml @@ -27,8 +27,8 @@ 1 - - 职级 + + [('yuthon_company', '=', yuthon_company)] diff --git a/yuthon_hr_attendance/models/hr_attendance_month.py b/yuthon_hr_attendance/models/hr_attendance_month.py index 1a9896398..dcb474591 100644 --- a/yuthon_hr_attendance/models/hr_attendance_month.py +++ b/yuthon_hr_attendance/models/hr_attendance_month.py @@ -396,7 +396,7 @@ class HrAttendanceMonthDetail(models.Model): def button_all_put(self): detail_ids = self.env["hr.attendance.month.detail"].browse(self._context.get('active_ids', self._context.get('active_id'))) for detail in detail_ids: - menu_id = self.env['ir.ui.menu'].search([('name', '=', '我的确认'), ('parent_id', '!=', False)]) + menu_id = self.env['ir.ui.menu'].search([('name', '=', '考勤确认'), ('parent_id', '!=', False)]) str = 'https://oa.thtzjt.com/web#id={}&cids=1&menu_id={}&action={}&model=hr.attendance.month.detail&view_type=form'.format( self.id, menu_id.id, menu_id.action.id) we_id = self.env['hr.employee'].search([('id', '=', detail.employee_id)]).wecom_userid diff --git a/yuthon_hr_employee/models/inherit_hr_job.py b/yuthon_hr_employee/models/inherit_hr_job.py index 637029b40..b69761c1f 100644 --- a/yuthon_hr_employee/models/inherit_hr_job.py +++ b/yuthon_hr_employee/models/inherit_hr_job.py @@ -13,7 +13,7 @@ class HrJob(models.Model): ] number = fields.Char(string="序号") - yuthon_company = fields.Selection([('thtz', '集团本部'), ('thwg', '天河物管'), ('thlc', '天河粮储'), ('thtjbb', '集团本部')], string="所属公司") + yuthon_company = fields.Selection([('thtz', '集团本部'), ('thwg', '天河物管'), ('thlc', '天河粮储')], string="所属公司") job_type_id = fields.Many2one('hr.job.type', string="岗位类别") start_date = fields.Date(string="生效日期", default=lambda self: fields.Date.today()) end_date = fields.Date(string="失效日期", default=fields.Date.from_string('2099-01-01'))