fix payment strings

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index ff6482d59551bcfd99283a4a5fee5ad71abfdc4a..510e382f4cf0adb30cc200cb7d281b0028cb4778 100644 (file)
Binary files a/teleforma/locale/fr/LC_MESSAGES/django.mo and b/teleforma/locale/fr/LC_MESSAGES/django.mo differ

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po
index 7b9022f476ef1e5a59d6ac04b76fd73aa6087c62..38f678098a31fe32501ddab6e62f6f0dd0115b3d 100644 (file)
--- a/teleforma/locale/fr/LC_MESSAGES/django.po
+++ b/teleforma/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-05 02:07+0200\n"
+"POT-Creation-Date: 2012-06-05 02:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,11 +48,11 @@ msgstr "type de matière"
 msgid "title"
 msgstr "titre"
 
-#: models.py:127 models.py:270 models.py:388
+#: models.py:127 models.py:269 models.py:388
 msgid "code"
 msgstr "cote"
 
-#: models.py:128 models.py:269
+#: models.py:128 models.py:268
 msgid "date modified"
 msgstr "date de modification"
 
@@ -148,14 +148,14 @@ msgstr "stream en direct"
 msgid "credits"
 msgstr "crédits"
 
-#: models.py:267
-msgid "published"
-msgstr "publié"
-
-#: models.py:268 models.py:468
+#: models.py:267 models.py:468
 msgid "date added"
 msgstr "date d'ajout"
 
+#: models.py:270
+msgid "published"
+msgstr "publié"
+
 #: models.py:291
 msgid "document type"
 msgstr "type de document"
@@ -182,8 +182,8 @@ msgid "obligation"
 msgstr "obligation"
 
 #: models.py:394
-msgid "cost (€)"
-msgstr ""
+msgid "cost"
+msgstr "coût"
 
 #: models.py:411
 msgid "iej"
@@ -558,7 +558,7 @@ msgid "Live"
 msgstr "Direct"
 
 #: templates/teleforma/course_detail.html:50
-#: templates/teleforma/courses.html:81
+#: templates/teleforma/courses.html:83
 msgid "No document"
 msgstr "Aucun document"
 

diff --git a/teleforma/models.py b/teleforma/models.py
index e353d5c25d603b9b2cc9a630ae811469a2f8a5b7..4e7bc118b3267284dd72d1ed1df52fcd5bb8d2ae 100755 (executable)
--- a/teleforma/models.py
+++ b/teleforma/models.py
@@ -391,7 +391,7 @@ class Training(Model):
                                  blank=True, null=True)
     synthesis_note  = BooleanField(_('synthesis note'))
     obligation      = BooleanField(_('obligation'))
-    cost            = FloatField(_('cost (€)'))
+    cost            = FloatField(_('cost'), blank=True)
 
     def __unicode__(self):
         code = self.code
@@ -439,7 +439,7 @@ class Student(Model):
     class Meta:
         db_table = app_label + '_' + 'student'
         verbose_name = _('student')
-        ordering = ['user']
+        ordering = ['user__last_name']
 
 
 class Profile(models.Model):
@@ -467,9 +467,14 @@ class Payment(models.Model):
     amount  = FloatField(_('amount (€)'))
     date_added = DateTimeField(_('date added'), auto_now_add=True)
 
+    def __unicode__(self):
+        return ' - '.join([str(self.date_added), self.student.user.last_name + ' ' + \
+                        self.student.user.first_name,  str(self.amount)])
+
     class Meta:
         db_table = app_label + '_' + 'payment'
         verbose_name = _('payment')
+        ordering = ['-date_added']
 
 
 # TOOLS