From dff8d1fb95c62f5fa321f57bd4921b511bd96517 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Mon, 8 Jul 2019 09:33:44 +1000
Subject: [PATCH] Supply part name for auto-fill when creating a new part

---
 .../part/templates/part/bom_upload/select_parts.html |  2 +-
 InvenTree/part/views.py                              | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/InvenTree/part/templates/part/bom_upload/select_parts.html b/InvenTree/part/templates/part/bom_upload/select_parts.html
index d7db2b7d84..c514f095eb 100644
--- a/InvenTree/part/templates/part/bom_upload/select_parts.html
+++ b/InvenTree/part/templates/part/bom_upload/select_parts.html
@@ -35,7 +35,7 @@
         </thead>
         <tbody>
             {% for row in bom_rows %}
-            <tr part-description='{{ row.description }}' part-select='#select_part_{{ row.index }}'>
+            <tr part-name='{{ row.part_name }}' part-description='{{ row.description }}' part-select='#select_part_{{ row.index }}'>
                 <td>
                     <button class='btn btn-default btn-remove' id='del_row_{{ forloop.counter }}' style='display: inline; float: right;' title='Remove row'>
                             <span row_id='{{ forloop.counter }}' onClick='removeRowFromBomWizard()' class='glyphicon glyphicon-small glyphicon-remove'></span>
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index 78dce09640..ff53d4db5f 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -708,6 +708,7 @@ class BomUpload(FormView):
                 # User-input (passed between client and server)
                 'quantity': row.get('quantity', None),
                 'description': row.get('description', ''),
+                'part_name': row.get('part_name', ''),
                 'part': row.get('part', None),
                 'reference': row.get('reference', ''),
                 'notes': row.get('notes', ''),
@@ -799,8 +800,9 @@ class BomUpload(FormView):
 
 
     def preFillSelections(self):
-        """ Once data columns have been selected,
-        attempt to pre-select the proper data from the database.
+        """ Once data columns have been selected, attempt to pre-select the proper data from the database.
+        This function is called once the field selection has been validated.
+        The pre-fill data are then passed through to the part selection form.
         """
 
         q_idx = self.getColumnIndex('Quantity')
@@ -823,13 +825,15 @@ class BomUpload(FormView):
                     pass
 
             if p_idx >= 0:
-                p_val = row['data'][p_idx]
+                part_name = row['data'][p_idx]
+
+                row['part_name'] = part_name
 
                 # Fuzzy match the values and see what happends
                 matches = []
 
                 for part in self.allowed_parts:
-                    ratio = fuzz.partial_ratio(part.name + part.description, p_val)
+                    ratio = fuzz.partial_ratio(part.name + part.description, part_name)
                     matches.append({'part': part, 'match': ratio})
 
                 if len(matches) > 0: