From 182fb8f95e9ccad32a59ce441f3cbbc32e285993 Mon Sep 17 00:00:00 2001 From: "Benoit C. Sirois" Date: Tue, 5 Mar 2013 15:27:27 -0500 Subject: [PATCH] Fixed bug --- project/rh/models.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/project/rh/models.py b/project/rh/models.py index 7a80262..192cc66 100644 --- a/project/rh/models.py +++ b/project/rh/models.py @@ -1126,7 +1126,7 @@ class RHDossierClassementRecord(models.Model): # Premièrement, pour les nouvelles instances: if created: - if not self.classement: + if not instance.classement: return else: cls.objects.create( @@ -1338,8 +1338,17 @@ class Remuneration_(RemunerationMixin, DevisableMixin): montant_euros = Decimal(str(self.montant_euros_float()) or '0') if self.type.nature_remuneration != u'Accessoire': + dossier = getattr(self, 'dossier', None) + if not dossier: + """ + Dans le cas d'un DossierComparaisonRemuneration, il + n'y a plus de reference au dossier. + """ + regime_travail = REGIME_TRAVAIL_DEFAULT + else: + regime_travail = self.dossier.regime_travail return (montant_euros * factor * - self.dossier.regime_travail / 100) + regime_travail / 100) else: return montant_euros -- 1.7.10.4