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/models/sf_base.py
#	sf_manufacturing_orders/__manifest__.py
#	sf_route_workcenter/models/workcenter.py
This commit is contained in:
jinling.yang
2022-11-16 09:43:10 +08:00
parent 98c3f868e9 ec9f82f09c
commit 4ce0a7670c
14 changed files with 1139 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_base/views/mrs_common_view.xml
View File

@@ -296,9 +296,8 @@
<search string="托盘">
<field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码" filter_domain="[('code','ilike',self)]"/>
<!-- <field name="state" string="状态" filter_domain="[('state','ilike',self)]"/>-->
<group string="分组">
<filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
<filter name="state" string="状态" domain="[]" context="{'group_by': 'state'}"/>
</group>
</search>
@@ -338,5 +337,6 @@
</record>
</data>
</odoo>