解决冲突

2024-11-11 16:32:54 +08:00
parent eebb143778 a12eb12678
commit d68a9249c6
33 changed files with 392 additions and 250 deletions
--- a/sf_manufacturing/manifest.py
+++ b/sf_manufacturing/manifest.py
@@ -21,6 +21,7 @@
        'wizard/workpiece_delivery_views.xml',
        'wizard/rework_wizard_views.xml',
        'wizard/production_wizard_views.xml',
+        'wizard/production_technology_wizard_views.xml',
        'views/mrp_views_menus.xml',
        'views/agv_scheduling_views.xml',
        'views/stock_lot_views.xml',