amélioration du formulaire de coût d'embauche

diff --git a/project/dae/models.py b/project/dae/models.py
index 09e7082..6f906a4 100644 (file)
--- a/project/dae/models.py
+++ b/project/dae/models.py
@@ -342,6 +342,18 @@ class Remuneration(models.Model):
     # date_annulation = models.DateField(null=True, blank=True)
     # user_annulation = models.IntegerField(null=True, blank=True)
 
+    def montant_mois(self):
+        return round(self.montant / 12, 2)
+
+    def taux_devise(self):
+        return self.devise.tauxchange_set.order_by('-annee').all()[0].taux
+
+    def montant_euro(self):
+        return round(float(self.montant) / float(self.taux_devise()), 2)
+
+    def montant_euro_mois(self):
+        return round(self.montant_euro() / 12, 2)
+
 
 class JustificationPoste(models.Model):
     pass

diff --git a/project/dae/templates/dae/embauche-remun.html b/project/dae/templates/dae/embauche-remun.html
index 97997f2..37b42d3 100644 (file)
--- a/project/dae/templates/dae/embauche-remun.html
+++ b/project/dae/templates/dae/embauche-remun.html
@@ -13,10 +13,8 @@
                value="{{ remun.montant_mois }}" /></td>
     <td><input name="cg-montant-{{ remun.id }}"
                value="{{ remun.montant|default_if_none:'' }}" /></td>
-    <td><input name="montant_euro_mois-{{ remun.id }}"
-               value="{{ remun.montant_euro_mois }}" /></td>
-    <td><input name="montant_euro-{{ remun.id }}"
-               value="{{ remun.montant_euro }}" /></td>
+    <td>{{ remun.montant_euro_mois }}</td>
+    <td>{{ remun.montant_euro }}</td>
     <td><input name="cg-precision-{{ remun.id }}"
                value="{{ remun.precision|default_if_none:'' }}" /></td>
   </tr>

diff --git a/project/dae/views.py b/project/dae/views.py
index 2faf1af..0ee31ef 100644 (file)
--- a/project/dae/views.py
+++ b/project/dae/views.py
@@ -169,7 +169,6 @@ def embauche(request, key=None, dossier=None):
                     dossier = get_object_or_404(dae.Dossier, pk=dossier)
                 dossier_form = DossierForm(request.POST, instance=dossier)
 
-                #import ipdb; ipdb.set_trace()
                 if dossier_form.is_valid():
                     dossier = dossier_form.save()
                     if not dossier.remuneration_set.all():