Merge branch 'develop' into feature/tree视图表格样式修改

# Conflicts: # sf_manufacturing/static/src/xml/kanban_change.xml
2023-08-03 17:34:54 +08:00
parent 921336ad13 d0fab40b03
commit da7184d841
39 changed files with 37817 additions and 1735 deletions
--- a/sf_manufacturing/manifest.py
+++ b/sf_manufacturing/manifest.py
@@ -15,6 +15,7 @@
        'data/stock_data.xml',
        'security/group_security.xml',
        'security/ir.model.access.csv',
+        'views/mrp_production_addional_change.xml',
        'report/tray_report.xml',
        # 'views/mrp_maintenance_views.xml',
        'views/mrp_routing_workcenter_view.xml',
@@ -42,6 +43,14 @@
    ],
    'qweb': [
    ],
+    'assets': {
+        'web.assets_backend': [
+            'sf_manufacturing/static/src/js/kanban_change.js',
+            'sf_manufacturing/static/src/scss/kanban_change.scss',
+            'sf_manufacturing/static/src/xml/kanban_change.xml',
+        ],
+
+    },
    'license': 'LGPL-3',
    'installable': True,
    'application': False,