From a9ec12e7286510833e827f75ad8d64904a37a202 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 21 Feb 2025 20:48:27 +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_notice/views/yuthon_notice_views.xml          | 4 ++--
 yuthon_salary/models/inherit_hr_payroll_structure.py | 3 +++
 yuthon_salary/views/yuthon_payroll_project_views.xml | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/yuthon_notice/views/yuthon_notice_views.xml b/yuthon_notice/views/yuthon_notice_views.xml
index 25538e09c..b905bc132 100644
--- a/yuthon_notice/views/yuthon_notice_views.xml
+++ b/yuthon_notice/views/yuthon_notice_views.xml
@@ -164,14 +164,14 @@
     <menuitem id="yuthon_notice_menu1"
             parent="yuthon_notice_menu_config_root"
             name="通知公告管理"
-            action="approval_notice_action2"
+            action="approval_notice_action"
             groups="group_notice_admin"
             sequence="1"/>
 
     <menuitem id="yuthon_notice_my_menu"
             parent="yuthon_notice_menu_config_root"
             name="通知公告"
-            action="approval_notice_action"
+            action="approval_notice_action2"
             groups="group_notice_user"
             sequence="2"/>
 
diff --git a/yuthon_salary/models/inherit_hr_payroll_structure.py b/yuthon_salary/models/inherit_hr_payroll_structure.py
index 2bbdecbc6..c289f9ad0 100644
--- a/yuthon_salary/models/inherit_hr_payroll_structure.py
+++ b/yuthon_salary/models/inherit_hr_payroll_structure.py
@@ -17,12 +17,15 @@ class HrPayrollStructure(models.Model):
 
     currency_id = fields.Many2one("res.currency", string="货币", required=True,
                                   default=lambda self: self.env.company.currency_id)
+    base_salary = fields.Monetary(string="基本工资", currency_field="currency_id")
     rank_salary = fields.Monetary(string="职级工资", currency_field="currency_id")
     performance_bonus = fields.Monetary(string="绩效奖金", currency_field="currency_id")
     communication_subsidy = fields.Monetary(string="通讯补贴", currency_field="currency_id")
     position_salary = fields.Monetary(string="岗位工资", currency_field="currency_id")
+    position_subsidy = fields.Monetary(string="岗位补贴", currency_field="currency_id")
     seniority_salary = fields.Monetary(string="工龄工资", currency_field="currency_id")
     overtime_pay = fields.Monetary(string="加班费", currency_field="currency_id")
+    integrated_subsidy = fields.Monetary(string="综合补贴", currency_field="currency_id")
     full_attendance_bonus = fields.Monetary(string="全勤奖", currency_field="currency_id")
 
     @api.model
diff --git a/yuthon_salary/views/yuthon_payroll_project_views.xml b/yuthon_salary/views/yuthon_payroll_project_views.xml
index 21c819187..2dcac4d23 100644
--- a/yuthon_salary/views/yuthon_payroll_project_views.xml
+++ b/yuthon_salary/views/yuthon_payroll_project_views.xml
@@ -81,7 +81,7 @@
                 <field name="employee_base_floor"/>
                 <field name="company_values"/>
                 <field name="employee_values"/>
-                <field name="documents_ids"/>
+                <field name="documents_ids" widget="preview_many2many"/>
                 <field name="remarks"/>
                 <field name="start_date"/>
                 <field name="end_date"/>