From 156d6b4d549b1bb2e6f433f8b544d38b4176ebbc Mon Sep 17 00:00:00 2001 From: "Benoit C. Sirois" Date: Fri, 8 Mar 2013 14:22:43 -0500 Subject: [PATCH] #5696 --- project/dae/forms.py | 6 +++++- project/rh/models.py | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/project/dae/forms.py b/project/dae/forms.py index df6594a..8856a18 100644 --- a/project/dae/forms.py +++ b/project/dae/forms.py @@ -284,7 +284,11 @@ PosteComparaisonFormSet = inlineformset_factory( ) -class FlexibleRemunForm(forms.ModelForm): +class FlexibleRemunForm( + filtered_archived_fields_form_factory( + 'type', + ), + forms.ModelForm): # Utilisé dans templats. montant_mensuel = forms.DecimalField(required=False) montant = forms.DecimalField(required=True, label='Montant annuel') diff --git a/project/rh/models.py b/project/rh/models.py index 146667b..df61f6c 100644 --- a/project/rh/models.py +++ b/project/rh/models.py @@ -101,6 +101,7 @@ class Archivable(models.Model): archive = models.BooleanField(u'archivé', default=False) objects = ArchivableManager() + avec_archives = models.Manager() class Meta: abstract = True @@ -1508,6 +1509,9 @@ class TypeRemuneration(Archivable): Catégorie de Remuneration. """ + objects = models.Manager() + sans_archives = ArchivableManager() + nom = models.CharField(max_length=255) type_paiement = models.CharField( u"type de paiement", max_length=30, choices=TYPE_PAIEMENT_CHOICES -- 1.7.10.4