diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py index 8572d0c634..9a521b8044 100644 --- a/InvenTree/order/models.py +++ b/InvenTree/order/models.py @@ -368,9 +368,6 @@ class PurchaseOrder(Order): stock.save() - text = _("Received items") - note = _('Received {n} items against order {name}').format(n=quantity, name=str(self)) - tracking_info = { 'status': status, 'purchaseorder': self.pk, diff --git a/InvenTree/stock/admin.py b/InvenTree/stock/admin.py index 9fed3e53a4..f32fa008a0 100644 --- a/InvenTree/stock/admin.py +++ b/InvenTree/stock/admin.py @@ -130,7 +130,7 @@ class StockAttachmentAdmin(admin.ModelAdmin): class StockTrackingAdmin(ImportExportModelAdmin): - list_display = ('item', 'date', 'title') + list_display = ('item', 'date', 'label') class StockItemTestResultAdmin(admin.ModelAdmin): diff --git a/InvenTree/stock/api.py b/InvenTree/stock/api.py index b70b379e69..c7914827e7 100644 --- a/InvenTree/stock/api.py +++ b/InvenTree/stock/api.py @@ -965,7 +965,7 @@ class StockItemTestResultList(generics.ListCreateAPIView): test_result.save() -class StockTrackingList(generics.ListCreateAPIView): +class StockTrackingList(generics.ListAPIView): """ API endpoint for list view of StockItemTracking objects. StockItemTracking objects are read-only diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py index 408c598141..7d55d26f4d 100644 --- a/InvenTree/stock/models.py +++ b/InvenTree/stock/models.py @@ -1620,6 +1620,13 @@ class StockItemTracking(models.Model): def get_absolute_url(self): return '/stock/track/{pk}'.format(pk=self.id) + def label(self): + + if self.tracking_type in StockHistoryCode.keys(): + return StockHistoryCode.label(self.tracking_type) + else: + return self.title + tracking_type = models.IntegerField( default=StockHistoryCode.LEGACY, ) diff --git a/InvenTree/stock/serializers.py b/InvenTree/stock/serializers.py index 4991a44e6f..c5ad3c7100 100644 --- a/InvenTree/stock/serializers.py +++ b/InvenTree/stock/serializers.py @@ -351,10 +351,14 @@ class StockTrackingSerializer(InvenTreeModelSerializer): url = serializers.CharField(source='get_absolute_url', read_only=True) + label = serializers.CharField(read_only=True) + item_detail = StockItemSerializerBrief(source='item', many=False, read_only=True) user_detail = UserSerializerBrief(source='user', many=False, read_only=True) + deltas = serializers.JSONField(read_only=True) + class Meta: model = StockItemTracking fields = [ @@ -363,10 +367,13 @@ class StockTrackingSerializer(InvenTreeModelSerializer): 'item', 'item_detail', 'date', - 'title', - 'notes', + 'deltas', + 'label', 'link', + 'notes', 'quantity', + 'title', + 'tracking_type', 'user', 'user_detail', 'system',