From ad8f63570dd25c9132e21516fa11aa7721c5f1f3 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Fri, 21 Mar 2025 16:10:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=B7=E8=B4=AD=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9B=E8=B4=A7=E6=96=B9=E5=BC=8F=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_purchase_request/views/purchase_request_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jikimo_purchase_request/views/purchase_request_view.xml b/jikimo_purchase_request/views/purchase_request_view.xml
index 385db699..db88a4e2 100644
--- a/jikimo_purchase_request/views/purchase_request_view.xml
+++ b/jikimo_purchase_request/views/purchase_request_view.xml
@@ -55,6 +55,7 @@
         <field name="inherit_id" ref="purchase_request.purchase_request_line_search" />
         <field name="arch" type="xml">
             <xpath expr="//field[@name='product_id']" position="after">
+                <field name="supply_method"/>
                 <field name="related_product"/>
                 <field name="part_number"/>
                 <field name="part_name"/>

From 30b01b6e2c20644f39c8d25435437cf0718e1080 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Fri, 21 Mar 2025 18:15:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=B2=E6=89=B9?=
 =?UTF-8?q?=E5=87=86=E4=B8=BA=E6=97=A0=E5=BC=82=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/wizard/sale_order_cancel.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_manufacturing/wizard/sale_order_cancel.py b/sf_manufacturing/wizard/sale_order_cancel.py
index 646edd53..ead9ef71 100644
--- a/sf_manufacturing/wizard/sale_order_cancel.py
+++ b/sf_manufacturing/wizard/sale_order_cancel.py
@@ -489,7 +489,7 @@ class SFSaleOrderCancelLine(models.TransientModel):
                     'product_name': f'[{purchase_request_line.product_id.default_code}] {purchase_request_line.product_id.name}',
                     'quantity': purchase_request_line.product_qty,
                     'doc_state': purchase_request_map_dict.get(purchase_request_line.request_state, purchase_request_line.request_state),
-                    'cancel_reason': '已有异动' if purchase_request_line.request_state not in ['draft', 'cancel'] else ''
+                    'cancel_reason': '已有异动' if purchase_request_line.request_state not in ['draft', 'cancel', 'approved'] else ''
                 }
                 lines.append(self.create(vals))