Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售权限

# Conflicts:
#	sf_manufacturing/models/product_template.py

sf_mrs_connect/controllers/controllers.py

@@ -37,7 +37,7 @@ class Sf_Mrs_Connect(http.Controller):
                     download_state = request.env['sf.cnc.processing'].with_user(
                         request.env.ref("base.user_admin")).download_file_tmp(
                         ret['folder_name'], r)
-                    if download_state == False:
+                    if not download_state:
                         res['status'] = -2
                         res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_workorder.production_id.name)
                         return json.JSONEncoder().encode(res)