合并代码

sf_base/views/mrs_common_view.xml

@@ -277,8 +277,6 @@
         </record>
 
         #------------------托盘------------------
-<<<<<<< HEAD
-=======
         <record id="action_sf_tray" model="ir.actions.act_window">
             <field name="name">托盘</field>
             <field name="type">ir.actions.act_window</field>
@@ -291,13 +289,11 @@
             </field>
         </record>
 
->>>>>>> a33b16cf78ac96c7254fa26cd71610cc3aef97fa
         <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">
-<<<<<<< HEAD
-<!--                <group>-->
+
 
 
                     <search string="托盘">
@@ -309,12 +305,12 @@
                         <filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
                     </group>
 <!--                </group>-->
-=======
+
                 <search string="托盘">
                     <field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>
                     <field name="code" string="编码" filter_domain="[('code','ilike',self)]"/>
                 </search>
->>>>>>> a33b16cf78ac96c7254fa26cd71610cc3aef97fa
+
             </field>
         </record>
 
@@ -350,7 +346,7 @@
             </field>
         </record>
 
-<<<<<<< HEAD
+
         <record id="action_sf_tray" model="ir.actions.act_window">
             <field name="name">托盘</field>
             <field name="type">ir.actions.act_window</field>
@@ -362,8 +358,7 @@
                 </p>
             </field>
         </record>
-=======
->>>>>>> a33b16cf78ac96c7254fa26cd71610cc3aef97fa
+
 
     </data>
 </odoo>