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
This commit is contained in:
jinling.yang
2023-08-15 17:31:49 +08:00
parent 9fe58a1fba 0ecd4e4c3b
commit 8a99bd8589
110 changed files with 27374 additions and 1649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sf_base/views/tool_views.xml
View File

@@ -8,7 +8,7 @@
<field name="arch" type="xml">
<tree string="刀具物料" create="0" edit="0" delete="0">
<field name="code"/>
<field name="name"/>
<field name="name" string="名称"/>
<field name="remark"/>
</tree>
</field>
@@ -44,7 +44,7 @@
<search string="刀具物料">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
</search>
</field>
</record>
@@ -56,7 +56,7 @@
<field name="arch" type="xml">
<tree string="功能刀具">
<field name="code"/>
<field name="name"/>
<field name="name" string="名称"/>
<field name="mrs_cutting_tool_type_id"/>
<field name="mrs_cutting_tool_integral_model_ids" optional="hide"/>
<field name="mrs_cutting_tool_blade_model_ids" optional="hide"/>
@@ -79,7 +79,7 @@
<group string='基本信息'>
<group>
<field name="code"/>
<field name="name"/>
<field name="name" string="名称"/>
<field name="mrs_cutting_tool_type_id"
options="{'no_create': True, 'no_quick_create': True}"/>
<field name="mrs_cutting_tool_model_id"
@@ -142,6 +142,7 @@
<search string="功能刀具">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
</search>
</field>
</record>
@@ -153,7 +154,7 @@
<field name="model">sf.functional.cutting.tool.model</field>
<field name="arch" type="xml">
<tree string="功能刀具类型" create="0" delete="0" edit="0">
<field name="name"/>
<field name="name" string="名称"/>
<field name="code"/>
<field name="remark"/>
</tree>
@@ -187,6 +188,7 @@
<search string="功能刀具类型">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
</search>
</field>
</record>
@@ -196,9 +198,9 @@
<field name="name">sf.cutting.tool.model.tree</field>
<field name="model">sf.cutting.tool.model</field>
<field name="arch" type="xml">
<tree string="刀具型号">
<tree string="刀具型号" edit="0" delete="0" create="0">
<field name="code"/>
<field name="name"/>
<field name="name" string="名称"/>
<field name="mrs_cutting_tool_material_id"/>
<field name="image" widget='image'/>
</tree>
@@ -209,11 +211,15 @@
<field name="name">sf.cutting.tool.model.form</field>
<field name="model">sf.cutting.tool.model</field>
<field name="arch" type="xml">
<form string="刀具型号">
<form string="刀具型号" edit="0" delete="0" create="0">
<sheet>
<div class="oe_title">
<h1>
<field name="code"/>
</h1>
</div>
<group>
<group>
<field name="code"/>
<field name="name"/>
<field name="cutting_tool_material_type" invisible="1"/>
<field name="mrs_cutting_tool_material_id"
@@ -439,6 +445,7 @@
<search string="刀具型号">
<field name="name" string="名称搜索" filter_domain="[('name','ilike',self)]"/>
<field name="code" string="编码搜索" filter_domain="[('code','ilike',self)]"/>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
<searchpanel class="account_root">
<field name="mrs_cutting_tool_material_id" icon="fa-filter"/>
</searchpanel>
@@ -454,7 +461,7 @@
<field name="arch" type="xml">
<tree string="刀具类型" create="0" edit="0" delete="0">
<field name="code"/>
<field name="name"/>
<field name="name" string="名称"/>
<field name="mrs_cutting_tool_material_id"/>
<field name="remark"/>
</tree>