historique

diff --git a/buildout.cfg b/buildout.cfg
index e0d6adf..cf93c18 100644 (file)
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -15,6 +15,7 @@ eggs =
     auf.django.skin
     datamaster_modeles
     auf.django.auth
+    django-reversion
 
 [versions]
 django-admin-tools = 0.4.0
@@ -22,6 +23,7 @@ django = 1.2.5
 south = 0.7
 auf.django.skin = 0.15dev
 auf.django.auth = 0.5.2dev
+django-reversion = 1.3.3
 
 [django] 
 recipe = auf.recipe.django

diff --git a/project/dae/admin.py b/project/dae/admin.py
new file mode 100644 (file)
index 0000000..8cd001b
--- /dev/null
+++ b/project/dae/admin.py
@@ -0,0 +1,13 @@
+# -*- encoding: utf-8 -*-
+
+from django.contrib import admin
+from reversion.admin import VersionAdmin
+from models import Poste
+
+class PosteAdmin(VersionAdmin):
+    pass
+
+admin.site.register(Poste, PosteAdmin)
+
+
+

diff --git a/project/dae/templates/dae/poste.html b/project/dae/templates/dae/poste.html
index d0f0857..2d2673a 100644 (file)
--- a/project/dae/templates/dae/poste.html
+++ b/project/dae/templates/dae/poste.html
@@ -157,8 +157,14 @@ Demande d'autorisation d'embauche
         </tr>
         <tr>
             <th>Minimum</th>
-            <td>{{ form.classement_min }}</td>
-            <td>{{ form.coefficient_min }}</td>
+            <td>
+                {{ form.classement_min }}
+                {{ form.classement_min.errors }}
+            </td>
+            <td>
+                {{ form.coefficient_min }}
+                {{ form.coefficient_min.errors }}
+            </td>
             <td>
                 {{ form.valeur_point_min }}
                 {{ form.valeur_point_min.errors }}
@@ -184,8 +190,14 @@ Demande d'autorisation d'embauche
         </tr>
         <tr>
             <th>Maximun</th>
-            <td>{{ form.classement_max }}</td>
-            <td>{{ form.coefficient_max }}</td>
+            <td>
+                {{ form.classement_max }}
+                {{ form.classement_max.errors }}
+            </td>
+            <td>
+                {{ form.coefficient_max }}
+                {{ form.coefficient_max.errors }}
+            </td>
             <td>
                 {{ form.valeur_point_max }}
                 {{ form.valeur_point_max.errors }}

diff --git a/project/rh_v1/models.py b/project/rh_v1/models.py
index 07afe92..acd4b67 100644 (file)
--- a/project/rh_v1/models.py
+++ b/project/rh_v1/models.py
@@ -364,7 +364,12 @@ class ValeurPoint(models.Model):
         return None
 
     def __unicode__(self):
-        return u'%s (%s-%s) %s' % (self.valeur, self.implantation_id, self.annee, self.get_tauxchange_courant().devise.code)
+        tx = self.get_tauxchange_courant()
+        if tx:
+            devise_code = tx.devise.code
+        else:
+            devise_code = "??"
+        return u'%s (%s-%s) %s' % (self.valeur, self.implantation_id, self.annee, devise_code)
         
     class Meta:
         ordering = ['valeur']

diff --git a/project/settings.py b/project/settings.py
index 0afb639..f69a096 100644 (file)
--- a/project/settings.py
+++ b/project/settings.py
@@ -40,6 +40,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.middleware.doc.XViewMiddleware',
+    'reversion.middleware.RevisionMiddleware',
 )
 
 ROOT_URLCONF = 'project.urls'
@@ -56,9 +57,10 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.admin',
     'south',
-    'project.rh',
-    'project.dae',
+    'reversion',
+    #'project.rh', 
     'project.rh_v1',
+    'project.dae',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (