diff --git a/InvenTree/InvenTree/static/script/inventree/stock.js b/InvenTree/InvenTree/static/script/inventree/stock.js index 73a97b0b63..df63f21fdd 100644 --- a/InvenTree/InvenTree/static/script/inventree/stock.js +++ b/InvenTree/InvenTree/static/script/inventree/stock.js @@ -275,7 +275,7 @@ function loadStockTrackingTable(table, options) { formatter: function(value, row, index, field) { var m = moment(value); if (m.isValid()) { - var html = m.format('dddd MMMM Do YYYY') + '
' + m.format('h:mm a'); + var html = m.format('dddd MMMM Do YYYY'); // + '
' + m.format('h:mm a'); return html; } diff --git a/InvenTree/stock/urls.py b/InvenTree/stock/urls.py index d5c8b428f0..423fd04788 100644 --- a/InvenTree/stock/urls.py +++ b/InvenTree/stock/urls.py @@ -29,6 +29,7 @@ stock_item_detail_urls = [ stock_tracking_urls = [ # edit + url(r'^(?P\d+)/edit/', views.StockItemTrackingEdit.as_view(), name='stock-tracking-edit'), # list url('^.*$', views.StockTrackingIndex.as_view(), name='stock-tracking-list') diff --git a/InvenTree/stock/views.py b/InvenTree/stock/views.py index a2a6403913..5055eac452 100644 --- a/InvenTree/stock/views.py +++ b/InvenTree/stock/views.py @@ -592,6 +592,14 @@ class StockTrackingIndex(ListView): context_object_name = 'items' +class StockItemTrackingEdit(AjaxUpdateView): + """ View for editing a StockItemTracking object """ + + model = StockItemTracking + ajax_form_title = 'Edit Stock Tracking Entry' + form_class = TrackingEntryForm + + class StockItemTrackingCreate(AjaxCreateView): """ View for creating a new StockItemTracking object. """ @@ -619,7 +627,7 @@ class StockItemTrackingCreate(AjaxCreateView): tracking.item = stock_item tracking.user = self.request.user tracking.quantity = stock_item.quantity - tracking.date=datetime.now().date() + tracking.date = datetime.now().date() tracking.system = False tracking.save() @@ -634,4 +642,3 @@ class StockItemTrackingCreate(AjaxCreateView): } return self.renderJsonResponse(request, self.form, data=data) - \ No newline at end of file