PEP8 party 2

main/admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 from main.models import *
 
+
 class ProductAdmin(admin.ModelAdmin):
     pass
 

main/forms.py

@@ -7,6 +7,7 @@ from models import *
 
 import utils
 
+
 class OrderForm(forms.ModelForm):
     def clean_customer(self):
         if self.cleaned_data['customer'].get_profile().balance <= 0:
@@ -18,16 +19,19 @@ class OrderForm(forms.ModelForm):
         model = Order
         fields = ('customer',)
 
+
 class OrderLineForm(forms.Form):
     product = forms.IntegerField(required=True)
     amount = forms.IntegerField(required=True)
     unit_price = forms.FloatField(required=True, localize=True)
 
+
 class DepositForm(forms.ModelForm):
 
     class Meta:
         model = Transaction
 
+
 class SimpleCreateUserForm(forms.Form):
     first_name = forms.CharField(required=True, label="Fornavn")
     last_name = forms.CharField(required=True, label="Etternavn")
@@ -54,6 +58,7 @@ class SimpleCreateUserForm(forms.Form):
 
         return user
 
+
 class InventoryTransactionForm(forms.ModelForm):
     unit_price = forms.FloatField(required=True, localize=True)
 
@@ -66,6 +71,7 @@ class InventoryTransactionForm(forms.ModelForm):
         model = InventoryTransaction
         fields = ['product', 'amount', 'unit_price', 'comment']
 
+
 class DateRangeForm(forms.Form):
     start_time = forms.DateTimeField(required=False, label=_("Fra"))
     end_time = forms.DateTimeField(required=False, label=_("Til"))

main/models.py

@@ -5,103 +5,115 @@ from django.dispatch import receiver
 from django.utils.translation import ugettext as _
 from datetime import datetime
 
+
 class Product(models.Model):
 
-	def __unicode__(self):
+    def __unicode__(self):
-		return self.name
+        return self.name
 
-	name = models.CharField(max_length=64)
+    name = models.CharField(max_length=64)
-	sale_price_int = models.FloatField()
+    sale_price_int = models.FloatField()
-	sale_price_ext = models.FloatField()
+    sale_price_ext = models.FloatField()
-	description = models.CharField(max_length=256, blank=True)
+    description = models.CharField(max_length=256, blank=True)
-	volume_liter = models.FloatField(null=True)
+    volume_liter = models.FloatField(null=True)
-	alcohol_percent = models.FloatField(null=True)
+    alcohol_percent = models.FloatField(null=True)
-	image = models.ImageField(upload_to='products', blank=True)
+    image = models.ImageField(upload_to='products', blank=True)
-	customer_support = models.CharField(max_length=32, blank=True)
+    customer_support = models.CharField(max_length=32, blank=True)
-	inventory_amount = models.FloatField(default=0)
+    inventory_amount = models.FloatField(default=0)
-	active = models.BooleanField(default=True)
+    active = models.BooleanField(default=True)
-	created = models.DateTimeField(auto_now_add=True)
+    created = models.DateTimeField(auto_now_add=True)
-	updated = models.DateTimeField(auto_now=True)
+    updated = models.DateTimeField(auto_now=True)
 
-        @property
+    @property
-        def inventory_value(self):
+    def inventory_value(self):
-            return self.inventory_amount * self.sale_price_int
+        return self.inventory_amount * self.sale_price_int
+
+    class Meta:
+        ordering = ['name']
 
-        class Meta:
-            ordering = ['name']
 
 class Order(models.Model):
-	customer = models.ForeignKey(User)
+    customer = models.ForeignKey(User)
-	order_sum = models.FloatField(db_column='sum')
+    order_sum = models.FloatField(db_column='sum')
-	created = models.DateTimeField(auto_now_add=True)
+    created = models.DateTimeField(auto_now_add=True)
+
+    def __unicode__(self):
+        return u"{0}: {1} kr".format(self.customer, self.order_sum)
 
-	def __unicode__(self):
-		return u"{0}: {1} kr".format(self.customer, self.order_sum)
 
 class OrderLine(models.Model):
