inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-04 07:05:41 +00:00
Code Activity

Remove 'simple-history'

Browse Source 
- Might re-add it later on
This commit is contained in:
Oliver Walters
2019-04-18 21:28:09 +10:00
parent 88a7fa9656
commit 5d887f3785
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
InvenTree/InvenTree/settings.py
View File

@@ -57,7 +57,6 @@ INSTALLED_APPS = [
# Third part add-ons # Third part add-ons
'django_filters', 'django_filters',
'rest_framework', 'rest_framework',
'simple_history',
'crispy_forms', 'crispy_forms',
'import_export', 'import_export',
'django_cleanup', 'django_cleanup',
@@ -72,7 +71,6 @@ MIDDLEWARE = [
'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware',
'simple_history.middleware.HistoryRequestMiddleware',
'InvenTree.middleware.AuthRequiredMiddleware' 'InvenTree.middleware.AuthRequiredMiddleware'
] ]

2
InvenTree/part/admin.py
View File

@@ -12,7 +12,7 @@ class PartAdmin(ImportExportModelAdmin):
list_display = ('name', 'IPN', 'description', 'total_stock', 'category') list_display = ('name', 'IPN', 'description', 'total_stock', 'category')
class PartCategoryAdmin(admin.ModelAdmin): class PartCategoryAdmin(ImportExportModelAdmin):
list_display = ('name', 'pathstring', 'description') list_display = ('name', 'pathstring', 'description')

5
InvenTree/static/script/inventree/bom.js
View File

@@ -21,7 +21,10 @@ function downloadBom(options = {}) {
<div class='controls'> <div class='controls'>
<select id='bom-format' class='select'> <select id='bom-format' class='select'>
<option value='csv'>CSV</option> <option value='csv'>CSV</option>
<option value='xls'>XLSX</option> <option value='tsv'>TSV</option>
<option value='xls'>XLS</option>
<option value='xlsx'>XLSX</option>
<option value='ods'>ODS</option>
<option value='yaml'>YAML</option> <option value='yaml'>YAML</option>
<option value='json'>JSON</option> <option value='json'>JSON</option>
<option value='xml'>XML</option> <option value='xml'>XML</option>

8
InvenTree/stock/admin.py
View File

@@ -1,19 +1,19 @@
from django.contrib import admin from django.contrib import admin
from simple_history.admin import SimpleHistoryAdmin from import_export.admin import ImportExportModelAdmin
from .models import StockLocation, StockItem from .models import StockLocation, StockItem
from .models import StockItemTracking from .models import StockItemTracking
class LocationAdmin(admin.ModelAdmin): class LocationAdmin(ImportExportModelAdmin):
list_display = ('name', 'pathstring', 'description') list_display = ('name', 'pathstring', 'description')
class StockItemAdmin(SimpleHistoryAdmin): class StockItemAdmin(ImportExportModelAdmin):
list_display = ('part', 'quantity', 'location', 'status', 'updated') list_display = ('part', 'quantity', 'location', 'status', 'updated')
class StockTrackingAdmin(admin.ModelAdmin): class StockTrackingAdmin(ImportExportModelAdmin):
list_display = ('item', 'date', 'title') list_display = ('item', 'date', 'title')

1
requirements/base.txt
View File

@@ -3,7 +3,6 @@ psycopg2>=2.8.1
pillow>=5.0.0 pillow>=5.0.0
djangorestframework>=3.6.2 djangorestframework>=3.6.2
django_filter>=1.0.2 django_filter>=1.0.2
django-simple-history>=1.8.2
coreapi>=2.3.0 coreapi>=2.3.0
pygments>=2.2.0 pygments>=2.2.0
tablib>=0.13.0 tablib>=0.13.0