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

Merge branch 'hotfix/新增刀具按批次管理' into hotfix/新增刀具按批次管理_1.1

Browse Source 
# Conflicts:
#	sf_tool_management/controllers/controllers.py
This commit is contained in:
yuxianghui
2024-06-06 09:17:32 +08:00
parent 07b1c3cceb b6acbb8357
commit 206fc7bb21
14 changed files with 558 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_tool_management/views/functional_tool_views.xml
View File

@@ -115,7 +115,7 @@
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="cutting_tool_cutterhead_model_id"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="safe_inventory_id" readonly="0"/>
<field name="safe_inventory_id" invisible="1"/>
</group>
<group>
<field name="image" nolabel="1" widget="image"/>