From 38e9b3051aed90d1cdadbaa392a8031f5fa7ae98 Mon Sep 17 00:00:00 2001
From: zhouzhou <123@qq.com>
Date: Sun, 8 Dec 2024 18:10:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_salary/wizard/yuthon_salary_wizard.py | 12 ++++++------
 yuthon_work_brand/views/attendance_menu.xml  |  7 +------
 2 files changed, 7 insertions(+), 12 deletions(-)

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"/>
-    <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"/>