Merge branch 'feature/修复sf的bug' into develop

This commit is contained in:
jinling.yang
2023-01-31 10:38:37 +08:00
12 changed files with 118 additions and 135 deletions

View File

@@ -12,7 +12,8 @@
<!-- </field>-->
<field name="invoice_policy" position="after">
<field name="model_file" widget="model_viewer" />
<!-- <field name="model_file" widget="model_viewer" attrs="{'invisible': [('categ_id', 'child_of', '成品')]}"/>-->
<field name="embryo_model_type_id"/>
<field name="materials_id" string="材料"/>
<field name="materials_type_id" string="型号"
domain="[('materials_id', '=', materials_id)]"/>
@@ -53,7 +54,7 @@
<!-- <field name="model_width" string="宽[mm]"/>-->
<!-- <field name="model_height" string="高[mm]"/>-->
<field name="model_volume" string="体积[mm³]"/>
<field name="model_type_id" string="模型类型"/>
<field name="product_model_type_id" string="模型类型"/>
<field name="model_processing_panel" placeholder="例如R,U" string="加工面板"/>
<field name="model_machining_precision"/>
<field name="model_surface_process_id" string="表面工艺"/>
@@ -123,5 +124,19 @@
</field>
</field>
</record>
<record id="product_template_search_view_sf" model="ir.ui.view">
<field name="name">product.template.search</field>
<field name="model">product.template</field>
<field name="inherit_id" ref="product.product_template_search_view"/>
<field name="arch" type="xml">
<xpath expr="//filter[@name='consumable']" position="after">
<separator/>
<filter name="finish_product" string="成品" domain="[('categ_id.type','=','成品')]"/>
<filter name="embryo" string="胚料" domain="[('categ_id.type','=','胚料')]"/>
<filter name="raw_bom" string="原材料" domain="[('categ_id.type','=','原材料')]"/>
</xpath>
</field>
</record>
</data>
</odoo>