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

25
sf_base/views/fixture_view.xml
View File

@@ -13,7 +13,7 @@
filter_domain="[('name', 'ilike', self)]"/>
<field name="remark" string="备注"
filter_domain="[('remark', 'ilike', self)]"/>
<filter name="filter_active" string="未启用" domain="[('active','=',False)]"/>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
</search>
</field>
</record>
@@ -24,10 +24,10 @@
<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="category"/>
<field name="remark"/>
<field name="active" string="启用"/>
<!-- <field name="active" string="启用"/>-->
</tree>
</field>
</record>
@@ -77,7 +77,7 @@
filter_domain="[('name', 'ilike', self)]"/>
<field name="remark" string="备注"
filter_domain="[('remark', 'ilike', self)]"/>
<filter name="filter_active" string="未启用" domain="[('active','=',False)]"/>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
</search>
</field>
</record>
@@ -89,9 +89,9 @@
<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"/>
<field name="active" string="启用"/>
<!-- <field name="active" string="启用"/>-->
</tree>
</field>
</record>
@@ -150,6 +150,8 @@
<filter string='联装类型' name="multi_mounting_type_id" domain="[]"
context="{'group_by' : 'multi_mounting_type_id'}"/>
</group>
<filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
<searchpanel class="account_root">
<field name="fixture_material_id" icon="fa-filter"/>
</searchpanel>
@@ -163,7 +165,7 @@
<field name="arch" type="xml">
<tree string="夹具型号">
<field name="code"/>
<field name="name"/>
<field name="name" string="名称"/>
<field name="brand_id"/>
<field name="fixture_material_id"/>
<field name="multi_mounting_type_id"/>
@@ -177,12 +179,15 @@
<field name="arch" type="xml">
<form string="夹具型号">
<sheet>
<div class="oe_title">
<h1>
<field name="code" force_save="1" readonly="1"/>
</h1>
</div>
<group>
<group>
<field name="code" force_save="1"/>
<field name="name"/>
<field name="name" string="名称"/>
<field name="brand_id" options="{'no_create': True}"/>
<field name="manufacturer_model_number"/>
<field name="fixture_material_id" options="{'no_create': True}"/>
<field name="fixture_material_type" invisible="1"/>
<field name="multi_mounting_type_id" options="{'no_create': True}"/>