diff --git a/yuthon_salary/wizard/yuthon_salary_wizard.py b/yuthon_salary/wizard/yuthon_salary_wizard.py
index 2a570374d..5f794757d 100644
--- a/yuthon_salary/wizard/yuthon_salary_wizard.py
+++ b/yuthon_salary/wizard/yuthon_salary_wizard.py
@@ -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,
diff --git a/yuthon_work_brand/views/attendance_menu.xml b/yuthon_work_brand/views/attendance_menu.xml
index 2401a1329..cbb5b9ee6 100644
--- a/yuthon_work_brand/views/attendance_menu.xml
+++ b/yuthon_work_brand/views/attendance_menu.xml
@@ -154,11 +154,6 @@
name="考勤记录"
parent="hr_attendance_root_board"
sequence="4"/>
-