From fbf86a69e34d52eb815fc1124934281fc268a3af Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 29 Dec 2023 11:24:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95Tree?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AE=A1=E6=A0=B8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_dlm_management/__manifest__.py           | 2 +-
 sf_manufacturing/models/product_template.py | 4 ++--
 sf_sale/models/auto_quatotion_common.py     | 2 +-
 sf_sale/models/quick_easy_order.py          | 6 +++---
 sf_sale/models/sale_order.py                | 3 ++-
 sf_sale/views/purchase_order_view.xml       | 6 +++---
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/sf_dlm_management/__manifest__.py b/sf_dlm_management/__manifest__.py
index a5c894d4..813fdb3f 100644
--- a/sf_dlm_management/__manifest__.py
+++ b/sf_dlm_management/__manifest__.py
@@ -11,7 +11,7 @@
     'website': 'https://www.sf.jikimo.com',
     'depends': ['sf_sale', 'sf_dlm', 'sf_manufacturing'],
     'data': [
-        'data/stock_data.xml',
+        # 'data/stock_data.xml',
         'views/product_template_management_view.xml',
     ],
     'demo': [
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 285d43f0..3233e674 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -6,8 +6,8 @@ import os
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py
index 09ea3f0f..10b83aed 100644
--- a/sf_sale/models/auto_quatotion_common.py
+++ b/sf_sale/models/auto_quatotion_common.py
@@ -2,7 +2,7 @@
 import logging
 from odoo.modules import get_resource_path
 from odoo import fields, models, api
-from quatotion import readSql, feature_recognize, auto_quatotion
+# from quatotion import readSql, feature_recognize, auto_quatotion
 
 __author__ = 'jinling.yang'
 _logger = logging.getLogger(__name__)
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 1e5f274c..3f65e1cd 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -4,9 +4,9 @@ import hashlib
 import os
 import json
 from datetime import datetime
-import requests
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# import requests
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError
diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py
index 8cbcbb31..03ab0a88 100644
--- a/sf_sale/models/sale_order.py
+++ b/sf_sale/models/sale_order.py
@@ -103,7 +103,8 @@ class RePurchaseOrder(models.Model):
 
     def button_confirm(self):
         self.check_status = 'pending'
-        return super().button_confirm()
+        res = super().button_confirm()
+        return res
 
 
 class ResPartnerToSale(models.Model):
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 93b59032..3b2d8d09 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -126,12 +126,12 @@
             </field>
         </record>
 
-        <record id="view_purchase_order_kpis_tree_inherit_sf" model="ir.ui.view">
+        <record id="purchase_order_view_tree_inherit_sf" model="ir.ui.view">
             <field name="name">purchase.order.tree.inherit.sf</field>
             <field name="model">purchase.order</field>
-            <field name="inherit_id" ref="purchase.purchase_order_kpis_tree"/>
+            <field name="inherit_id" ref="purchase.purchase_order_view_tree"/>
             <field name="arch" type="xml">
-                <field name="state" position="after">
+                <field name="invoice_status" position="after">
                     <field name="check_status" widget="badge"
                            decoration-success="check_status == 'approved'"
                            decoration-warning="check_status == 'pending'"