Import fixups - not relative

This commit is contained in:
Sachi King 2017-04-17 22:55:48 +10:00
parent 4456398735
commit bcb63fd1cd
12 changed files with 25 additions and 24 deletions

View file

@ -26,7 +26,7 @@ class CategoryController(object):
products, otherwise it'll do all. '''
# STOPGAP -- this needs to be elsewhere tbqh
from product import ProductController
from registrasion.controllers.product import ProductController
if products is AllProducts:
products = inventory.Product.objects.all().select_related(

View file

@ -4,7 +4,7 @@ from django.db import transaction
from registrasion.models import commerce
from for_id import ForId
from registrasion.controllers.for_id import ForId
class CreditNoteController(ForId, object):

View file

@ -11,9 +11,9 @@ from registrasion.models import commerce
from registrasion.models import conditions
from registrasion.models import people
from cart import CartController
from credit_note import CreditNoteController
from for_id import ForId
from registrasion.controllers.cart import CartController
from registrasion.controllers.credit_note import CreditNoteController
from registrasion.controllers.for_id import ForId
class InvoiceController(ForId, object):

View file

@ -1,6 +1,7 @@
''' NEEDS TESTS '''
import operator
from functools import reduce
from registrasion.models import commerce
from registrasion.models import inventory

View file

@ -428,7 +428,7 @@ class InvoicesWithProductAndStatusForm(forms.Form):
product = [int(i) for i in product]
super(InvoicesWithProductAndStatusForm, self).__init__(*a, **k)
print status
print(status)
qs = commerce.Invoice.objects.filter(
status=status or commerce.Invoice.STATUS_UNPAID,

View file

@ -1,4 +1,4 @@
from commerce import * # NOQA
from conditions import * # NOQA
from inventory import * # NOQA
from people import * # NOQA
from registrasion.models.commerce import * # NOQA
from registrasion.models.conditions import * # NOQA
from registrasion.models.inventory import * # NOQA
from registrasion.models.people import * # NOQA

View file

@ -324,7 +324,7 @@ class CreditNote(PaymentBase):
elif hasattr(self, 'creditnoterefund'):
reference = self.creditnoterefund.reference
print reference
print(reference)
return "Refunded with reference: %s" % reference
raise ValueError("This should never happen.")

View file

@ -1,5 +1,5 @@
import csv
import forms
import registrasion.reporting.forms
from django.contrib.auth.decorators import user_passes_test
from django.shortcuts import render
@ -178,7 +178,7 @@ class Links(Report):
return []
def rows(self, content_type):
print self._links
print(self._links)
for url, link_text in self._links:
yield [
self._linked_text(content_type, url, link_text)

View file

@ -1,4 +1,4 @@
import forms
from registrasion.reporting import forms
import collections
import datetime
@ -24,11 +24,11 @@ from registrasion import views
from symposion.schedule import models as schedule_models
from reports import get_all_reports
from reports import Links
from reports import ListReport
from reports import QuerysetReport
from reports import report_view
from registrasion.reporting.reports import get_all_reports
from registrasion.reporting.reports import Links
from registrasion.reporting.reports import ListReport
from registrasion.reporting.reports import QuerysetReport
from registrasion.reporting.reports import report_view
def CURRENCY():
@ -95,7 +95,7 @@ def items_sold():
total_quantity=Sum("quantity"),
)
print line_items
print(line_items)
headings = ["Description", "Quantity", "Price", "Total"]
@ -414,7 +414,7 @@ def attendee(request, form, user_id=None):
if user_id is None:
return attendee_list(request)
print user_id
print(user_id)
attendee = people.Attendee.objects.get(user__id=user_id)
name = attendee.attendeeprofilebase.attendee_name()

View file

@ -4,7 +4,7 @@ from registrasion.controllers.item import ItemController
from django import template
from django.db.models import Sum
from urllib import urlencode
from urllib.parse import urlencode
register = template.Library()

View file

@ -1,4 +1,4 @@
from reporting import views as rv
from registrasion.reporting import views as rv
from django.conf.urls import include
from django.conf.urls import url

View file

@ -1,6 +1,6 @@
import datetime
import sys
import util
from registrasion import util
import zipfile
from registrasion import forms