Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修复表面工艺工单完成入库操作

# Conflicts:
#	sf_manufacturing/security/ir.model.access.csv

sf_sale/models/sale_order.py

@@ -32,9 +32,9 @@ class ReSaleOrder(models.Model):
         tracking=3,
         default='draft')
     deadline_of_delivery = fields.Date('订单交期', tracking=True)
-    person_of_delivery = fields.Char('交货人')
-    telephone_of_delivery = fields.Char('交货人电话号码')
-    address_of_delivery = fields.Char('交货人地址')
+    person_of_delivery = fields.Char('收货人')
+    telephone_of_delivery = fields.Char('电话号码')
+    address_of_delivery = fields.Char('联系地址')
     payments_way = fields.Selection([('现结', '现结'), ('月结', '月结')], '结算方式', default='现结', tracking=True)
     pay_way = fields.Selection([('转账', '转账'), ('微信', '微信'), ('支付宝', '支付宝')], '支付方式')
     check_status = fields.Selection([('pending', '待审核'), ('approved', '已审核'), ('fail', '不通过')], '审核状态')