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

!19 bug

Browse Source 
Merge pull request !19 from 李鹏宇/pengyuthon-dev
This commit is contained in:
李鹏宇
2024-05-20 09:56:26 +00:00
committed by Gitee
parent dd0ac44415 fc6037651c
commit 4741f98f75
3 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approvals/i18n/zh_CN.po
+1 -1
View File
@@ -133,7 +133,7 @@ msgstr "审批申请"
#. module: approvals
#: model:ir.model.fields,field_description:approvals.field_approval_request__name
msgid "Approval Subject"
msgstr "审批主题"
msgstr "审批单"
#. module: approvals
#: model:ir.model.fields,field_description:approvals.field_approval_category__approval_type
yuthon_approval/data/approval_category_type_data.xml
+1
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data noupdate="1">
<!-- 审批导入模板，测试用 -->
<record id="approval_category_data_business_trip" model="approval.category">
<field name="name">demo测试</field>
<field name="category_type_number">demo_request</field>
yuthon_hr_employee/data/yuthon.job.lv.csv
+53 -53
View File
@@ -1,53 +1,53 @@
"name","base_wage","job_wage","post_wage","performance_bonus","phone_subsidy","attendance_bonus","all_wage","create_time","end_time","job_lv_type"
"部门经理一档","5300.0","5087.0","0.0","2800.0","300.0","200.0","13687.0","","","正式员工"
"部门经理二档","5300.0","4717.0","0.0","2800.0","300.0","200.0","13317.0","","","正式员工"
"部门经理三档","5300.0","4363.0","0.0","2800.0","300.0","200.0","12963.0","","","正式员工"
"部门经理四档","5300.0","4022.0","0.0","2800.0","300.0","200.0","12622.0","","","正式员工"
"部门经理五档","5300.0","3694.0","0.0","2800.0","300.0","200.0","12294.0","","","正式员工"
"部门经理六档","5300.0","3379.0","0.0","2800.0","300.0","200.0","11979.0","","","正式员工"
"部门经理七档","5300.0","3076.0","0.0","2800.0","300.0","200.0","11676.0","","","正式员工"
"部门经理八档","5300.0","2785.0","0.0","2800.0","300.0","200.0","11385.0","","","正式员工"
"部门副经理一档","4800.0","3648.0","0.0","2500.0","300.0","200.0","11448.0","","","正式员工"
"部门副经理二档","4800.0","3354.0","0.0","2500.0","300.0","200.0","11154.0","","","正式员工"
"部门副经理三档","4800.0","3072.0","0.0","2500.0","300.0","200.0","10872.0","","","正式员工"
"部门副经理四档","4800.0","2800.0","0.0","2500.0","300.0","200.0","10600.0","","","正式员工"
"部门副经理五档","4800.0","2537.0","0.0","2500.0","300.0","200.0","10337.0","","","正式员工"
"部门副经理六档","4800.0","2286.0","0.0","2500.0","300.0","200.0","10086.0","","","正式员工"
"部门副经理七档","4800.0","2045.0","0.0","2500.0","300.0","200.0","9845.0","","","正式员工"
"部门副经理八档","4800.0","1812.0","0.0","2500.0","300.0","200.0","9612.0","","","正式员工"
"业务主管一档","4000.0","2603.0","0.0","2200.0","300.0","200.0","9303.0","","","正式员工"
"业务主管二档","4000.0","2367.0","0.0","2200.0","300.0","200.0","9067.0","","","正式员工"
"业务主管三档","4000.0","2143.0","0.0","2200.0","300.0","200.0","8843.0","","","正式员工"
"业务主管四档","4000.0","1926.0","0.0","2200.0","300.0","200.0","8626.0","","","正式员工"
"业务主管五档","4000.0","1716.0","0.0","2200.0","300.0","200.0","8416.0","","","正式员工"
"业务主管六档","4000.0","1516.0","0.0","2200.0","300.0","200.0","8216.0","","","正式员工"
"业务主管七档","4000.0","1324.0","0.0","2200.0","300.0","200.0","8024.0","","","正式员工"
"业务主管八档","4000.0","1138.0","0.0","2200.0","300.0","200.0","7838.0","","","正式员工"
"高级职员一档","3500.0","1870.0","0.0","2000.0","300.0","200.0","7870.0","","","正式员工"
"高级职员二档","3500.0","1682.0","0.0","2000.0","300.0","200.0","7682.0","","","正式员工"
"高级职员三档","3500.0","1502.0","0.0","2000.0","300.0","200.0","7502.0","","","正式员工"
"高级职员四档","3500.0","1329.0","0.0","2000.0","300.0","200.0","7329.0","","","正式员工"
"高级职员五档","3500.0","1162.0","0.0","2000.0","300.0","200.0","7162.0","","","正式员工"
"高级职员六档","3500.0","1003.0","0.0","2000.0","300.0","200.0","7003.0","","","正式员工"
"高级职员七档","3500.0","848.0","0.0","2000.0","300.0","200.0","6848.0","","","正式员工"
"高级职员八档","3500.0","701.0","0.0","2000.0","300.0","200.0","6701.0","","","正式员工"
"一级员工一档","3000.0","1385.0","0.0","1800.0","300.0","200.0","6685.0","","","正式员工"
"一级员工二档","3000.0","1236.0","0.0","1800.0","300.0","200.0","6536.0","","","正式员工"
"一级员工三档","3000.0","1093.0","0.0","1800.0","300.0","200.0","6393.0","","","正式员工"
"一级员工四档","3000.0","955.0","0.0","1800.0","300.0","200.0","6255.0","","","正式员工"
"一级员工五档","3000.0","821.0","0.0","1800.0","300.0","200.0","6121.0","","","正式员工"
"一级员工六档","3000.0","694.0","0.0","1800.0","300.0","200.0","5994.0","","","正式员工"
"一级员工七档","3000.0","571.0","0.0","1800.0","300.0","200.0","5871.0","","","正式员工"
"一级员工八档","3000.0","453.0","0.0","1800.0","300.0","200.0","5753.0","","","正式员工"
"二级员工一档","2600.0","1001.0","0.0","1600.0","300.0","200.0","5701.0","","","正式员工"
"二级员工二档","2600.0","881.0","0.0","1600.0","300.0","200.0","5581.0","","","正式员工"
"二级员工三档","2600.0","767.0","0.0","1600.0","300.0","200.0","5467.0","","","正式员工"
"二级员工四档","2600.0","656.0","0.0","1600.0","300.0","200.0","5356.0","","","正式员工"
"二级员工五档","2600.0","550.0","0.0","1600.0","300.0","200.0","5250.0","","","正式员工"
"二级员工六档","2600.0","448.0","0.0","1600.0","300.0","200.0","5148.0","","","正式员工"
"二级员工七档","2600.0","350.0","0.0","1600.0","300.0","200.0","5050.0","","","正式员工"
"二级员工八档","2600.0","256.0","0.0","1600.0","300.0","200.0","4956.0","","","正式员工"
"厨师","2400.0","2500.0","0.0","0.0","0.0","0.0","4900.0","","","正式员工"
"厨工","2400.0","700.0","500.0","0.0","0.0","0.0","3600.0","","","正式员工"
"保洁","2400.0","763.0","4000.0","0.0","0.0","0.0","7163.0","","","正式员工"
"实习生","2300.0","0.0","0.0","0.0","300.0","200.0","2800.0","","","正式员工"
"name","base_wage","job_wage","post_wage","performance_bonus","phone_subsidy","attendance_bonus","all_wage","create_time","end_time"
"部门经理一档","5300.0","5087.0","0.0","2800.0","300.0","200.0","13687.0","","",
"部门经理二档","5300.0","4717.0","0.0","2800.0","300.0","200.0","13317.0","","",
"部门经理三档","5300.0","4363.0","0.0","2800.0","300.0","200.0","12963.0","","",
"部门经理四档","5300.0","4022.0","0.0","2800.0","300.0","200.0","12622.0","","",
"部门经理五档","5300.0","3694.0","0.0","2800.0","300.0","200.0","12294.0","","",
"部门经理六档","5300.0","3379.0","0.0","2800.0","300.0","200.0","11979.0","","",
"部门经理七档","5300.0","3076.0","0.0","2800.0","300.0","200.0","11676.0","","",
"部门经理八档","5300.0","2785.0","0.0","2800.0","300.0","200.0","11385.0","","",
"部门副经理一档","4800.0","3648.0","0.0","2500.0","300.0","200.0","11448.0","","",
"部门副经理二档","4800.0","3354.0","0.0","2500.0","300.0","200.0","11154.0","","",
"部门副经理三档","4800.0","3072.0","0.0","2500.0","300.0","200.0","10872.0","","",
"部门副经理四档","4800.0","2800.0","0.0","2500.0","300.0","200.0","10600.0","","",
"部门副经理五档","4800.0","2537.0","0.0","2500.0","300.0","200.0","10337.0","","",
"部门副经理六档","4800.0","2286.0","0.0","2500.0","300.0","200.0","10086.0","","",
"部门副经理七档","4800.0","2045.0","0.0","2500.0","300.0","200.0","9845.0","","",
"部门副经理八档","4800.0","1812.0","0.0","2500.0","300.0","200.0","9612.0","","",
"业务主管一档","4000.0","2603.0","0.0","2200.0","300.0","200.0","9303.0","","",
"业务主管二档","4000.0","2367.0","0.0","2200.0","300.0","200.0","9067.0","","",
"业务主管三档","4000.0","2143.0","0.0","2200.0","300.0","200.0","8843.0","","",
"业务主管四档","4000.0","1926.0","0.0","2200.0","300.0","200.0","8626.0","","",
"业务主管五档","4000.0","1716.0","0.0","2200.0","300.0","200.0","8416.0","","",
"业务主管六档","4000.0","1516.0","0.0","2200.0","300.0","200.0","8216.0","","",
"业务主管七档","4000.0","1324.0","0.0","2200.0","300.0","200.0","8024.0","","",
"业务主管八档","4000.0","1138.0","0.0","2200.0","300.0","200.0","7838.0","","",
"高级职员一档","3500.0","1870.0","0.0","2000.0","300.0","200.0","7870.0","","",
"高级职员二档","3500.0","1682.0","0.0","2000.0","300.0","200.0","7682.0","","",
"高级职员三档","3500.0","1502.0","0.0","2000.0","300.0","200.0","7502.0","","",
"高级职员四档","3500.0","1329.0","0.0","2000.0","300.0","200.0","7329.0","","",
"高级职员五档","3500.0","1162.0","0.0","2000.0","300.0","200.0","7162.0","","",
"高级职员六档","3500.0","1003.0","0.0","2000.0","300.0","200.0","7003.0","","",
"高级职员七档","3500.0","848.0","0.0","2000.0","300.0","200.0","6848.0","","",
"高级职员八档","3500.0","701.0","0.0","2000.0","300.0","200.0","6701.0","","",
"一级员工一档","3000.0","1385.0","0.0","1800.0","300.0","200.0","6685.0","","",
"一级员工二档","3000.0","1236.0","0.0","1800.0","300.0","200.0","6536.0","","",
"一级员工三档","3000.0","1093.0","0.0","1800.0","300.0","200.0","6393.0","","",
"一级员工四档","3000.0","955.0","0.0","1800.0","300.0","200.0","6255.0","","",
"一级员工五档","3000.0","821.0","0.0","1800.0","300.0","200.0","6121.0","","",
"一级员工六档","3000.0","694.0","0.0","1800.0","300.0","200.0","5994.0","","",
"一级员工七档","3000.0","571.0","0.0","1800.0","300.0","200.0","5871.0","","",
"一级员工八档","3000.0","453.0","0.0","1800.0","300.0","200.0","5753.0","","",
"二级员工一档","2600.0","1001.0","0.0","1600.0","300.0","200.0","5701.0","","",
"二级员工二档","2600.0","881.0","0.0","1600.0","300.0","200.0","5581.0","","",
"二级员工三档","2600.0","767.0","0.0","1600.0","300.0","200.0","5467.0","","",
"二级员工四档","2600.0","656.0","0.0","1600.0","300.0","200.0","5356.0","","",
"二级员工五档","2600.0","550.0","0.0","1600.0","300.0","200.0","5250.0","","",
"二级员工六档","2600.0","448.0","0.0","1600.0","300.0","200.0","5148.0","","",
"二级员工七档","2600.0","350.0","0.0","1600.0","300.0","200.0","5050.0","","",
"二级员工八档","2600.0","256.0","0.0","1600.0","300.0","200.0","4956.0","","",
"厨师","2400.0","2500.0","0.0","0.0","0.0","0.0","4900.0","","",
"厨工","2400.0","700.0","500.0","0.0","0.0","0.0","3600.0","","",
"保洁","2400.0","763.0","4000.0","0.0","0.0","0.0","7163.0","","",
"实习生","2300.0","0.0","0.0","0.0","300.0","200.0","2800.0","","",
1 name base_wage job_wage post_wage performance_bonus phone_subsidy attendance_bonus all_wage create_time end_time job_lv_type
2 部门经理一档 5300.0 5087.0 0.0 2800.0 300.0 200.0 13687.0 正式员工
3 部门经理二档 5300.0 4717.0 0.0 2800.0 300.0 200.0 13317.0 正式员工
4 部门经理三档 5300.0 4363.0 0.0 2800.0 300.0 200.0 12963.0 正式员工
5 部门经理四档 5300.0 4022.0 0.0 2800.0 300.0 200.0 12622.0 正式员工
6 部门经理五档 5300.0 3694.0 0.0 2800.0 300.0 200.0 12294.0 正式员工
7 部门经理六档 5300.0 3379.0 0.0 2800.0 300.0 200.0 11979.0 正式员工
8 部门经理七档 5300.0 3076.0 0.0 2800.0 300.0 200.0 11676.0 正式员工
9 部门经理八档 5300.0 2785.0 0.0 2800.0 300.0 200.0 11385.0 正式员工
10 部门副经理一档 4800.0 3648.0 0.0 2500.0 300.0 200.0 11448.0 正式员工
11 部门副经理二档 4800.0 3354.0 0.0 2500.0 300.0 200.0 11154.0 正式员工
12 部门副经理三档 4800.0 3072.0 0.0 2500.0 300.0 200.0 10872.0 正式员工
13 部门副经理四档 4800.0 2800.0 0.0 2500.0 300.0 200.0 10600.0 正式员工
14 部门副经理五档 4800.0 2537.0 0.0 2500.0 300.0 200.0 10337.0 正式员工
15 部门副经理六档 4800.0 2286.0 0.0 2500.0 300.0 200.0 10086.0 正式员工
16 部门副经理七档 4800.0 2045.0 0.0 2500.0 300.0 200.0 9845.0 正式员工
17 部门副经理八档 4800.0 1812.0 0.0 2500.0 300.0 200.0 9612.0 正式员工
18 业务主管一档 4000.0 2603.0 0.0 2200.0 300.0 200.0 9303.0 正式员工
19 业务主管二档 4000.0 2367.0 0.0 2200.0 300.0 200.0 9067.0 正式员工
20 业务主管三档 4000.0 2143.0 0.0 2200.0 300.0 200.0 8843.0 正式员工
21 业务主管四档 4000.0 1926.0 0.0 2200.0 300.0 200.0 8626.0 正式员工
22 业务主管五档 4000.0 1716.0 0.0 2200.0 300.0 200.0 8416.0 正式员工
23 业务主管六档 4000.0 1516.0 0.0 2200.0 300.0 200.0 8216.0 正式员工
24 业务主管七档 4000.0 1324.0 0.0 2200.0 300.0 200.0 8024.0 正式员工
25 业务主管八档 4000.0 1138.0 0.0 2200.0 300.0 200.0 7838.0 正式员工
26 高级职员一档 3500.0 1870.0 0.0 2000.0 300.0 200.0 7870.0 正式员工
27 高级职员二档 3500.0 1682.0 0.0 2000.0 300.0 200.0 7682.0 正式员工
28 高级职员三档 3500.0 1502.0 0.0 2000.0 300.0 200.0 7502.0 正式员工
29 高级职员四档 3500.0 1329.0 0.0 2000.0 300.0 200.0 7329.0 正式员工
30 高级职员五档 3500.0 1162.0 0.0 2000.0 300.0 200.0 7162.0 正式员工
31 高级职员六档 3500.0 1003.0 0.0 2000.0 300.0 200.0 7003.0 正式员工
32 高级职员七档 3500.0 848.0 0.0 2000.0 300.0 200.0 6848.0 正式员工
33 高级职员八档 3500.0 701.0 0.0 2000.0 300.0 200.0 6701.0 正式员工
34 一级员工一档 3000.0 1385.0 0.0 1800.0 300.0 200.0 6685.0 正式员工
35 一级员工二档 3000.0 1236.0 0.0 1800.0 300.0 200.0 6536.0 正式员工
36 一级员工三档 3000.0 1093.0 0.0 1800.0 300.0 200.0 6393.0 正式员工
37 一级员工四档 3000.0 955.0 0.0 1800.0 300.0 200.0 6255.0 正式员工
38 一级员工五档 3000.0 821.0 0.0 1800.0 300.0 200.0 6121.0 正式员工
39 一级员工六档 3000.0 694.0 0.0 1800.0 300.0 200.0 5994.0 正式员工
40 一级员工七档 3000.0 571.0 0.0 1800.0 300.0 200.0 5871.0 正式员工
41 一级员工八档 3000.0 453.0 0.0 1800.0 300.0 200.0 5753.0 正式员工
42 二级员工一档 2600.0 1001.0 0.0 1600.0 300.0 200.0 5701.0 正式员工
43 二级员工二档 2600.0 881.0 0.0 1600.0 300.0 200.0 5581.0 正式员工
44 二级员工三档 2600.0 767.0 0.0 1600.0 300.0 200.0 5467.0 正式员工
45 二级员工四档 2600.0 656.0 0.0 1600.0 300.0 200.0 5356.0 正式员工
46 二级员工五档 2600.0 550.0 0.0 1600.0 300.0 200.0 5250.0 正式员工
47 二级员工六档 2600.0 448.0 0.0 1600.0 300.0 200.0 5148.0 正式员工
48 二级员工七档 2600.0 350.0 0.0 1600.0 300.0 200.0 5050.0 正式员工
49 二级员工八档 2600.0 256.0 0.0 1600.0 300.0 200.0 4956.0 正式员工
50 厨师 2400.0 2500.0 0.0 0.0 0.0 0.0 4900.0 正式员工
51 厨工 2400.0 700.0 500.0 0.0 0.0 0.0 3600.0 正式员工
52 保洁 2400.0 763.0 4000.0 0.0 0.0 0.0 7163.0 正式员工
53 实习生 2300.0 0.0 0.0 0.0 300.0 200.0 2800.0 正式员工