From 433f3bd2dcba83b02cca8d4f2dd67c93a720d5e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=A7?= <huyao@jikimo.com>
Date: Wed, 13 Nov 2024 09:07:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E8=89=BA=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E5=B8=88=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/sale_order_views.xml                | 38 +++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml b/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml
index 58e8f8ae..c5a1766c 100644
--- a/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml
+++ b/jikimo_sale_multiple_supply_methods/views/sale_order_views.xml
@@ -34,9 +34,13 @@
     </record>
 
     <record id="jikimo_sale_order_view_search_inherit_quotation" model="ir.ui.view">
+        <field name="name">jikimo.sale.order.search.inherit.quotation</field>
+        <field name="model">sale.order</field>
+        <field name="mode">primary</field>
+        <field name="inherit_id" ref="sale.sale_order_view_search_inherit_quotation"/>
         <field name="arch" type="xml">
-            <xpath expr="//filter[@name='my_quotation']" position="attributes">
-                <attribute name="domain">[('state', 'in', ('draft', 'sent')), ('user_id', '=', uid)]</attribute>
+            <xpath expr="//filter[@name='my_quotation']" position="replace">
+                <filter string="我的报价" name="my_quotation" domain="[('state', 'in', ('draft', 'sent'))]"/>
             </xpath>
         </field>
     </record>
@@ -47,8 +51,8 @@
         <field name="mode">primary</field>
         <field name="inherit_id" ref="sale.sale_order_view_search_inherit_quotation"/>
         <field name="arch" type="xml">
-            <xpath expr="//filter[@name='my_quotation']" position="attributes">
-                <attribute name="domain">[('state', 'in', ('draft', 'sent')), ('user_id', '=', uid)]</attribute>
+            <xpath expr="//filter[@name='my_quotation']" position="replace">
+                <filter string="我的报价" name="my_quotation" domain="[('state', 'in', ('draft', 'sent'))]"/>
             </xpath>
             <xpath expr="//filter[@name='draft']" position="after">
                 <filter string="供货方式待确认" name="supply_method" domain="[('state', '=', 'supply method')]"/>
@@ -56,7 +60,7 @@
         </field>
     </record>
 
-    <record id="sale.action_quotations_with_onboarding" model="ir.actions.act_window">
+    <record id="sale.action_quotations" model="ir.actions.act_window">
         <field name="search_view_id" ref="jikimo_sale_order_view_search_inherit_quotation"/>
     </record>
 
@@ -65,7 +69,6 @@
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sale.order</field>
         <field name="view_mode">tree,kanban,form,calendar,pivot,graph,activity</field>
-        <field name="view_id" ref="sale.view_quotation_tree_with_onboarding"/>
         <field name="search_view_id" ref="jikimo_sale_order_view_search_inherit_quotation_supply_method"/>
         <field name="context">{'search_default_supply_method': 1}</field>
         <field name="help" type="html">
@@ -80,22 +83,27 @@
         id="sale.sale_menu_root"
         groups="sf_base.group_production_engineer,sf_base.group_sale_director,sf_base.group_sale_salemanager"
         />
-    <menuitem
-        id="sale_order_menu_supply_method"
-        name="订单"
-        sequence="10"
-        parent="sale.sale_menu_root"
-        groups="sf_base.group_production_engineer"
-        />
     <!--供货路线专员菜单-->
     <menuitem
         id="sale_order_menu_quotations_supply_method"
         name="报价"
         action="action_quotations_supply_method"
-        parent="sale_order_menu_supply_method"
+        parent="sale.sale_order_menu"
         groups="sf_base.group_production_engineer"
         sequence="2"/>
-    
+
+    <record id="sale.menu_sale_order" model="ir.ui.menu">
+        <field name="groups_id" eval="[(4, ref('sf_base.group_production_engineer'))]"/>
+    </record>
+
+    <record id="sale.report_sales_team" model="ir.ui.menu">
+        <field name="groups_id" eval="[(4, ref('sf_base.group_production_engineer'))]"/>
+    </record>
+
+    <record id="sale.res_partner_menu" model="ir.ui.menu">
+        <field name="groups_id" eval="[(4, ref('sf_base.group_production_engineer'))]"/>
+    </record>
+
     
     
 </odoo>