Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

# Conflicts:
#	sf_manufacturing/models/stock.py

sf_manufacturing/models/stock.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 import logging
 import base64
-from collections import defaultdict, namedtuple
 import requests
 from re import findall as regex_findall
 from datetime import datetime, timedelta
 from re import split as regex_split
 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
@@ -306,12 +306,12 @@ class StockPicking(models.Model):
 
         res = super().button_validate()
         # 采购单验证(夹具)
-        for item in self.move_ids_without_package:
-            if item.quantity_done > 0:
-                if item.product_id.categ_type == '夹具':
-                    item._register_fixture()
-                elif item.product_id.categ_type == '刀具':
-                    item._register_cutting_tool()
+        # for item in self.move_ids_without_package:
+        #     if item.quantity_done > 0:
+        #         if item.product_id.categ_type == '夹具':
+        #             item._register_fixture()
+        #         elif item.product_id.categ_type == '刀具':
+        #             item._register_cutting_tool()
         return res
 
     # 创建 外协出库入单