Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug

2023-11-23 16:37:53 +08:00
parent baaeac10eb 8e5f5cf0d1
commit 9bb3b88fd6
47 changed files with 1633 additions and 1549 deletions
--- a/sf_manufacturing/manifest.py
+++ b/sf_manufacturing/manifest.py
@@ -17,7 +17,6 @@
        'security/ir.model.access.csv',
        'views/mrp_views_menus.xml',
        'views/mrp_production_addional_change.xml',
-        # 'views/mrp_maintenance_views.xml',
        'views/mrp_routing_workcenter_view.xml',
        'views/production_line_view.xml',
        'views/mrp_workcenter_views.xml',
@@ -25,7 +24,6 @@
        'views/model_type_view.xml',
        'views/sf_maintenance_equipment.xml',

-
    ],
    'assets': {