解决合并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/manifest.py
+++ b/sf_demand_plan/manifest.py
@@ -14,9 +14,13 @@
    'data': [
        'security/ir.model.access.csv',
        'data/stock_route_group.xml',
+<<<<<<< HEAD
        'views/sale_order_views.xml',
        'views/demand_plan.xml',
        'views/demand_main_plan.xml',
+=======
+        'views/demand_plan.xml',
+>>>>>>> develop
        'views/stock_route.xml',
        'wizard/sf_demand_plan_print_wizard_view.xml',
        'wizard/sf_release_plan_wizard_views.xml',