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 feature/制造代码优化

Browse Source 
# Conflicts:
#	sf_sale/security/ir.model.access.csv
This commit is contained in:
mgw
2024-01-04 08:54:12 +08:00
parent ce58e989dd 5d09d1585b
commit 9443a07eb4
13 changed files with 103 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_base/views/fixture_view.xml
View File

@@ -341,7 +341,7 @@
</tree>
</field>
<field name="adapter_board_fixture_ids"
attrs="{'invisible': [('fixture_material_type', '!=', '转接板夹具')]}">
attrs="{'invisible': [('fixture_material_type', '!=', '转接板(锁板)夹具')]}">
<tree editable="bottom" class="center" delete="0">
<field name="name"/>
<field name="length"/>