Merge branch 'master' into dev

diff --cc project/dae/models.py
Simple merge

diff --cc project/dae/templates/dae/embauche_consulter.html
Simple merge

diff --cc project/dae/templates/dae/embauches_liste.html
index 1cc7d8b,10dce27..6cc97fe
--- 1/project/dae/templates/dae/embauches_liste.html
--- 2/project/dae/templates/dae/embauches_liste.html
+++ b/project/dae/templates/dae/embauches_liste.html
@@@ -1,6 -1,24 +1,23 @@@
  {% extends 'base.html' %}
  
+ {% block extrahead %}
+     <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/tablesorter.css" media="screen"/>
+     <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-1.5.1.min.js"></script> 
+     <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.tablesorter.min.js"></script> 
+     <script>
+         $(document).ready(function() { 
+             $(".tablesorter").tablesorter({
+                 dateFormat: 'uk',
+                 headers: {
+                     4: {sorter: "shortDate"},
+                 }
+             }
+             ); 
+         });
+     </script> 
+ {% endblock %}
+ 
  {% block title %}RH - DAE - Embauches{% endblock %}
 -{% block titre %}Ressources humaines{% endblock %}
  {% block sous_titre %}Demande d'autorisation d'engagement{% endblock %}
  
  {% block main %}

diff --cc project/dae/templates/dae/postes_liste.html
index c010b90,5d0a71e..b59891b
--- 1/project/dae/templates/dae/postes_liste.html
--- 2/project/dae/templates/dae/postes_liste.html
+++ b/project/dae/templates/dae/postes_liste.html
@@@ -1,6 -1,24 +1,23 @@@
  {% extends 'base.html' %}
  
+ {% block extrahead %}
+     <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/tablesorter.css" media="screen"/>
+     <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-1.5.1.min.js"></script> 
+     <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.tablesorter.min.js"></script> 
+     <script>
+         $(document).ready(function() { 
+             $(".tablesorter").tablesorter({
+                 dateFormat: 'uk',
+                 headers: {
+                     3: {sorter: "shortDate"},
+                 }
+             }
+             ); 
+         });
+     </script> 
+ {% endblock %}
+ 
  {% block title %}RH - DAE - Postes{% endblock %}
 -{% block titre %}Ressources humaines{% endblock %}
  {% block sous_titre %}Demande d'autorisation d'engagement{% endblock %}
  
  {% block main %}