Merge branch 'feature/修改产品等信息' into develop

# Conflicts:
#	sf_base/models/product_template.py
#	sf_route_workcenter/models/workcenter.py

sf_manufacturing_orders/__manifest__.py

@@ -10,9 +10,10 @@
     """,
     'category': '',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['mrp'],
+    'depends': ['mrp', 'sf_base', 'sf_route_workcenter'],
     'data': [
         'views/sf_production.xml',
+        'views/mrp_routing_workcenter_view.xml'
 
 
 

sf_manufacturing_orders/models/__init__.py

@@ -1,3 +1,4 @@
 from . import sf_production
 from . import mrp_workorder
 
+