Masse salariale: valeur defaut année en cours

diff --git a/project/rh/templates/rh/rapports/masse_salariale.html b/project/rh/templates/rh/rapports/masse_salariale.html
index 38ff53a..1c835b1 100644 (file)
--- a/project/rh/templates/rh/rapports/masse_salariale.html
+++ b/project/rh/templates/rh/rapports/masse_salariale.html
@@ -2,14 +2,13 @@
 {% load adminmedia rapports i18n l10n %}
 
 {% block nomrapport %}Rapport de masse salariale{% endblock %}
-{% block count_elements %}<h2>Rapport du {{ request.GET.date_debut }} au {{ request.GET.date_fin }}</h2>{% endblock %}
+{% block count_elements %}<h2>Rapport pour {{ request.GET.annee }}</h2>{% endblock %}
 
 {% block extrastyle %}
 {{ block.super }}
 <script type="text/javascript" src="{{ STATIC_URL }}js/jquery-1.5.1.min.js"></script>
 <script type="text/javascript" src="{% admin_media_prefix %}js/jquery-stickytableheaders.js"></script>
 
-{% include "admin/rh/annee_select.js" %}
 <style>
     #changelist .actions .filter {width: auto; float: left;}
     #changelist .actions .filter h3 {font-size: 11px; margin-left: 0.5em;}
@@ -30,7 +29,7 @@
         </div>
         <div class="filter">
             <h3>Année</h3>
-            {{ form.date_debut }}
+            {{ form.annee }}
         </div>
         <div class="filter" style="margin-left:20px">
             <h3>&nbsp;</h3>

diff --git a/project/rh/views.py b/project/rh/views.py
index 97c3da2..cdf4874 100644 (file)
--- a/project/rh/views.py
+++ b/project/rh/views.py
@@ -206,13 +206,12 @@ def rapports_masse_salariale(request):
                 rh.Remuneration.objects.exclude(date_debut=None) \
                         .order_by('date_debut')[0].date_debut.year
                 , date.today().year + 1)
-        CHOICE_ANNEES.append('')
 
-        #date_debut pour que le script javascript le mette dans le querystring
-        date_debut = forms.CharField(widget=forms.Select(choices=
+        annee = forms.CharField(initial=date.today().year,
+                widget=forms.Select(choices=
                     ((a, a) for a in reversed(CHOICE_ANNEES)
-                    ))
-                )
+                ))
+        )
 
         region = forms.CharField(
                 widget=forms.Select(choices=[('', '')] +
@@ -237,9 +236,9 @@ def rapports_masse_salariale(request):
 
     date_debut = None
     date_fin = None
-    if request.GET.get('date_debut', None):
-        date_debut = "01-01-%s" % request.GET.get('date_debut', None)
-        date_fin = "31-12-%s" % request.GET.get('date_debut', None)
+    if request.GET.get('annee', None):
+        date_debut = "01-01-%s" % request.GET.get('annee', None)
+        date_fin = "31-12-%s" % request.GET.get('annee', None)
 
     implantation = request.GET.get('implantation')
     region = request.GET.get('region')