Accept Merge Request #348: (feature/刀具管理加粗字段调整及界面布局优化 -> develop)
Merge Request: 刀具管理加粗字段调整, zpl_print,web_widget模块添加 'license': 'LGPL-3' Created By: @禹翔辉 Accepted By: @禹翔辉 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/348?initial=true
This commit is contained in:
@@ -13,7 +13,7 @@ class FunctionalCuttingToolEntity(models.Model):
|
|||||||
_description = '功能刀具列表'
|
_description = '功能刀具列表'
|
||||||
|
|
||||||
code = fields.Char('编码')
|
code = fields.Char('编码')
|
||||||
name = fields.Char('名称')
|
name = fields.Char('名称', required=True, size=20)
|
||||||
mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号')
|
mrs_cutting_tool_model_id = fields.Many2one('sf.cutting.tool.model', string='刀具型号')
|
||||||
mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', tracking=True,
|
mrs_cutting_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', tracking=True,
|
||||||
group_expand='_read_group_mrs_cutting_tool_type_ids')
|
group_expand='_read_group_mrs_cutting_tool_type_ids')
|
||||||
|
|||||||
@@ -29,12 +29,12 @@
|
|||||||
<sheet>
|
<sheet>
|
||||||
<div class="oe_title">
|
<div class="oe_title">
|
||||||
<h1>
|
<h1>
|
||||||
<field name="name" invisible="False"/>
|
<field name="name" invisible="False" placeholder="请输入20字以内的名称"/>
|
||||||
</h1>
|
</h1>
|
||||||
</div>
|
</div>
|
||||||
<group>
|
<group>
|
||||||
<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_type_id"/>
|
||||||
|
|
||||||
<field name="mrs_cutting_tool_integral_model_ids"
|
<field name="mrs_cutting_tool_integral_model_ids"
|
||||||
|
|||||||
@@ -18,5 +18,7 @@
|
|||||||
'web.assets_backend': [
|
'web.assets_backend': [
|
||||||
'web_widget_model_viewer/static/src/js/*',
|
'web_widget_model_viewer/static/src/js/*',
|
||||||
],
|
],
|
||||||
}
|
},
|
||||||
|
|
||||||
|
'license': 'LGPL-3',
|
||||||
}
|
}
|
||||||
@@ -22,6 +22,7 @@
|
|||||||
'jikimo_sfs/zpl_print/static/src/scss/changes.scss'
|
'jikimo_sfs/zpl_print/static/src/scss/changes.scss'
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
'license': 'LGPL-3',
|
||||||
'installable': True,
|
'installable': True,
|
||||||
'application': False,
|
'application': False,
|
||||||
'auto_install': False,
|
'auto_install': False,
|
||||||
|
|||||||
Reference in New Issue
Block a user