Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add user information to stocktake table

Browse Source
This commit is contained in:
Oliver Walters 2022-12-21 23:40:17 +11:00
parent c47703c2e6
commit a3b52dad80
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/part/api.py
View File

@ -1730,12 +1730,13 @@ class PartStocktakeList(ListCreateAPI):
ordering_fields = [
'part',
'quantity',
'date',
'user',
]
# Reverse date ordering by default
ordering = '-date'
ordering = '-pk'
class BomFilter(rest_filters.FilterSet):

6
InvenTree/part/serializers.py
View File

@ -24,7 +24,8 @@ from InvenTree.serializers import (DataFileExtractSerializer,
InvenTreeDecimalField,
InvenTreeImageSerializerField,
InvenTreeModelSerializer,
InvenTreeMoneySerializer, RemoteImageMixin)
InvenTreeMoneySerializer, RemoteImageMixin,
UserSerializer)
from InvenTree.status_codes import BuildStatus
from .models import (BomItem, BomItemSubstitute, Part, PartAttachment,
@ -510,6 +511,8 @@ class PartStocktakeSerializer(InvenTreeModelSerializer):
quantity = serializers.FloatField()
user_detail = UserSerializer(source='user', read_only=True, many=False)
class Meta:
"""Metaclass options"""
@ -521,6 +524,7 @@ class PartStocktakeSerializer(InvenTreeModelSerializer):
'quantity',
'note',
'user',
'user_detail',
]
read_only_fields = [

2
InvenTree/templates/js/translated/attachment.js
View File

@ -292,7 +292,7 @@ function loadAttachmentTable(url, options) {
var html = renderDate(value);
if (row.user_detail) {
html += `<span class='badge bg-dark rounded-pill float-right'>${row.user_detail.username}</div>`;
html += `<span class='badge bg-dark rounded-pill float-right'>${row.user_detail.username}</span>`;
}
return html;

24
InvenTree/templates/js/translated/part.js
View File

@ -840,22 +840,32 @@ function loadPartStocktakeTable(partId, options={}) {
return '{% trans "No stocktake information available" %}';
},
columns: [
{
field: 'date',
title: '{% trans "Date" %}',
},
{
field: 'quantity',
title: '{% trans "Quantity" %}',
switchable: false,
sortable: true,
},
{
field: 'note',
title: '{% trans "Notes" %}',
switchable: true,
},
{
field: 'user',
title: '{% trans "User" %}',
}
field: 'date',
title: '{% trans "Date" %}',
switchable: false,
sortable: true,
formatter: function(value, row) {
var html = renderDate(value);
if (row.user_detail) {
html += `<span class='badge bg-dark rounded-pill float-right'>${row.user_detail.username}</span>`;
}
return html;
}
},
]
});
}