inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-12 10:05:39 +00:00
Code Activity

Merge remote-tracking branch 'inventree/master' into currency-support

Browse Source 
# Conflicts:
#	InvenTree/InvenTree/settings.py
#	InvenTree/InvenTree/urls.py
#	InvenTree/templates/InvenTree/settings/tabs.html
#	InvenTree/users/models.py
#	requirements.txt

IMPORTANT: Had to merge some migration files due to different migrations applied on the part model tables
This commit is contained in:
Oliver Walters
2020-11-12 17:24:48 +11:00
parent b7187c5e06 265a29fa1a
commit cb3c86f87a
31 changed files with 878 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -28,5 +28,6 @@ django-debug-toolbar==2.2 # Debug / profiling toolbar
django-admin-shell==0.1.2 # Python shell for the admin interface
django-money==1.1 # Django app for currency management
certifi # Certifi is (most likely) installed through one of the requirements above
django-error-report==0.2.0 # Error report viewer for the admin interface
inventree # Install the latest version of the InvenTree API python library