Merge branch 'refs/heads/feature/库存路线' into feature/物料需求计划管理

# Conflicts:
#	sf_demand_plan/__manifest__.py
#	sf_demand_plan/models/sf_production_demand_plan.py
#	sf_demand_plan/security/ir.model.access.csv
This commit is contained in:
guanhuan
2025-06-25 14:32:18 +08:00
11 changed files with 320 additions and 73 deletions

View File

@@ -28,7 +28,7 @@
<field name="qty_delivered"/>
<field name="qty_to_deliver"/>
<field name="model_long"/>
<field name="blank_type"/>
<field name="blank_type" optional="hide"/>
<field name="embryo_long"/>
<field name="materials_id"/>
<field name="model_machining_precision"/>
@@ -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"/>