From 5644ee2670f6a3e58ecf3071b8d69752699499f9 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 18 Aug 2023 11:37:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=80=E5=85=B7=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/views/common_view.xml                | 78 --------------------
 sf_tool_management/views/tool_base_views.xml |  8 +-
 2 files changed, 4 insertions(+), 82 deletions(-)

diff --git a/sf_base/views/common_view.xml b/sf_base/views/common_view.xml
index a05155c7..e340650f 100644
--- a/sf_base/views/common_view.xml
+++ b/sf_base/views/common_view.xml
@@ -352,84 +352,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-<!--        #&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;托盘&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;-->
-<!--        <record id="action_sf_tray" model="ir.actions.act_window">-->
-<!--            <field name="name">托盘</field>-->
-<!--            <field name="type">ir.actions.act_window</field>-->
-<!--            <field name="res_model">sf.tray</field>-->
-<!--            <field name="view_mode">tree,form</field>-->
-<!--            <field name="help" type="html">-->
-<!--                <p class="o_view_nocontent_smiling_face">-->
-<!--                    创建托盘吧-->
-<!--                </p>-->
-<!--            </field>-->
-<!--        </record>-->
 
-        <record id="view_sf_tray_search" model="ir.ui.view">
-            <field name="name">sf.tray.search</field>
-            <field name="model">sf.tray</field>
-            <field name="arch" type="xml">
-                <search string="托盘">
-                    <field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>
-                    <field name="code" string="编码" filter_domain="[('code','ilike',self)]"/>
-                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
-                    <group string="分组">
-                        <filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-<!--        <record id="view_sf_tray_search" model="ir.ui.view">-->
-<!--            <field name="name">sf.tray.search</field>-->
-<!--            <field name="model">sf.tray</field>-->
-<!--            <field name="arch" type="xml">-->
-<!--                <search string="托盘">-->
-<!--                    <field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>-->
-<!--                    <field name="code" string="编码" filter_domain="[('code','ilike',self)]"/>-->
-<!--                    <group string="分组">-->
-<!--                        <filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/>-->
-<!--                    </group>-->
-<!--                </search>-->
-
-<!--            </field>-->
-<!--        </record>-->
-
-<!--        <record model="ir.ui.view" id="tree_sf_tray_view">-->
-<!--            <field name="name">sf.tray.tree</field>-->
-<!--            <field name="model">sf.tray</field>-->
-<!--            <field name="arch" type="xml">-->
-<!--                <tree string="托盘">-->
-<!--                    <field name="code"/>-->
-<!--                    <field name="name"/>-->
-<!--                    <field name="state"/>-->
-<!--                </tree>-->
-<!--            </field>-->
-<!--        </record>-->
-
-        <record model="ir.ui.view" id="sf_tray_form">
-            <field name="name">sf.tray.form</field>
-            <field name="model">sf.tray</field>
-            <field name="arch" type="xml">
-                <form string="托盘">
-                    <header>
-                        <field name='state' widget="radio" options="{'horizontal': True}"/>
-                    </header>
-                    <sheet>
-                        <div class="oe_title">
-                            <h1>
-                                <field name="code"/>
-                            </h1>
-                        </div>
-                        <group name="group1">
-                            <group>
-                                <field name="name" required="1" string="名称"/>
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-=======
 <!--        <record model="ir.ui.view" id="sf_tray_form">-->
 <!--            <field name="name">sf.tray.form</field>-->
 <!--            <field name="model">sf.tray</field>-->
@@ -451,6 +374,5 @@
 <!--                </form>-->
 <!--            </field>-->
 <!--        </record>-->
->>>>>>> ae07a515b7846f3ab9dea426ae5a88c0472cf6b6
     </data>
 </odoo>
\ No newline at end of file
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 04f06b27..02ab3ce6 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -84,7 +84,7 @@
                                         <field name="integral_blade_length"/>
                                         <field name="effective_blade_length"/>
                                         <field name="max_life"/>
-                                        <field name="is_standard"/>
+                                        <field name="is_standard" default="false"/>
                                         <field name="applicable_range"/>
                                     </group>
                                 </group>
@@ -236,7 +236,7 @@
                                         <field name="integral_blade_length"/>
                                         <field name="effective_blade_length"/>
                                         <field name="max_life"/>
-                                        <field name="is_standard"/>
+                                        <field name="is_standard" default="false"/>
                                         <field name="applicable_range"/>
                                     </group>
                                 </group>
@@ -409,7 +409,7 @@
                                         <field name="integral_blade_length"/>
                                         <field name="effective_blade_length"/>
                                         <field name="max_life"/>
-                                        <field name="is_standard"/>
+                                        <field name="is_standard" default="false"/>
                                         <field name="applicable_range"/>
                                     </group>
                                 </group>
@@ -544,7 +544,7 @@
                                         <field name="integral_blade_length"/>
                                         <field name="effective_blade_length"/>
                                         <field name="max_life"/>
-                                        <field name="is_standard"/>
+                                        <field name="is_standard" default="false"/>
                                         <field name="applicable_range"/>
                                     </group>
                                 </group>