inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-07 07:40:22 +00:00
Code

Improve reporting in stock history API

Browse Source
This commit is contained in:
Oliver Walters 2021-05-11 17:41:17 +10:00
parent af53b341f0
commit 70ad0ba0de
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/order/models.py
View File

@ -368,9 +368,6 @@ class PurchaseOrder(Order):
stock.save() stock.save()
text = _("Received items")
note = _('Received {n} items against order {name}').format(n=quantity, name=str(self))
tracking_info = { tracking_info = {
'status': status, 'status': status,
'purchaseorder': self.pk, 'purchaseorder': self.pk,

2
InvenTree/stock/admin.py
View File

@ -130,7 +130,7 @@ class StockAttachmentAdmin(admin.ModelAdmin):
class StockTrackingAdmin(ImportExportModelAdmin): class StockTrackingAdmin(ImportExportModelAdmin):
list_display = ('item', 'date', 'title') list_display = ('item', 'date', 'label')
class StockItemTestResultAdmin(admin.ModelAdmin): class StockItemTestResultAdmin(admin.ModelAdmin):

2
InvenTree/stock/api.py
View File

@ -965,7 +965,7 @@ class StockItemTestResultList(generics.ListCreateAPIView):
test_result.save() test_result.save()
class StockTrackingList(generics.ListCreateAPIView): class StockTrackingList(generics.ListAPIView):
""" API endpoint for list view of StockItemTracking objects. """ API endpoint for list view of StockItemTracking objects.
StockItemTracking objects are read-only StockItemTracking objects are read-only

7
InvenTree/stock/models.py
View File

@ -1620,6 +1620,13 @@ class StockItemTracking(models.Model):
def get_absolute_url(self): def get_absolute_url(self):
return '/stock/track/{pk}'.format(pk=self.id) 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( tracking_type = models.IntegerField(
default=StockHistoryCode.LEGACY, default=StockHistoryCode.LEGACY,
) )

11
InvenTree/stock/serializers.py
View File

@ -351,10 +351,14 @@ class StockTrackingSerializer(InvenTreeModelSerializer):
url = serializers.CharField(source='get_absolute_url', read_only=True) 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) item_detail = StockItemSerializerBrief(source='item', many=False, read_only=True)
user_detail = UserSerializerBrief(source='user', many=False, read_only=True) user_detail = UserSerializerBrief(source='user', many=False, read_only=True)
deltas = serializers.JSONField(read_only=True)
class Meta: class Meta:
model = StockItemTracking model = StockItemTracking
fields = [ fields = [
@ -363,10 +367,13 @@ class StockTrackingSerializer(InvenTreeModelSerializer):
'item', 'item',
'item_detail', 'item_detail',
'date', 'date',
'title', 'deltas',
'notes', 'label',
'link', 'link',
'notes',
'quantity', 'quantity',
'title',
'tracking_type',
'user', 'user',
'user_detail', 'user_detail',
'system', 'system',