Merge branch refs/heads/develop into refs/heads/feature/修改机床参数bug

sf_manufacturing/models/stock.py

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 import base64
+from collections import defaultdict, namedtuple
 import logging
+import json
+from re import split as regex_split
 from re import findall as regex_findall
 from datetime import datetime, timedelta
-from re import split as regex_split
 import requests
 from odoo import SUPERUSER_ID, _, api, fields, models
 from odoo.tools import float_compare
-from collections import defaultdict, namedtuple
 from odoo.addons.stock.models.stock_rule import ProcurementException
 from odoo.addons.sf_base.commons.common import Common
 from odoo.exceptions import UserError
@@ -517,8 +518,8 @@ class ReStockMove(models.Model):
                 'inner_diameter': item.product_id.cutting_tool_inner_diameter,
                 'cooling_suit_type_ids': item.product_id.cooling_suit_type_ids,
                 'er_size_model': item.product_id.cutting_tool_er_size_model,
-                'image': '' if not item.product_id.image_1920 else base64.b64encode(item.product_id.image_1920).decode(
-                    'utf-8'),
+                'image': '' if not item.product_id.image_1920 else
+                base64.b64encode(item.product_id.image_1920).decode('utf-8'),
             }
         try:
             if item.product_id.industry_code: