diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py index 9e1b5491e8..f8bbd0e841 100644 --- a/InvenTree/part/views.py +++ b/InvenTree/part/views.py @@ -14,8 +14,6 @@ from django.views.generic import DetailView, ListView, FormView from django.forms.models import model_to_dict from django.forms import HiddenInput, CheckboxInput -import tablib - from fuzzywuzzy import fuzz from decimal import Decimal diff --git a/InvenTree/stock/admin.py b/InvenTree/stock/admin.py index 225c86dfc2..119aa3e7a8 100644 --- a/InvenTree/stock/admin.py +++ b/InvenTree/stock/admin.py @@ -66,6 +66,8 @@ class StockItemResource(ModelResource): supplier_name = Field(attribute='supplier_part__supplier__name', readonly=True) + status_label = Field(attribute='status_label', readonly=True) + location = Field(attribute='location', widget=widgets.ForeignKeyWidget(StockLocation)) location_name = Field(attribute='location__name', readonly=True) diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py index 272d212cef..7b5d01c58b 100644 --- a/InvenTree/stock/models.py +++ b/InvenTree/stock/models.py @@ -140,6 +140,11 @@ class StockItem(models.Model): system=True ) + @property + def status_label(self): + + return StockStatus.label(self.status) + @property def serialized(self): """ Return True if this StockItem is serialized """ diff --git a/InvenTree/stock/views.py b/InvenTree/stock/views.py index b9862aff31..1bb9a27a83 100644 --- a/InvenTree/stock/views.py +++ b/InvenTree/stock/views.py @@ -18,13 +18,10 @@ from InvenTree.views import AjaxView from InvenTree.views import AjaxUpdateView, AjaxDeleteView, AjaxCreateView from InvenTree.views import QRCodeView -from InvenTree.status_codes import StockStatus from InvenTree.helpers import str2bool, DownloadFile, GetExportFormats from InvenTree.helpers import ExtractSerialNumbers from datetime import datetime -import tablib - from company.models import Company from part.models import Part from .models import StockItem, StockLocation, StockItemTracking