pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
李鹏宇
2025-04-02 18:54:57 +08:00
parent a5ae5debed
commit b3ebff8fd9
8 changed files with 14 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_hr_attendance/security/ir.model.access.csv
+6 -6
View File
@@ -43,10 +43,10 @@ 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_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_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
access_hr_attendance_year_manager,hr.attendance.year.manager,model_hr_attendance_year,base.group_user,1,1,1,1
access_hr_attendance_month_manager,hr.attendance.month.manager,model_hr_attendance_month,base.group_user,1,1,0,1
access_hr_attendance_month_detail_user,hr.attendance.month.detail.user,model_hr_attendance_month_detail,base.group_user,1,0,0,0
access_hr_attendance_month_detail_manager,hr.attendance.month.detail.manager,model_hr_attendance_month_detail,base.group_user,1,1,1,1
access_hr_attendance_month_wizard_manager,hr.attendance.month.wizard.manager,model_hr_attendance_month_wizard,base.group_user,1,1,1,1
access_yuthon_delete_planning_wizard,yuthon.delete.planning.wizard,model_yuthon_delete_planning_wizard,base.group_user,1,1,1,1
1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
43 access_yuthon_delete_planning_wizard yuthon.delete.planning.wizard model_yuthon_delete_planning_wizard group_he_attendance_manager base.group_user 1 1 1 1
44
45
46
47
48
49
50
51
52
yuthon_hr_attendance/views/all_attendance_menu.xml
+2 -49
View File
@@ -9,8 +9,6 @@
name="月度考勤"
parent="hr_attendance_root_board"
sequence="4"/>
<!-- <menuitem id="menu_hr_attendance_month_wizard" name="考勤统计" parent="menu_hr_attendance_month_board"-->
<!-- action="action_hr_attendance_month_wizard"/>-->
<menuitem id="menu_hr_attendance_month_view_attendances" name="报表" parent="menu_hr_attendance_month_board"
sequence="30" action="hr_attendance_month_action"/>
<menuitem id="menu_hr_attendance_year_view_attendances" name="出勤年份维护" parent="menu_hr_attendance_month_board"
@@ -29,12 +27,6 @@
parent="hr_attendance_root_board"
action="view_action_card_remind"
sequence="1"/>
<!-- <menuitem id="menu_hr_attendance_is_abnormal_board"-->
<!-- name="我的异常"-->
<!-- parent="hr_attendance_root_board"-->
<!-- groups="group_he_attendance_manager"-->
<!-- action="hr_attendance_action_is_abnormal"-->
<!-- sequence="5"/>-->
<menuitem id="menu_hr_attendance_record_board"
name="考勤记录"
parent="hr_attendance_root_board"
@@ -70,11 +62,6 @@
parent="menu_hr_attendance_approval_request_board"
action="yuthon_holiday.view_yuthon_fixes_approval_action"
sequence="7"/>
<!-- <menuitem id="menu_yuthon_shift_approval_board"-->
<!-- name="调替班申请"-->
<!-- parent="menu_hr_attendance_approval_request_board"-->
<!-- sequence="5"-->
<!-- action="view_yuthon_shift_approval_action"/>-->
<menuitem id="menu_hr_attendance_remove_holiday_board"
name="销假申请"
parent="menu_hr_attendance_approval_request_board"
@@ -90,16 +77,6 @@
parent="menu_hr_attendance_approval_request_board"
action="yuthon_holiday.hr_leave_batch_action_all"
sequence="1"/>
<!-- <menuitem id="menu_hr_attendance_special_approval_board"-->
<!-- name="特殊加班申请"-->
<!-- parent="menu_hr_attendance_approval_request_board"-->
<!-- sequence="15"-->
<!-- action="view_special_approval_action"/>-->
<!-- <menuitem id="menu_hr_customer_approval_board"-->
<!-- name="客服值班审批"-->
<!-- parent="menu_hr_attendance_approval_request_board"-->
<!-- sequence="17"-->
<!-- action="action_yuthon_customer_approval"/>-->
<menuitem id="menu_hr_attendance_month_my_detail"
name="考勤确认"
parent="hr_attendance_root_board"
@@ -108,7 +85,6 @@
<menuitem id="attendance_resources_setting_root_board"
name="配置"
parent="hr_attendance_root_board"
groups="group_he_attendance_manager"
sequence="99"/>
<menuitem id="menu_hr_attendance_work_board"
name="考勤时间表"
@@ -135,60 +111,50 @@
<menuitem id="menu_hr_attendance_security_record_board"
name="保安部计划"
parent="yuthon_attendance_planning_board"
groups="group_he_attendance_security_user"
sequence="5"/>
<menuitem id="menu_hr_plan_sources_guard_all_board"
name="全部计划"
parent="menu_hr_attendance_security_record_board"
groups="group_he_attendance_security_manager"
action="action_planning_slot_all_form1"
sequence="3"/>
<menuitem id="menu_hr_plan_sources_guard_a_board"
name="班组A计划"
parent="menu_hr_attendance_security_record_board"
groups="group_he_attendance_class_a_duty"
action="action_planning_slot_all_form2"
sequence="5"/>
<menuitem id="menu_hr_plan_sources_guard_b_board"
name="班组B计划"
parent="menu_hr_attendance_security_record_board"
groups="group_he_attendance_class_b_duty"
action="action_planning_slot_all_form3"
sequence="7"/>
<menuitem id="menu_hr_plan_sources_guard_c_board"
name="班组C计划"
parent="menu_hr_attendance_security_record_board"
groups="group_he_attendance_class_c_duty"
action="action_planning_slot_all_form4"
sequence="9"/>
<menuitem id="menu_hr_plan_sources_arrange_board1"
name="排版规则"
parent="menu_hr_attendance_security_record_board"
action="yuthon_shift_planning_view_action"
groups="group_he_attendance_security_manager"
sequence="10"/>
<!--工程部-->
<menuitem id="menu_hr_attendance_engineering_record_board"
name="工程部计划"
parent="yuthon_attendance_planning_board"
groups="group_he_attendance_engineering_user"
sequence="7"/>
<menuitem id="menu_hr_plan_sources_all_board1"
name="运行班计划"
parent="menu_hr_attendance_engineering_record_board"
groups="group_he_attendance_run_user"
action="action_planning_slot_form3"
sequence="6"/>
<menuitem id="menu_hr_plan_sources_all_board2"
name="高压班计划"
parent="menu_hr_attendance_engineering_record_board"
groups="group_he_attendance_hv_user"
action="action_planning_slot_form4"
sequence="7"/>
<menuitem id="menu_hr_plan_sources_all_board3"
name="综合班计划"
parent="menu_hr_attendance_engineering_record_board"
groups="group_he_attendance_integrated_user"
action="action_planning_slot_form5"
sequence="8"/>
<menuitem id="menu_hr_attendance_all_board"
@@ -198,27 +164,23 @@
<menuitem id="menu_hr_attendance_planning_run_board"
name="运行班排班"
parent="menu_hr_attendance_all_board"
groups="group_he_attendance_run_manager"
action="action_yuthon_run_planning"
sequence="3"/>
<menuitem id="menu_hr_attendance_planning_high_board"
name="高压班排班"
parent="menu_hr_attendance_all_board"
groups="group_he_attendance_hv_manager"
action="action_yuthon_high_planning"
sequence="4"/>
<menuitem id="menu_hr_attendance_planning_integrated_board"
name="综合班排班"
parent="menu_hr_attendance_all_board"
action="action_yuthon_integrated_planning"
groups="group_he_attendance_integrated_manager"
sequence="5"/>
<!-- 值班相关 -->
<menuitem id="menu_hr_attendance_duty_summary_flow_board"
name="流程"
parent="menu_hr_attendance_duty_summary_menu_board"
groups="group_he_attendance_lc_manager"
parent="yuthon_attendance_planning_board"
sequence="25"/>
<menuitem id="menu_adjustments_approval_board"
name="值班调休"
@@ -232,8 +194,7 @@
action="view_yuthon_abnormal_approval_action"/>
<menuitem id="menu_yuthon_duty_summary_setting"
name="配置"
parent="menu_hr_attendance_duty_summary_menu_board"
groups="group_he_attendance_lc_manager"
parent="yuthon_attendance_planning_board"
sequence="99"/>
<menuitem id="menu_yuthon_duty_shows_class_board"
name="班组配置"
@@ -249,42 +210,35 @@
<menuitem id="menu_hr_attendance_customer_board"
name="客服计划"
parent="yuthon_attendance_planning_board"
groups="group_he_attendance_customer_user"
sequence="9"/>
<menuitem id="menu_hr_attendance_customer_summary_board"
name="排班计划"
parent="menu_hr_attendance_customer_board"
groups="group_he_attendance_customer_user"
action="action_planning_slot_form7"
sequence="10"/>
<menuitem id="menu_hr_attendance_customer_flow_board"
name="排班规则"
parent="menu_hr_attendance_customer_board"
action="yuthon_customer_planning_view_action"
groups="group_he_attendance_customer_manager"
sequence="12"/>
<menuitem id="menu_hr_attendance_duty_summary_menu_board"
name="粮库计划"
parent="yuthon_attendance_planning_board"
groups="group_he_attendance_lc_user"
sequence="12"/>
<menuitem id="menu_hr_attendance_duty_summary_board"
name="排班计划"
parent="menu_hr_attendance_duty_summary_menu_board"
groups="group_he_attendance_lc_user"
action="action_planning_slot_form6"
sequence="1"/>
<menuitem id="menu_hr_attendance_duty_plan_board"
name="排版规则"
parent="menu_hr_attendance_duty_summary_menu_board"
groups="group_he_attendance_lc_manager"
action="view_yuthon_duty_plan_action"
sequence="5"/>
<!--流程-->
<menuitem id="menu_yuthon_customer_process_board"
name="流程"
parent="yuthon_attendance_planning_board"
groups="group_he_attendance_planning_manager"
sequence="15"/>
<menuitem id="menu_yuthon_shift_approval_board"
name="调替班申请"
@@ -300,7 +254,6 @@
<menuitem id="menu_yuthon_customer_setting_board"
name="配置"
parent="yuthon_attendance_planning_board"
groups="group_he_attendance_planning_manager"
sequence="20"/>
<menuitem id="menu_hr_attendance_role_board"
name="班次角色"
yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml
+1 -6
View File
@@ -40,11 +40,6 @@
<field name="checkin_type"/>
<field name="checkin_time"/>
<field name="sch_checkin_time"/>
<!-- <field name="exception_type" />-->
<!-- <field name="location_title"/>-->
<!-- <field name="notes"/>-->
<!-- <field name="attendance_detail_image_ids" />-->
<!-- <button name="action_show_details" string="打卡图片" type="object" title="Show Details" icon="fa-list"/>-->
</tree>
</field>
</record>
@@ -77,7 +72,7 @@
</record>
<menuitem id="menu_hr_attendance_attendances_view" name="考勤" parent="hr_attendance.menu_hr_attendance_root" sequence="20"/>
<menuitem id="menu_hr_attendance_detail_view_attendances" name="打卡详情" parent="hr_attendance_root_board" sequence="90" action="hr_attendance_detail_action"/>
<!-- <menuitem id="menu_hr_attendance_detail_view_attendances" name="打卡详情" parent="hr_attendance_root_board" sequence="90" action="hr_attendance_detail_action"/>-->
<menuitem id="menu_hr_attendance_attendances_setting_view" name="考勤维护" parent="hr_attendance.menu_hr_attendance_root" sequence="30"/>
</odoo>
yuthon_salary/models/inherit_hr_payroll_structure.py
-1
View File
@@ -23,7 +23,6 @@ class HrPayrollStructure(models.Model):
position_subsidy = fields.Monetary(string="岗位补贴", currency_field="currency_id")
integrated_subsidy = fields.Monetary(string="综合补贴", currency_field="currency_id")
advance_performance_bonuses = fields.Monetary(string="预发绩效奖金", currency_field="currency_id")
yuthon_company = fields.Selection([])
@api.model
def read_group(self, domain, fields, groupby, offset=0, limit=None, orderby=False, lazy=True):
yuthon_work_brand/__manifest__.py
-1
View File
@@ -11,7 +11,6 @@
],
'data': [
'security/ir.model.access.csv',
'security/yuthon_xingzheng_groups.xml',
'views/yuthon_none_views.xml',
'views/hr_menus.xml',
'views/executive_manage.xml',
yuthon_work_brand/security/yuthon_xingzheng_groups.xml
-27
View File
@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="module_yuthon_administrative" model="ir.module.category">
<field name="name">行政管理</field>
</record>
<record id="module_yuthon_administrative_user" model="res.groups">
<field name="name">用户</field>
<field name="category_id" ref="module_yuthon_administrative"/>
</record>
<record id="module_yuthon_administrative_manager" model="res.groups">
<field name="name">管理员</field>
<field name="category_id" ref="module_yuthon_administrative"/>
<field name="implied_ids" eval="[(4, ref('module_yuthon_administrative_user'))]"/>
<field name="users" eval="[(4, ref('base.user_admin'))]"/>
</record>
<record id="module_base_apps" model="ir.module.category">
<field name="name">行政管理</field>
</record>
<record id="module_base_apps_user" model="res.groups">
<field name="name">用户</field>
<field name="category_id" ref="module_base_apps"/>
</record>
</odoo>
yuthon_work_brand/views/executive_manage.xml
-1
View File
@@ -3,7 +3,6 @@
<menuitem id="executive_manage_menu_root_board"
name="行政管理"
web_icon="yuthon_work_brand,static/description/manage.png"
groups="module_yuthon_administrative_user"
sequence="80"/>
<menuitem id="executive_manage_union_root_board"
yuthon_work_brand/views/hr_menus.xml
+5 -27
View File
@@ -112,41 +112,37 @@
<menuitem id="hr_employee_menu_root_board2"
name="花名册"
parent="human_resources_menu_root_board"
groups="yuthon_hr_employee.group_hr_employee_user"
action="hr.open_view_employee_list_my"
sequence="1"/>
<menuitem id="hr_menu_root_board"
name="人事管理"
parent="human_resources_menu_root_board"
groups="yuthon_hr_employee.group_hr_employee_user"
sequence="3"/>
<menuitem id="hr_employee_menu_root_board"
name="员工"
parent="hr_menu_root_board"
groups="yuthon_hr_employee.group_hr_employee_user"
sequence="1"/>
<menuitem id="hr_recruitment_work_job_menu_board"
name="岗位编制"
parent="hr_employee_menu_root_board"
groups="yuthon_hr_employee.group_hr_employee_user"
action="hr.action_hr_job"
sequence="5"/>
<menuitem id="hr_set_role_menu_root_board"
name="角色管理"
parent="hr_employee_menu_root_board"
groups="yuthon_hr_employee.group_hr_employee_manager"
action="soong_workflow.view_soong_user_role_action"
sequence="7"/>
<menuitem id="hr_contract_menu_root_board"
name="合同管理"
parent="hr_employee_menu_root_board"
groups="yuthon_hr_employee.group_hr_employee_manager"
action="hr_contract.action_hr_contract"
sequence="9"/>
<menuitem id="hr_employee_organization_menu_root_board"
name="组织结构"
parent="hr_employee_menu_root_board"
groups="yuthon_hr_employee.group_hr_employee_manager"
action="hr_org_chart.action_hr_employee_org_chart"
sequence="10"/>
<menuitem id="hr_employee_medical_message_menu_root_board"
@@ -162,7 +158,7 @@
<menuitem id="hr_set_process_menu_root_board"
name="流程"
parent="hr_menu_root_board"
groups="yuthon_hr_employee.group_hr_employee_user"
sequence="5"/>
<menuitem id="hr_menu_regularization_approval_root_board"
name="转正申请表"
@@ -213,7 +209,7 @@
<menuitem id="hr_setting_menu_root_board"
name="配置"
parent="hr_menu_root_board"
groups="yuthon_hr_employee.group_hr_employee_manager"
sequence="9"/>
<menuitem id="hr_set_menu_root_board"
name="设置"
@@ -287,7 +283,6 @@
sequence="7"/>
<menuitem id="holiday_set_menu_board"
name="配置"
groups="yuthon_holiday.group_yuthon_holiday_admin"
parent="holiday_manage_menu_root_board"
sequence="9"/>
<menuitem id="holiday_set_type_board2"
@@ -452,91 +447,76 @@
<menuitem id="yuthon_accounts_receivable_menu"
sequence="1"
name="应收账单"
groups="yuthon_property.group_account_user"
parent="yuthon_financial_management_menu"
action="yuthon_property.property_accounts_receivable_action"/>
<menuitem id="yuthon_subject_form_menu"
sequence="5"
name="预算科目表"
groups="yuthon_property.group_account_user"
parent="yuthon_financial_management_menu"
action="yuthon_property.view_property_subject_action"/>
<menuitem id="yuthon_bank_statement_menu"
sequence="20"
name="对账"
groups="yuthon_property.group_account_user"
parent="yuthon_financial_management_menu"
action="yuthon_property.view_property_bank_statements_action"/>
<menuitem id="yuthon_bank_statement_menu1"
sequence="23"
name="银行流水"
groups="yuthon_property.group_account_user"
parent="yuthon_financial_management_menu"
action="yuthon_property.view_property_bank_statements_action1"/>
<!--财务报表 -->
<menuitem id="yuthon_property_process"
sequence="90"
name="流程"
groups="yuthon_property.group_account_user"
parent="yuthon_financial_management_menu"/>
<menuitem id="yuthon_property_fee_adjust"
sequence="3"
name="费用调整"
groups="yuthon_property.group_account_user"
parent="yuthon_property_process"
action="yuthon_property_approval.property_record_action"/>
<menuitem id="yuthon_property_rent_relief"
sequence="5"
name="租金减免"
groups="yuthon_property.group_account_user"
parent="yuthon_property_process"
action="yuthon_property_approval.property_rent_relief_action"/>
<menuitem id="yuthon_property_penalty_relief"
sequence="7"
name="违约金减免"
groups="yuthon_property.group_account_user"
parent="yuthon_property_process"
action="yuthon_property_approval.property_penalty_relief_action"/>
<menuitem id="yuthon_property_renovation_application"
sequence="11"
name="装修申请"
groups="yuthon_property.group_account_user"
parent="yuthon_property_process"
action="yuthon_property_approval.property_fitment_action"/>
<menuitem id="yuthon_property_increase_application"
sequence="13"
name="增容申请"
groups="yuthon_property.group_account_user"
parent="yuthon_property_process"
action="yuthon_property_approval.property_capacity_action"/>
<menuitem id="yuthon_property_management_fee_adjustments"
sequence="15"
name="管理费调整"
groups="yuthon_property.group_account_user"
parent="yuthon_property_process"
action="yuthon_property_approval.property_management_fee_action"/>
<menuitem id="yuthon_property_penalty_tweaks"
sequence="17"
name="违约金比例调整"
groups="yuthon_property.group_account_user"
parent="yuthon_property_process"
action="yuthon_property_approval.property_penalty_proportion_action"/>
<menuitem id="property_reimbursement_form_menu"
sequence="19"
name="体检费报销单"
groups="yuthon_property.group_account_user"
parent="yuthon_property_process"
action="yuthon_property_approval.view_property_reimbursement_form_action"/>
<menuitem id="property_claim_form_menu"
sequence="20"
name="业务报销单"
groups="yuthon_property.group_account_user"
parent="yuthon_property_process"
action="yuthon_property_approval.view_property_claim_approval_action"/>
<menuitem id="property_borrowing_approval_menu"
sequence="21"
name="借支申请表"
groups="yuthon_property.group_account_user"
parent="yuthon_property_process"
action="yuthon_property_approval.view_property_borrowing_approval_action"/>
<menuitem id="yuthon_property_process_setting"
@@ -546,13 +526,11 @@
<menuitem id="yuthon_property_account_setting_menu"
sequence="1"
name="账户设置"
groups="yuthon_property.group_account_admin"
parent="yuthon_property_process_setting"
action="yuthon_property.yuthon_property_account_setting_action"/>
<menuitem id="yuthon_property_project_setting_menu"
sequence="5"
name="费用项目"
groups="yuthon_property.group_account_admin"
parent="yuthon_property_process_setting"
action="yuthon_property.yuthon_property_project_setting_action"/>
</odoo>