Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹预调工单任务

# Conflicts:
#	sf_manufacturing/views/mrp_production_addional_change.xml

sf_sale/models/sale_order.py

@@ -7,6 +7,7 @@ from odoo.exceptions import UserError
 class ReSaleOrder(models.Model):
     _inherit = 'sale.order'
 
+    logistics_way = fields.Selection([('自提', '自提'), ('到付', '到付'), ('在线支付', '在线支付')], string='物流方式')
     state = fields.Selection(
         selection=[
             ('draft', "报价"),
@@ -19,7 +20,6 @@ class ReSaleOrder(models.Model):
         readonly=True, copy=False, index=True,
         tracking=3,
         default='draft')
-
     deadline_of_delivery = fields.Date('订单交期', tracking=True)
     person_of_delivery = fields.Char('交货人')
     telephone_of_delivery = fields.Char('交货人电话号码')