From b78bbaf3adab96b6df821079219489b9356a81ae Mon Sep 17 00:00:00 2001
From: =?utf8?q?Olivier=20Larchev=C3=AAque?= <olivier.larcheveque@auf.org>
Date: Wed, 14 Mar 2012 15:15:23 -0400
Subject: [PATCH] devise fix

---
 project/dae/models.py |    6 ++----
 project/rh/models.py  |   10 +++++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/project/dae/models.py b/project/dae/models.py
index c36685b..6e76eb2 100644
--- a/project/dae/models.py
+++ b/project/dae/models.py
@@ -1,6 +1,5 @@
 # -=- encoding: utf-8 -=-
 
-import os
 from django.conf import settings
 from django.core.files.storage import FileSystemStorage
 from django.db import models
@@ -9,7 +8,6 @@ from rh import models as rh
 from workflow import PosteWorkflow, DossierWorkflow
 from workflow import DOSSIER_ETAT_DRH_FINALISATION, DOSSIER_ETAT_REGION_FINALISATION, \
                      DOSSIER_ETAT_FINALISE
-import auf.django.references.models as ref
 from auf.django.metadata.models import AUFMetadata
 from managers import *
 from rh.models import HELP_TEXT_DATE
@@ -465,8 +463,8 @@ class Dossier(DossierWorkflow, rh.Dossier_):
             raise Exception('Le poste de cette DAE doît être importé')
         return True
 
-    def get_annee_pour_taux_devise(self):
-        return self.dossier.contrat_date_debut.year
+    #def get_annee_pour_taux_devise(self):
+    #    return self.contrat_date_debut.year
 
     def get_salaire_anterieur_euros(self):
         if self.devise_anterieur.code == 'EUR':
diff --git a/project/rh/models.py b/project/rh/models.py
index 612a2ac..8c9af61 100644
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -570,7 +570,7 @@ COMPTE_COMPTA_CHOICES = (
     ('aucun', 'Aucun'),
 )
 
-class Dossier_(AUFMetadata):
+class Dossier_(AUFMetadata, DevisableMixin):
     """Le Dossier regroupe les informations relatives à l'occupation
     d'un Poste par un Employe. Un seul Dossier existe par Poste occupé
     par un Employe.
@@ -633,6 +633,14 @@ class Dossier_(AUFMetadata):
         verbose_name = u"Dossier"
         verbose_name_plural = "Dossiers"
 
+    def get_annee_pour_taux_devise(self):
+        annee = datetime.datetime.now().year
+        if self.poste.date_debut is not None:
+            annee = self.poste.date_debut.year
+        if self.date_debut is not None:
+            annee = self.date_debut.year
+        return annee
+
     def salaire_theorique(self):
         annee = date.today().year
         coeff = self.classement.coefficient
-- 
1.7.10.4