projets
/
auf_rh_dae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d4635cc
)
Bug dernier_salaire dans rh_v1.dossier
author
Ali Jetha
<ali.jetha@auf.org>
Wed, 15 Jun 2011 20:31:17 +0000
(16:31 -0400)
committer
Ali Jetha
<ali.jetha@auf.org>
Wed, 15 Jun 2011 20:31:17 +0000
(16:31 -0400)
project/rh_v1/models.py
patch
|
blob
|
blame
|
history
diff --git
a/project/rh_v1/models.py
b/project/rh_v1/models.py
index
bb137bc
..
7948438
100644
(file)
--- a/
project/rh_v1/models.py
+++ b/
project/rh_v1/models.py
@@
-141,7
+141,7
@@
class Dossier(models.Model):
return u'%s : %s %s' % (self.employe, self.poste1, self.complement1)
def get_dernier_salaire_remun(self):
return u'%s : %s %s' % (self.employe, self.poste1, self.complement1)
def get_dernier_salaire_remun(self):
- remun = [r for r in self.remuneration_set.all() if r.type_id == 1] # type salaire de base
+ remun = [r for r in self.remuneration_set.all().order_by('-id') if r.type_id == 1] # type salaire de base
if len(remun) == 0:
return None
else:
if len(remun) == 0:
return None
else: