X-Git-Url: http://git.auf.org/?p=auf_rh_dae.git;a=blobdiff_plain;f=project%2Frh%2Fmodels.py;h=192cc66a7f0c5fcc60c6892915956184d8ed62e3;hp=7a80262e1e2f307a4815a10e5cce9c0b45fd1cc6;hb=182fb8f95e9ccad32a59ce441f3cbbc32e285993;hpb=7d8f67895a635b30d59900e76e92aee0941a768d 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