解决合并develop冲突

2025-07-07 10:03:09 +08:00
parent 86bacee926 20df1c0365
commit bd6f35a16f
25 changed files with 714 additions and 441 deletions
--- a/sf_demand_plan/models/init.py
+++ b/sf_demand_plan/models/init.py
@@ -7,4 +7,5 @@ from . import sale_order
 from . import stock_route
 from . import stock_rule
 from . import purchase_request
-from . import purchase_order
+from . import purchase_order
+