arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-24 17:02:18 +00:00
Code Issues Projects Releases Wiki Activity

Bug fix for non unicode in admin panel.

Browse Source 
Add __str__ for Payments
This commit is contained in:
tomtom5152
2015-03-27 12:15:10 +00:00
parent d70ad24c53
commit 2a3875f198
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
RIGS/models.py
View File

@@ -5,6 +5,7 @@ from django.db import models, connection
from django.contrib.auth.models import AbstractUser from django.contrib.auth.models import AbstractUser
from django.conf import settings from django.conf import settings
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.utils.encoding import python_2_unicode_compatible
import reversion import reversion
from decimal import Decimal from decimal import Decimal
@@ -39,6 +40,7 @@ class RevisionMixin(object):
@reversion.register @reversion.register
@python_2_unicode_compatible
class Person(models.Model, RevisionMixin): class Person(models.Model, RevisionMixin):
name = models.CharField(max_length=50) name = models.CharField(max_length=50)
phone = models.CharField(max_length=15, blank=True, null=True) phone = models.CharField(max_length=15, blank=True, null=True)
@@ -73,6 +75,7 @@ class Person(models.Model, RevisionMixin):
@reversion.register @reversion.register
@python_2_unicode_compatible
class Organisation(models.Model, RevisionMixin): class Organisation(models.Model, RevisionMixin):
name = models.CharField(max_length=50) name = models.CharField(max_length=50)
phone = models.CharField(max_length=15, blank=True, null=True) phone = models.CharField(max_length=15, blank=True, null=True)
@@ -122,6 +125,7 @@ class VatManager(models.Manager):
@reversion.register @reversion.register
@python_2_unicode_compatible
class VatRate(models.Model, RevisionMixin): class VatRate(models.Model, RevisionMixin):
start_at = models.DateTimeField() start_at = models.DateTimeField()
rate = models.DecimalField(max_digits=6, decimal_places=6) rate = models.DecimalField(max_digits=6, decimal_places=6)
@@ -142,6 +146,7 @@ class VatRate(models.Model, RevisionMixin):
@reversion.register @reversion.register
@python_2_unicode_compatible
class Venue(models.Model, RevisionMixin): class Venue(models.Model, RevisionMixin):
name = models.CharField(max_length=255) name = models.CharField(max_length=255)
phone = models.CharField(max_length=15, blank=True, null=True) phone = models.CharField(max_length=15, blank=True, null=True)
@@ -198,6 +203,7 @@ class EventManager(models.Manager):
@reversion.register(follow=['items']) @reversion.register(follow=['items'])
@python_2_unicode_compatible
class Event(models.Model, RevisionMixin): class Event(models.Model, RevisionMixin):
# Done to make it much nicer on the database # Done to make it much nicer on the database
PROVISIONAL = 0 PROVISIONAL = 0
@@ -326,6 +332,7 @@ class EventCrew(models.Model):
notes = models.TextField(blank=True, null=True) notes = models.TextField(blank=True, null=True)
@python_2_unicode_compatible
class Invoice(models.Model): class Invoice(models.Model):
event = models.OneToOneField('Event') event = models.OneToOneField('Event')
invoice_date = models.DateField(auto_now_add=True) invoice_date = models.DateField(auto_now_add=True)
@@ -369,6 +376,7 @@ class Invoice(models.Model):
ordering = ['-invoice_date'] ordering = ['-invoice_date']
@python_2_unicode_compatible
class Payment(models.Model): class Payment(models.Model):
CASH = 'C' CASH = 'C'
INTERNAL = 'I' INTERNAL = 'I'
@@ -387,3 +395,6 @@ class Payment(models.Model):
date = models.DateField() date = models.DateField()
amount = models.DecimalField(max_digits=10, decimal_places=2, help_text='Please use ex. VAT') amount = models.DecimalField(max_digits=10, decimal_places=2, help_text='Please use ex. VAT')
method = models.CharField(max_length=2, choices=METHODS, null=True, blank=True) method = models.CharField(max_length=2, choices=METHODS, null=True, blank=True)
def __str__(self):
return "%s: %d" % (self.get_method_display(), self.amount)