From 46dab81b63ee0184fc262846a482f30f2338c667 Mon Sep 17 00:00:00 2001 From: "Benoit C. Sirois" Date: Thu, 28 Feb 2013 11:58:35 -0500 Subject: [PATCH] Fixed natures choices --- project/dae/forms.py | 8 +------- project/rh/models.py | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/project/dae/forms.py b/project/dae/forms.py index 55cf8bf..3c777a5 100644 --- a/project/dae/forms.py +++ b/project/dae/forms.py @@ -496,13 +496,7 @@ def remun_formset_factory_factory(read_only=False, parent_model=dae.Dossier, mod extra=extras, can_delete=can_delete, read_only=read_only, - groups = [ - (u'Traitement', u'Traitement',), - (u'Indemnité', u'Indemnité',), - (u'Charges', u'Charges',), - (u'Accessoire', u'Accessoire',), - (u'RAS', u'Rémunération autre source',), - ], + groups = rh.NATURE_REMUNERATION_CHOICES, choice_overrides = { u'Traitement': { 'type': [null_choice] + list( diff --git a/project/rh/models.py b/project/rh/models.py index ddce0bf..1f605bc 100644 --- a/project/rh/models.py +++ b/project/rh/models.py @@ -1420,9 +1420,9 @@ TYPE_PAIEMENT_CHOICES = ( ) NATURE_REMUNERATION_CHOICES = ( - (u'Accessoire', u'Traitement ponctuel'), + (u'Accessoire', u'Accessoire'), (u'Charges', u'Charges patronales'), - (u'Indemnité', u'Indemnité'), + (u'Indemnité', u'Indemnité autre'), (u'RAS', u'Rémunération autre source'), (u'Traitement', u'Traitement'), ) -- 1.7.10.4