diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py index 4038c2870a..fe8a624458 100644 --- a/InvenTree/InvenTree/urls.py +++ b/InvenTree/InvenTree/urls.py @@ -61,6 +61,7 @@ urlpatterns = [ url(r'^login/', auth_views.LoginView.as_view(), name='login'), url(r'^logout/', auth_views.LogoutView.as_view(template_name='registration/logout.html'), name='logout'), + url(r'^admin/', admin.site.urls, name='inventree-admin'), url(r'^qr_code/', include(qr_code_urls, namespace='qr_code')), diff --git a/InvenTree/company/forms.py b/InvenTree/company/forms.py index bf7057a1ea..679fe323ee 100644 --- a/InvenTree/company/forms.py +++ b/InvenTree/company/forms.py @@ -23,7 +23,6 @@ class EditCompanyForm(HelperForm): 'phone', 'email', 'contact', - 'image', 'is_customer', 'is_supplier', 'notes' diff --git a/Makefile b/Makefile index 38081570e4..c7fdddc1e2 100644 --- a/Makefile +++ b/Makefile @@ -38,3 +38,6 @@ documentation: pip install -U -r docs/requirements.txt cd docs & make html +backup: + python InvenTree/manage.py dbbackup + python InvenTree/manage.py mediabackup \ No newline at end of file diff --git a/docs/backup.rst b/docs/backup.rst index 6e36a65a1a..1976f574d2 100644 --- a/docs/backup.rst +++ b/docs/backup.rst @@ -9,4 +9,6 @@ Backup and Restore InvenTree provides database backup and restore functionality through the `django-dbbackup <https://github.com/django-dbbackup/django-dbbackup>`_ extension. -This extension allows databas models and uploaded media files to be backed up (and restored) via the command line. \ No newline at end of file +This extension allows database models and uploaded media files to be backed up (and restored) via the command line. + +In the root InvenTre directory, run ``make backup`` to generate backup files for the database models and media files. \ No newline at end of file