From 5739e167f495c4e557d7d39ebcd1c7bc15001268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Mon, 2 Dec 2024 19:46:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__manifest__.py                                |  3 +--
 .../views/sale_order_view.xml                      | 14 --------------
 sf_manufacturing/views/sale_order_views.xml        | 12 +++++++++++-
 3 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 jikimo_sale_multiple_supply_methods/views/sale_order_view.xml

diff --git a/jikimo_sale_multiple_supply_methods/__manifest__.py b/jikimo_sale_multiple_supply_methods/__manifest__.py
index e4b94ff4..cfc56321 100644
--- a/jikimo_sale_multiple_supply_methods/__manifest__.py
+++ b/jikimo_sale_multiple_supply_methods/__manifest__.py
@@ -6,12 +6,11 @@
     'author': 'fox',
     'website': '',
     'category': '',
-    'depends': ['sf_dlm', 'sale_stock', 'sf_sale'],
+    'depends': ['sf_dlm', 'sale_stock', 'sf_sale', 'sale'],
     "data": [
         'security/ir.model.access.csv',
         'data/stock_routes.xml',
         'data/product_data.xml',
-        'views/sale_order_view.xml',
         # 'views/product_product_views.xml',
     ],'assets': {
             #   'web.assets_backend': [
diff --git a/jikimo_sale_multiple_supply_methods/views/sale_order_view.xml b/jikimo_sale_multiple_supply_methods/views/sale_order_view.xml
deleted file mode 100644
index 81e9f7d8..00000000
--- a/jikimo_sale_multiple_supply_methods/views/sale_order_view.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <record id="view_order_form_inherit_sf" model="ir.ui.view">
-        <field name="name">view.sale.order.form.inherit.sf</field>
-        <field name="inherit_id" ref="sale_stock.view_order_form_inherit_sale_stock_qty"/>
-        <field name="model">sale.order</field>
-        <field name="arch" type="xml">
-            <xpath expr="//page/field[@name='order_line']/form/group/group/div[@name='ordered_qty']/widget[@name='qty_at_date_widget']" position="replace">
-            </xpath>
-            <xpath expr="//page/field[@name='order_line']/tree/widget[@name='qty_at_date_widget']" position="replace">
-            </xpath>
-        </field>
-    </record>
-</odoo>
\ No newline at end of file
diff --git a/sf_manufacturing/views/sale_order_views.xml b/sf_manufacturing/views/sale_order_views.xml
index 5de69b64..ba26134d 100644
--- a/sf_manufacturing/views/sale_order_views.xml
+++ b/sf_manufacturing/views/sale_order_views.xml
@@ -91,6 +91,16 @@
         <field name="groups_id" eval="[(4, ref('sf_base.group_production_engineer'))]"/>
     </record>
 
-    
+    <record id="view_order_form_inherit_sf" model="ir.ui.view">
+        <field name="name">view.sale.order.form.inherit.jikimo</field>
+        <field name="inherit_id" ref="sale_stock.view_order_form_inherit_sale_stock_qty"/>
+        <field name="model">sale.order</field>
+        <field name="arch" type="xml">
+            <xpath expr="//page/field[@name='order_line']/form/group/group/div[@name='ordered_qty']/widget[@name='qty_at_date_widget']" position="replace">
+            </xpath>
+            <xpath expr="//page/field[@name='order_line']/tree/widget[@name='qty_at_date_widget']" position="replace">
+            </xpath>
+        </field>
+    </record>
     
 </odoo>