-	order = models.ForeignKey('main.Order')
+    order = models.ForeignKey('main.Order')
-	product = models.ForeignKey('main.Product', related_name='orderlines')
+    product = models.ForeignKey('main.Product', related_name='orderlines')
-	amount = models.IntegerField()
+    amount = models.IntegerField()
-	unit_price = models.FloatField(verbose_name=_('Enhetspris'))
+    unit_price = models.FloatField(verbose_name=_('Enhetspris'))
 
-        @property
+    @property
-        def price(self):
+    def price(self):
-            return self.amount * self.unit_price
+        return self.amount * self.unit_price
 
-	def __unicode__(self):
+    def __unicode__(self):
-	    return u"{0} {1} ({2} kr per)".format(self.amount, self.product, self.unit_price)
+        return u"{0} {1} ({2} kr per)".format(self.amount, self.product, self.unit_price)
+
+    class Meta:
+        unique_together = ('order', 'product')
 
-	class Meta:
-	    unique_together = ('order', 'product')
 
 class Transaction(models.Model):
-        """ Money """
+    """ Money """
-	user = models.ForeignKey(User)
+    user = models.ForeignKey(User)
-	amount = models.FloatField()
+    amount = models.FloatField()
-	created = models.DateTimeField(auto_now_add=True)
+    created = models.DateTimeField(auto_now_add=True)
+
+    def __unicode__(self):
+        return u"{0}: {1}: {2}".format(self.id, self.user, self.amount)
 
-	def __unicode__(self):
-	    return u"{0}: {1}: {2}".format(self.id, self.user, self.amount)
 
 class InventoryTransaction(models.Model):
-        """ Goods """
+    """ Goods """
-	user = models.ForeignKey(User)
+    user = models.ForeignKey(User)
-	product = models.ForeignKey('main.Product', related_name='transactions', verbose_name=_('Produkt'))
+    product = models.ForeignKey('main.Product', related_name='transactions', verbose_name=_('Produkt'))
-	amount = models.FloatField(verbose_name=_('Antall'))
+    amount = models.FloatField(verbose_name=_('Antall'))
-        unit_price = models.FloatField(verbose_name=_('Enhetspris'))
+    unit_price = models.FloatField(verbose_name=_('Enhetspris'))
-        comment = models.TextField(verbose_name=_('Kommentar'), blank=True)
+    comment = models.TextField(verbose_name=_('Kommentar'), blank=True)
-	created = models.DateTimeField(auto_now_add=True)
+    created = models.DateTimeField(auto_now_add=True)
 
-        @property
+    @property
-        def price(self):
+    def price(self):
-            return self.amount * self.unit_price
+        return self.amount * self.unit_price
+
+    def __unicode__(self):
+        return u"{0}: {1}: {2} ({3} kr per)".format(
+            self.id,
+            self.user,
+            self.product,
+            self.amount,
+            self.unit_price)
 
-	def __unicode__(self):
-            return u"{0}: {1}: {2} ({3} kr per)".format(self.id, self.user, self.product, self.amount, self.unit_price)
 
 class UserProfile(models.Model):
-	user = models.OneToOneField(User)
+    user = models.OneToOneField(User)
-	balance = models.FloatField(default=0.0)
+    balance = models.FloatField(default=0.0)
-	#image = models.ImageField(upload_to='users', blank=True)
+    #image = models.ImageField(upload_to='users', blank=True)
-	image = models.URLField(blank=True)
+    image = models.URLField(blank=True)
 
-        def last_purchase(self):
+    def last_purchase(self):
-            if len(self.user.order_set.all()) == 0:
+        if len(self.user.order_set.all()) == 0:
-                return None
+            return None
-            return self.user.order_set.order_by('created').reverse()[0]
+        return self.user.order_set.order_by('created').reverse()[0]
 
-        def last_purchase_date(self):
+    def last_purchase_date(self):
-            last = self.last_purchase()
+        last = self.last_purchase()
-            if last:
+        if last:
-                return last.created
+            return last.created
-            else:
+        else:
-                return datetime.min
+            return datetime.min
+
+    def __unicode__(self):
+        return u"{0}".format(self.user)
 
-	def __unicode__(self):
-		return u"{0}".format(self.user)
 
 # Create a new UserProfile object when we create a new User.
 @receiver(post_save, sender=User, dispatch_uid='randomz')
 def create_user_profile(sender, instance, created, **kwargs):
-	if created:
+    if created:
-		UserProfile.objects.create(user=instance)
+        UserProfile.objects.create(user=instance)