From 5a165e95dad42d281f041ff656438fa09f28b6b2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Larchev=C3=AAque?= Date: Wed, 14 Mar 2012 15:30:48 -0400 Subject: [PATCH] devise on current year --- project/dae/models.py | 3 --- project/rh/models.py | 26 +------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/project/dae/models.py b/project/dae/models.py index 6e76eb2..31fbc10 100644 --- a/project/dae/models.py +++ b/project/dae/models.py @@ -463,9 +463,6 @@ 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.contrat_date_debut.year - def get_salaire_anterieur_euros(self): if self.devise_anterieur.code == 'EUR': tx = 1 diff --git a/project/rh/models.py b/project/rh/models.py index 8c9af61..eef6db5 100644 --- a/project/rh/models.py +++ b/project/rh/models.py @@ -57,7 +57,7 @@ def contrat_dispatch(instance, filename): class DevisableMixin(object): def get_annee_pour_taux_devise(self): - raise NotImplementedError + return datetime.datetime.now().year def taux_devise(self): if self.devise is None: @@ -333,9 +333,6 @@ class PosteComparaison_(AUFMetadata, DevisableMixin): abstract = True - def get_annee_pour_taux_devise(self): - return self.poste.date_debut.year - def __unicode__(self): return self.nom @@ -633,14 +630,6 @@ class Dossier_(AUFMetadata, DevisableMixin): 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 @@ -734,9 +723,6 @@ class DossierComparaison_(models.Model, DevisableMixin): class Meta: abstract = True - def get_annee_pour_taux_devise(self): - return self.dossier.date_debut.year - class DossierComparaison(DossierComparaison_): pass @@ -785,16 +771,6 @@ class Remuneration_(RemunerationMixin, DevisableMixin): def montant_avec_regime(self): return round(self.montant * (self.dossier.regime_travail/100), 2) - def get_annee_pour_taux_devise(self): - annee = datetime.datetime.now().year - if self.dossier.poste.date_debut is not None: - annee = self.dossier.poste.date_debut.year - if self.dossier.date_debut is not None: - annee = self.dossier.date_debut.year - if self.date_debut is not None: - annee = self.date_debut.year - return annee - def montant_euro_mois(self): return round(self.montant_euros() / 12, 2) -- 1.7.10.4