From f4e4423b55e308841e070b473f6423d6a34535d5 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sun, 15 Jun 2025 19:40:46 +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

---
 .../wizard/soong_workflow_comment_wizard_view.xml           | 6 +++---
 yuthon_hr_attendance/views/yuthon_shift_approval_views.xml  | 6 +++---
 yuthon_salary/models/inherit_hr_payslip.py                  | 3 ++-
 yuthon_salary/views/inherit_hr_payslip_run_views.xml        | 3 +--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
index abaf946ce..253cbe92c 100644
--- a/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
+++ b/soong_workflow/wizard/soong_workflow_comment_wizard_view.xml
@@ -17,7 +17,7 @@
                     <div class="oe_comment_block" style=" width:1200%; border: 1px solid #dee2e6; border-radius: 4px; padding: 12px; margin-bottom: 16px;">
                         <label for="comment_note_id" string="常用意见"
                                style="font-weight: bold; margin-bottom: 8px; display: block;"/>
-                        <field name="comment_note_id" class="mb-3" style="width: 100%;" options="{'no_create': True}" domain="[('note_setting_id.users_role_ids', 'in', user_id.user_role_id)]"/>
+                        <field name="comment_note_id" class="mb-3" style="width: 100%;" options="{'no_create': True}" domain="[('note_setting_id.users_role_ids', 'in', user_id.employee_id.user_role_id)]"/>
                         <field name="comment_note" placeholder="请输入意见内容..." style="width: 100%;"/>
                     </div>
                 </group>
@@ -25,7 +25,7 @@
                     <div class="oe_comment_block" style=" width:1200%; border: 1px solid #dee2e6; border-radius: 4px; padding: 12px; margin-bottom: 16px;">
                         <label for="comment_note_id" string="结束意见"
                                style="font-weight: bold; margin-bottom: 8px; display: block;"/>
-                        <field name="comment_note_id" class="mb-3" style="width: 100%;" options="{'no_create': True}" domain="[('note_setting_id.users_role_ids', 'in', user_id.user_role_id)]"/>
+                        <field name="comment_note_id" class="mb-3" style="width: 100%;" options="{'no_create': True}" domain="[('note_setting_id.users_role_ids', 'in', user_id.employee_id.user_role_id)]"/>
                         <field name="comment_note" placeholder="请输入意见内容..." style="width: 100%;"/>
                     </div>
                 </group>
@@ -33,7 +33,7 @@
                     <div class="oe_comment_block" style=" width:1200%; border: 1px solid #dee2e6; border-radius: 4px; padding: 12px; margin-bottom: 16px;">
                         <label for="comment_note_id" string="分发意见"
                                style="font-weight: bold; margin-bottom: 8px; display: block;"/>
-                        <field name="comment_note_id" class="mb-3" style="width: 100%;" options="{'no_create': True}" domain="[('note_setting_id.users_role_ids', 'in', user_id.user_role_id)]"/>
+                        <field name="comment_note_id" class="mb-3" style="width: 100%;" options="{'no_create': True}" domain="[('note_setting_id.users_role_ids', 'in', user_id.employee_id.user_role_id)]"/>
                         <field name="comment_note" placeholder="请输入意见内容..." style="width: 100%;"/>
                     </div>
                 </group>
diff --git a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
index cced38b19..abf3a7ed1 100644
--- a/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
+++ b/yuthon_hr_attendance/views/yuthon_shift_approval_views.xml
@@ -17,9 +17,9 @@
         <field name="arch" type="xml">
             <form string="值班换班审批" create="0">
                 <sheet>
-                    <header>
-                        <button name="button_shift_approval" type="object" string="批准" class="oe_highlight"/>
-                    </header>
+<!--                    <header>-->
+<!--                        <button name="button_shift_approval" type="object" string="批准" class="oe_highlight"/>-->
+<!--                    </header>-->
                     <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
                         invisible="urgency_level != 'normal'"/>
                     <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py
index efc28bf1e..8e61f2adb 100644
--- a/yuthon_salary/models/inherit_hr_payslip.py
+++ b/yuthon_salary/models/inherit_hr_payslip.py
@@ -428,7 +428,8 @@ class InheritHrPayslip(models.Model):
             "views": [(False, "tree")],
             "domain": [("slip_id", "=", self.id), ("amount", "!=", 0)],
             "target": "new",
-            "context": "{'tree_view_ref': 'yuthon_salary.view_hr_payslip_line_tree_custom'}"
+            "context": "{'tree_view_ref': 'yuthon_salary.view_hr_payslip_line_tree_custom'}",
+            'create': False,
         }
 
     def open_record(self):
diff --git a/yuthon_salary/views/inherit_hr_payslip_run_views.xml b/yuthon_salary/views/inherit_hr_payslip_run_views.xml
index c30115a0a..3f7f74f0e 100644
--- a/yuthon_salary/views/inherit_hr_payslip_run_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_run_views.xml
@@ -14,9 +14,8 @@
             <xpath expr="//field[@name='company_id']" position="after">
                 <field name="document_ids" widget="preview_many2many"/>
                 <field name="run_stage" readonly="1"/>
-                <button type="object" name="Fileline" string="归档明细" class="oe_highlight"  invisible="run_stage != 'issued'"/>
+                <button type="object" name="Fileline" string="薪资明细" class="oe_highlight"/>
                 <button type="object" name="payslip_wizard" string="发放工资条" class="oe_highlight" invisible="run_stage != 'to_be_issued'" groups="yuthon_salary.salary_rule_confirm_group"/>
-                <button type="object" name="open_payslip" string="详情" class="oe_highlight"/>
             </xpath>
         </field>
     </record>