Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/表面工艺外协修复

# Conflicts:
#	sf_sale/views/sale_order_view.xml

sf_bf_connect/models/jd_eclp.py

@@ -164,8 +164,8 @@ class JdEclp(models.Model):
         self.is_bill = True
         self.logistics_status = '1'
 
-        # 京东物流下单后，销售订单状态改为待收货
-        self.env['sale.order'].search([('name', '=', self.origin)]).write({'scheduled_status': 'to receive'})
+        # # 京东物流下单后，销售订单状态改为待收货
+        # self.env['sale.order'].search([('name', '=', self.origin)]).write({'scheduled_status': 'to receive'})
 
         # else:
         #     raise UserError("选择京东物流才能下单呦")