From 67618514078e5a73826ddcd67cdf8eb118855365 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Tue, 20 Aug 2024 14:38:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mrp_production_addional_change.xml  | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/sf_manufacturing/views/mrp_production_addional_change.xml b/sf_manufacturing/views/mrp_production_addional_change.xml
index 893c8475..b1c1ff1e 100644
--- a/sf_manufacturing/views/mrp_production_addional_change.xml
+++ b/sf_manufacturing/views/mrp_production_addional_change.xml
@@ -82,7 +82,6 @@
                 <xpath expr="//sheet//group//group//div[3]" position="after">
                     <field name="manual_quotation" readonly="1"/>
                     <field name="programming_no" readonly="1"/>
-                    <field name="confirm_cancel" readonly="1"/>、
                     <field name="programming_state" readonly="1"
                            decoration-success="programming_state == '已编程'"
                            decoration-warning="programming_state =='编程中'"
@@ -104,11 +103,11 @@
                     <field name="tool_state_remark" string="备注" attrs="{'invisible': [('tool_state', '!=', '1')]}"/>
                     <field name="tool_state_remark2" invisible="1"/>
                 </xpath>
-<!--                <xpath expr="//header//button[@name='action_cancel']" position="replace">-->
-<!--                    <button name="action_cancel" type="object" string="取消" data-hotkey="z"-->
-<!--                            attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'cancel')), ('confirm_cancel', '=', True)]}"-->
-<!--                            groups="sf_base.group_sf_mrp_user"/>-->
-<!--                </xpath>-->
+                <xpath expr="//header//button[@name='action_cancel']" position="replace">
+                    <button name="action_cancel" type="object" string="取消" data-hotkey="z"
+                            attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'cancel')), ('confirm_cancel', '=', True)]}"
+                            groups="sf_base.group_sf_mrp_user"/>
+                </xpath>
                 <xpath expr="(//header//button[@name='button_mark_done'])[1]" position="replace">
                     <button name="button_mark_done"
                             attrs="{'invisible': ['|', '|', ('state', 'in', ('draft', 'cancel', 'done', 'to_close')), ('qty_producing', '=', 0), ('move_raw_ids', '!=', [])]}"
@@ -216,12 +215,12 @@
                             type="object" groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
 
-<!--                <xpath expr="//header//button[@name='action_cancel']" position="replace">-->
-<!--                    <button name="action_cancel" type="object" string="Cancel" data-hotkey="z"-->
-<!--                            attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'cancel')), ('confirm_cancel', '=', False)]}"-->
-<!--                            confirm="Some product moves have already been confirmed, this manufacturing order can't be completely cancelled. Are you still sure you want to process ?"-->
-<!--                            groups="sf_base.group_sf_mrp_user"/>-->
-<!--                </xpath>-->
+                <xpath expr="//header//button[@name='action_cancel']" position="replace">
+                    <button name="action_cancel" type="object" string="Cancel" data-hotkey="z"
+                            attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'cancel')), ('confirm_cancel', '=', False)]}"
+                            confirm="Some product moves have already been confirmed, this manufacturing order can't be completely cancelled. Are you still sure you want to process ?"
+                            groups="sf_base.group_sf_mrp_user"/>
+                </xpath>
 
                 <xpath expr="//header//button[@name='button_unbuild']" position="replace">
                     <button name="button_unbuild" type="object" string="拆单"
@@ -266,12 +265,12 @@
                             type="object" groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
 
-<!--                <xpath expr="//header//button[@name='action_cancel']" position="replace">-->
-<!--                    <button name="action_cancel" type="object" string="取消" data-hotkey="z"-->
-<!--                            attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'cancel')), ('confirm_cancel', '=', False)]}"-->
-<!--                            confirm="Some product moves have already been confirmed, this manufacturing order can't be completely cancelled. Are you still sure you want to process ?"-->
-<!--                            groups="sf_base.group_sf_mrp_user"/>-->
-<!--                </xpath>-->
+                <xpath expr="//header//button[@name='action_cancel']" position="replace">
+                    <button name="action_cancel" type="object" string="取消" data-hotkey="z"
+                            attrs="{'invisible': ['|', '|', ('id', '=', False), ('state', 'in', ('done', 'cancel')), ('confirm_cancel', '=', False)]}"
+                            confirm="Some product moves have already been confirmed, this manufacturing order can't be completely cancelled. Are you still sure you want to process ?"
+                            groups="sf_base.group_sf_mrp_user"/>
+                </xpath>
                 <xpath expr="//header//button[@name='button_unbuild']" position="replace">
                     <button name="button_unbuild" type="object" string="拆单"
                             attrs="{'invisible': [('state', '!=', 'done')]}" data-hotkey="shift+v"
@@ -422,9 +421,9 @@
                 <xpath expr="//header//button[@name='do_unreserve']" position="replace">
                     <button name="do_unreserve" type="object" string="取消保留" groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
-<!--                <xpath expr="//header//button[@name='action_cancel']" position="replace">-->
-<!--                    <button name="action_cancel" type="object" string="取消" groups="sf_base.group_sf_mrp_user"/>-->
-<!--                </xpath>-->
+                <xpath expr="//header//button[@name='action_cancel']" position="replace">
+                    <button name="action_cancel" type="object" string="取消" groups="sf_base.group_sf_mrp_user"/>
+                </xpath>
                 <xpath expr="//field[@name='state']" position="after">
                     <field name="tool_state" invisible="1"/>
                 </xpath>