merge master

diff --git a/buildout.cfg b/buildout.cfg
index 759c76f..c9158dc 100644 (file)
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -14,10 +14,13 @@ find-links = http://pypi.auf.org/simple/auf.recipe.django/
     http://pypi.auf.org/simple/auf.django.permissions/
     http://pypi.auf.org/simple/auf.django.emploi/
     http://pypi.auf.org/simple/auf.django.references/
+    http://pypi.auf.org/simple/auf.django.piwik/
     http://pypi.auf.org/simple/django-alphafilter/
     http://pypi.auf.org/simple/odsgen/
+
 develop = src/qbe
     src/auf.django.metadata
+
 eggs =
     django
     south
@@ -41,6 +44,7 @@ eggs =
     auf.django.references
     auf.django.skin
     auf.django.workflow
+    auf.django.piwik
     auf.recipe.django
     odsgen
     django-picklefield

diff --git a/project/conf.py.edit b/project/conf.py.edit
index 0f33865..114cec0 100644 (file)
--- a/project/conf.py.edit
+++ b/project/conf.py.edit
@@ -15,3 +15,5 @@ EMAIL_FROM = ''
 ROA_API_KEY = ''
 
 AUTH_PASSWORD_REQUIRED = True
+
+PIWIK_TOKEN = ''

diff --git a/project/dae/models.py b/project/dae/models.py
index 4f3c195..158af84 100644 (file)
--- a/project/dae/models.py
+++ b/project/dae/models.py
@@ -657,7 +657,6 @@ class Dossier(DossierWorkflow, rh.Dossier_):
         dossier_rh.regime_travail_nb_heure_semaine = \
                 self.regime_travail_nb_heure_semaine
         dossier_rh.date_debut = self.contrat_date_debut
-        dossier_rh.date_fin = self.contrat_date_fin
         dossier_rh.save()
 
         rh.DossierComparaison.objects.filter(dossier=dossier_rh).delete()

diff --git a/project/settings.py b/project/settings.py
index df61367..fd2c315 100644 (file)
--- a/project/settings.py
+++ b/project/settings.py
@@ -55,6 +55,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'auf.django.piwik.middleware.TrackMiddleware',
     'django.middleware.doc.XViewMiddleware',
     'reversion.middleware.RevisionMiddleware',
 )

diff --git a/versions.cfg b/versions.cfg
index 267c447..cc9a84a 100644 (file)
--- a/versions.cfg
+++ b/versions.cfg
@@ -4,7 +4,7 @@ south = 0.7
 django-admin-tools = 0.4.1
 django-ajax-selects = 1.1.4
 django-alphafilter = 0.5.3auf4
-django-reversion = 1.5.2
+django-reversion = 1.5.4
 django-sendfile = 0.2.1
 django-urldecorators = 0.3
 auf.django.auth = 0.5.5dev
@@ -71,3 +71,6 @@ auf.recipe.django = 2.1
 
 # Added by Buildout Versions at 2012-08-23 09:21:24.235070
 raven = 2.0.4
+
+# Added by Buildout Versions at 2012-09-18 10:17:13.131666
+auf.django.piwik = 1.7