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_base/__manifest__.py

@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-{
-    'name': '机企猫藏智能工厂 基础模块',
-    'version': '1.0',
-    'summary': '智能工厂基础模块',
-    'sequence': 1,
-    'description': """
-在本模块，定义了主要的角色、菜单、基础业务对象
-    """,
-    'category': 'YZ',
-    'website': 'https://www.sf.jikimo.com',
-    'depends': ['account', 'base', 'mrp','sale'],
-    'data': [
-        'security/group_security.xml',
-        'security/ir.model.access.csv',
-        'data/product_data.xml',
-        'views/mrs_base_view.xml',
-        'views/mrs_common_view.xml',
-        'views/menu_view.xml',
-        'views/sale_order_view.xml',
-        'views/product_template_view.xml',
-        'views/mrp_routing_workcenter_view.xml',
-
-
-
-    ],
-    'demo': [
-    ],
-    'qweb': [
-    ],
-    'installable': True,
-    'application': False,
-    'auto_install': False,
-}