Accept Merge Request #1412: (feature/还原代码 -> develop)

Merge Request: 还原代码

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1412
This commit is contained in:
杨金灵
2024-10-17 14:08:18 +08:00
committed by Coding

View File

@@ -34,36 +34,36 @@
</field> </field>
</record> </record>
<!-- <record model="ir.ui.view" id="quality_point_view_form_inherit_sf">--> <record model="ir.ui.view" id="quality_point_view_form_inherit_sf">
<!-- <field name="name">quality.point.form.inherit.sf</field>--> <field name="name">quality.point.form.inherit.sf</field>
<!-- <field name="model">quality.point</field>--> <field name="model">quality.point</field>
<!-- <field name="inherit_id" ref="quality.quality_point_view_form"/>--> <field name="inherit_id" ref="quality.quality_point_view_form"/>
<!-- <field name="arch" type="xml">--> <field name="arch" type="xml">
<!-- &lt;!&ndash; <xpath expr="//sheet//group//group//field[@name='title']" position="replace"> &ndash;&gt;--> <!-- <xpath expr="//sheet//group//group//field[@name='title']" position="replace"> -->
<!-- &lt;!&ndash; <field name="title" class="custom_required" required="1"/> &ndash;&gt;--> <!-- <field name="title" class="custom_required" required="1"/> -->
<!-- &lt;!&ndash; </xpath> &ndash;&gt;--> <!-- </xpath> -->
<!-- <xpath expr="//sheet//group//group//field[@name='title']" position="attributes">--> <xpath expr="//sheet//group//group//field[@name='title']" position="attributes">
<!-- <attribute name="class">custom_required</attribute>--> <attribute name="class">custom_required</attribute>
<!-- <attribute name="required">1</attribute>--> <attribute name="required">1</attribute>
<!-- </xpath>--> </xpath>
<!-- <xpath expr="//sheet//group//group//field[@name='picking_type_ids']" position="attributes">--> <xpath expr="//sheet//group//group//field[@name='picking_type_ids']" position="attributes">
<!-- <attribute name="class">custom_required</attribute>--> <attribute name="class">custom_required</attribute>
<!-- <attribute name="required">1</attribute>--> <attribute name="required">1</attribute>
<!-- </xpath>--> </xpath>
<!-- </field>--> </field>
<!-- </record>--> </record>
<!-- <record model="ir.ui.view" id="sf_quality_point_view_form_inherit_quality_control">--> <record model="ir.ui.view" id="sf_quality_point_view_form_inherit_quality_control">
<!-- <field name="name">sf.quality.point.form.inherit.sf</field>--> <field name="name">sf.quality.point.form.inherit.sf</field>
<!-- <field name="model">quality.point</field>--> <field name="model">quality.point</field>
<!-- <field name="inherit_id" ref="quality_control.quality_point_view_form_inherit_quality_control"/>--> <field name="inherit_id" ref="quality_control.quality_point_view_form_inherit_quality_control"/>
<!-- <field name="arch" type="xml">--> <field name="arch" type="xml">
<!-- <xpath expr="//field[@name='measure_on']" position="attributes">--> <xpath expr="//field[@name='measure_on']" position="attributes">
<!-- <attribute name="class">custom_required</attribute>--> <attribute name="class">custom_required</attribute>
<!-- </xpath>--> </xpath>
<!-- <xpath expr="//field[@name='measure_frequency_type']" position="attributes">--> <xpath expr="//field[@name='measure_frequency_type']" position="attributes">
<!-- <attribute name="class">custom_required</attribute>--> <attribute name="class">custom_required</attribute>
<!-- </xpath>--> </xpath>
<!-- </field>--> </field>
<!-- </record>--> </record>
</odoo> </odoo>