Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/销售订单行新增模型展示

sf_sale/models/sale_order.py

@@ -1,5 +1,6 @@
 from odoo import models, fields
 import datetime
+import base64
 
 
 class ReSaleOrder(models.Model):
@@ -48,7 +49,7 @@ class ReSaleOrder(models.Model):
                 product.materials_id.name),
             'price_unit': product.list_price,
             'product_uom_qty': item['number'],
-            # 'model_glb_file': product.model_file,
+            'model_glb_file':  base64.b64decode(item['model_file']),
         }
         return self.env['sale.order.line'].create(vals)
 
@@ -56,5 +57,5 @@ class ReSaleOrder(models.Model):
 class ResaleOrderLine(models.Model):
     _inherit = 'sale.order.line'
 
-    model_glb_file = fields.Binary('模型的glb文件', related='product_id.model_file')
+    model_glb_file = fields.Binary('模型的glb文件')