Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单文件优化

# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py

sf_sale/models/sale_order.py

@@ -44,6 +44,7 @@ class ReSaleOrder(models.Model):
                 product.model_machining_precision,
                 product.materials_id.name),
             'price_unit': product.list_price,
+            # 'route_id': product.route_ids,
             'product_uom_qty': item['number']
         }
         return self.env['sale.order.line'].create(vals)