jikimo/jikimo_sf
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/security/ir.model.access.csv
#	sf_base/views/mrs_common_view.xml
#	sf_route_workcenter/models/workcenter.py
This commit is contained in:
gqh
2022-11-07 11:00:14 +08:00
parent a49a24e9e6 a33b16cf78
commit 84cf25f39d
7 changed files with 98 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sf_base/views/mrs_common_view.xml
View File

@@ -277,10 +277,26 @@
</record>
#------------------托盘------------------
<<<<<<< HEAD
=======
<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>
>>>>>>> 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>-->
@@ -293,6 +309,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>
@@ -312,7 +334,9 @@
<field name="name">sf.tray.form</field>
<field name="model">sf.tray</field>
<field name="arch" type="xml">
<header><field name = 'state' widget="radio" options="{'horizontal': True}"/></header>
<header>
<field name='state' widget="radio" options="{'horizontal': True}"/>
</header>
<form string="托盘">
<group string="基本信息" name="group1">
<group>
@@ -326,6 +350,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>
@@ -337,6 +362,8 @@
</p>
</field>
</record>
=======
>>>>>>> a33b16cf78ac96c7254fa26cd71610cc3aef97fa
</data>
</odoo>