From c943b320e6596aa8a9596f36cdab7aceae673afb Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 26 Nov 2021 23:02:29 +1100 Subject: [PATCH] shipment table tweaks --- InvenTree/order/serializers.py | 2 +- InvenTree/templates/js/translated/order.js | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/InvenTree/order/serializers.py b/InvenTree/order/serializers.py index 42e08fe9cb..f75d373d13 100644 --- a/InvenTree/order/serializers.py +++ b/InvenTree/order/serializers.py @@ -489,7 +489,7 @@ class SalesOrderAllocationSerializer(InvenTreeModelSerializer): def __init__(self, *args, **kwargs): order_detail = kwargs.pop('order_detail', False) - part_detail = kwargs.pop('part_detail', False) + part_detail = kwargs.pop('part_detail', True) item_detail = kwargs.pop('item_detail', False) location_detail = kwargs.pop('location_detail', False) diff --git a/InvenTree/templates/js/translated/order.js b/InvenTree/templates/js/translated/order.js index a403d68fed..6646abafee 100644 --- a/InvenTree/templates/js/translated/order.js +++ b/InvenTree/templates/js/translated/order.js @@ -1206,7 +1206,11 @@ function loadSalesOrderShipmentTable(table, options={}) { detailFormatter: function(index, row, element) { return showAllocationSubTable(index, row, element, options); }, - onPostBody: setupShipmentCallbacks, + onPostBody: function() { + setupShipmentCallbacks(); + + $(table).bootstrapTable('expandAllRows'); + }, formatNoMatches: function() { return '{% trans "No matching shipments found" %}'; }, @@ -1218,7 +1222,7 @@ function loadSalesOrderShipmentTable(table, options={}) { }, { field: 'reference', - title: '{% trans "Reference" %}', + title: '{% trans "Shipment" %}', switchable: false, }, { @@ -1734,8 +1738,11 @@ function showAllocationSubTable(index, row, element, options) { showHeader: false, columns: [ { - field: 'part', + field: 'part_detail', title: '{% trans "Part" %}', + formatter: function(part, row) { + return imageHoverIcon(part.thumbnail) + renderLink(part.full_name, `/part/${part.pk}/`); + } }, { field: 'allocated',