From 41962ca23a552d408646773cc2ece489f8f7ff05 Mon Sep 17 00:00:00 2001 From: eeintech Date: Fri, 30 Apr 2021 13:54:56 -0400 Subject: [PATCH 1/2] API fixes related to ManufacturerPart --- InvenTree/company/api.py | 2 +- InvenTree/company/serializers.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/InvenTree/company/api.py b/InvenTree/company/api.py index 66557b783b..494b3652b2 100644 --- a/InvenTree/company/api.py +++ b/InvenTree/company/api.py @@ -131,7 +131,7 @@ class ManufacturerPartList(generics.ListCreateAPIView): params = self.request.query_params # Filter by manufacturer - manufacturer = params.get('company', None) + manufacturer = params.get('manufacturer', None) if manufacturer is not None: queryset = queryset.filter(manufacturer=manufacturer) diff --git a/InvenTree/company/serializers.py b/InvenTree/company/serializers.py index 35e84aac1e..335a351583 100644 --- a/InvenTree/company/serializers.py +++ b/InvenTree/company/serializers.py @@ -192,10 +192,11 @@ class SupplierPartSerializer(InvenTreeModelSerializer): manufacturer_id = self.initial_data.get('manufacturer', None) MPN = self.initial_data.get('MPN', None) - if manufacturer_id or MPN: - kwargs = {'manufacturer': manufacturer_id, - 'MPN': MPN, - } + if manufacturer_id and MPN: + kwargs = { + 'manufacturer': manufacturer_id, + 'MPN': MPN, + } supplier_part.save(**kwargs) return supplier_part From 4972440ddaf3f635af10cd10cec47298d428c3e7 Mon Sep 17 00:00:00 2001 From: eeintech Date: Fri, 30 Apr 2021 15:27:36 -0400 Subject: [PATCH 2/2] Fixed API test --- InvenTree/company/test_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InvenTree/company/test_api.py b/InvenTree/company/test_api.py index a65beb4dc2..c43280c76c 100644 --- a/InvenTree/company/test_api.py +++ b/InvenTree/company/test_api.py @@ -100,7 +100,7 @@ class ManufacturerTest(InvenTreeAPITestCase): self.assertEqual(response.data['MPN'], 'MPN_TEST') # Filter by manufacturer - data = {'company': 7} + data = {'manufacturer': 7} response = self.get(url, data) self.assertEqual(len(response.data), 3)