Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop
This commit is contained in:
@@ -38,13 +38,13 @@
|
||||
|
||||
/>
|
||||
|
||||
<menuitem
|
||||
id="menu_sf_product_template"
|
||||
name="产品"
|
||||
parent="menu_mrs_base"
|
||||
sequence="1"
|
||||
action="sf_product_template"
|
||||
/>
|
||||
<!-- <menuitem-->
|
||||
<!-- id="menu_sf_product_template"-->
|
||||
<!-- name="产品"-->
|
||||
<!-- parent="menu_mrs_base"-->
|
||||
<!-- sequence="1"-->
|
||||
<!-- action="sf_product_template"-->
|
||||
<!-- />-->
|
||||
|
||||
<menuitem
|
||||
id="menu_mrs_production_process_1"
|
||||
|
||||
@@ -277,20 +277,20 @@
|
||||
</record>
|
||||
<!--产品-->
|
||||
<!-- <field name="domain">[('materials_model_ids', '!=', False)]</field>-->
|
||||
<record id="sf_product_template" model="ir.actions.act_window">
|
||||
<field name="name">产品</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<!-- <record id="sf_product_template" model="ir.actions.act_window">-->
|
||||
<!-- <field name="name">产品</field>-->
|
||||
<!-- <field name="type">ir.actions.act_window</field>-->
|
||||
|
||||
<field name="res_model">product.template</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="help" type="html">
|
||||
<!-- <field name="res_model">product.template</field>-->
|
||||
<!-- <field name="view_mode">tree,form</field>-->
|
||||
<!-- <field name="help" type="html">-->
|
||||
|
||||
<p class="o_view_nocontent_smiling_face">
|
||||
创建产品吧
|
||||
</p>
|
||||
</field>
|
||||
<!-- <p class="o_view_nocontent_smiling_face">-->
|
||||
<!-- 创建产品吧-->
|
||||
<!-- </p>-->
|
||||
<!-- </field>-->
|
||||
|
||||
</record>
|
||||
<!-- </record>-->
|
||||
<!-- <record id="view_product_account_purchase_ok_form" model="ir.ui.view">-->
|
||||
<!-- <field name="name">product.template.materials</field>-->
|
||||
<!-- <field name="model">product.template</field>-->
|
||||
@@ -302,17 +302,17 @@
|
||||
<!-- </field>-->
|
||||
<!-- </field>-->
|
||||
<!-- </record>-->
|
||||
<record id="view_product_account_purchase_ok_search" model="ir.ui.view">
|
||||
<field name="name">product.template.materials.search</field>
|
||||
<field name="model">product.template</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="产品名">
|
||||
<field name="name" string="产品名查询"
|
||||
filter_domain = "[('name','ilike',self)]" />
|
||||
<!-- <record id="view_product_account_purchase_ok_search" model="ir.ui.view">-->
|
||||
<!-- <field name="name">product.template.materials.search</field>-->
|
||||
<!-- <field name="model">product.template</field>-->
|
||||
<!-- <field name="arch" type="xml">-->
|
||||
<!-- <search string="产品名">-->
|
||||
<!-- <field name="name" string="产品名查询"-->
|
||||
<!-- filter_domain = "[('name','ilike',self)]" />-->
|
||||
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
<!-- </search>-->
|
||||
<!-- </field>-->
|
||||
<!-- </record>-->
|
||||
|
||||
|
||||
</data>
|
||||
|
||||
Reference in New Issue
Block a user