From beb96c9762a825e7ce522dd636edf7ed6c7ce017 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Tue, 5 Jun 2012 03:07:52 +0200
Subject: [PATCH] fix payment strings

---
 teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 4605 -> 4632 bytes
 teleforma/locale/fr/LC_MESSAGES/django.po |  22 +++++++++++-----------
 teleforma/models.py                       |   9 +++++++--
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index ff6482d59551bcfd99283a4a5fee5ad71abfdc4a..510e382f4cf0adb30cc200cb7d281b0028cb4778 100644
GIT binary patch
delta 1979
zcmXw)eQ4EH7{|}u?!9xH+L|wg3lX-E;j*a}tE|=1mO9I3W-ps&LgW4sy*Q#+@WVvx
zpOU)TyJU!3$%wc_nizso{-F_pq5ct$Ac`_9Fnghw&*$#xaK7jBJm+_Q&v~A6?r;0M
z^|iL_o96uXL|cchKy9@tZGs&|23psIlnU_rU^i^QUkvkb1#E<?U>#f+EXDIDpzEK4
zli)_^`mN*7v-BoLJrg@2J-yFB4yh9U$M6#T!_W=B4F6Q{duYJlp$X*)=KJ-KsWb^X
zKOGvU1)9j5>hp}sFf6vGI+4;6NKgF?W<C(}L(q*L5C7TlH;4ZcZ07kJF+U3F=|J!Z
zw15-PgigZA?4QoWgCC$r{R^b0iwu)tjx6+>pwDMOE1MPb?a;&)z}2uDy6#m-Pdgag
z@ZIo7!`}}xD?fx`fTOT_#KBXLp3X9OWIu-g2XuX&!TBa=LNlQo&4yk<2Q*$Mq^B;1
z8n_6$uD3B|)eZV$!RlDB9$w0VN8m*GG&Im=Xu>Z*6WazonYZKld*Ocw-QZx%ABIi%
z$HG4iJ=w8F&flXt&x95H27U40V4mHl;@87cjtZd(JWttjD>Tq6&^WuH3Gai(*$++d
zQ23w6^W)ICr!x%pN<Tvb{t3-AM^wzz3_Z$O&~<Illj(#e+!OvX=&ySa`rf0^6B~iP
zzX=+DOYlWF4L{qC;S2lV<?sOX#jl_noPk#GEp*+v@c)8tSYU8|8e}T9Lf6lSZm<xV
zct7;Y)&xtCgt9b@;n9siKc9`z1h$PYNN+&{?t&ieC^X<F(Dy!z=f|NNd>tHvYw>@A
zR^G?4n&3+4)jSOS{iPuc18sm-{0yY0=NR0$9P>M%3G9L1T_yZu(1cDxdKwG=S7;&s
zK(C<4y&10ox^610_4~h41GYmexC$Du3syfD=!U(}1O}jqmV!@0*N;Ho-vX`pWoQDg
zLkoN-{Jqe4AHb3s9mSxhFBn{S7CQeO^r+55H@E<&!yNa-$B^zq{?D-WA*<>}cOZWg
z7G+z8mXwzlTL*iwW}{n?JKc<yqkhzZu0vDMW$1Qv1G)v-ZbA<r?lUb!SEDYp3Xxb^
zR6bE`Dcpv2XZc*QyRZ`L-txS<DcKsV7Bq-D(fw#Xnt^ORXb$rC>Nn7atbYaa0Bwtr
z|0Deay8wC6OOdU89O*tdGwiu=9=hAD1~48%|F?U>@Gxx;j-z_pH)5}?T&Vk~re?!%
eWpBf$xteRQsSHiLSX)^C*pY+7mBFT+x&Hv^V524g

delta 1954
zcmYk7eQ1_d7>Dmo_d4I#=9-n&oBcDvM%HYR>&uU=EGu2jths8s2o}MJK8Q4;Ckqm^
zLYT>j#6RpqiRj}cghVQG5h?vwYEdASMFlGmLSoQ$z1~5G^E=nM&pFS1-{*dwcN?ES
z)n5G2HvN^L4Wo<Hw20?riGg-Wb3_yDNOr<9_Em5?Tn;O61)Kr<lY_Z`KlJ<vJPSSw
zJzt#JFJc>$nJjFF^mvtl9AZz}Z^7Bv??D56lJ*zLV^D{`LK8X#ef~70$5gJD2%?_~
zG?6N7j)I#p@v>d@g@|h)J$f0;d{wRwKm!e@J(~6tX>W#Y>~GEWU63C8k~QcB4nh;1
zfGxz2FLUEKwA3dcJ$_+mfq$iKHtv_9H*1BSy8xP4I~;(W&~sZLJziok;CR}*pcmc?
z3m<%!iJ2Wpeg^4rn88wgllD*0^OL#$4>XaPEE=E<TKc(Ae^p42c7{gS2|d>Zc{I8!
z)ZYWWd7uxTjolAt!3Us@9)V`O5&EE6d-JWiza#C}paI^@^|xUwb}j8g(25>`R_MD5
z_4fuRSn$E$l9TWp>{IZe27-}|2|P|Y<Wo>bo1u=jLlfQ!^|J?>;NG-9$o>6LzlR{M
z<9NYDhd)Cz{R7ftiosG=h~mN7(8^Sy3161>V(3@B68hXaXvIdL&p!<H|5$PpJQw>}
z==owNlk=Ip4t?+-G{6M(246uB9!vWqG~l1PuE8`~py%g711x|hz6AQpZb`0%CbR)k
zxgtiG__G;>CQ#&oEl`IqLrXgjb@&Ff<nQPHerSMClSkkN?4!^?-IUb?mqK67YN($z
zu>SjB&x9TiG8k}UeIw#IXy9$ocQ&5(J5UE7L3(_i_EG2seuS3(cc{NfNRQLGUgkZz
z-vZ12{@a-7a31t$(g6*)5Sl;_^p*4_2cYMNp*J6e-t<Xm0?$Az^g`M%LjCQ4CbSRI
zqsB1k!HL{B3@y>u&;Z}U^WaIyk0APx|08U-A#b%5-HiN3yp`=%v~p~y)IM|*vju25
zGSU*X3iYFfXfc|D=AsqoTC@z=u1AB2_Zat}PINU|i%2ML82i3dZR%yVdTgq+tZ5Ci
zyT*EE%qfPLRndKD5n6}3(1pm>gDypWr+)kMk%hS(SwP#3Xc*m%u0-{37}`3{p#I19
z;+$U&uRwPg>Ru*(ga5TVb7C?7-+bHGq4l+<<_{ZdAD0g_G%o6{Jw5C1X|+wQyBq!m
D*5sV3

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po
index 7b9022f4..38f67809 100644
--- 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 e353d5c2..4e7bc118 100755
--- 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
-- 
2.39.5