From: Benoit C. Sirois <benoit.clennett-sirois@auf.org>
Date: Wed, 24 Apr 2013 15:49:03 +0000 (-0400)
Subject: 6052
X-Git-Tag: 1.8~6
X-Git-Url: http://git.auf.org/?p=auf_rh_dae.git;a=commitdiff_plain;h=f2560be25cc1d1afd6ff6199c43ef83e8b11863b;ds=sidebyside

6052
---

diff --git a/project/rh/admin.py b/project/rh/admin.py
index 8388b60..5b83ffb 100644
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -1424,6 +1424,7 @@ def _communique(modaladmin, req, qs):
                 ctx['types'].append({
                         'bgcolor': thead_colors[t],
                         'name': types_dict[t],
+                        'key': t,
                         'changements': changements,
                         })
 
diff --git a/project/rh/templates/email/mouvement_employe.html b/project/rh/templates/email/mouvement_employe.html
index 73c3226..95c23bd 100644
--- a/project/rh/templates/email/mouvement_employe.html
+++ b/project/rh/templates/email/mouvement_employe.html
@@ -41,7 +41,15 @@
 	    {{ changement.dossier.employe.id }}
 	  </td>
 	  <td valign="top">
-	    {{ changement.date_creation|date:"d-m-Y" }}
+	    {% if type.key == 'NO' %}
+	    {{ changement.dossier.date_debut|date:"d-m-Y" }}
+	    {% endif %}
+	    {% if type.key == 'MO' %}
+	    {{ changement.dossier.date_fin|date:"d-m-Y" }}
+	    {% endif %}
+	    {% if type.key == 'DE' %}
+	    {{ changement.dossier.date_debut|date:"d-m-Y" }}
+	    {% endif %}
 	  </td>
 	  <td valign="top">
 	    {{ changement.dossier.poste.nom }}