jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

Browse Source 
# Conflicts:
#	sf_base/views/menu_view.xml
#	sf_base/views/mrs_common_view.xml
This commit is contained in:
jinling.yang
2022-10-14 16:41:22 +08:00
parent b4aa6b61ed 5e5d62eabd
commit c06fec0e74
9 changed files with 301 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sf_base/views/menu_view.xml
View File

@@ -91,6 +91,14 @@
sequence="1"
action="mrs_processing_technology"/>
<menuitem
id="menu_sf_partner_views"
name="工厂token"
parent="menu_mrs_base"
sequence="1"
action="token_factory_view"
/>
<menuitem
id="menu_mrs_machine_brand"
@@ -133,6 +141,7 @@
sequence="1"
action="action_mrs_machine_control_system"/>
<!-- <menuitem-->
<!-- id="menu_sf_partner_views"-->
<!-- name="工厂token"-->
@@ -142,5 +151,6 @@
<!-- />-->
</data>
</odoo>

61
sf_base/views/mrs_common_view.xml
View File

@@ -277,38 +277,39 @@
</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 id="view_product_account_purchase_ok_form" model="ir.ui.view">-->
<!-- <field name="name">product.template.materials</field>-->
<!-- <field name="model">product.template</field>-->
<!-- <field name="inherit_id" ref="account.product_template_form_view"/>-->
<!-- <field name="arch" type="xml">-->
<!-- <field name="name" position="after" >-->
<!-- </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>-->
<!-- <field name="inherit_id" ref="account.product_template_form_view"/>-->
<!-- <field name="arch" type="xml">-->
<!-- <field name="name" position="after" >-->
<!-- </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)]" />-->
<!-- </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)]" />-->
<!-- </search>-->
<!-- </field>-->
@@ -345,5 +346,11 @@
<!-- </field>-->
<!-- </record>-->
<!-- </search>-->
<!-- </field>-->
<!-- </record>-->
</data>
</odoo>