From 12050ec4139b0b2026cf76aa3422121419e5fc91 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Sat, 1 Mar 2025 16:11:43 +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_holiday/views/hr_leave_accrual_views.xml | 3 +++ yuthon_holiday/views/hr_leave_batch.xml | 2 +- .../views/inherit_hr_leave_accrual_plan_views.xml | 3 +++ .../views/inherit_hr_leave_allocation_views.xml | 6 ++++++ yuthon_holiday/views/inherit_hr_type_views.xml | 3 +++ .../views/yuthon_fixes_approval_views.xml | 2 +- .../security/attendance_group.xml | 9 +-------- yuthon_hr_attendance/security/ir.model.access.csv | 4 ++-- yuthon_hr_attendance/views/card_approval.xml | 2 +- yuthon_hr_attendance/views/duty_approval.xml | 2 +- yuthon_hr_attendance/views/go_approval.xml | 2 +- .../views/hr_attendance_detail_wechat_views.xml | 2 +- .../views/hr_attendance_month_views.xml | 2 +- .../views/inherit_planning_slot_views.xml | 3 +++ yuthon_hr_attendance/views/leave_approval.xml | 2 +- yuthon_hr_attendance/views/overtime_approval.xml | 2 +- .../views/overtime_page_views.xml | 2 +- .../views/planning_slot_template_views.xml | 3 +++ .../views/remove_holiday_approval.xml | 2 +- .../views/resource_calendar_leaves_views.xml | 3 +++ .../views/yuthon_abnormal_approval_views.xml | 2 +- .../views/yuthon_adjustments_approval_views.xml | 2 +- .../views/yuthon_customer_approval_views.xml | 2 +- .../views/yuthon_customer_planning_views.xml | 2 +- .../views/yuthon_duty_plan_views.xml | 2 +- .../views/yuthon_duty_setting_views.xml | 2 +- .../views/yuthon_run_planning_views.xml | 2 +- .../views/yuthon_shift_approval_views.xml | 2 +- .../views/yuthon_shift_planning_views.xml | 2 +- .../views/yuthon_special_approval_views.xml | 2 +- yuthon_hr_employee/models/inherit_hr_job.py | 1 + .../views/inherit_hr_applicant_views.xml | 3 +++ yuthon_hr_employee/views/inherit_hr_job_views.xml | 2 ++ .../views/inherit_hr_work_location_views.xml | 3 +++ .../views/inherit_res_groups_views.xml | 3 +++ .../views/yuthon_hr_employee_views.xml | 3 +++ .../views/yuthon_job_postings_views.xml | 2 +- .../views/yuthon_medical_manage_views.xml | 2 +- .../models/inherit_hr_job.py | 6 +----- .../models/yuthon_recruitment_approval.py | 15 +++++++++++++-- .../views/yuthon_account_approval_views.xml | 2 +- .../views/yuthon_appointment_approval_views.xml | 2 +- .../views/yuthon_enrollment_approval_views.xml | 2 +- .../views/yuthon_interview_approval_views.xml | 2 +- .../views/yuthon_leaving_approval_views.xml | 2 +- .../views/yuthon_message_login_views.xml | 2 +- .../views/yuthon_onboard_approval_views.xml | 2 +- .../views/yuthon_prepare_approval_views.xml | 2 +- .../views/yuthon_rank_approval_views.xml | 2 +- .../views/yuthon_reassignment_approval_views.xml | 2 +- .../views/yuthon_recruitment_approval_views.xml | 3 ++- .../yuthon_regularization_approval_views.xml | 2 +- .../views/yuthon_retired_approval_views.xml | 2 +- .../views/yuthon_reward_approval_views.xml | 2 +- .../views/yuthon_salary_approval_views.xml | 2 +- .../views/yuthon_service_approval_views.xml | 2 +- .../views/yuthon_social_files_approval_view.xml | 2 +- .../views/yuthon_system_approval_views.xml | 2 +- .../views/yuthon_transfer_approval_views.xml | 2 +- .../views/yuthon_inspection_items_views.xml | 2 +- .../views/yuthon_inspection_route_views.xml | 2 +- .../views/yuthon_inspection_scores_views.xml | 2 +- .../views/yuthon_inspection_views.xml | 2 +- .../views/issue_approval_decision_type_views.xml | 2 +- .../views/issue_approval_decision_views.xml | 2 +- yuthon_issue/views/issue_library_views.xml | 2 +- .../views/issue_meeting_minutes_views.xml | 2 +- .../views/property_report_repair.xml | 2 +- .../views/yuthon_lessee_notice.xml | 2 +- yuthon_maintain/views/property_report_repair.xml | 2 +- .../views/yuthon_maintain_desktop_views.xml | 2 +- .../views/yuthon_maintain_service_views.xml | 2 +- .../yuthon_official_incoming_labor_views.xml | 2 +- .../yuthon_official_incoming_normal_views.xml | 2 +- .../yuthon_official_incoming_party_views.xml | 2 +- .../views/yuthon_official_labor_views.xml | 2 +- .../views/yuthon_official_party_views.xml | 2 +- yuthon_official/views/yuthon_official_views.xml | 2 +- .../views/yuthon_assessment_tasks.xml | 2 +- .../yuthon_departmental_responsible_views.xml | 2 +- .../views/yuthon_duty_management.xml | 2 +- .../views/yuthon_employee_appraisal.xml | 2 +- .../views/yuthon_employee_approval.xml | 2 +- .../views/yuthon_employee_performance.xml | 2 +- yuthon_performance/views/yuthon_grading_tasks.xml | 2 +- .../views/yuthon_index_approval.xml | 2 +- .../views/yuthon_index_employee.xml | 2 +- .../views/yuthon_index_management.xml | 2 +- yuthon_performance/views/yuthon_kpi_tasks.xml | 2 +- .../views/yuthon_personal_logs_views.xml | 2 +- .../views/yuthon_plan_management.xml | 2 +- .../views/yuthon_tissue_duty_approval.xml | 2 +- .../views/property_accounting_unit_views.xml | 2 +- .../views/property_check_decorate_views.xml | 2 +- .../views/property_check_elevator_views.xml | 2 +- .../views/property_check_equipment_views.xml | 2 +- .../views/property_check_escape_views.xml | 2 +- .../views/property_check_list_views.xml | 2 +- .../views/property_check_lobby_views.xml | 2 +- .../views/property_check_project_views.xml | 2 +- .../views/property_check_room_views.xml | 2 +- .../views/property_check_stairs_views.xml | 2 +- .../views/property_construction_unit_views.xml | 2 +- .../views/property_electric_reading_views.xml | 2 +- .../views/property_intention_information.xml | 2 +- .../views/property_meter_archives_views.xml | 2 +- .../views/property_meter_water_views.xml | 2 +- yuthon_property/views/property_patrol_duty.xml | 2 +- yuthon_property/views/property_patrol_plan.xml | 2 +- .../views/property_patrol_position.xml | 2 +- .../views/property_patrol_standard.xml | 2 +- .../views/property_route_management.xml | 2 +- .../views/property_tenant_information_views.xml | 2 +- .../views/property_water_reading_views.xml | 2 +- .../views/yuthon_property_message_views.xml | 2 +- yuthon_property/views/yuthon_property_views.xml | 2 +- .../views/perperty_claim_approval_views.xml | 2 +- .../views/property_accounting_approval_views.xml | 2 +- .../views/property_approval_views.xml | 2 +- .../views/property_assess_views.xml | 2 +- .../views/property_billing_confirmation.xml | 2 +- .../views/property_borrowing_approval_views.xml | 2 +- .../views/property_business_confirm.xml | 2 +- .../views/property_capacity.xml | 2 +- .../views/property_collection_confirm.xml | 2 +- .../views/property_confirm_views.xml | 2 +- .../property_construction_approval_views.xml | 2 +- .../views/property_construction_work.xml | 2 +- .../views/property_contract_changes.xml | 2 +- .../views/property_delegated_agent_views.xml | 2 +- .../views/property_design_approval_views.xml | 2 +- .../views/property_early_quitting.xml | 2 +- .../views/property_eligibility.xml | 2 +- .../views/property_equity_views.xml | 2 +- .../views/property_evaluate_application_views.xml | 2 +- .../views/property_fitment.xml | 2 +- .../views/property_handover_views.xml | 2 +- .../views/property_information.xml | 2 +- .../views/property_intention_views.xml | 2 +- .../views/property_inventory_table.xml | 2 +- .../views/property_lease_alter.xml | 2 +- .../views/property_lease_contract.xml | 2 +- .../views/property_lease_extension.xml | 2 +- .../views/property_lease_renewal.xml | 2 +- .../views/property_lessee_change.xml | 2 +- .../views/property_management.xml | 2 +- .../views/property_management_fee.xml | 2 +- .../views/property_material_procurement.xml | 2 +- .../views/property_merge_approval_views.xml | 2 +- .../views/property_move_views.xml | 2 +- .../views/property_offline_registration.xml | 2 +- .../views/property_open_rent_views.xml | 2 +- .../views/property_penalty_proportion.xml | 2 +- .../views/property_penalty_relief.xml | 2 +- .../views/property_project_approval_views.xml | 2 +- .../views/property_project_works_viwes.xml | 2 +- .../views/property_record_views.xml | 2 +- .../views/property_reimbursement_form_views.xml | 2 +- .../views/property_renamed.xml | 2 +- .../views/property_rent_relief.xml | 2 +- .../views/property_rental_conditions.xml | 2 +- .../views/property_rental_form_views.xml | 2 +- .../views/property_split_approval_views.xml | 2 +- .../views/property_sporadic_works_views.xml | 2 +- .../views/property_supervising_approval_views.xml | 2 +- .../views/property_transaction_confirmed.xml | 2 +- .../views/property_transfer_views.xml | 2 +- .../views/property_utility_bills.xml | 2 +- .../yuthon_office_supplies_setting_views.xml | 2 +- .../views/yuthon_office_supplies_views.xml | 2 +- .../views/yuthon_care_condolences_views.xml | 2 +- .../views/yuthon_message_approval_views.xml | 2 +- .../views/yuthon_personal_condolences.xml | 2 +- yuthon_trade/views/yuthon_trade_activities.xml | 2 +- yuthon_trade/views/yuthon_trade_borrowing.xml | 2 +- yuthon_trade/views/yuthon_trade_contract.xml | 2 +- yuthon_trade/views/yuthon_trade_pay.xml | 2 +- yuthon_trade/views/yuthon_trade_policy.xml | 2 +- yuthon_trade/views/yuthon_trade_premium.xml | 2 +- yuthon_trade/views/yuthon_trade_purchase.xml | 2 +- yuthon_trade/views/yuthon_trade_refund.xml | 2 +- yuthon_trade/views/yuthon_trade_reimbursed.xml | 2 +- yuthon_trade/views/yuthon_trade_supportive.xml | 2 +- .../views/yuthon_work_condolences_views.xml | 2 +- yuthon_wechat/views/wecom_api_views.xml | 2 +- yuthon_wechat/views/wecom_apps_config_views.xml | 2 +- yuthon_wechat/views/wecom_apps_views.xml | 2 +- yuthon_will_task/views/yuthon_will_task_views.xml | 2 +- 188 files changed, 228 insertions(+), 188 deletions(-) diff --git a/yuthon_holiday/views/hr_leave_accrual_views.xml b/yuthon_holiday/views/hr_leave_accrual_views.xml index 8128ee40e..b6f59b55c 100644 --- a/yuthon_holiday/views/hr_leave_accrual_views.xml +++ b/yuthon_holiday/views/hr_leave_accrual_views.xml @@ -5,6 +5,9 @@ hr.leave.accrual.level + + 0 + [16, 0] diff --git a/yuthon_holiday/views/hr_leave_batch.xml b/yuthon_holiday/views/hr_leave_batch.xml index 6e0f62d87..cbec97b96 100644 --- a/yuthon_holiday/views/hr_leave_batch.xml +++ b/yuthon_holiday/views/hr_leave_batch.xml @@ -17,7 +17,7 @@ hr.leave.batch.form hr.leave.batch -
+ diff --git a/yuthon_holiday/views/inherit_hr_leave_accrual_plan_views.xml b/yuthon_holiday/views/inherit_hr_leave_accrual_plan_views.xml index 209c19fbb..03ed7459a 100644 --- a/yuthon_holiday/views/inherit_hr_leave_accrual_plan_views.xml +++ b/yuthon_holiday/views/inherit_hr_leave_accrual_plan_views.xml @@ -5,6 +5,9 @@ hr.leave.accrual.plan + + 0 + diff --git a/yuthon_holiday/views/inherit_hr_leave_allocation_views.xml b/yuthon_holiday/views/inherit_hr_leave_allocation_views.xml index 0daba141f..0e5fccfe5 100644 --- a/yuthon_holiday/views/inherit_hr_leave_allocation_views.xml +++ b/yuthon_holiday/views/inherit_hr_leave_allocation_views.xml @@ -27,6 +27,9 @@ hr.leave.allocation + + 0 + @@ -38,6 +41,9 @@ hr.leave.allocation + + 0 + diff --git a/yuthon_holiday/views/inherit_hr_type_views.xml b/yuthon_holiday/views/inherit_hr_type_views.xml index 683715b59..9af4ef731 100644 --- a/yuthon_holiday/views/inherit_hr_type_views.xml +++ b/yuthon_holiday/views/inherit_hr_type_views.xml @@ -23,6 +23,9 @@ hr.leave.type + + 0 + diff --git a/yuthon_holiday/views/yuthon_fixes_approval_views.xml b/yuthon_holiday/views/yuthon_fixes_approval_views.xml index 052abe399..f64c1f52f 100644 --- a/yuthon_holiday/views/yuthon_fixes_approval_views.xml +++ b/yuthon_holiday/views/yuthon_fixes_approval_views.xml @@ -16,7 +16,7 @@ yuthon.fixes.approval.form yuthon.fixes.approval - + diff --git a/yuthon_hr_attendance/security/attendance_group.xml b/yuthon_hr_attendance/security/attendance_group.xml index d82d2c927..ae89eda4b 100644 --- a/yuthon_hr_attendance/security/attendance_group.xml +++ b/yuthon_hr_attendance/security/attendance_group.xml @@ -4,29 +4,22 @@ 出勤组 - - 用户 - - 考勤记录(天河投资) - 考勤记录(天河物管) - 考勤记录(天河粮储) - 管理者 - diff --git a/yuthon_hr_attendance/security/ir.model.access.csv b/yuthon_hr_attendance/security/ir.model.access.csv index 0afe959a5..9f12e96ed 100644 --- a/yuthon_hr_attendance/security/ir.model.access.csv +++ b/yuthon_hr_attendance/security/ir.model.access.csv @@ -43,9 +43,9 @@ access_hr_attendance_detail_image_user,hr.attendance.detail.image.user,model_hr_ access_hr_attendance_detail_image_manager,hr.attendance.detail.image.manager,model_hr_attendance_detail_image,base.group_user,1,1,1,1 -access_hr_attendance_year_manager,hr.attendance.year.manager,model_hr_attendance_year,group_he_attendance_user,1,1,1,1 +access_hr_attendance_year_manager,hr.attendance.year.manager,model_hr_attendance_year,group_he_attendance_manager,1,1,1,1 access_hr_attendance_month_manager,hr.attendance.month.manager,model_hr_attendance_month,group_he_attendance_manager,1,1,0,1 -access_hr_attendance_month_detail_user,hr.attendance.month.detail.user,model_hr_attendance_month_detail,group_he_attendance_user,1,0,0,0 +access_hr_attendance_month_detail_user,hr.attendance.month.detail.user,model_hr_attendance_month_detail,group_he_attendance_manager,1,0,0,0 access_hr_attendance_month_detail_manager,hr.attendance.month.detail.manager,model_hr_attendance_month_detail,group_he_attendance_manager,1,1,1,1 access_hr_attendance_month_wizard_manager,hr.attendance.month.wizard.manager,model_hr_attendance_month_wizard,group_he_attendance_manager,1,1,1,1 access_yuthon_delete_planning_wizard,yuthon.delete.planning.wizard,model_yuthon_delete_planning_wizard,group_he_attendance_manager,1,1,1,1 diff --git a/yuthon_hr_attendance/views/card_approval.xml b/yuthon_hr_attendance/views/card_approval.xml index c392ffe2b..2d6403ad6 100644 --- a/yuthon_hr_attendance/views/card_approval.xml +++ b/yuthon_hr_attendance/views/card_approval.xml @@ -16,7 +16,7 @@ card.approval.form card.approval - + diff --git a/yuthon_hr_attendance/views/duty_approval.xml b/yuthon_hr_attendance/views/duty_approval.xml index 84be822a0..4831a5ae5 100644 --- a/yuthon_hr_attendance/views/duty_approval.xml +++ b/yuthon_hr_attendance/views/duty_approval.xml @@ -15,7 +15,7 @@ duty.approval.actions duty.approval - + diff --git a/yuthon_hr_attendance/views/go_approval.xml b/yuthon_hr_attendance/views/go_approval.xml index 8e0f2a34a..8bc07855e 100644 --- a/yuthon_hr_attendance/views/go_approval.xml +++ b/yuthon_hr_attendance/views/go_approval.xml @@ -16,7 +16,7 @@ go.approval.actions go.approval - + diff --git a/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml b/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml index b2f1e798b..8d2412825 100644 --- a/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml +++ b/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml @@ -15,7 +15,7 @@ hr.attendance.detail.image.form hr.attendance.detail.image - + diff --git a/yuthon_hr_attendance/views/hr_attendance_month_views.xml b/yuthon_hr_attendance/views/hr_attendance_month_views.xml index 0eb250922..f6468186d 100644 --- a/yuthon_hr_attendance/views/hr_attendance_month_views.xml +++ b/yuthon_hr_attendance/views/hr_attendance_month_views.xml @@ -34,7 +34,7 @@ hr.attendance.month.form hr.attendance.month - + diff --git a/yuthon_hr_attendance/views/inherit_planning_slot_views.xml b/yuthon_hr_attendance/views/inherit_planning_slot_views.xml index 0b49e79ad..d937f9608 100644 --- a/yuthon_hr_attendance/views/inherit_planning_slot_views.xml +++ b/yuthon_hr_attendance/views/inherit_planning_slot_views.xml @@ -14,6 +14,9 @@ planning.slot + + 0 + 1 diff --git a/yuthon_hr_attendance/views/leave_approval.xml b/yuthon_hr_attendance/views/leave_approval.xml index 1f5d88f3b..b587c3072 100644 --- a/yuthon_hr_attendance/views/leave_approval.xml +++ b/yuthon_hr_attendance/views/leave_approval.xml @@ -19,7 +19,7 @@ leave.approval.actions leave.approval - +
diff --git a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml index b2ae68a83..fe1b491b1 100644 --- a/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_onboard_approval_views.xml @@ -15,7 +15,7 @@ yuthon.onboard.approval.form yuthon.onboard.approval - +
diff --git a/yuthon_maintain/views/property_report_repair.xml b/yuthon_maintain/views/property_report_repair.xml index bd8516b94..a522a6354 100644 --- a/yuthon_maintain/views/property_report_repair.xml +++ b/yuthon_maintain/views/property_report_repair.xml @@ -14,7 +14,7 @@ property.report.repair.form property.report.repair - + diff --git a/yuthon_maintain/views/yuthon_maintain_desktop_views.xml b/yuthon_maintain/views/yuthon_maintain_desktop_views.xml index 64dff6082..28f9956bc 100644 --- a/yuthon_maintain/views/yuthon_maintain_desktop_views.xml +++ b/yuthon_maintain/views/yuthon_maintain_desktop_views.xml @@ -16,7 +16,7 @@ yuthon.maintain.desktop.form yuthon.maintain.desktop - +