Merge remote-tracking branch 'origin/feature/产品添加夹具型号信息' into feature/功能刀具新增字段

# Conflicts:
#	sf_manufacturing/models/product_template.py
This commit is contained in:
yuxianghui
2024-01-09 10:33:16 +08:00
9 changed files with 254 additions and 42 deletions

View File

@@ -490,6 +490,28 @@
<field name="domain">[]</field>
</record>
<!-- ================================================刀具组================================================ -->
<record id="sf_tool_groups_tree" model="ir.ui.view">
<field name="name">刀具组</field>
<field name="model">sf.tool.groups</field>
<field name="arch" type="xml">
<tree create="1" edit="1" delete="1" editable="bottom">
<field name="name"/>
<field name="equipment_ids" widget="many2many_tags"/>
<field name="remark"/>
<field name="create_uid" string="创建人"/>
<field name="create_date" string="创建时间"/>
</tree>
</field>
</record>
<record id="sf_tool_groups_view_act" model="ir.actions.act_window">
<field name="name">刀具组</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sf.tool.groups</field>
<field name="view_mode">tree,form,search</field>
</record>
<!-- ================================================刀具基础参数================================================ -->
<!-- <record id="view_sf_tool_materials_basic_parameters_tree" model="ir.ui.view">-->
<!-- <field name="name">sf.tool.materials.basic.parameters.tree</field>-->