pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!6339 添加功能

Browse Source 
Merge pull request !6339 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2025-11-12 02:24:55 +00:00
committed by Gitee
parent 530300f010 d331626386
commit 86fd0e71e5
2 changed files with 18 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sh_backmate_theme_adv_enterprise/static/src/views/form/form_controller.xml
+18 -38
View File
@@ -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>
yuthon_property_approval/wizard/penalty_line_wizard.py
-1
View File
@@ -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 = []