Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单流程

# Conflicts:
#	sf_base/__manifest__.py
#	sf_bpm_api/__manifest__.py
#	sf_manufacturing_orders/models/sf_production.py

sf_bpm_api/__manifest__.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-{
-    'name': '机企猫智能工厂 API模块',
-    'version': '1.0',
-    'summary': '智能工厂API模块',
-    'sequence': 1,
-    'description': """
-    在本模块，接收业务平台订单
-    """,
-    'category': 'sf',
-    'website': 'https://www.sf.cs.jikimo.com',
-    'depends': ['sale', 'sf_base'],
-    'data': [
-        'data/product_data.xml',
-
-    ],
-    'demo': [
-    ],
-    'qweb': [
-    ],
-    'installable': True,
-    'application': False,
-    'auto_install': False,
-}