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

# Conflicts:
#	sf_manufacturing/models/product_template.py

sf_bf_connect/models/__init__.py

@@ -2,4 +2,3 @@ from . import http
 from . import models
 from . import process_status
 from . import jd_eclp
-

sf_bf_connect/models/jd_eclp.py

@@ -1,8 +1,8 @@
-# import cpca
 import base64
 import logging
 from datetime import datetime
 import requests
+import cpca
 from odoo.exceptions import UserError
 from odoo.exceptions import ValidationError
 from odoo import api, fields, models, SUPERUSER_ID, _

sf_bf_connect/models/models.py

@@ -4,7 +4,6 @@ import uuid
 import string
 import random
 
-
 from odoo import fields, models
 
 __author__ = 'jinling.yang'
@@ -25,4 +24,4 @@ class ResPartner(models.Model):
         return ran_str
 
     sf_token = fields.Char(u'Token', default=get_token)
-    sf_secret_key = fields.Char(u'密钥', default=get_secret)
+    sf_secret_key = fields.Char(u'密钥', default=get_secret)