Merge branch refs/heads/develop into refs/heads/release/release_2.15

This commit is contained in:
胡尧
2025-07-01 17:57:06 +08:00
29 changed files with 597 additions and 127 deletions

View File

@@ -38,7 +38,8 @@
<field name="sale_order_id" optional="hide"/>
<field name="sale_order_line_number" optional="hide"/>
<field name="order_state"/>
<field name="route_id" optional="hide"/>
<field name="route_ids" widget="many2many_tags" optional="hide" readonly="0"
context="{'demand_plan_search_stock_route_id': id}"/>
<field name="contract_date"/>
<field name="date_order"/>
<field name="contract_code"/>

View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<record id="sf_stock_location_route_form_view" model="ir.ui.view">
<field name="name">stock.route.form</field>
<field name="model">stock.route</field>
<field name="inherit_id" ref="stock.stock_location_route_form_view"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='packaging_selectable']" position="after">
<field name="demand_plan_selectable"/>
</xpath>
<xpath expr="//group[@name='route_selector']" position="after">
<group name="group_category" string="组类">
<group>
<field name="stock_route_group_ids" options="{'no_create': True}" widget="many2many_tags"/>
<field name="demand_plan_ids" invisible="1" options="{'no_create': True}" widget="many2many_tags"/>
</group>
</group>
</xpath>
</field>
</record>
</odoo>