From d3316263860c8770054a26f4537d081461966744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 12 Nov 2025 10:23:58 +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

---
 .../static/src/views/form/form_controller.xml | 56 ++++++-------------
 .../wizard/penalty_line_wizard.py             |  1 -
 2 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/sh_backmate_theme_adv_enterprise/static/src/views/form/form_controller.xml b/sh_backmate_theme_adv_enterprise/static/src/views/form/form_controller.xml
index 2ff271fb2..fa593d3a2 100644
--- a/sh_backmate_theme_adv_enterprise/static/src/views/form/form_controller.xml
+++ b/sh_backmate_theme_adv_enterprise/static/src/views/form/form_controller.xml
@@ -1,48 +1,28 @@
-<!--<templates xml:space="preserve">-->
-<!--    <t t-inherit="web.FormStatusIndicator" t-inherit-mode="extension">-->
-<!--        &lt;!&ndash; 隐藏原来的按钮容器 &ndash;&gt;-->
-<!--        <xpath expr="//div[contains(@class,'o_form_status_indicator_buttons')]" position="attributes">-->
-<!--            <attribute name="t-att-class">"o_form_status_indicator_buttons d-flex invisible"</attribute>-->
-<!--        </xpath>-->
-<!--    </t>-->
-<!--    <t t-inherit="web.FormView" t-inherit-mode="extension">-->
-<!--        <xpath expr="//Layout/t[@t-set-slot='control-panel-create-button'][2]" position="inside">-->
-<!--            &lt;!&ndash; edit by Lucky 20250714:增加buttonState.showEditButton &ndash;&gt;-->
-<!--            <t t-if="!model.root.isInEdition and buttonState.showEditButton">-->
-<!--                <button type="button" class="btn btn-outline-primary o_form_button_edit" t-on-click="edit" data-hotkey="a">编辑</button>-->
-<!--            </t>-->
-<!--            <t t-if="model.root.isInEdition and buttonState.formRendered">-->
-<!--                <div class="o_form_buttons_edit">-->
-<!--                    <button id="editButton" type="button" class="btn btn-secondary o_form_button_save" t-on-click="saveButtonClicked" data-hotkey="s">-->
-<!--                        <i class="fa fa-cloud-upload fa-fw" />-->
-<!--                        保存-->
-<!--                    </button>-->
-<!--                    <button type="button" id="formDiscard" class="btn btn-secondary" t-on-click="discard" data-hotkey="j">-->
-<!--                        <i class="fa fa-undo fa-fw" />-->
-<!--                        丢弃-->
-<!--                    </button>-->
-<!--                </div>-->
-<!--            </t>-->
-<!--        </xpath>-->
-<!--    </t>-->
-<!--</templates>-->
 <templates xml:space="preserve">
+    <t t-inherit="web.FormStatusIndicator" t-inherit-mode="extension">
+        <!-- 隐藏原来的按钮容器 -->
+        <xpath expr="//div[contains(@class,'o_form_status_indicator_buttons')]" position="attributes">
+            <attribute name="t-att-class">"o_form_status_indicator_buttons d-flex invisible"</attribute>
+        </xpath>
+    </t>
     <t t-inherit="web.FormView" t-inherit-mode="extension">
-        <xpath expr="//Layout[t@t-set-slot='control-panel-create-button'][2]" position="inside">
+        <xpath expr="//Layout/t[@t-set-slot='control-panel-create-button'][2]" position="inside">
             <!-- edit by Lucky 20250714:增加buttonState.showEditButton -->
-            <t t-if="!model.root.isInEdition and buttonState.showEditButton and !env.isSmall">
+            <t t-if="!model.root.isInEdition and buttonState.showEditButton">
                 <button type="button" class="btn btn-outline-primary o_form_button_edit" t-on-click="edit" data-hotkey="a">编辑</button>
             </t>
             <t t-if="model.root.isInEdition and buttonState.formRendered">
-                <t t-call="web.FormView.buttons"/>
+                <div class="o_form_buttons_edit">
+                    <button id="editButton" type="button" class="btn btn-secondary o_form_button_save" t-on-click="saveButtonClicked" data-hotkey="s">
+                        <i class="fa fa-cloud-upload fa-fw" />
+                        保存
+                    </button>
+                    <button type="button" id="formDiscard" class="btn btn-secondary" t-on-click="discard" data-hotkey="j">
+                        <i class="fa fa-undo fa-fw" />
+                        丢弃
+                    </button>
+                </div>
             </t>
         </xpath>
     </t>
-        <!-- 继承 ControlPanel 模板 -->
-        <t t-inherit="web.ControlPanel" t-inherit-mode="extension">
-            <xpath expr="//div[@class='o_control_panel d-flex flex-column gap-3 gap-lg-1 px-3 pt-2 pb-3']" position="attributes">
-                <attribute name="t-attf-class">o_control_panel d-flex flex-column gap-3 gap-lg-1 px-3 pt-2 pb-3 #{env.isSmall ? '
-                </attribute>
-            </xpath>
-        </t>
 </templates>
\ No newline at end of file
diff --git a/yuthon_property_approval/wizard/penalty_line_wizard.py b/yuthon_property_approval/wizard/penalty_line_wizard.py
index 908f0c266..026dee54b 100644
--- a/yuthon_property_approval/wizard/penalty_line_wizard.py
+++ b/yuthon_property_approval/wizard/penalty_line_wizard.py
@@ -78,7 +78,6 @@ class PenaltyLineWizard(models.Model):
         modify_lines = self.env['receivable.modify.line'].search([
             ('receivable_id', '=', receivable.id),
             ('reconciliation_date', '!=', False),
-            ('is_penalty', '=', False)
         ], order='reconciliation_date asc')
 
         new_penalty_lines = []