diff --git a/soong_workflow/views/soong_workflow_record.xml b/soong_workflow/views/soong_workflow_record.xml index dedae8a43..2f7e46514 100644 --- a/soong_workflow/views/soong_workflow_record.xml +++ b/soong_workflow/views/soong_workflow_record.xml @@ -190,14 +190,25 @@ - - 我的流程 + + 待办 ir.actions.act_window soong.workflow.record tree,kanban,search {'header_search_default_approve_state': 1, 'header_search_default_to_do':1, 'check_employee': 1} - [('users_ids', 'in', uid), ('reclaim_state', '=', False)] + [('users_ids', 'in', uid), ('reclaim_state', '=', False), ('soong_state', '=', 'to_do')] + + + + + 已办 + ir.actions.act_window + soong.workflow.record + tree,kanban,search + + {'header_search_default_approve_state': 1, 'header_search_default_to_do':1, 'check_employee': 1} + [('users_ids', 'in', uid), ('reclaim_state', '=', False), ('soong_state', '=', 'done')] diff --git a/yuthon_hr_attendance/models/yuthon_vacation_reports.py b/yuthon_hr_attendance/models/yuthon_vacation_reports.py index c362fe125..8d764ff55 100644 --- a/yuthon_hr_attendance/models/yuthon_vacation_reports.py +++ b/yuthon_hr_attendance/models/yuthon_vacation_reports.py @@ -436,7 +436,7 @@ class YuthonVacationReports(models.Model): } def attendance_confirmation(self): - reports = self.env["yuthon.vacation.reports"].search([]) + reports = self.env["yuthon.vacation.reports"].search([('employee_id.name', '=', '叶华锋')]) employee_ids = {report.employee_id for report in reports if report.employee_id} for employee in employee_ids: employee_reports = reports.filtered(lambda r: r.employee_id == employee) diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index 81a9560a1..e7cd546e8 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -637,8 +637,17 @@ + +