From 0963602bea611d7dd8989fc6d555e47d9f000c10 Mon Sep 17 00:00:00 2001 From: Oliver Date: Mon, 7 Feb 2022 08:37:39 +1100 Subject: [PATCH] Add optional part lookup by "part" field --- InvenTree/part/serializers.py | 12 ++++++++++-- InvenTree/templates/js/translated/forms.js | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/InvenTree/part/serializers.py b/InvenTree/part/serializers.py index fd0b0c8e52..cb050c82f8 100644 --- a/InvenTree/part/serializers.py +++ b/InvenTree/part/serializers.py @@ -883,6 +883,16 @@ class BomExtractSerializer(serializers.Serializer): except (ValueError, Part.DoesNotExist): pass + # Optionally, specify using field "part" + if part is None: + pk = self.find_matching_data(row, 'part', headers) + + if pk is not None: + try: + part = Part.objects.get(pk=pk) + except (ValueError, Part.DoesNotExist): + pass + if part is None: if part_name is not None or part_ipn is not None: @@ -900,8 +910,6 @@ class BomExtractSerializer(serializers.Serializer): row['part'] = part.pk if part is not None else None - print("part:", part) - rows.append(row) return { diff --git a/InvenTree/templates/js/translated/forms.js b/InvenTree/templates/js/translated/forms.js index e5cb571a58..181b4436e1 100644 --- a/InvenTree/templates/js/translated/forms.js +++ b/InvenTree/templates/js/translated/forms.js @@ -1236,7 +1236,7 @@ function addClearCallbacks(fields, options) { } -function addClearCallback(name, field, options) { +function addClearCallback(name, field, options={}) { var field_name = getFieldName(name, options); @@ -1491,7 +1491,7 @@ function initializeRelatedField(field, fields, options={}) { var pageSize = options.pageSize || 25; var parent = null; - var auto_width = true; + var auto_width = false; // Special considerations if the select2 input is a child of a modal if (options && options.modal) {