diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py index 03aaac7243..931a62d689 100644 --- a/InvenTree/stock/models.py +++ b/InvenTree/stock/models.py @@ -330,7 +330,8 @@ class StockItemTracking(models.Model): """ def get_absolute_url(self): - return reverse('stock-tracking-detail', kwargs={'pk': self.id}) + return '/stock/track/{pk}'.format(pk=self.id) + #return reverse('stock-tracking-detail', kwargs={'pk': self.id}) # Stock item item = models.ForeignKey(StockItem, on_delete=models.CASCADE, diff --git a/InvenTree/stock/templates/stock/tracking.html b/InvenTree/stock/templates/stock/tracking.html new file mode 100644 index 0000000000..9ba4b290df --- /dev/null +++ b/InvenTree/stock/templates/stock/tracking.html @@ -0,0 +1,28 @@ +{% extends "stock/stock_app_base.html" %} +{% load static %} + +{% block content %} + +

Stock list here!

+ + +
+ +{% include 'modals.html' %} + +{% endblock %} + +{% block js_ready %} +{{ block.super }} + + loadStockTrackingTable($("#tracking-table"), { + params: function(p) { + return { + ordering: '-date', + }; + }, + partColumn: true, + url: "{% url 'api-stock-track' %}", + }); + +{% endblock %} \ No newline at end of file diff --git a/InvenTree/stock/urls.py b/InvenTree/stock/urls.py index 090ffcac53..503c9e809c 100644 --- a/InvenTree/stock/urls.py +++ b/InvenTree/stock/urls.py @@ -28,6 +28,8 @@ stock_urls = [ url(r'^item/new/?', views.StockItemCreate.as_view(), name='stock-item-create'), + url(r'^track/?', views.StockTrackingIndex.as_view(), name='stock-tracking-list'), + # Individual stock items url(r'^item/(?P\d+)/', include(stock_item_detail_urls)), diff --git a/InvenTree/stock/views.py b/InvenTree/stock/views.py index 207b2e698a..fc1d2726aa 100644 --- a/InvenTree/stock/views.py +++ b/InvenTree/stock/views.py @@ -9,7 +9,7 @@ from django.forms.models import model_to_dict from InvenTree.views import AjaxUpdateView, AjaxDeleteView, AjaxCreateView from part.models import Part -from .models import StockItem, StockLocation +from .models import StockItem, StockLocation, StockItemTracking from .forms import EditStockLocationForm from .forms import CreateStockItemForm @@ -248,3 +248,13 @@ class StockItemStocktake(AjaxUpdateView): } return self.renderJsonResponse(request, form, data) + + +class StockTrackingIndex(ListView): + """ + StockTrackingIndex provides a page to display StockItemTracking objects + """ + + model = StockItemTracking + template_name = 'stock/tracking.html' + context_object_name = 'items'