diff --git a/registrasion/reporting/reports.py b/registrasion/reporting/reports.py index 817cc5dedbf98ec91f86cce1595a42d7130bf10d..f8339a5dbb755722cb04686f69708808d0dc94e2 100644 --- a/registrasion/reporting/reports.py +++ b/registrasion/reporting/reports.py @@ -1,19 +1,8 @@ -from collections import namedtuple - from django.contrib.auth.decorators import user_passes_test -from django.core.urlresolvers import reverse -from django.db import models -from django.db.models import F, Q -from django.db.models import Sum -from django.db.models import Case, When, Value -from django.http import Http404 from django.shortcuts import render from functools import wraps -from registrasion import forms from registrasion import views -from registrasion.models import commerce -from registrasion.models import inventory ''' A list of report views objects that can be used to load a list of diff --git a/registrasion/reporting/views.py b/registrasion/reporting/views.py index 935a3299eb2c1d0d1fc6592285b59750040214fc..d44de51487347674120b9cc14951c1b4269e8a3f 100644 --- a/registrasion/reporting/views.py +++ b/registrasion/reporting/views.py @@ -1,18 +1,13 @@ -from collections import namedtuple - from django.contrib.auth.decorators import user_passes_test from django.core.urlresolvers import reverse from django.db import models from django.db.models import F, Q from django.db.models import Sum from django.db.models import Case, When, Value -from django.http import Http404 from django.shortcuts import render -from functools import wraps from registrasion import forms from registrasion.models import commerce -from registrasion.models import inventory from registrasion import views from reports import get_all_reports @@ -28,15 +23,15 @@ def reports_list(request): for report in get_all_reports(): reports.append({ - "name" : report.__name__, - "url" : reverse(report), - "description" : report.__doc__, + "name": report.__name__, + "url": reverse(report), + "description": report.__doc__, }) reports.sort(key=lambda report: report["name"]) ctx = { - "reports" : reports, + "reports": reports, } return render(request, "registrasion/reports_list.html", ctx) @@ -91,8 +86,8 @@ def items_sold(request, form): return Report("Paid items", headings, data) -@report_view("Inventory", form_type=forms.ProductAndCategoryForm) -def inventory(request, form): +@report_view("Product status", form_type=forms.ProductAndCategoryForm) +def product_status(request, form): ''' Summarises the inventory status of the given items, grouping by invoice status. ''' diff --git a/registrasion/urls.py b/registrasion/urls.py index 22df0e51b496ab9c236a4366931f659dd8e823f4..d87b13fec5b5493ce939ca3e896fc3cba48c894c 100644 --- a/registrasion/urls.py +++ b/registrasion/urls.py @@ -38,8 +38,12 @@ public = [ reports = [ url(r"^$", reporting_views.reports_list, name="reports_list"), - url(r"^credit_notes/?$", reporting_views.credit_notes, name="inventory"), - url(r"^inventory/?$", reporting_views.inventory, name="inventory"), + url(r"^credit_notes/?$", reporting_views.credit_notes, name="credit_notes"), + url( + r"^product_status/?$", + reporting_views.product_status, + name="product_status", + ), url(r"^items_sold/?$", reporting_views.items_sold, name="items_sold"), ]