diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py index bba84e2d24..4b1e0eca33 100644 --- a/InvenTree/part/views.py +++ b/InvenTree/part/views.py @@ -49,13 +49,11 @@ from . import settings as part_settings from .bom import MakeBomTemplate, ExportBom, IsValidBOMFormat from order.models import PurchaseOrderLineItem -from .admin import PartResource - from InvenTree.views import AjaxView, AjaxCreateView, AjaxUpdateView, AjaxDeleteView from InvenTree.views import QRCodeView from InvenTree.views import InvenTreeRoleMixin -from InvenTree.helpers import DownloadFile, str2bool +from InvenTree.helpers import str2bool class PartIndex(InvenTreeRoleMixin, ListView): diff --git a/InvenTree/stock/api.py b/InvenTree/stock/api.py index f60f1c535f..34563b38d7 100644 --- a/InvenTree/stock/api.py +++ b/InvenTree/stock/api.py @@ -626,7 +626,7 @@ class StockList(generics.ListCreateAPIView): dataset = StockItemResource().export(queryset=queryset) filedata = dataset.export(export_format) - + filename = 'InvenTree_Stocktake_{date}.{fmt}'.format( date=datetime.now().strftime("%d-%b-%Y"), fmt=export_format diff --git a/InvenTree/stock/views.py b/InvenTree/stock/views.py index f4cc6bc05d..95cb498739 100644 --- a/InvenTree/stock/views.py +++ b/InvenTree/stock/views.py @@ -25,13 +25,13 @@ from InvenTree.views import QRCodeView from InvenTree.views import InvenTreeRoleMixin from InvenTree.forms import ConfirmForm -from InvenTree.helpers import str2bool, DownloadFile, GetExportFormats +from InvenTree.helpers import str2bool from InvenTree.helpers import extract_serial_numbers from decimal import Decimal, InvalidOperation from datetime import datetime, timedelta -from company.models import Company, SupplierPart +from company.models import SupplierPart from part.models import Part from .models import StockItem, StockLocation, StockItemTracking @@ -39,8 +39,6 @@ import common.settings from common.models import InvenTreeSetting from users.models import Owner -from .admin import StockItemResource - from . import forms as StockForms