Permalink
Browse files

Default for membership_type and unicode fix

  • Loading branch information...
1 parent df2184b commit f34b9c9823c235c7e861257b82f99a3e86108450 @anttihirvonen committed Sep 14, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 dotmembership/apps/billing/models.py
  2. +1 −1 dotmembership/apps/members/models.py
@@ -48,7 +48,7 @@ def save(self, *args, **kwargs):
super(Invoice, self).save(*args, **kwargs)
def __unicode__(self):
- return "{0}, {1}".format(self.member, self.for_year)
+ return u"{0}, {1}".format(self.member, self.for_year)
reversion.register(Invoice)
@@ -43,7 +43,7 @@ class Member(models.Model):
# Membership data
joined = models.DateTimeField(_(u"liittymisaika"), auto_now_add=True, editable=False)
- membership_type = models.CharField(_(u"jäsentyyppi"), choices=MEMBERSHIP, max_length=15)
+ membership_type = models.CharField(_(u"jäsentyyppi"), choices=MEMBERSHIP, default=MEMBERSHIP.normal, max_length=15)
@property
def timestamped_id(self):

0 comments on commit f34b9c9

Please sign in to comment.