diff --git a/src/backend/InvenTree/plugin/base/supplier/api.py b/src/backend/InvenTree/plugin/base/supplier/api.py index ec96e21e04..7dc6c6045b 100644 --- a/src/backend/InvenTree/plugin/base/supplier/api.py +++ b/src/backend/InvenTree/plugin/base/supplier/api.py @@ -213,17 +213,17 @@ class ImportPart(APIView): for c in category_parameters: for p in parameters: - if p.parameter_template == c.parameter_template: + if p.parameter_template == c.template: p.on_category = True p.value = p.value if p.value is not None else c.default_value break else: parameters.append( supplier.ImportParameter( - name=c.parameter_template.name, + name=c.template.name, value=c.default_value, on_category=True, - parameter_template=c.parameter_template, + parameter_template=c.template, ) ) parameters.sort(key=lambda x: x.on_category, reverse=True) diff --git a/src/backend/InvenTree/plugin/samples/supplier/test_supplier_sample.py b/src/backend/InvenTree/plugin/samples/supplier/test_supplier_sample.py index 22f86a05a5..a8772a0707 100644 --- a/src/backend/InvenTree/plugin/samples/supplier/test_supplier_sample.py +++ b/src/backend/InvenTree/plugin/samples/supplier/test_supplier_sample.py @@ -2,14 +2,10 @@ from django.urls import reverse +from common.models import ParameterTemplate from company.models import ManufacturerPart, SupplierPart from InvenTree.unit_test import InvenTreeAPITestCase -from part.models import ( - Part, - PartCategory, - PartCategoryParameterTemplate, - PartParameterTemplate, -) +from part.models import Part, PartCategory, PartCategoryParameterTemplate from plugin import registry @@ -134,14 +130,14 @@ class SampleSupplierTest(InvenTreeAPITestCase): # valid supplier, valid part import category = PartCategory.objects.get(pk=1) - p_len = PartParameterTemplate(name='Length', units='mm') - p_test = PartParameterTemplate(name='Test Parameter') + p_len = ParameterTemplate(name='Length', units='mm') + p_test = ParameterTemplate(name='Test Parameter') p_len.save() p_test.save() PartCategoryParameterTemplate.objects.bulk_create([ - PartCategoryParameterTemplate(category=category, parameter_template=p_len), + PartCategoryParameterTemplate(category=category, template=p_len), PartCategoryParameterTemplate( - category=category, parameter_template=p_test, default_value='Test Value' + category=category, template=p_test, default_value='Test Value' ), ]) res = self.post(