From 6ad2fa80f1e96c82232ee853ddf6e0556a6d03e6 Mon Sep 17 00:00:00 2001
From: hujiaying <hujiaying@jikimo.com>
Date: Fri, 13 Sep 2024 10:15:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=EF=BC=8C?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=EF=BC=8C=E5=88=B6=E9=80=A0=EF=BC=8C=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93=E4=BA=A7=E5=93=81=E8=AE=BE=E7=BD=AE=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E9=BB=98=E8=AE=A4=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/product_template_management_view.xml | 18 ++++++++++++------
 .../views/mrp_workcenter_views.xml             |  2 +-
 sf_sale/views/purchase_order_view.xml          |  5 +++++
 sf_sale/views/sale_order_view.xml              |  5 +++++
 sf_stock/__manifest__.py                       |  3 ++-
 sf_stock/models/stock_picking.py               |  2 --
 sf_stock/views/stock_picking.xml               |  1 +
 sf_stock/views/stock_product_template.xml      | 11 +++++++++++
 8 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 sf_stock/views/stock_product_template.xml

diff --git a/sf_dlm_management/views/product_template_management_view.xml b/sf_dlm_management/views/product_template_management_view.xml
index 2cdfd1a3..caefcb34 100644
--- a/sf_dlm_management/views/product_template_management_view.xml
+++ b/sf_dlm_management/views/product_template_management_view.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
+        <record id="mrp.product_template_action" model="ir.actions.act_window">
+            <field name="context">
+                {"search_default_categ_id":1,"search_default_consumable": 1, 'default_detailed_type': 'product'}
+            </field>
+        </record>
         <record model="ir.ui.view" id="view_sale_product_template_form_inherit_sf">
             <field name="name">product.template.form.inherit.sf</field>
             <field name="model">product.template</field>
@@ -88,7 +93,8 @@
                                 </div>
                                 <field name="model_volume" string="体积[mm³]"/>
                                 <field name="product_model_type_id" string="模型类型"/>
-                                <field name="model_processing_panel" placeholder="例如R,U" string="加工面板" readonly="1"/>
+                                <field name="model_processing_panel" placeholder="例如R,U" string="加工面板"
+                                       readonly="1"/>
                                 <field name="model_machining_precision"/>
                                 <field name="model_process_parameters_ids" string="表面工艺参数"
                                        widget="many2many_tags"
@@ -103,11 +109,11 @@
                         '刀具')], 'required': True}
                     </attribute>
                 </xpath>
-<!--                <xpath expr="//field[@name='default_code']" position="attributes">-->
-<!--                    <attribute name="attrs">{'readonly': [('categ_type', '=', '刀具')], 'invisible':-->
-<!--                        [('product_variant_count', '>' , 1)]}-->
-<!--                    </attribute>-->
-<!--                </xpath>-->
+                <!--                <xpath expr="//field[@name='default_code']" position="attributes">-->
+                <!--                    <attribute name="attrs">{'readonly': [('categ_type', '=', '刀具')], 'invisible':-->
+                <!--                        [('product_variant_count', '>' , 1)]}-->
+                <!--                    </attribute>-->
+                <!--                </xpath>-->
             </field>
         </record>
 
diff --git a/sf_manufacturing/views/mrp_workcenter_views.xml b/sf_manufacturing/views/mrp_workcenter_views.xml
index 37ff8af5..5ba5290d 100644
--- a/sf_manufacturing/views/mrp_workcenter_views.xml
+++ b/sf_manufacturing/views/mrp_workcenter_views.xml
@@ -43,7 +43,7 @@
                 <label for="default_capacity"/>
                 <div class="o_row">
                     <field name="default_capacity" string="产线日产能"/>
-                    台
+                    件
                 </div>
             </xpath>
             <xpath expr="//field[@name='default_capacity'][last()]" position="before">
diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index a45d8049..445bded6 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -184,5 +184,10 @@
                 </xpath>
             </field>
         </record>
+        <record id="purchase.product_normal_action_puchased" model="ir.actions.act_window">
+            <field name="context">
+                {"search_default_categ_id":1,"search_default_filter_to_purchase":1, "purchase_product_template": 1}
+            </field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index 534d42e4..506f5b8d 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -225,5 +225,10 @@
                 </field>
             </field>
         </record>
+        <record id="sale.product_template_action" model="ir.actions.act_window">
+            <field name="context">{"search_default_categ_id":1,
+                "search_default_filter_to_sell":1,"sale_multi_pricelist_product_template": 1}
+            </field>
+        </record>
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_stock/__manifest__.py b/sf_stock/__manifest__.py
index 40f9113b..1b5f44c4 100644
--- a/sf_stock/__manifest__.py
+++ b/sf_stock/__manifest__.py
@@ -3,7 +3,7 @@
     'name': "sf_stock",
 
     'summary': """
-        处理代发货业务""",
+        处理仓库 -代发货业务""",
 
     'description': """
         Long description of module's purpose
@@ -25,6 +25,7 @@
     'data': [
         # 'security/ir.model.access.csv',
         'views/stock_picking.xml',
+        'views/stock_product_template.xml'
     ],
     # only loaded in demonstration mode
     'demo': [
diff --git a/sf_stock/models/stock_picking.py b/sf_stock/models/stock_picking.py
index 82ce7ea5..3a64f78c 100644
--- a/sf_stock/models/stock_picking.py
+++ b/sf_stock/models/stock_picking.py
@@ -13,8 +13,6 @@ _logger = logging.getLogger(__name__)
 class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
-    cancel_backorder_ids = fields.Boolean(default=False, string='是否取消后置单据')
-
     # 重写验证，下发发货到bfm
     def button_validate(self):
         info = super(StockPicking, self).button_validate()
diff --git a/sf_stock/views/stock_picking.xml b/sf_stock/views/stock_picking.xml
index 7750ca76..5bf4d40e 100644
--- a/sf_stock/views/stock_picking.xml
+++ b/sf_stock/views/stock_picking.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
   <data>
 
diff --git a/sf_stock/views/stock_product_template.xml b/sf_stock/views/stock_product_template.xml
new file mode 100644
index 00000000..2d2a2fbe
--- /dev/null
+++ b/sf_stock/views/stock_product_template.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="stock.product_template_action_product" model="ir.actions.act_window">
+            <field name="context">
+                {"search_default_categ_id":1,"search_default_consumable": 1, 'default_detailed_type': 'product'}
+            </field>
+        </record>
+
+    </data>
+</odoo>
\ No newline at end of file