Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	sf_manufacturing/models/mrp_production.py
#	sf_manufacturing/models/purchase_order.py
#	sf_sale/models/sale_order.py

sf_sale/models/sale_order.py

@@ -323,7 +323,7 @@ class RePurchaseOrder(models.Model):
     contract_summary = fields.Text(string='合同概况')
 
     # 选择是否为紧急采购
-    urgent_purchase = fields.Selection([('no', '否'), ('yes', '是')], string='紧急采购', default='no')
+    urgent_purchase = fields.Selection([('no', '否'), ('yes', '是')], string='紧急采购', default='yes')
 
     @api.depends('origin')
     def _compute_purchase_type(self):