!1529 !1528 添加功能

Merge pull request !1529 from 李鹏宇/dev

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

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

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