affichages divers

[auf_rh_dae.git] / project / rh_v1 / models.py

diff --git a/project/rh_v1/models.py b/project/rh_v1/models.py
index f0424ca..6b8e917 100644 (file)
--- a/project/rh_v1/models.py
+++ b/project/rh_v1/models.py
@@ -106,6 +106,9 @@ class Dossier(models.Model):
 
     # Managers
     objects = DossierManager()
+    
+    def __unicode__(self):
+        return u'%s : %s %s' % (self.employe, self.poste1, self.complement1)
 
 LIEN_PARENTE_CHOICES = (
     ('Conjoint', 'Conjoint'),
@@ -267,6 +270,9 @@ class OrganismeBstg(models.Model):
     def __unicode__(self):
         return u'%s (%s)' % (self.nom, self.type)
 
+    class Meta:
+        ordering = ['type', 'nom']
+
 
 CONTRAT_CATEGORIE_CHOICES= (
     ('A', 'A'),
@@ -283,7 +289,7 @@ class Statut(models.Model):
     actif = models.BooleanField()
 
     def __unicode__(self):
-        return u'%s' % self.nom
+        return u'%s : %s' % (self.code, self.nom)
 
 TYPE_CLASSEMENT_CHOICES = (
     ('S', 'S'),
@@ -313,6 +319,15 @@ class ValeurPoint(models.Model):
     implantation = models.ForeignKey('datamaster_modeles.Implantation', db_column='implantation')
     #Méta
     annee = models.IntegerField()
+        
+    def get_devise_code(self):
+        code = ''
+        try:
+            taux = TauxChange.objects.get(implantation=self.implantation, annee=self.annee)
+            code = taux.devise.code
+        except TauxChange.DoesNotExist:
+            pass
+        return code
 
     def __unicode__(self):
         return u'%s (%s-%s)' % (self.valeur, self.implantation_id, self.annee)
@@ -350,4 +365,4 @@ class TypeContrat(models.Model):
     actif = models.BooleanField()
 
     def __unicode__(self):
-        return u'%s - %s' % (self.categorie, self.nom)
+        return u'%s' % (self.nom)