From: Olivier Larchevêque Date: Wed, 14 Mar 2012 16:33:20 +0000 (-0400) Subject: #2784 X-Git-Tag: 1.6.5~205 X-Git-Url: http://git.auf.org/?p=auf_rh_dae.git;a=commitdiff_plain;h=7ba822a6f923a5370eaa481df82d794fedccc8db;hp=e2827532acec52f436318169ab4850557c3f3e99 #2784 --- diff --git a/project/dae/forms.py b/project/dae/forms.py index 0760e5c..a18132d 100644 --- a/project/dae/forms.py +++ b/project/dae/forms.py @@ -134,7 +134,7 @@ class PosteForm(forms.ModelForm): """ Formulaire des postes. """ # On ne propose que les services actifs - service = forms.ModelChoiceField(queryset=rh.Service.objects.filter(archive=False), required=True) + service = forms.ModelChoiceField(queryset=rh.Service.objects.all(), required=True) responsable=AutoCompleteSelectField('responsables', required=True) #responsable = forms.ModelChoiceField( diff --git a/project/rh/admin.py b/project/rh/admin.py index b609871..79b1c57 100644 --- a/project/rh/admin.py +++ b/project/rh/admin.py @@ -19,6 +19,23 @@ from decorators import in_drh_or_admin import models as rh import auf.django.references.models as ref +class ArchiveMixin(object): + """ + Archive Mixin pour gérer le queryset et le display + NON COMPRIS : list_filter, et list_display, field à setter dans la classe. + """ + + def queryset(self, request): + return self.model._base_manager + + def _archive(self, obj): + if obj.archive: + return "oui" + else: + return "non" + _archive.short_description = u'Archivé' + _archive.admin_order_field = 'archive' + class RegionProxy(ref.Region): """ Proxy utilisé pour les organigrammes par région """ class Meta: @@ -250,7 +267,7 @@ class CommentaireAdmin(admin.ModelAdmin): pass -class DeviseAdmin(AUFMetadataAdminMixin, admin.ModelAdmin): +class DeviseAdmin(AUFMetadataAdminMixin, admin.ModelAdmin, ArchiveMixin): list_display = ( 'code', 'nom', @@ -265,16 +282,6 @@ class DeviseAdmin(AUFMetadataAdminMixin, admin.ModelAdmin): }), ) - def queryset(self, request): - return self.model._base_manager - - def _archive(self, obj): - if obj.archive: - return "oui" - else: - return "non" - _archive.short_description = u'Archivé' - def _date_modification(self, obj): return date(obj.date_modification) \ if obj.date_modification is not None else "(aucune)" @@ -892,7 +899,7 @@ class ResponsableImplantationAdmin(AUFMetadataAdminMixin, admin.ModelAdmin): ) -class ServiceAdmin(AUFMetadataAdminMixin, admin.ModelAdmin): +class ServiceAdmin(AUFMetadataAdminMixin, admin.ModelAdmin, ArchiveMixin): list_display = ( 'nom', '_archive', @@ -906,13 +913,6 @@ class ServiceAdmin(AUFMetadataAdminMixin, admin.ModelAdmin): }), ) - def _archive(self, obj): - if obj.archive: - return "oui" - else: - return "non" - _archive.short_description = u'Archivé' - def _date_modification(self, obj): return date(obj.date_modification) \ if obj.date_modification is not None else "(aucune)" @@ -1016,15 +1016,18 @@ class TypePosteAdmin(AUFMetadataAdminMixin, admin.ModelAdmin): _date_modification.admin_order_field = 'date_modification' -class TypeRemunerationAdmin(AUFMetadataAdminMixin, admin.ModelAdmin): +class TypeRemunerationAdmin(AUFMetadataAdminMixin, admin.ModelAdmin, ArchiveMixin): list_display = ( 'nom', 'type_paiement', 'nature_remuneration', + '_archive', '_date_modification', 'user_modification',) + list_filter = ('archive', ) fieldsets = AUFMetadataAdminMixin.fieldsets + ( - (None, {'fields': ('nom', 'type_paiement', 'nature_remuneration',)}), + (None, {'fields': ('nom', 'type_paiement', 'nature_remuneration', + 'archive')}), ) def _date_modification(self, obj): diff --git a/project/rh/managers.py b/project/rh/managers.py index af71276..9d04f69 100644 --- a/project/rh/managers.py +++ b/project/rh/managers.py @@ -131,6 +131,10 @@ class DossierComparaisonManager(SecurityManager): class DeviseManager(NoDeleteManager): + pass - def get_query_set(self): - return super(DeviseManager, self).get_query_set().filter(archive=False) +class ServiceManager(NoDeleteManager): + pass + +class TypeRemunerationManager(NoDeleteManager): + pass diff --git a/project/rh/migrations/0024_auto__chg_field_postecomparaison_implantation__chg_field_dossiercompar.py b/project/rh/migrations/0024_auto__chg_field_postecomparaison_implantation__chg_field_dossiercompar.py new file mode 100644 index 0000000..93effd5 --- /dev/null +++ b/project/rh/migrations/0024_auto__chg_field_postecomparaison_implantation__chg_field_dossiercompar.py @@ -0,0 +1,601 @@ +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Changing field 'PosteComparaison.implantation' + db.alter_column('rh_postecomparaison', 'implantation_id', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, null=True, to=orm['managedref.Implantation'])) + + # Changing field 'DossierComparaison.implantation' + db.alter_column('rh_dossiercomparaison', 'implantation_id', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, null=True, to=orm['managedref.Implantation'])) + + # Adding field 'TypeRemuneration.archive' + db.add_column('rh_typeremuneration', 'archive', self.gf('django.db.models.fields.BooleanField')(default=False, blank=True), keep_default=False) + + # Changing field 'Poste.implantation' + db.alter_column('rh_poste', 'implantation', self.gf('django.db.models.fields.related.ForeignKey')(db_column='implantation', to=orm['managedref.Implantation'])) + + # Changing field 'Employe.pays' + db.alter_column('rh_employe', 'pays', self.gf('django.db.models.fields.related.ForeignKey')(db_column='pays', to_field='code', to=orm['managedref.Pays'], blank=True, null=True)) + + # Changing field 'Employe.nationalite' + db.alter_column('rh_employe', 'nationalite', self.gf('django.db.models.fields.related.ForeignKey')(db_column='nationalite', to_field='code', to=orm['managedref.Pays'], blank=True, null=True)) + + # Changing field 'ResponsableImplantation.implantation' + db.alter_column('rh_responsableimplantation', 'implantation', self.gf('django.db.models.fields.related.ForeignKey')(unique=True, db_column='implantation', to=orm['managedref.Implantation'])) + + # Changing field 'ValeurPoint.implantation' + db.alter_column('rh_valeurpoint', 'implantation', self.gf('django.db.models.fields.related.ForeignKey')(db_column='implantation', to=orm['managedref.Implantation'])) + + # Changing field 'AyantDroit.nationalite' + db.alter_column('rh_ayantdroit', 'nationalite', self.gf('django.db.models.fields.related.ForeignKey')(db_column='nationalite', to_field='code', to=orm['managedref.Pays'], blank=True, null=True)) + + # Changing field 'OrganismeBstg.pays' + db.alter_column('rh_organismebstg', 'pays', self.gf('django.db.models.fields.related.ForeignKey')(db_column='pays', to_field='code', to=orm['managedref.Pays'], blank=True, null=True)) + + + def backwards(self, orm): + + # Changing field 'PosteComparaison.implantation' + db.alter_column('rh_postecomparaison', 'implantation_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['references.Implantation'], blank=True)) + + # Changing field 'DossierComparaison.implantation' + db.alter_column('rh_dossiercomparaison', 'implantation_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['references.Implantation'], blank=True)) + + # Deleting field 'TypeRemuneration.archive' + db.delete_column('rh_typeremuneration', 'archive') + + # Changing field 'Poste.implantation' + db.alter_column('rh_poste', 'implantation', self.gf('django.db.models.fields.related.ForeignKey')(db_column='implantation', to=orm['references.Implantation'])) + + # Changing field 'Employe.pays' + db.alter_column('rh_employe', 'pays', self.gf('django.db.models.fields.related.ForeignKey')(db_column='pays', to_field='code', to=orm['references.Pays'], blank=True, null=True)) + + # Changing field 'Employe.nationalite' + db.alter_column('rh_employe', 'nationalite', self.gf('django.db.models.fields.related.ForeignKey')(db_column='nationalite', to_field='code', to=orm['references.Pays'], blank=True, null=True)) + + # Changing field 'ResponsableImplantation.implantation' + db.alter_column('rh_responsableimplantation', 'implantation', self.gf('django.db.models.fields.related.ForeignKey')(unique=True, db_column='implantation', to=orm['references.Implantation'])) + + # Changing field 'ValeurPoint.implantation' + db.alter_column('rh_valeurpoint', 'implantation', self.gf('django.db.models.fields.related.ForeignKey')(db_column='implantation', to=orm['references.Implantation'])) + + # Changing field 'AyantDroit.nationalite' + db.alter_column('rh_ayantdroit', 'nationalite', self.gf('django.db.models.fields.related.ForeignKey')(db_column='nationalite', to_field='code', to=orm['references.Pays'], blank=True, null=True)) + + # Changing field 'OrganismeBstg.pays' + db.alter_column('rh_organismebstg', 'pays', self.gf('django.db.models.fields.related.ForeignKey')(db_column='pays', to_field='code', to=orm['references.Pays'], blank=True, null=True)) + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'max_length': '30', 'unique': 'True'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'managedref.bureau': { + 'Meta': {'object_name': 'Bureau', 'db_table': "u'ref_bureau'"}, + 'actif': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'code': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'implantation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['managedref.Implantation']", 'db_column': "'implantation'"}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'nom_court': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'nom_long': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'region': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['managedref.Region']", 'db_column': "'region'"}) + }, + 'managedref.implantation': { + 'Meta': {'object_name': 'Implantation', 'db_table': "u'ref_implantation'"}, + 'actif': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'adresse_physique_bureau': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'adresse_physique_code_postal': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'adresse_physique_code_postal_avant_ville': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'adresse_physique_no': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'adresse_physique_pays': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'impl_adresse_physique'", 'to_field': "'code'", 'db_column': "'adresse_physique_pays'", 'to': "orm['managedref.Pays']"}), + 'adresse_physique_precision': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'adresse_physique_precision_avant': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'adresse_physique_region': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'adresse_physique_rue': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'adresse_physique_ville': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'adresse_postale_boite_postale': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'adresse_postale_bureau': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'adresse_postale_code_postal': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), + 'adresse_postale_code_postal_avant_ville': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'adresse_postale_no': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'adresse_postale_pays': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'impl_adresse_postale'", 'to_field': "'code'", 'db_column': "'adresse_postale_pays'", 'to': "orm['managedref.Pays']"}), + 'adresse_postale_precision': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'adresse_postale_precision_avant': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'adresse_postale_region': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'adresse_postale_rue': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'adresse_postale_ville': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'bureau_rattachement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['managedref.Implantation']", 'db_column': "'bureau_rattachement'"}), + 'code_meteo': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'commentaire': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'courriel': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'courriel_interne': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'date_extension': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'date_fermeture': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'date_inauguration': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'date_ouverture': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'fax': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'fax_interne': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'fuseau_horaire': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'hebergement_convention': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'hebergement_convention_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'hebergement_etablissement': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modif_date': ('django.db.models.fields.DateField', [], {}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'nom_court': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'nom_long': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'region': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['managedref.Region']", 'db_column': "'region'"}), + 'remarque': ('django.db.models.fields.TextField', [], {}), + 'responsable_implantation': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'statut': ('django.db.models.fields.IntegerField', [], {}), + 'telephone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'telephone_interne': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'url': ('django.db.models.fields.URLField', [], {'max_length': '255', 'blank': 'True'}) + }, + 'managedref.pays': { + 'Meta': {'object_name': 'Pays', 'db_table': "u'ref_pays'"}, + 'actif': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'code': ('django.db.models.fields.CharField', [], {'max_length': '2', 'unique': 'True'}), + 'code_bureau': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['managedref.Bureau']", 'to_field': "'code'", 'null': 'True', 'db_column': "'code_bureau'", 'blank': 'True'}), + 'code_iso3': ('django.db.models.fields.CharField', [], {'max_length': '3', 'unique': 'True'}), + 'developpement': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'monnaie': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'nord_sud': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'region': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['managedref.Region']", 'db_column': "'region'"}) + }, + 'managedref.region': { + 'Meta': {'object_name': 'Region', 'db_table': "u'ref_region'"}, + 'actif': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'code': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'implantation_bureau': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'gere_region'", 'blank': 'True', 'null': 'True', 'db_column': "'implantation_bureau'", 'to': "orm['managedref.Implantation']"}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}) + }, + 'references.implantation': { + 'Meta': {'managed': 'False', 'object_name': 'Implantation', 'db_table': "u'ref_implantation'", '_ormbases': ['managedref.Implantation']} + }, + 'references.pays': { + 'Meta': {'managed': 'False', 'object_name': 'Pays', 'db_table': "u'ref_pays'", '_ormbases': ['managedref.Pays']} + }, + 'rh.ayantdroit': { + 'Meta': {'object_name': 'AyantDroit'}, + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_naissance': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'employe': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ayantdroits'", 'db_column': "'employe'", 'to': "orm['rh.Employe']"}), + 'genre': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'lien_parente': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'nationalite': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ayantdroits_nationalite'", 'db_column': "'nationalite'", 'to_field': "'code'", 'to': "orm['managedref.Pays']", 'blank': 'True', 'null': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'nom_affichage': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'prenom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.ayantdroitcommentaire': { + 'Meta': {'object_name': 'AyantDroitCommentaire'}, + 'ayant_droit': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'db_column': "'ayant_droit'", 'to': "orm['rh.AyantDroit']"}), + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'db_column': "'owner'", 'to': "orm['auth.User']"}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'texte': ('django.db.models.fields.TextField', [], {}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.classement': { + 'Meta': {'object_name': 'Classement'}, + 'coefficient': ('django.db.models.fields.FloatField', [], {'default': '0', 'null': 'True'}), + 'commentaire': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'degre': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}), + 'echelon': ('django.db.models.fields.IntegerField', [], {'default': '0', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.contrat': { + 'Meta': {'object_name': 'Contrat'}, + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_debut': ('django.db.models.fields.DateField', [], {}), + 'date_fin': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'dossier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rh_contrats'", 'db_column': "'dossier'", 'to': "orm['rh.Dossier']"}), + 'fichier': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'type_contrat': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'db_column': "'type_contrat'", 'to': "orm['rh.TypeContrat']"}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.devise': { + 'Meta': {'object_name': 'Devise'}, + 'archive': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'unique': 'True'}), + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.dossier': { + 'Meta': {'object_name': 'Dossier'}, + 'classement': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'classement'", 'to': "orm['rh.Classement']"}), + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_debut': ('django.db.models.fields.DateField', [], {}), + 'date_fin': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'employe': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rh_dossiers'", 'db_column': "'employe'", 'to': "orm['rh.Employe']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'organisme_bstg': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'organisme_bstg'", 'to': "orm['rh.OrganismeBstg']"}), + 'poste': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rh_dossiers'", 'db_column': "'poste'", 'to': "orm['rh.Poste']"}), + 'regime_travail': ('django.db.models.fields.DecimalField', [], {'default': "'100.00'", 'null': 'True', 'max_digits': '12', 'decimal_places': '2'}), + 'regime_travail_nb_heure_semaine': ('django.db.models.fields.DecimalField', [], {'default': "'35.00'", 'null': 'True', 'max_digits': '12', 'decimal_places': '2'}), + 'remplacement': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'remplacement_de': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'to': "orm['rh.Dossier']"}), + 'statut': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'to': "orm['rh.Statut']"}), + 'statut_residence': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '10', 'null': 'True'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.dossiercommentaire': { + 'Meta': {'object_name': 'DossierCommentaire'}, + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'dossier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'db_column': "'dossier'", 'to': "orm['rh.Dossier']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'db_column': "'owner'", 'to': "orm['auth.User']"}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'texte': ('django.db.models.fields.TextField', [], {}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.dossiercomparaison': { + 'Meta': {'object_name': 'DossierComparaison'}, + 'devise': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'to': "orm['rh.Devise']"}), + 'dossier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rh_comparaisons'", 'to': "orm['rh.Dossier']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'implantation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'to': "orm['managedref.Implantation']"}), + 'montant': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'personne': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'poste': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) + }, + 'rh.dossierpiece': { + 'Meta': {'object_name': 'DossierPiece'}, + 'dossier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rh_dossierpieces'", 'db_column': "'dossier'", 'to': "orm['rh.Dossier']"}), + 'fichier': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + 'rh.employe': { + 'Meta': {'object_name': 'Employe'}, + 'adresse': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'code_postal': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_entree': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_naissance': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'genre': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nationalite': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'employes_nationalite'", 'db_column': "'nationalite'", 'to_field': "'code'", 'to': "orm['managedref.Pays']", 'blank': 'True', 'null': 'True'}), + 'nb_postes': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'nom_affichage': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'pays': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'employes'", 'db_column': "'pays'", 'to_field': "'code'", 'to': "orm['managedref.Pays']", 'blank': 'True', 'null': 'True'}), + 'prenom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'province': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'situation_famille': ('django.db.models.fields.CharField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'tel_cellulaire': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'tel_domicile': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}), + 'ville': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) + }, + 'rh.employecommentaire': { + 'Meta': {'object_name': 'EmployeCommentaire'}, + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'employe': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'db_column': "'employe'", 'to': "orm['rh.Employe']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'db_column': "'owner'", 'to': "orm['auth.User']"}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'texte': ('django.db.models.fields.TextField', [], {}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.employepiece': { + 'Meta': {'object_name': 'EmployePiece'}, + 'employe': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rh.Employe']", 'db_column': "'employe'"}), + 'fichier': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + 'rh.familleemploi': { + 'Meta': {'object_name': 'FamilleEmploi'}, + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.organismebstg': { + 'Meta': {'object_name': 'OrganismeBstg'}, + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'pays': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'organismes_bstg'", 'db_column': "'pays'", 'to_field': "'code'", 'to': "orm['managedref.Pays']", 'blank': 'True', 'null': 'True'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '10'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.poste': { + 'Meta': {'object_name': 'Poste'}, + 'appel': ('django.db.models.fields.CharField', [], {'default': "'interne'", 'max_length': '10', 'null': 'True'}), + 'autre_max': ('django.db.models.fields.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '12', 'decimal_places': '2'}), + 'autre_min': ('django.db.models.fields.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '12', 'decimal_places': '2'}), + 'classement_max': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'classement_max'", 'to': "orm['rh.Classement']"}), + 'classement_min': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'classement_min'", 'to': "orm['rh.Classement']"}), + 'comp_autre_max': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '12', 'decimal_places': '2', 'blank': 'True'}), + 'comp_autre_min': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '12', 'decimal_places': '2', 'blank': 'True'}), + 'comp_fonctionpub_max': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '12', 'decimal_places': '2', 'blank': 'True'}), + 'comp_fonctionpub_min': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '12', 'decimal_places': '2', 'blank': 'True'}), + 'comp_locale_max': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '12', 'decimal_places': '2', 'blank': 'True'}), + 'comp_locale_min': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '12', 'decimal_places': '2', 'blank': 'True'}), + 'comp_ong_max': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '12', 'decimal_places': '2', 'blank': 'True'}), + 'comp_ong_min': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '12', 'decimal_places': '2', 'blank': 'True'}), + 'comp_universite_max': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '12', 'decimal_places': '2', 'blank': 'True'}), + 'comp_universite_min': ('django.db.models.fields.DecimalField', [], {'null': 'True', 'max_digits': '12', 'decimal_places': '2', 'blank': 'True'}), + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_debut': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'date_fin': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'devise_comparaison': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'devise_comparaison'", 'to': "orm['rh.Devise']"}), + 'devise_max': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'db_column': "'devise_max'", 'to': "orm['rh.Devise']"}), + 'devise_min': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'db_column': "'devise_min'", 'to': "orm['rh.Devise']"}), + 'expatrie': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'implantation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'db_column': "'implantation'", 'to': "orm['managedref.Implantation']"}), + 'indemn_max': ('django.db.models.fields.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '12', 'decimal_places': '2'}), + 'indemn_min': ('django.db.models.fields.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '12', 'decimal_places': '2'}), + 'justification': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'local': ('django.db.models.fields.NullBooleanField', [], {'default': 'True', 'null': 'True', 'blank': 'True'}), + 'mise_a_disposition': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'nom_feminin': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), + 'regime_travail': ('django.db.models.fields.DecimalField', [], {'default': "'100.00'", 'null': 'True', 'max_digits': '12', 'decimal_places': '2'}), + 'regime_travail_nb_heure_semaine': ('django.db.models.fields.DecimalField', [], {'default': "'35.00'", 'null': 'True', 'max_digits': '12', 'decimal_places': '2'}), + 'responsable': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'db_column': "'responsable'", 'to': "orm['rh.Poste']"}), + 'salaire_max': ('django.db.models.fields.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '12', 'decimal_places': '2'}), + 'salaire_min': ('django.db.models.fields.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '12', 'decimal_places': '2'}), + 'service': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'db_column': "'service'", 'to': "orm['rh.Service']"}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'type_poste': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'null': 'True', 'db_column': "'type_poste'", 'to': "orm['rh.TypePoste']"}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}), + 'vacant': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'valeur_point_max': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'valeur_point_max'", 'to': "orm['rh.ValeurPoint']"}), + 'valeur_point_min': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'valeur_point_min'", 'to': "orm['rh.ValeurPoint']"}) + }, + 'rh.postecommentaire': { + 'Meta': {'object_name': 'PosteCommentaire'}, + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'db_column': "'owner'", 'to': "orm['auth.User']"}), + 'poste': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'db_column': "'poste'", 'to': "orm['rh.Poste']"}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'texte': ('django.db.models.fields.TextField', [], {}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.postecomparaison': { + 'Meta': {'object_name': 'PosteComparaison'}, + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'devise': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'to': "orm['rh.Devise']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'implantation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'to': "orm['managedref.Implantation']"}), + 'montant': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'poste': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rh_comparaisons_internes'", 'to': "orm['rh.Poste']"}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.postefinancement': { + 'Meta': {'object_name': 'PosteFinancement'}, + 'commentaire': ('django.db.models.fields.TextField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'poste': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rh_financements'", 'db_column': "'poste'", 'to': "orm['rh.Poste']"}), + 'pourcentage': ('django.db.models.fields.DecimalField', [], {'max_digits': '12', 'decimal_places': '2'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '1'}) + }, + 'rh.postepiece': { + 'Meta': {'object_name': 'PostePiece'}, + 'fichier': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'poste': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rh_pieces'", 'db_column': "'poste'", 'to': "orm['rh.Poste']"}) + }, + 'rh.remuneration': { + 'Meta': {'object_name': 'Remuneration'}, + 'commentaire': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_debut': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'date_fin': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'devise': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'db_column': "'devise'", 'to': "orm['rh.Devise']"}), + 'dossier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rh_remunerations'", 'db_column': "'dossier'", 'to': "orm['rh.Dossier']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'montant': ('django.db.models.fields.DecimalField', [], {'default': '0', 'null': 'True', 'max_digits': '12', 'decimal_places': '2', 'blank': 'True'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'db_column': "'type'", 'to': "orm['rh.TypeRemuneration']"}), + 'type_revalorisation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'type_revalorisation'", 'to': "orm['rh.TypeRevalorisation']"}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.responsableimplantation': { + 'Meta': {'object_name': 'ResponsableImplantation'}, + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'employe': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'employe'", 'to': "orm['rh.Employe']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'implantation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'unique': 'True', 'db_column': "'implantation'", 'to': "orm['managedref.Implantation']"}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.service': { + 'Meta': {'object_name': 'Service'}, + 'archive': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.statut': { + 'Meta': {'object_name': 'Statut'}, + 'code': ('django.db.models.fields.CharField', [], {'max_length': '25', 'unique': 'True'}), + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.tauxchange': { + 'Meta': {'object_name': 'TauxChange'}, + 'annee': ('django.db.models.fields.IntegerField', [], {}), + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'devise': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['rh.Devise']", 'db_column': "'devise'"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'taux': ('django.db.models.fields.FloatField', [], {}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.typecontrat': { + 'Meta': {'object_name': 'TypeContrat'}, + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'nom_long': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.typeposte': { + 'Meta': {'object_name': 'TypePoste'}, + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'famille_emploi': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'db_column': "'famille_emploi'", 'to': "orm['rh.FamilleEmploi']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_responsable': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'nom_feminin': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.typeremuneration': { + 'Meta': {'object_name': 'TypeRemuneration'}, + 'archive': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nature_remuneration': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'type_paiement': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.typerevalorisation': { + 'Meta': {'object_name': 'TypeRevalorisation'}, + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'nom': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}) + }, + 'rh.valeurpoint': { + 'Meta': {'object_name': 'ValeurPoint'}, + 'annee': ('django.db.models.fields.IntegerField', [], {}), + 'date_creation': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_modification': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'devise': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'db_column': "'devise'", 'to': "orm['rh.Devise']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'implantation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'rh_valeur_point'", 'db_column': "'implantation'", 'to': "orm['managedref.Implantation']"}), + 'supprime': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), + 'user_creation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_creation'", 'to': "orm['auth.User']"}), + 'user_modification': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'blank': 'True', 'null': 'True', 'db_column': "'user_modification'", 'to': "orm['auth.User']"}), + 'valeur': ('django.db.models.fields.FloatField', [], {'null': 'True'}) + } + } + + complete_apps = ['rh'] diff --git a/project/rh/models.py b/project/rh/models.py index 09e6abe..97e4250 100644 --- a/project/rh/models.py +++ b/project/rh/models.py @@ -13,7 +13,8 @@ from auf.django.metadata.models import AUFMetadata from auf.django.metadata.managers import NoDeleteManager import auf.django.references.models as ref from validators import validate_date_passee -from managers import PosteManager, DossierManager, DossierComparaisonManager, PosteComparaisonManager, DeviseManager +from managers import PosteManager, DossierManager, DossierComparaisonManager, \ +PosteComparaisonManager, DeviseManager, ServiceManager, TypeRemunerationManager # Gruick hack pour déterminer d'ou provient l'instanciation d'une classe pour l'héritage. @@ -963,6 +964,8 @@ NATURE_REMUNERATION_CHOICES = ( class TypeRemuneration(AUFMetadata): """Catégorie de Remuneration. """ + objects = TypeRemunerationManager() + nom = models.CharField(max_length=255) type_paiement = models.CharField(max_length=30, choices=TYPE_PAIEMENT_CHOICES, @@ -970,6 +973,7 @@ class TypeRemuneration(AUFMetadata): nature_remuneration = models.CharField(max_length=30, choices=NATURE_REMUNERATION_CHOICES, verbose_name = u"Nature de la rémunération") + archive = models.BooleanField(verbose_name=u"Archivé", default=False) class Meta: ordering = ['nom'] @@ -977,7 +981,11 @@ class TypeRemuneration(AUFMetadata): verbose_name_plural = u"Types de rémunération" def __unicode__(self): - return u'%s' % (self.nom) + if self.archive: + archive = u"(archivé)" + else: + archive = "" + return u'%s %s' % (self.nom, archive) class TypeRevalorisation(AUFMetadata): """Justification du changement de la Remuneration. @@ -996,6 +1004,8 @@ class TypeRevalorisation(AUFMetadata): class Service(AUFMetadata): """Unité administrative où les Postes sont rattachés. """ + objects = ServiceManager() + archive = models.BooleanField(verbose_name=u"Archivé", default=False) nom = models.CharField(max_length=255)