|
@@ -40,12 +40,12 @@ class Member(CoinLdapSyncMixin, AbstractUser):
|
|
|
default='natural_person')
|
|
|
|
|
|
organization_name = models.CharField(max_length=200, blank=True,
|
|
|
- verbose_name='Nom de l\'organisme',
|
|
|
+ verbose_name="nom de l'organisme",
|
|
|
help_text='Pour une personne morale')
|
|
|
home_phone_number = models.CharField(max_length=25, blank=True,
|
|
|
- verbose_name='Téléphone fixe')
|
|
|
+ verbose_name='téléphone fixe')
|
|
|
mobile_phone_number = models.CharField(max_length=25, blank=True,
|
|
|
- verbose_name='Téléphone mobile')
|
|
|
+ verbose_name='téléphone mobile')
|
|
|
# TODO: use a django module that provides an address model? (would
|
|
|
# support more countries and address types)
|
|
|
address = models.TextField(verbose_name='adresse', blank=True, null=True)
|
|
@@ -54,19 +54,19 @@ class Member(CoinLdapSyncMixin, AbstractUser):
|
|
|
message='Code postal non valide.')],
|
|
|
verbose_name='code postal')
|
|
|
city = models.CharField(max_length=200, blank=True, null=True,
|
|
|
- verbose_name='Commune')
|
|
|
+ verbose_name='commune')
|
|
|
country = models.CharField(max_length=200, blank=True, null=True,
|
|
|
default='France',
|
|
|
- verbose_name='Pays')
|
|
|
+ verbose_name='pays')
|
|
|
entry_date = models.DateField(null=False,
|
|
|
blank=False,
|
|
|
default=datetime.date.today,
|
|
|
- verbose_name='Date de première adhésion')
|
|
|
+ verbose_name='date de première adhésion')
|
|
|
# TODO: for data retention, prevent deletion of a user object while
|
|
|
# the resign date is recent enough (e.g. one year in France).
|
|
|
resign_date = models.DateField(null=True, blank=True,
|
|
|
- verbose_name='Date de départ de '
|
|
|
- 'l\'association')
|
|
|
+ verbose_name="date de départ de "
|
|
|
+ "l'association")
|
|
|
|
|
|
# Following fields are managed by the parent class AbstractUser :
|
|
|
# username, first_name, last_name, email
|
|
@@ -238,8 +238,8 @@ class CryptoKey(models.Model):
|
|
|
KEY_TYPE_CHOICES = (('RSA', 'RSA'), ('GPG', 'GPG'))
|
|
|
|
|
|
type = models.CharField(max_length=3, choices=KEY_TYPE_CHOICES)
|
|
|
- key = models.TextField(verbose_name='Clé')
|
|
|
- member = models.ForeignKey('Member', verbose_name='Membre')
|
|
|
+ key = models.TextField(verbose_name='clé')
|
|
|
+ member = models.ForeignKey('Member', verbose_name='membre')
|
|
|
|
|
|
def __unicode__(self):
|
|
|
return 'Clé %s de %s' % (self.type, self.member)
|
|
@@ -250,20 +250,20 @@ class CryptoKey(models.Model):
|
|
|
|
|
|
class MembershipFee(models.Model):
|
|
|
member = models.ForeignKey('Member', related_name='membership_fees',
|
|
|
- verbose_name='Membre')
|
|
|
+ verbose_name='membre')
|
|
|
#TODO: config: valeur par défaut à externaliser dans la configuration
|
|
|
amount = models.IntegerField(null=False, default='20', help_text='en €',
|
|
|
- verbose_name='Montant')
|
|
|
+ verbose_name='montant')
|
|
|
start_date = models.DateField(
|
|
|
null=False,
|
|
|
blank=False,
|
|
|
default=datetime.date.today,
|
|
|
- verbose_name='Date de début de cotisation')
|
|
|
+ verbose_name='date de début de cotisation')
|
|
|
end_date = models.DateField(
|
|
|
null=False,
|
|
|
blank=False,
|
|
|
default=utils.in_one_year,
|
|
|
- verbose_name='Date de fin de cotisation')
|
|
|
+ verbose_name='date de fin de cotisation')
|
|
|
|
|
|
def __unicode__(self):
|
|
|
return '%s - %s - %i€' % (self.member, self.start_date, self.amount)
|