Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协

# Conflicts:
#	sf_dlm/__manifest__.py
#	sf_dlm/models/product_template.py
#	sf_manufacturing/models/mrp_production.py

sf_machine_connect/__manifest__.py

@@ -12,7 +12,7 @@
     'category': 'sf',
     'author': 'jikimo',
     'website': 'https://sf.cs.jikimo.com',
-    'depends': ['sf_base', 'sf_manufacturing', 'barcodes', ],
+    'depends': ['sf_manufacturing', 'barcodes', ],
     'data': [
         # 定义权限组放在最上面
         # 权限组
@@ -33,6 +33,9 @@
     ],
 
     'assets': {
+        'web.assets_backend': [
+            'sf_machine_connect/static/src/js/*'
+        ],
     },
     'license': 'LGPL-3',
     'installable': True,