From a03cb31b295bc781236c57c6e3fb2fabc9e16c89 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 7 Aug 2024 17:11:12 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A4=84=E7=90=86=20=20SF=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E5=8D=95=E9=9C=80=E6=B1=82=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/views/sale_order_view.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 7bf352eb..00cca206 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -34,15 +34,13 @@
                 <!--                </xpath>-->
                 <xpath expr="//form/header/button[@name='action_confirm'][2]" position="replace">
                     <button name="action_confirm" data-hotkey="v"
-                            string="确认" type="object" context="{'validate_analytic': True}"
+                            string="确认接单" type="object" context="{'validate_analytic': True}"
                             attrs="{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&amp;','&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel']),('delivery_status', '!=', False)]}"/>
                 </xpath>
                 <xpath expr="//form/header/button[@name='action_cancel']" position="attributes">
-                    <attribute name="attrs">{'invisible': ['|','&amp;',('state', 'in',
-                        ['cancel','draft']),('check_status',
-                        'in',
-                        [False,'approved']),'&amp;',('check_status', '=', 'approved'),('state', 'in',
-                        ['sale','cancel','draft'])]}
+                    <attribute name="attrs">{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state',
+                        'in', ['draft','cancel']),'&amp;','&amp;',('check_status', '=', 'approved'),('state', 'in',
+                        ['sale','cancel']),('delivery_status', '!=', False)]}
                     </attribute>
                 </xpath>
                 <xpath expr="//form/header/button[@name='action_draft']" position="attributes">