Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具物料与夹具物料的反注册
# Conflicts: # sf_base/views/base_view.xml # sf_base/views/common_view.xml # sf_tool_management/models/base.py
This commit is contained in:
jinling.yang
@@ -11,9 +11,12 @@
|
||||
<field name="name" string="模糊搜索"
|
||||
filter_domain="['|',('name', 'ilike', self),('code', 'ilike', self)]"/>
|
||||
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
|
||||
<!-- <searchpanel>-->
|
||||
<!-- <field name="tag_ids" icon="fa-filter"/>-->
|
||||
<!-- </searchpanel>-->
|
||||
<group string="分组">
|
||||
<filter name="tag_ids" string="标签" domain="[]" context="{'group_by': 'tag_ids'}"/>
|
||||
</group>
|
||||
<searchpanel>
|
||||
<field name="tag_ids" select="multi" icon="fa-building" enable_counters="1"/>
|
||||
</searchpanel>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
@@ -352,18 +352,18 @@
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
|
||||
#------------------托盘------------------
|
||||
<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="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>
|
||||
@@ -377,21 +377,34 @@
|
||||
<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>-->
|
||||
|
||||
<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>
|
||||
<!-- </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>
|
||||
@@ -416,5 +429,28 @@
|
||||
</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>-->
|
||||
<!-- <field name="arch" type="xml">-->
|
||||
<!-- <form string="托盘">-->
|
||||
<!-- <header>-->
|
||||
<!-- <field name='state' widget="radio" options="{'horizontal': True}"/>-->
|
||||
<!-- </header>-->
|
||||
<!-- <sheet>-->
|
||||
<!-- <group name="group1">-->
|
||||
<!-- <group>-->
|
||||
<!-- <field name="code" required="1"/>-->
|
||||
<!-- </group>-->
|
||||
<!-- <group>-->
|
||||
<!-- <field name="name" required="1"/>-->
|
||||
<!-- </group>-->
|
||||
<!-- </group>-->
|
||||
<!-- </sheet>-->
|
||||
<!-- </form>-->
|
||||
<!-- </field>-->
|
||||
<!-- </record>-->
|
||||
>>>>>>> ae07a515b7846f3ab9dea426ae5a88c0472cf6b6
|
||||
</data>
|
||||
</odoo>
|
||||
@@ -44,13 +44,13 @@
|
||||
sequence="2"
|
||||
action="action_sf_machine_tool_type"/>
|
||||
|
||||
<menuitem
|
||||
id="menu_sf_tray"
|
||||
parent="mrp.menu_mrp_configuration"
|
||||
name="托盘"
|
||||
sequence="8"
|
||||
action="action_sf_tray"
|
||||
/>
|
||||
<!-- <menuitem-->
|
||||
<!-- id="menu_sf_tray"-->
|
||||
<!-- parent="mrp.menu_mrp_configuration"-->
|
||||
<!-- name="托盘"-->
|
||||
<!-- sequence="8"-->
|
||||
<!-- action="action_sf_tray"-->
|
||||
<!-- />-->
|
||||
|
||||
<menuitem
|
||||
sequence="2"
|
||||
|
||||
Reference in New Issue
Block a user