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

!686 zhou

Browse Source 
Merge pull request !686 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2024-12-08 10:13:04 +00:00
committed by Gitee
parent aa1c50bc60 3b3590d475
commit c35a3b3893
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_salary/wizard/yuthon_salary_wizard.py
+6 -6
View File
@@ -57,14 +57,14 @@ class YuthonSalaryWizard(models.Model):
salary_name = self.env['hr.salary.rule']
text = row[2].value
yuthon_company = yuthon_company_dict.get(row[10].value)
struct_id = self.env['hr.payroll.structure.type'].search([('name', '=', text)])
struct_id = self.env['hr.payroll.structure.type'].search([('name', '=', text),('yuthon_company','=','thtz')])
if not struct_id:
struct_id = self.env['hr.payroll.structure.type'].create({
'name': text,
'sequence': row[0].value,
'yuthon_company': yuthon_company})
structure_id = self.env['hr.payroll.structure'].search([('name', '=', text)])
level_id = self.env['yuthon.payroll.type.setting'].search([('name', '=', row[1].value)],('yuthon_company','=','thtz'))
structure_id = self.env['hr.payroll.structure'].search([('name', '=', text), ('yuthon_company','=','thtz')])
level_id = self.env['yuthon.payroll.type.setting'].search([('name', '=', row[1].value), ('yuthon_company','=','thtz')])
if not structure_id:
structure_id = self.env['hr.payroll.structure'].create({
'name': text,
@@ -143,9 +143,9 @@ class YuthonSalaryWizard(models.Model):
'name': text,
'sequence': row[0].value,
'yuthon_company': yuthon_company})
structure_id = self.env['hr.payroll.structure'].search([('name', '=', text)])
level_id = self.env['yuthon.payroll.type.setting'].search([('name', '=', row[1].value)],
[('yuthon_company', '=', 'thwg')])
structure_id = self.env['hr.payroll.structure'].search([('name', '=', text), ('yuthon_company', '=', 'thwg')])
level_id = self.env['yuthon.payroll.type.setting'].search([('name', '=', row[1].value),
('yuthon_company', '=', 'thwg')])
if not structure_id:
structure_id = self.env['hr.payroll.structure'].create({
'name': text,
yuthon_work_brand/views/attendance_menu.xml
+1 -6
View File
@@ -154,11 +154,6 @@
name="考勤记录"
parent="hr_attendance_root_board"
sequence="4"/>
<menuitem id="menu_hr_attendance_all_record_board"
name="全部考勤"
parent="hr_attendance_record_root_board"
action="hr_attendance.hr_attendance_action"
sequence="1"/>
<menuitem id="menu_hr_attendance_tt_record_board"
name="天河投资"
parent="hr_attendance_record_root_board"
@@ -289,7 +284,7 @@
sequence="3"
action="resource.action_resource_calendar_form"/>
<menuitem id="menu_hr_attendance_overtime_page_board"
name="加班时间表"
name="加班说明"
parent="attendance_resources_setting_root_board"
sequence="4"
action="yuthon_hr_attendance.view_overtime_page_action"/>