Accept Merge Request #2293: (feature/7254_new -> develop)
Merge Request: 材料型号增加是否磁吸 Created By: @刘磊 Reviewed By: @胡尧 Approved By: @胡尧 Accepted By: @刘磊 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2293
This commit is contained in:
@@ -263,6 +263,7 @@
|
||||
<field name="materials_no" readonly="1" force_save="1"/>
|
||||
<field name="gain_way" required="0"/>
|
||||
<field name="density" readonly="1" required="1" class="custom_required"/>
|
||||
<field name="need_m" default="false" readonly="1"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="rough_machining" required="1"/>
|
||||
@@ -306,6 +307,7 @@
|
||||
<field name="tensile_strength"/>
|
||||
<field name="hardness" optional="show"/>
|
||||
<field name="need_h"/>
|
||||
<field name="need_m"/>
|
||||
<field name="apply" widget="many2many_tags" optional="show"/>
|
||||
<field name="density" optional="show"/>
|
||||
<field name="rough_machining" optional="hide"/>
|
||||
@@ -352,6 +354,7 @@
|
||||
<field name="materials_no"/>
|
||||
<field name="name"/>
|
||||
<field name="need_h"/>
|
||||
<field name="need_m"/>
|
||||
<field name="mf_materia_post"/>
|
||||
<field name="density"/>
|
||||
<field name='materials_id' default="default" invisible="1"/>
|
||||
|
||||
Reference in New Issue
Block a user