From e661297b5d1b227dc53ba6e06a18ef14be150e41 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 24 Jan 2024 15:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD=E6=80=BB?=
 =?UTF-8?q?=E7=9B=91=E5=AE=A1=E6=A0=B8=E8=8F=9C=E5=8D=95=E5=8D=95-?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E5=90=8E=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=8F=8D=E5=BA=94-=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/views/purchase_order_view.xml | 6 ++----
 sf_sale/views/sale_order_view.xml     | 7 +++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 423742b8..c1794277 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -10,22 +10,20 @@
                     <field name="partner_id" widget="res_partner_many2one" context="{'is_supplier': True }"/>
                 </field>
                 <field name="currency_id" position="after">
-                    <field name="check_status" invisible="1"/>
-                    <!--                    <field name="state"/>-->
                     <field name="remark" attrs="{'readonly': ['&amp;',('state', 'in', ['purchase']),('check_status','in',
                         ['pending','approved'])]}"/>
                 </field>
                 <xpath expr="//form/header/button[@name='action_rfq_send'][1]" position="after">
                     <button name="sf_sale.action_purchase_order_check_wizard" string="审核" type="action"
                             context="{'default_order_id':active_id}" groups="sf_base.group_purchase_director"
-                            attrs="{'invisible': ['&amp;',('check_status','in', ['approved',False,'fail']),('state', 'in', ['purchase'])]}"
+                            attrs="{'invisible': ['&amp;',('check_status','in', ['approved',False,'fail']),('state', 'in', ['purchase','draft'])]}"
                             class="oe_highlight"/>
 
                 </xpath>
                 <xpath expr="//form/header/button[@name='button_confirm'][2]" position="replace">
                     <button name="button_confirm" type="object" context="{'validate_analytic': True}"
                             string="确认订单" id="draft_confirm"
-                            attrs="{'invisible': ['|','&amp;','&amp;', ('state', 'in', ['purchase']), ('check_status', 'in', ['approved']), ('date_approve', '!=', False),'&amp;', '&amp;',('state', 'in', ['purchase', 'draft']),('check_status', 'in', [False, 'pending', 'fail']),('date_approve', '=', False)]}"
+                            attrs="{'invisible': ['|','&amp;','&amp;', ('state', 'in', ['purchase','draft']), ('check_status', 'in', ['approved']), ('date_approve', '!=', False),'&amp;', '&amp;',('state', 'in', ['purchase', 'draft']),('check_status', 'in', [False, 'pending', 'fail']),('date_approve', '=', False)]}"
                     />
                     <button name="button_confirming" type="object"
                             string="确认订单"
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index f6bef6a6..e6e7e8a2 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -87,8 +87,11 @@
                             attrs="{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&amp;','&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel']),('schedule_status', 'not in', False)]}"/>
                 </xpath>
                 <xpath expr="//form/header/button[@name='action_cancel']" position="attributes">
-                    <attribute name="attrs">{'invisible': ['|',('state', 'in', ['cancel']),('check_status', 'in',
-                        [False,'approved'])]}
+                    <attribute name="attrs">{'invisible': ['|','&amp;',('state', 'in',
+                        ['cancel','draft']),('check_status',
+                        'in',
+                        [False,'approved']),'&amp;','&amp;',('check_status', '=', 'approved'),('state', 'in',
+                        ['sale','cancel','draft']),('schedule_status', 'not in', False)]}
                     </attribute>
                 </xpath>
                 <xpath expr="//form/header/button[@name='action_draft']" position="attributes">