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

# Conflicts:
#	sf_bf_connect/models/process_status.py

sf_manufacturing/models/stock.py

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 import base64
+from collections import defaultdict, namedtuple
 import logging
-from re import findall as regex_findall
-from datetime import datetime
+import json
 from re import split as regex_split
+from re import findall as regex_findall
+from datetime import datetime, timedelta
 import requests
 from odoo import SUPERUSER_ID, _, api, fields, models
 from odoo.tools import float_compare
-from collections import defaultdict, namedtuple
 from odoo.addons.stock.models.stock_rule import ProcurementException
 from odoo.addons.sf_base.commons.common import Common
 from odoo.exceptions import UserError