diff --git a/InvenTree/order/serializers.py b/InvenTree/order/serializers.py index 757559da06..95a41902d5 100644 --- a/InvenTree/order/serializers.py +++ b/InvenTree/order/serializers.py @@ -741,7 +741,7 @@ class SalesOrderAllocationSerializer(InvenTreeModelSerializer): """Initialization routine for the serializer""" order_detail = kwargs.pop('order_detail', False) part_detail = kwargs.pop('part_detail', True) - item_detail = kwargs.pop('item_detail', False) + item_detail = kwargs.pop('item_detail', True) location_detail = kwargs.pop('location_detail', False) customer_detail = kwargs.pop('customer_detail', False) diff --git a/InvenTree/templates/js/translated/order.js b/InvenTree/templates/js/translated/order.js index 0909c02808..04bed69c6c 100644 --- a/InvenTree/templates/js/translated/order.js +++ b/InvenTree/templates/js/translated/order.js @@ -3236,10 +3236,12 @@ function showAllocationSubTable(index, row, element, options) { formatter: function(value, row, index, field) { var text = ''; - if (row.serial != null && row.quantity == 1) { - text = `{% trans "Serial Number" %}: ${row.serial}`; - } else { - text = `{% trans "Quantity" %}: ${row.quantity}`; + var item = row.item_detail; + + var text = `{% trans "Quantity" %}: ${row.quantity}`; + + if (item && item.serial != null && row.quantity == 1) { + text = `{% trans "Serial Number" %}: ${item.serial}`; } return renderLink(text, `/stock/item/${row.item}/`);