From e260ef01f0788374b24eb82c8dd81ade7089112f Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 4 Dec 2024 11:43:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=20=E5=BF=AB=E9=80=9F=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=20=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/views/quick_easy_order_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sf_sale/views/quick_easy_order_view.xml b/sf_sale/views/quick_easy_order_view.xml
index 3b386062..89792a49 100644
--- a/sf_sale/views/quick_easy_order_view.xml
+++ b/sf_sale/views/quick_easy_order_view.xml
@@ -128,9 +128,9 @@
         <!--                action="account.res_partner_action_customer"-->
         <!--                groups="sales_team.group_sale_salesman"-->
         <!--                sequence="40"/>-->
-        <menuitem sequence="21" name="快速订单" id="menu_quick_easy_order"
-                  action="action_quick_easy_order"
-                  parent="sale.sale_order_menu"
-                  groups="sales_team.group_sale_salesman,sf_base.group_sale_salemanager,sf_base.group_sale_director"/>
+<!--        <menuitem sequence="21" name="快速订单" id="menu_quick_easy_order"-->
+<!--                  action="action_quick_easy_order"-->
+<!--                  parent="sale.sale_order_menu"-->
+<!--                  groups="sales_team.group_sale_salesman,sf_base.group_sale_salemanager,sf_base.group_sale_director"/>-->
     </data>
 </odoo>
\ No newline at end of file

From 5b43cceb94d8bd1669cc956760a7fd70b50f9620 Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 4 Dec 2024 11:56:38 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E7=9A=84=E3=80=90=E5=88=B6=E9=80=A0=E8=AE=A2=E5=8D=95=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E8=AE=A1=E5=88=92=E3=80=91=E9=A1=B5=E9=9D=A2=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=90=8D=E7=A7=B0=E6=94=B9=E4=B8=BA=E3=80=90CNC?=
 =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E8=AE=A1=E5=88=92=E6=8E=92=E7=A8=8B=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_plan/views/view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index fad3d779..47e1dd54 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -257,7 +257,7 @@
 
 
         <record id="sf_production_plan_action" model="ir.actions.act_window">
-            <field name="name">制造订单生产计划</field>
+            <field name="name">CNC产线计划排程</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sf.production.plan</field>
             <field name="view_mode">gantt,tree,form</field>

From 6366904c91e0312844553ae1332e4744c304dfac Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 4 Dec 2024 15:37:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E4=BE=9B?=
 =?UTF-8?q?=E6=96=99=E5=85=A5=E5=BA=93=E5=8D=95=E7=9A=84=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 0c01a57c..898bec06 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -957,7 +957,7 @@ class ReStockMove(models.Model):
         合并制造订单的完成move单据
         """
         res = super(ReStockMove, self)._merge_moves_fields()
-        if self[0].origin and self.picking_type_id.name in ['生产发料', '内部调拨', '生产入库']:
+        if self[0].origin and self.picking_type_id.name in ['生产发料', '内部调拨', '生产入库', '客供料入库']:
             production = self.env['mrp.production'].search([('name', '=', self[0].origin)], limit=1, order='id asc')
             productions = self.env['mrp.production'].search(
                 [('origin', '=', production.origin), ('product_id', '=', production.product_id.id)])