diff --git a/InvenTree/company/serializers.py b/InvenTree/company/serializers.py index 9f40365757..8c89df2967 100644 --- a/InvenTree/company/serializers.py +++ b/InvenTree/company/serializers.py @@ -179,9 +179,10 @@ class SupplierPartSerializer(InvenTreeModelSerializer): def __init__(self, *args, **kwargs): - part_detail = kwargs.pop('part_detail', False) - supplier_detail = kwargs.pop('supplier_detail', False) - manufacturer_detail = kwargs.pop('manufacturer_detail', False) + part_detail = kwargs.pop('part_detail', True) + supplier_detail = kwargs.pop('supplier_detail', True) + manufacturer_detail = kwargs.pop('manufacturer_detail', True) + prettify = kwargs.pop('pretty', False) super(SupplierPartSerializer, self).__init__(*args, **kwargs) diff --git a/InvenTree/part/serializers.py b/InvenTree/part/serializers.py index b8b9b92d5e..313e2cf920 100644 --- a/InvenTree/part/serializers.py +++ b/InvenTree/part/serializers.py @@ -336,9 +336,10 @@ class PartSerializer(InvenTreeModelSerializer): 'category', 'category_detail', 'component', - 'description', - 'default_location', 'default_expiry', + 'default_location', + 'default_supplier', + 'description', 'full_name', 'image', 'in_stock', diff --git a/InvenTree/templates/js/forms.js b/InvenTree/templates/js/forms.js index 68eda4b734..4f15281427 100644 --- a/InvenTree/templates/js/forms.js +++ b/InvenTree/templates/js/forms.js @@ -1128,6 +1128,9 @@ function renderModelData(name, model, data, parameters, options) { case 'partcategory': renderer = renderPartCategory; break; + case 'supplierpart': + renderer = renderSupplierPart; + break; default: break; } diff --git a/InvenTree/templates/js/model_renderers.js b/InvenTree/templates/js/model_renderers.js index c9cf654d12..34c0ef1097 100644 --- a/InvenTree/templates/js/model_renderers.js +++ b/InvenTree/templates/js/model_renderers.js @@ -109,4 +109,24 @@ function renderPartCategory(name, data, parameters, options) { } return html; +} + + +// Rendered for "SupplierPart" model +function renderSupplierPart(name, data, parameters, options) { + + var image = data.supplier_detail.image; + + if (!image) { + image = `/static/img/blank_image.png`; + } + + var html = ``; + + html += ` ${data.supplier_detail.name} - ${data.SKU}`; + + html += `{% trans "Supplier Part ID" %}: ${data.pk}`; + + return html; + } \ No newline at end of file