From 61e65e6dbeda0bec531808f0dfb21f4fcce6faad Mon Sep 17 00:00:00 2001 From: zhouzhou <123@qq.com> Date: Wed, 18 Sep 2024 09:32:47 +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 --- .../models/yuthon_account_approval.py | 2 +- .../models/yuthon_recruitment_approval.py | 2 +- yuthon_hr_employee_approval/views/menuitem.xml | 4 ++-- .../views/yuthon_account_approval_views.xml | 13 +++++++++++++ .../views/yuthon_enrollment_approval_views.xml | 15 ++++++++++++++- .../views/yuthon_interview_approval_views.xml | 14 ++++++++++++++ .../views/yuthon_leaving_approval_views.xml | 14 +++++++++++++- .../views/yuthon_prepare_approval_views.xml | 14 +++++++++++++- .../views/yuthon_rank_approval_views.xml | 14 +++++++++++++- .../views/yuthon_reassignment_approval_views.xml | 13 +++++++++++++ .../views/yuthon_recruitment_approval_views.xml | 13 +++++++++++++ .../yuthon_regularization_approval_views.xml | 13 +++++++++++++ .../views/yuthon_reward_approval_views.xml | 13 +++++++++++++ .../views/yuthon_salary_approval_views.xml | 14 +++++++++++++- .../views/yuthon_service_approval_views.xml | 14 +++++++++++++- .../views/yuthon_system_approval_views.xml | 13 +++++++++++++ .../views/yuthon_title_approval_views.xml | 13 +++++++++++++ yuthon_work_brand/views/hr_menus.xml | 6 +++--- 18 files changed, 191 insertions(+), 13 deletions(-) diff --git a/yuthon_hr_employee_approval/models/yuthon_account_approval.py b/yuthon_hr_employee_approval/models/yuthon_account_approval.py index a11317027..ca822faf1 100644 --- a/yuthon_hr_employee_approval/models/yuthon_account_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_account_approval.py @@ -3,7 +3,7 @@ from odoo import models, fields, api class YuthonAccountApproval(models.Model): _name = 'yuthon.account.approval' - _description = '职称聘任申请表' + _description = '薪资核算申请表' _inherit = 'soong.workflow.mixin' diff --git a/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py b/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py index 089f447c7..f05d16900 100644 --- a/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_recruitment_approval.py @@ -3,7 +3,7 @@ from odoo import models, fields, api class YuthonRecruitmentApproval(models.Model): _name = 'yuthon.recruitment.approval' - _description = '编制调整需求表' + _description = '招聘需求申请表' _inherit = 'soong.workflow.mixin' diff --git a/yuthon_hr_employee_approval/views/menuitem.xml b/yuthon_hr_employee_approval/views/menuitem.xml index 37ea45e21..b21d2f70a 100644 --- a/yuthon_hr_employee_approval/views/menuitem.xml +++ b/yuthon_hr_employee_approval/views/menuitem.xml @@ -32,7 +32,7 @@ action="yuthon_leaving_approval_action" sequence="9"/> @@ -47,7 +47,7 @@ action="yuthon_reassignment_approval_action" sequence="15"/> diff --git a/yuthon_hr_employee_approval/views/yuthon_account_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_account_approval_views.xml index 103647216..e056637b6 100644 --- a/yuthon_hr_employee_approval/views/yuthon_account_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_account_approval_views.xml @@ -9,6 +9,19 @@ + + yuthon.account.approval.form + yuthon.account.approval + +
+ + + + + +
+
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_enrollment_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_enrollment_approval_views.xml index c2aa1b772..1dc6f4dfc 100644 --- a/yuthon_hr_employee_approval/views/yuthon_enrollment_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_enrollment_approval_views.xml @@ -9,8 +9,21 @@ + + yuthon.enrollment.approval.form + yuthon.enrollment.approval + +
+ + + + + +
+
+
+ -interview 待开发 yuthon.enrollment.approval diff --git a/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml index 27220fe73..8ff8592bb 100644 --- a/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_interview_approval_views.xml @@ -9,6 +9,20 @@ + + yuthon.interview.approval.form + yuthon.interview.approval + +
+ + + + + +
+
+
+ diff --git a/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml index 9583e831a..8f003e305 100644 --- a/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_leaving_approval_views.xml @@ -9,7 +9,19 @@ - + + yuthon.leaving.approval.form + yuthon.leaving.approval + +
+ + + + + +
+
+
待开发 diff --git a/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml index d9afe63e4..dff796dbd 100644 --- a/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_prepare_approval_views.xml @@ -9,7 +9,19 @@ - + + yuthon.prepare.approval.form + yuthon.prepare.approval + +
+ + + + + +
+
+
待开发 diff --git a/yuthon_hr_employee_approval/views/yuthon_rank_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_rank_approval_views.xml index 5753631a3..d64324526 100644 --- a/yuthon_hr_employee_approval/views/yuthon_rank_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_rank_approval_views.xml @@ -9,7 +9,19 @@ - + + yuthon.rank.approval.form + yuthon.rank.approval + +
+ + + + + +
+
+
待开发 diff --git a/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml index 50c9f59c6..4cc657b01 100644 --- a/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_reassignment_approval_views.xml @@ -9,6 +9,19 @@ + + yuthon.reassignment.approval.form + yuthon.reassignment.approval + +
+ + + + + +
+
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml index a83e84b2a..e7e3a90ff 100644 --- a/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_recruitment_approval_views.xml @@ -9,6 +9,19 @@ + + yuthon.recruitment.approval.form + yuthon.recruitment.approval + +
+ + + + + +
+
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml index c9b930633..4389d4ead 100644 --- a/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_regularization_approval_views.xml @@ -9,6 +9,19 @@ + + yuthon.regularization.approval.form + yuthon.regularization.approval + +
+ + + + + +
+
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml index 82a936cb5..a79cb2be5 100644 --- a/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_reward_approval_views.xml @@ -9,6 +9,19 @@ + + yuthon.reward.approval.form + yuthon.reward.approval + +
+ + + + + +
+
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_salary_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_salary_approval_views.xml index f0efbbecc..c42002e01 100644 --- a/yuthon_hr_employee_approval/views/yuthon_salary_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_salary_approval_views.xml @@ -9,7 +9,19 @@ - + + yuthon.salary.approval.form + yuthon.salary.approval + +
+ + + + + +
+
+
待开发 diff --git a/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml index 9e416d26d..065300458 100644 --- a/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_service_approval_views.xml @@ -9,7 +9,19 @@ - + + yuthon.service.approval.form + yuthon.service.approval + +
+ + + + + +
+
+
待开发 diff --git a/yuthon_hr_employee_approval/views/yuthon_system_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_system_approval_views.xml index 825a3601e..fdc2b1e86 100644 --- a/yuthon_hr_employee_approval/views/yuthon_system_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_system_approval_views.xml @@ -9,6 +9,19 @@ + + yuthon.system.approval.form + yuthon.system.approval + +
+ + + + + +
+
+
diff --git a/yuthon_hr_employee_approval/views/yuthon_title_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_title_approval_views.xml index 68fca5804..6e753ad73 100644 --- a/yuthon_hr_employee_approval/views/yuthon_title_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_title_approval_views.xml @@ -9,6 +9,19 @@ + + yuthon.title.approval.form + yuthon.title.approval + +
+ + + + + +
+
+
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index 7c8321d7c..ef5249b9b 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -160,7 +160,7 @@ action="yuthon_hr_employee_approval.yuthon_message_login_action" sequence="3"/> @@ -175,7 +175,7 @@ action="yuthon_none_action" sequence="9"/> @@ -190,7 +190,7 @@ action="yuthon_none_action" sequence="15"/>