Upgrade to django 1.8, ++

main/urls.py

@@ -1,24 +1,33 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import url
 
+from main.views.stats import stats_list, stats_orders, stats_orders_hourly, stats_products_realtime, stats_products, \
+    stats_products_per_user, products_json
+from main.views.general import register, deposit, log
+from main.views.reports import inventory, inventory_add, report
+from main.views.users import create_user, profile
 
-urlpatterns = patterns('main.views',
-    url(r'^register/$', 'register', name='register'),
-    url(r'^deposit/$', 'deposit', name='deposit'),
-    url(r'^log/$', 'log', name='log'),
-    url(r'^log/all$', 'log', kwargs={'limit': None}, name='log-all'),
-    url(r'^stats/$', 'stats', name='stats'),
-    url(r'^stats/orders/$', 'stats_orders', name='stats-orders'),
-    url(r'^stats/orders/hourly$', 'stats_orders_hourly', name='stats-orders-hourly'),
-    url(r'^stats/orders/products_realtime$', 'stats_products_realtime', name='stats-products-realtime'),
-    url(r'^stats/products/$', 'stats_products', name='stats-products'),
-    url(r'^stats/products/(?P<product>[0-9]+)/$', 'stats_products', name='stats-product'),
-    url(r'^stats/products/by_user/(?P<user_id>[0-9]+)/$', 'stats_products_per_user', name='stats-products-per-user'),
-    url(r'^products/(?P<product_id>[0-9]+)/$', 'products_json', name='json-product'),
-    url(r'^products/$', 'products_json', name='json-products'),
-    url(r'^user/create/$', 'create_user', name='create-user'),
-    url(r'^profile/$', 'profile', name='profile'),
-    url(r'^inventory/$', 'inventory', name='inventory'),
-    url(r'^inventory/add/$', 'inventory_add', name='inventory-add'),
-    url(r'^report$', 'report', name='report'),
-    
-)
+urlpatterns = [
+    url(r'^$', register, name='home'),
+    url(r'^register/$', register, name='register'),
+    url(r'^deposit/$', deposit, name='deposit'),
+    url(r'^log/$', log, name='log'),
+    url(r'^log/all$', log, kwargs={'limit': None}, name='log-all'),
+    # Stats
+    url(r'^stats/$', stats_list, name='stats'),
+    url(r'^stats/orders/$', stats_orders, name='stats-orders'),
+    url(r'^stats/orders/hourly$', stats_orders_hourly, name='stats-orders-hourly'),
+    url(r'^stats/orders/products_realtime$', stats_products_realtime, name='stats-products-realtime'),
+    url(r'^stats/products/$', stats_products, name='stats-products'),
+    url(r'^stats/products/(?P<product>[0-9]+)/$', stats_products, name='stats-product'),
+    url(r'^stats/products/by_user/(?P<user_id>[0-9]+)/$', stats_products_per_user, name='stats-products-per-user'),
+    # Products
+    url(r'^products/(?P<product_id>[0-9]+)/$', products_json, name='json-product'),
+    url(r'^products/$', products_json, name='json-products'),
+    # Users
+    url(r'^user/create/$', create_user, name='create-user'),
+    url(r'^profile/$', profile, name='profile'),
+    # Reports
+    url(r'^inventory/$', inventory, name='inventory'),
+    url(r'^inventory/add/$', inventory_add, name='inventory-add'),
+    url(r'^report$', report, name='report'),
+]