fix missing devise

diff --git a/project/dae/templates/dae/embauche_consulter.html b/project/dae/templates/dae/embauche_consulter.html
index 5f72418..46e7b3c 100644 (file)
--- a/project/dae/templates/dae/embauche_consulter.html
+++ b/project/dae/templates/dae/embauche_consulter.html
@@ -71,7 +71,7 @@
           <td>{{ dc.implantation }}</td>
           <td>{{ dc.personne }}</td>
           <td>{{ dc.poste }}</td>
-          <td>{{ dc.montant|floatformat:0 }} {{ dc.devise }}</td>
+          <td>{{ dc.montant|floatformat:0 }} {{ dc.devise.code }}</td>
           <td>{{ dc.montant_euros|floatformat:0 }} EUR</td>
       </tr>
       {% endfor %}

diff --git a/project/rh/models.py b/project/rh/models.py
index bf2ed11..3437b87 100644 (file)
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -294,6 +294,8 @@ class PosteComparaison_(AUFMetadata):
         abstract = True
 
     def taux_devise(self):
+        if self.devise is None:
+            return None
         if self.devise.code == "EUR":
             return 1
         annee = self.poste.date_debut.year
@@ -305,7 +307,10 @@ class PosteComparaison_(AUFMetadata):
             return list(taux)[0]
 
     def montant_euros(self):
-        return round(float(self.montant) * float(self.taux_devise()), 2)
+        taux = self.taux_devise()
+        if not taux:
+            return None
+        return round(float(self.montant) * float(taux), 2)
 
     def __unicode__(self):
         return self.nom
@@ -698,6 +703,8 @@ class DossierComparaison_(models.Model):
         abstract = True
 
     def taux_devise(self):
+        if self.devise is None:
+            return None
         annee = self.dossier.contrat_date_debut.year
         taux = [tc.taux for tc in TauxChange.objects.filter(devise=self.devise, annee=annee)]
         taux = set(taux)
@@ -707,7 +714,10 @@ class DossierComparaison_(models.Model):
             return list(taux)[0]
 
     def montant_euros(self):
-        return round(float(self.montant) * float(self.taux_devise()), 2)
+        taux = self.taux_devise()
+        if not taux:
+            return None
+        return round(float(self.montant) * float(taux), 2)
 
 class DossierComparaison(DossierComparaison_):
     pass