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

pengyuthon

Browse Source
This commit is contained in:
李鹏宇
2024-10-31 12:13:57 +00:00
committed by 李鹏宇
parent 517307cb08
commit b835353ca8
11 changed files with 107 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
preview_easy/static/src/xml/qweb.xml
-1
View File
@@ -11,7 +11,6 @@
<!-- </button>-->
<Many2XAutocomplete
id="props.id"
placeholder="tags.length ? '' : props.placeholder"
resModel="relation"
autoSelect="true"
fieldString="string"
yuthon_hr_attendance/models/hr_attendance.py
+3 -1
View File
@@ -16,4 +16,6 @@ class HrAttendance(models.Model):
out_card_time = fields.Datetime(string="外出打卡时间")
out_card_location = fields.Char(string="外出打卡地点")
work_hours = fields.Float(string="工作时长")
company_id = fields.Many2one('res.company', string='公司', index=True, default=lambda self: self.env.company)
company_id = fields.Many2one('res.company', string='公司', index=True, default=lambda self: self.env.company)
current_data = fields.Date(string='打卡日期', tracking=True)
yuthon_hr_attendance/views/hr_attendance_views.xml
+1
View File
@@ -13,6 +13,7 @@
<field name="is_early_card" optional="show"/>
<field name="is_late_card" optional="show"/>
<field name="work_time_type" optional="hidden"/>
<field name="current_data"/>
<field name="check_in" optional="show"/>
<field name="on_card_location" optional="show"/>
<field name="check_out" optional="show"/>
yuthon_hr_employee/__manifest__.py
+1
View File
@@ -29,6 +29,7 @@
'views/inherit_hr_applicant_views.xml',
'views/publish_applicant_setting_views.xml',
'views/yuthon_job_postings_views.xml',
'views/website_employee_views.xml'
],
'installable': True,
'application': False,
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"
"部门经理一档","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","yuthon_company"
"部门经理一档","5300.0","5087.0","0.0","2800.0","300.0","200.0","13687.0","","","thtz"
"部门经理二档","5300.0","4717.0","0.0","2800.0","300.0","200.0","13317.0","","","thtz"
"部门经理三档","5300.0","4363.0","0.0","2800.0","300.0","200.0","12963.0","","","thtz"
"部门经理四档","5300.0","4022.0","0.0","2800.0","300.0","200.0","12622.0","","","thtz"
"部门经理五档","5300.0","3694.0","0.0","2800.0","300.0","200.0","12294.0","","","thtz"
"部门经理六档","5300.0","3379.0","0.0","2800.0","300.0","200.0","11979.0","","","thtz"
"部门经理七档","5300.0","3076.0","0.0","2800.0","300.0","200.0","11676.0","","","thtz"
"部门经理八档","5300.0","2785.0","0.0","2800.0","300.0","200.0","11385.0","","","thtz"
"部门副经理一档","4800.0","3648.0","0.0","2500.0","300.0","200.0","11448.0","","","thtz"
"部门副经理二档","4800.0","3354.0","0.0","2500.0","300.0","200.0","11154.0","","","thtz"
"部门副经理三档","4800.0","3072.0","0.0","2500.0","300.0","200.0","10872.0","","","thtz"
"部门副经理四档","4800.0","2800.0","0.0","2500.0","300.0","200.0","10600.0","","","thtz"
"部门副经理五档","4800.0","2537.0","0.0","2500.0","300.0","200.0","10337.0","","","thtz"
"部门副经理六档","4800.0","2286.0","0.0","2500.0","300.0","200.0","10086.0","","","thtz"
"部门副经理七档","4800.0","2045.0","0.0","2500.0","300.0","200.0","9845.0","","","thtz"
"部门副经理八档","4800.0","1812.0","0.0","2500.0","300.0","200.0","9612.0","","","thtz"
"业务主管一档","4000.0","2603.0","0.0","2200.0","300.0","200.0","9303.0","","","thtz"
"业务主管二档","4000.0","2367.0","0.0","2200.0","300.0","200.0","9067.0","","","thtz"
"业务主管三档","4000.0","2143.0","0.0","2200.0","300.0","200.0","8843.0","","","thtz"
"业务主管四档","4000.0","1926.0","0.0","2200.0","300.0","200.0","8626.0","","","thtz"
"业务主管五档","4000.0","1716.0","0.0","2200.0","300.0","200.0","8416.0","","","thtz"
"业务主管六档","4000.0","1516.0","0.0","2200.0","300.0","200.0","8216.0","","","thtz"
"业务主管七档","4000.0","1324.0","0.0","2200.0","300.0","200.0","8024.0","","","thtz"
"业务主管八档","4000.0","1138.0","0.0","2200.0","300.0","200.0","7838.0","","","thtz"
"高级职员一档","3500.0","1870.0","0.0","2000.0","300.0","200.0","7870.0","","","thtz"
"高级职员二档","3500.0","1682.0","0.0","2000.0","300.0","200.0","7682.0","","","thtz"
"高级职员三档","3500.0","1502.0","0.0","2000.0","300.0","200.0","7502.0","","","thtz"
"高级职员四档","3500.0","1329.0","0.0","2000.0","300.0","200.0","7329.0","","","thtz"
"高级职员五档","3500.0","1162.0","0.0","2000.0","300.0","200.0","7162.0","","","thtz"
"高级职员六档","3500.0","1003.0","0.0","2000.0","300.0","200.0","7003.0","","","thtz"
"高级职员七档","3500.0","848.0","0.0","2000.0","300.0","200.0","6848.0","","","thtz"
"高级职员八档","3500.0","701.0","0.0","2000.0","300.0","200.0","6701.0","","","thtz"
"一级员工一档","3000.0","1385.0","0.0","1800.0","300.0","200.0","6685.0","","","thtz"
"一级员工二档","3000.0","1236.0","0.0","1800.0","300.0","200.0","6536.0","","","thtz"
"一级员工三档","3000.0","1093.0","0.0","1800.0","300.0","200.0","6393.0","","","thtz"
"一级员工四档","3000.0","955.0","0.0","1800.0","300.0","200.0","6255.0","","","thtz"
"一级员工五档","3000.0","821.0","0.0","1800.0","300.0","200.0","6121.0","","","thtz"
"一级员工六档","3000.0","694.0","0.0","1800.0","300.0","200.0","5994.0","","","thtz"
"一级员工七档","3000.0","571.0","0.0","1800.0","300.0","200.0","5871.0","","","thtz"
"一级员工八档","3000.0","453.0","0.0","1800.0","300.0","200.0","5753.0","","","thtz"
"二级员工一档","2600.0","1001.0","0.0","1600.0","300.0","200.0","5701.0","","","thtz"
"二级员工二档","2600.0","881.0","0.0","1600.0","300.0","200.0","5581.0","","","thtz"
"二级员工三档","2600.0","767.0","0.0","1600.0","300.0","200.0","5467.0","","","thtz"
"二级员工四档","2600.0","656.0","0.0","1600.0","300.0","200.0","5356.0","","","thtz"
"二级员工五档","2600.0","550.0","0.0","1600.0","300.0","200.0","5250.0","","","thtz"
"二级员工六档","2600.0","448.0","0.0","1600.0","300.0","200.0","5148.0","","","thtz"
"二级员工七档","2600.0","350.0","0.0","1600.0","300.0","200.0","5050.0","","","thtz"
"二级员工八档","2600.0","256.0","0.0","1600.0","300.0","200.0","4956.0","","","thtz"
"厨师","2400.0","2500.0","0.0","0.0","0.0","0.0","4900.0","","","thtz"
"厨工","2400.0","700.0","500.0","0.0","0.0","0.0","3600.0","","","thtz"
"保洁","2400.0","763.0","4000.0","0.0","0.0","0.0","7163.0","","","thtz"
"实习生","2300.0","0.0","0.0","0.0","300.0","200.0","2800.0","","","thtz"
1 name base_wage job_wage post_wage performance_bonus phone_subsidy attendance_bonus all_wage create_time end_time yuthon_company
2 部门经理一档 5300.0 5087.0 0.0 2800.0 300.0 200.0 13687.0 thtz
3 部门经理二档 5300.0 4717.0 0.0 2800.0 300.0 200.0 13317.0 thtz
4 部门经理三档 5300.0 4363.0 0.0 2800.0 300.0 200.0 12963.0 thtz
5 部门经理四档 5300.0 4022.0 0.0 2800.0 300.0 200.0 12622.0 thtz
6 部门经理五档 5300.0 3694.0 0.0 2800.0 300.0 200.0 12294.0 thtz
7 部门经理六档 5300.0 3379.0 0.0 2800.0 300.0 200.0 11979.0 thtz
8 部门经理七档 5300.0 3076.0 0.0 2800.0 300.0 200.0 11676.0 thtz
9 部门经理八档 5300.0 2785.0 0.0 2800.0 300.0 200.0 11385.0 thtz
10 部门副经理一档 4800.0 3648.0 0.0 2500.0 300.0 200.0 11448.0 thtz
11 部门副经理二档 4800.0 3354.0 0.0 2500.0 300.0 200.0 11154.0 thtz
12 部门副经理三档 4800.0 3072.0 0.0 2500.0 300.0 200.0 10872.0 thtz
13 部门副经理四档 4800.0 2800.0 0.0 2500.0 300.0 200.0 10600.0 thtz
14 部门副经理五档 4800.0 2537.0 0.0 2500.0 300.0 200.0 10337.0 thtz
15 部门副经理六档 4800.0 2286.0 0.0 2500.0 300.0 200.0 10086.0 thtz
16 部门副经理七档 4800.0 2045.0 0.0 2500.0 300.0 200.0 9845.0 thtz
17 部门副经理八档 4800.0 1812.0 0.0 2500.0 300.0 200.0 9612.0 thtz
18 业务主管一档 4000.0 2603.0 0.0 2200.0 300.0 200.0 9303.0 thtz
19 业务主管二档 4000.0 2367.0 0.0 2200.0 300.0 200.0 9067.0 thtz
20 业务主管三档 4000.0 2143.0 0.0 2200.0 300.0 200.0 8843.0 thtz
21 业务主管四档 4000.0 1926.0 0.0 2200.0 300.0 200.0 8626.0 thtz
22 业务主管五档 4000.0 1716.0 0.0 2200.0 300.0 200.0 8416.0 thtz
23 业务主管六档 4000.0 1516.0 0.0 2200.0 300.0 200.0 8216.0 thtz
24 业务主管七档 4000.0 1324.0 0.0 2200.0 300.0 200.0 8024.0 thtz
25 业务主管八档 4000.0 1138.0 0.0 2200.0 300.0 200.0 7838.0 thtz
26 高级职员一档 3500.0 1870.0 0.0 2000.0 300.0 200.0 7870.0 thtz
27 高级职员二档 3500.0 1682.0 0.0 2000.0 300.0 200.0 7682.0 thtz
28 高级职员三档 3500.0 1502.0 0.0 2000.0 300.0 200.0 7502.0 thtz
29 高级职员四档 3500.0 1329.0 0.0 2000.0 300.0 200.0 7329.0 thtz
30 高级职员五档 3500.0 1162.0 0.0 2000.0 300.0 200.0 7162.0 thtz
31 高级职员六档 3500.0 1003.0 0.0 2000.0 300.0 200.0 7003.0 thtz
32 高级职员七档 3500.0 848.0 0.0 2000.0 300.0 200.0 6848.0 thtz
33 高级职员八档 3500.0 701.0 0.0 2000.0 300.0 200.0 6701.0 thtz
34 一级员工一档 3000.0 1385.0 0.0 1800.0 300.0 200.0 6685.0 thtz
35 一级员工二档 3000.0 1236.0 0.0 1800.0 300.0 200.0 6536.0 thtz
36 一级员工三档 3000.0 1093.0 0.0 1800.0 300.0 200.0 6393.0 thtz
37 一级员工四档 3000.0 955.0 0.0 1800.0 300.0 200.0 6255.0 thtz
38 一级员工五档 3000.0 821.0 0.0 1800.0 300.0 200.0 6121.0 thtz
39 一级员工六档 3000.0 694.0 0.0 1800.0 300.0 200.0 5994.0 thtz
40 一级员工七档 3000.0 571.0 0.0 1800.0 300.0 200.0 5871.0 thtz
41 一级员工八档 3000.0 453.0 0.0 1800.0 300.0 200.0 5753.0 thtz
42 二级员工一档 2600.0 1001.0 0.0 1600.0 300.0 200.0 5701.0 thtz
43 二级员工二档 2600.0 881.0 0.0 1600.0 300.0 200.0 5581.0 thtz
44 二级员工三档 2600.0 767.0 0.0 1600.0 300.0 200.0 5467.0 thtz
45 二级员工四档 2600.0 656.0 0.0 1600.0 300.0 200.0 5356.0 thtz
46 二级员工五档 2600.0 550.0 0.0 1600.0 300.0 200.0 5250.0 thtz
47 二级员工六档 2600.0 448.0 0.0 1600.0 300.0 200.0 5148.0 thtz
48 二级员工七档 2600.0 350.0 0.0 1600.0 300.0 200.0 5050.0 thtz
49 二级员工八档 2600.0 256.0 0.0 1600.0 300.0 200.0 4956.0 thtz
50 厨师 2400.0 2500.0 0.0 0.0 0.0 0.0 4900.0 thtz
51 厨工 2400.0 700.0 500.0 0.0 0.0 0.0 3600.0 thtz
52 保洁 2400.0 763.0 4000.0 0.0 0.0 0.0 7163.0 thtz
53 实习生 2300.0 0.0 0.0 0.0 300.0 200.0 2800.0 thtz
yuthon_hr_employee/models/yuthon_job_lv.py
+7 -2
View File
@@ -6,7 +6,10 @@ from datetime import datetime
class YuthonJobLv(models.Model):
_name = 'yuthon.job.lv'
_description = "职级管理"
_order = 'lv desc'
lv = fields.Integer(string="级别")
name = fields.Char(string="职级名称")
base_wage = fields.Float(string="基本工资")
job_wage = fields.Float(string="职级工资")
@@ -16,9 +19,11 @@ class YuthonJobLv(models.Model):
attendance_bonus = fields.Float(string="全勤奖")
all_wage = fields.Float(string="应发工资")
yuthon_company = fields.Selection([('thtz', '天河投资集团'), ('thwg', '天河物管'),
('thlc', '天河粮储'), ('tctj', '天投城建')], string="所属公司")
create_time = fields.Datetime(string="生效日期", default=fields.Datetime.now)
end_time = fields.Datetime(string="失效日期")
company_page = fields.Selection([('tz', '天河投资'), ('wg', '天河物管'), ('lc', '天河粮储'), ('thjtzb','天河集团总部')], string="公司")
def pub_lv_approval(self):
pass
# def pub_lv_approval(self):
# pass
yuthon_hr_employee/views/website_employee_views.xml
+17 -15
View File
@@ -43,22 +43,24 @@
<form class="oe_website_form_room" role="form" t-attf-action="/hr/employee/create" method="post" onsubmit="this.action = '/hr/employee/create' + location.hash">
<input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
<ul class="nav nav-tabs">
<li class="active"><a href="panel_1">第一页</a></li>
<li><a href="panel_2">第二页</a></li>
<ul class="nav nav-tabs nav-fill" role="tablist">
<li class="nav-item" role="presentation">
<a aria-controls="panel_1" href="#panel_1" t-attf-class="nav-link #{'active' if not active_tab or active_tab == 'panel_1' else ''}" data-bs-toggle="tab" role="tab">第一页</a></li>
<li class="nav-item" role="presentation">
<a aria-controls="panel_2" href="#panel_2" t-attf-class="nav-link #{'active' if active_tab == 'panel_2' else ''}" data-bs-toggle="tab" role="tab">第二页</a></li>
</ul>
<div class="tab-content mt-3">
<div role="tabpanel" t-att-class="not comments and 'tab-pane fade in show active' or 'tab-pane fade'" id="panel_1">
<div class="mb-3 field-room_id">
<label for="employee_id" class="form-label">员工号</label>
<input type="text" placeholder="会议号" name="employee_id" t-att-value="employee_id" id="employee_id" t-attf-class="form-control" readonly="readonly"/>
</div>
</div>
<div role="tabpanel" t-att-class="comments and 'tab-pane fade in show active' or 'tab-pane fade'" id="panel_2">
222
</div>
</div>
<div class="tab-content">
<div role="tabpanel" id="panel_1" t-attf-class="tab-pane #{ 'show active' if active_tab == 'panel_1' else '' } bg-100">
<div class="mb-3 field-room_id">
<label for="employee_id" class="form-label">员工号</label>
<input type="text" placeholder="员工号" name="employee_id" t-att-value="employee_id" id="employee_id" t-attf-class="form-control" readonly="readonly"/>
</div>
</div>
<div role="tabpanel" id="panel_2" t-attf-class="tab-pane #{ 'show active' if active_tab == 'panel_2' else '' } bg-100">
222
</div>
</div>
<p class="alert alert-danger" t-if="error" role="alert">
<t t-esc="error"/>
@@ -68,7 +70,7 @@
</p>
<div t-attf-class="clearfix oe_login_buttons text-center gap-1 d-grid mb-1">
<button type="submit" class="btn btn-primary">签到</button>
<button type="submit" class="btn btn-primary">创建</button>
</div>
</form>
yuthon_hr_employee/views/yuthon_job_lv_views.xml
+17 -12
View File
@@ -5,10 +5,11 @@
<field name="name">yuthon.job.lv.tree</field>
<field name="model">yuthon.job.lv</field>
<field name="arch" type="xml">
<tree>
<header>
<button name="pub_lv_approval" string="提交职级调整申请" type="object"/>
</header>
<tree editable="bottom">
<!-- <header>-->
<!-- <button name="pub_lv_approval" string="提交职级调整申请" type="object"/>-->
<!-- </header>-->
<field name="lv"/>
<field name="name"/>
<field name="base_wage"/>
<field name="job_wage"/>
@@ -17,19 +18,22 @@
<field name="phone_subsidy"/>
<field name="attendance_bonus"/>
<field name="all_wage"/>
<field name="yuthon_company"/>
<field name="create_time"/>
<field name="end_time"/>
<field name="company_page"/>
</tree>
</field>
</record>
<record id="view_yuthon_job_lv_search" model="ir.ui.view">
</record>
<record id="view_yuthon_job_lv_search" model="ir.ui.view">
<field name="name">yuthon.job.lv.search</field>
<field name="model">yuthon.job.lv</field>
<field name="arch" type="xml">
<search string="职级查询">
<group expand="0">
<filter name="group_date" string="查询年月" context="{'group_by': 'create_time'}"/>
<filter name="group_company" string="所属公司" context="{'group_by': 'yuthon_company'}"/>
<filter name="group_lv" string="级别" context="{'group_by': 'lv'}"/>
</group>
</search>
</field>
@@ -38,13 +42,14 @@
<record id="view_yuthon_job_lv_action" model="ir.actions.act_window">
<field name="name">职级管理</field>
<field name="res_model">yuthon.job.lv</field>
<field name="view_mode">tree,form</field>
<field name="view_mode">tree</field>
<field name="context">{'search_default_group_company': True, 'search_default_group_lv': True}</field>
</record>
<!-- Menus -->
<menuitem
id="menu_yuthon_job_lv"
name="职级管理"
action="view_yuthon_job_lv_action"
parent="hr.menu_config_employee"
sequence="6"/>
id="menu_yuthon_job_lv"
name="职级管理"
action="view_yuthon_job_lv_action"
parent="hr.menu_config_employee"
sequence="6"/>
</odoo>
yuthon_tianhe/__manifest__.py
+1 -6
View File
@@ -13,12 +13,7 @@
'version': '0.1',
'license': 'LGPL-3',
'depends': ['base', 'base_setup', 'web', 'auth_signup', 'auth_oauth',
'sale_renting', 'project', 'hr', 'documents',
'room', 'fleet', 'website_slides', 'website', 'approvals',
'sale_renting', 'purchase', 'spreadsheet_dashboard',
'board', 'spreadsheet_dashboard', "hr_attendance", "hr_work_entry_contract_enterprise",
"calendar", "project_todo"],
'depends': ['base', 'base_setup', 'web', 'website_slides', 'website'],
'assets': {
'web.assets_frontend': [
yuthon_wechat/models/hr_attendance_detail.py
+1 -1
View File
@@ -198,7 +198,7 @@ class HrAttendanceDetail(models.Model):
"""
userid = data.get("userid", "")
# 查询是否存在数据
if self.env['hr.attendance.detail'].sudo().search_count([("userid", "=", userid), ("checkin_time", "=", checkin_time)]) <= 0:
if userid and checkin_time and self.env['hr.attendance.detail'].sudo().search_count([("userid", "=", userid), ("checkin_time", "=", checkin_time)]) <= 0:
res_user_obj = self.env['res.users'].sudo().search([("oauth_uid", "=", userid)], limit=1)
hr_employee_obj = self.env['hr.employee'].sudo().search([("user_id", "=", res_user_obj.id)], limit=1)
if not res_user_obj or not hr_employee_obj:
yuthon_work_brand/views/hr_menus.xml
+6 -37
View File
@@ -48,10 +48,6 @@
parent="hr_recruitment_setting_menu_board"
action="hr_recruitment.action_hr_recruitment_configuration"
sequence="1"/>
<!-- <menuitem id="hr_process_work_job_menu_board"-->
<!-- name="流程"-->
<!-- parent="hr_recruitment_menu_root_board"-->
<!-- sequence="5"/>-->
<menuitem id="hr_menu_recruitment_approval"
name="招聘需求申请表"
parent="hr_recruitment_menu_root_board"
@@ -77,10 +73,6 @@
parent="hr_recruitment_menu_root_board"
action="yuthon_hr_employee_approval.yuthon_message_login_action"
sequence="9"/>
<!-- <menuitem id="hr_recruitment_app2_menu_board"-->
<!-- name="应用"-->
<!-- parent="hr_recruitment_setting_menu_board"-->
<!-- sequence="5"/>-->
<menuitem id="hr_recruit_setting_menu_root_board"
name="岗位类型配置"
parent="hr_recruitment_setting_menu_board"
@@ -147,6 +139,11 @@
parent="hr_employee_menu_root_board"
action="hr_contract.action_hr_contract"
sequence="9"/>
<menuitem id="hr_employee_organization_menu_root_board"
name="组织结构"
parent="hr_employee_menu_root_board"
action="hr_org_chart.action_hr_employee_org_chart"
sequence="10"/>
<menuitem id="hr_set_process_menu_root_board"
name="流程"
parent="hr_employee_menu_root_board"
@@ -186,16 +183,7 @@
parent="hr_set_process_menu_root_board"
action="yuthon_hr_employee_approval.yuthon_transfer_approval_action"
sequence="13"/>
<menuitem id="hr_menu_cost_approval_root_board"
name="成本中心"
parent="hr_set_process_menu_root_board"
action="yuthon_none_action"
sequence="13"/>
<menuitem id="hr_employee_organization_menu_root_board"
name="组织结构"
parent="hr_set_process_menu_root_board"
action="hr_org_chart.action_hr_employee_org_chart"
sequence="15"/>
<menuitem id="hr_setting_menu_root_board"
name="配置"
parent="hr_menu_root_board"
@@ -249,25 +237,6 @@
parent="hr_set_employee_menu_root_board"
action="hr.open_view_categ_form"
sequence="15"/>
<menuitem id="hr_set_resume_menu_root_board"
name="简历"
parent="hr_setting_menu_root_board"
sequence="3"/>
<menuitem id="hr_set_route_menu_root_board"
name="路线类型"
parent="hr_set_resume_menu_root_board"
action="hr_skills.hr_resume_type_action"
sequence="1"/>
<menuitem id="hr_set_planning_menu_root_board"
name="活动规划"
parent="hr_setting_menu_root_board"
sequence="7"/>
<menuitem id="hr_plan_inout_menu_root_board"
name="入职离职计划"
parent="hr_set_planning_menu_root_board"
action="hr.mail_activity_plan_action"
sequence="1"/>
<!-- 出勤 -->
<menuitem id="hr_attendance_root_board"