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 feature/自建模块日志警告信息处理

Browse Source 
# Conflicts:
#	sf_base/models/fixture.py
#	sf_manufacturing/models/model_type.py
#	sf_manufacturing/models/product_template.py
#	sf_sale/models/quick_easy_order.py
This commit is contained in:
yuxianghui
2023-08-29 11:21:13 +08:00
parent 5ccd754261 dea565f8c6
commit be0f62ffe0
11 changed files with 247 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_tool_management/views/tool_base_views.xml
View File

@@ -29,12 +29,12 @@
<sheet>
<div class="oe_title">
<h1>
<field name="name" invisible="False"/>
<field name="name" invisible="False" placeholder="请输入20字以内的名称"/>
</h1>
</div>
<group>
<group>
<field name="code" readonly="1"/>
<field name="code" readonly="1" nolabel="True"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="mrs_cutting_tool_integral_model_ids"