From c606cc855c40b8e5faabb68cf52170b9259ce985 Mon Sep 17 00:00:00 2001 From: Patrick Rauscher Date: Thu, 3 Oct 2013 16:35:23 +0000 Subject: [PATCH] give valid verbose_names in modal --- accounting/models.py | 18 +++++++++--------- crm/models.py | 16 ++++++++-------- crm_contacts/models.py | 16 ++++++++-------- crm_document/models.py | 4 ++-- crm_member/models.py | 8 ++++---- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/accounting/models.py b/accounting/models.py index c60eab1..02d33ec 100644 --- a/accounting/models.py +++ b/accounting/models.py @@ -1,17 +1,17 @@ from django.db import models class Journal(models.Model): - label = models.CharField(max_length=30) - allowNull = models.BooleanField() - rootAccounts = models.ManyToManyField("Account") + label = models.CharField(max_length=30, verbose_name="Bezeichnung") + allowNull = models.BooleanField(verbose_name="Erzwinge Kontenrahmen nicht") + rootAccounts = models.ManyToManyField("Account", blank=True) def __unicode__(self): return self.label class Account(models.Model): - parent = models.ForeignKey("self", null=True, blank=True) - code = models.CharField(max_length=10) - name = models.CharField(max_length=50) + parent = models.ForeignKey("self", null=True, blank=True, verbose_name="Übergeordnetes Konto") + code = models.CharField(max_length=10, verbose_name="Kontonummer") + name = models.CharField(max_length=50, verbose_name="Bezeichnung") def __unicode__(self): return self.code + " " + self.name @@ -20,7 +20,7 @@ class Record(models.Model): pass class Split(models.Model): - record = models.ForeignKey(Record) - account = models.ForeignKey(Account) - note = models.CharField(max_length=50) + record = models.ForeignKey(Record, verbose_name="Buchung") + account = models.ForeignKey(Account, verbose_name="Konto") + note = models.CharField(max_length=50, blank=True) value = models.IntegerField() diff --git a/crm/models.py b/crm/models.py index a9b5292..ddeed6b 100644 --- a/crm/models.py +++ b/crm/models.py @@ -6,9 +6,9 @@ class Entity(models.Model): An Entity is the base of every part of the CRM. """ - links = models.ManyToManyField("self", blank = True) - tags = models.ManyToManyField("Tag", blank = True) - memo = models.TextField(blank = True) + links = models.ManyToManyField("self", blank=True, verbose_name="Verwandt") + tags = models.ManyToManyField("Tag", blank=True, verbose_name="Tags") + memo = models.TextField(blank=True, verbose_name="Notiz") def getEntity(self): for rel in self._meta.get_all_related_objects(): @@ -38,15 +38,15 @@ class Process(models.Model): Each change of a Entity is done via a Process which will be archived for later research """ - start = models.DateTimeField() - user = models.ForeignKey(User) + start = models.DateTimeField(verbose_name="Start") + user = models.ForeignKey(User, verbose_name="Verantwortlich") class Filter(models.Model): """ A Filter may be used to identify only the Entities you are looking for. This is the baseclass """ - name = models.CharField(max_length=70) + name = models.CharField(max_length=70, verbose_name="Bezeichnung") class Invariant(models.Model): """ @@ -54,5 +54,5 @@ class Invariant(models.Model): """ filter = models.ForeignKey(Filter) - name = models.CharField(max_length=50) - description = models.TextField() + name = models.CharField(max_length=50, verbose_name="Bezeichnung") + description = models.TextField(blank=True, verbose_name="Beschreibung") diff --git a/crm_contacts/models.py b/crm_contacts/models.py index dadd107..61e135b 100644 --- a/crm_contacts/models.py +++ b/crm_contacts/models.py @@ -2,21 +2,21 @@ from django.db import models class Contact(Entity): - telephoneNumbers = models.ManyToManyField("TelephoneNumber", blank = True) - emails = models.ManyToManyField("Email") + telephoneNumbers = models.ManyToManyField("TelephoneNumber", blank=True, verbose_name="Telefonnummern") + emails = models.ManyToManyField("Email", verbose_name="Mailadressen") class NaturalPerson(Contact): - givenName = models.CharField(max_length=30) - surName = models.CharField(max_length=50) - birthDay = models.DateField() + givenName = models.CharField(max_length=30, verbose_name="Vorname") + surName = models.CharField(max_length=50, verbose_name="Nachname") + birthDay = models.DateField(verbose_name="Geburtsdatum") def __unicode__(self): return self.givenName + " " + self.surName class ArtificialPerson(Contact): - legalName = models.CharField(max_length=100, unique=True) - contactGivenName = models.CharField(max_length=50) - contactSurName = models.CharField(max_length=30) + legalName = models.CharField(max_length=100, unique=True, verbose_name="Firma") + contactGivenName = models.CharField(max_length=50, blank=True, verbose_name="Vorname Ansprechpartner") + contactSurName = models.CharField(max_length=30, blank=True, verbose_name="Nachname Ansprechpartner") def __unicode__(self): return self.legalName diff --git a/crm_document/models.py b/crm_document/models.py index e7159f9..b797c3a 100644 --- a/crm_document/models.py +++ b/crm_document/models.py @@ -2,7 +2,7 @@ from django.db import models class Document(Entity): - name = models.CharField(max_length=40) + name = models.CharField(max_length=40, verbose_name="Bezeichnung") file = models.FileField(upload_to="document") def __unicode__(self): @@ -10,4 +10,4 @@ def __unicode__(self): class Archive(models.Model): document = models.ForeignKey(Document, unique=True) - keepUntil = models.DateField() + keepUntil = models.DateField(verbose_name="Archivfrist") diff --git a/crm_member/models.py b/crm_member/models.py index 7bd869c..af93056 100644 --- a/crm_member/models.py +++ b/crm_member/models.py @@ -2,7 +2,7 @@ from crm_contacts.models import Contact class Membership(models.Model): - label = models.CharField(max_length=30) + label = models.CharField(max_length=30, verbose_name="Bezeichnung") def __unicode__(self): return self.label @@ -10,8 +10,8 @@ def __unicode__(self): class Member(models.Model): contact = models.ForeignKey(Contact) membership = models.ForeignKey(Membership) - joinDate = models.DateField() - resignationDate = models.DateField(null = True, blank = True) + joinDate = models.DateField(verbose_name="Beitrittsdatum") + resignationDate = models.DateField(null=True, blank=True, verbose_name="Austrittsdatum") def __unicode__(self): - return str(self.contact) + " (#" + str(self.id) + " - " + str(self.membership) + ": " + str(self.joinDate) + " - " + ("today" if self.resignationDate == None else str(self.resignationDate)) + ")" + return str(self.contact) + " (#" + str(self.id) + ": " + str(self.membership) + (" [ausgetreten]" if self.resignationDate != None) + ")"