Merge branch 'develop' into feature/commercially_launched

This commit is contained in:
胡尧
2025-03-04 09:32:07 +08:00
26 changed files with 967 additions and 403 deletions

View File

@@ -127,6 +127,9 @@
<xpath expr="//field[@name='order_line']/tree/field[@name='product_uom_qty']" position="replace">
<field name="product_uom_qty" string="数量" widget="merge_field" optional="show" />
</xpath>
<xpath expr="//field[@name='order_line']/tree/field[@name='product_uom'][2]" position="attributes">
<attribute name="optional">hide</attribute>
</xpath>
<xpath expr="//field[@name='order_line']/tree/field[@name='product_uom']" position="attributes">
<attribute name="optional">hide</attribute>
</xpath>