diff options
5 files changed, 151 insertions, 152 deletions
| diff --git a/archaeological_context_records/migrations/0004_init_history_creator.py b/archaeological_context_records/migrations/0004_init_history_creator.py index ebe9880b2..b231214a4 100644 --- a/archaeological_context_records/migrations/0004_init_history_creator.py +++ b/archaeological_context_records/migrations/0004_init_history_creator.py @@ -62,14 +62,14 @@ class Migration(DataMigration):          'archaeological_context_records.contextrecordsource': {              'Meta': {'object_name': 'ContextRecordSource'},              'associated_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), -            'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contextrecordsource_related'", 'symmetrical': 'False', 'to': "orm['archaeological_context_records.Author']"}), +            'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contextrecordsource_related'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Author']"}),              'context_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_context_records.ContextRecord']"}),              'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),              'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'reference': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), -            'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.SourceType']"}), +            'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}),              'title': ('django.db.models.fields.CharField', [], {'max_length': '300'})          },          'archaeological_context_records.dating': { @@ -154,20 +154,20 @@ class Migration(DataMigration):              'classified_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), -            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_context_records.Department']", 'null': 'True', 'blank': 'True'}), +            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}),              'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'file_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.FileType']"}), -            'general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_context_records.Person']"}), +            'general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['auth.User']"}),              'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), -            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_responsability'", 'null': 'True', 'to': "orm['archaeological_context_records.Person']"}), +            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_responsability'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True', 'blank': 'True'}),              'mh_listing': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'mh_register': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),              'numeric_reference': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), -            'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.Organization']", 'null': 'True', 'blank': 'True'}), +            'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Organization']", 'null': 'True', 'blank': 'True'}),              'permit_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True', 'blank': 'True'}),              'permit_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.PermitType']", 'null': 'True', 'blank': 'True'}),              'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), @@ -177,12 +177,12 @@ class Migration(DataMigration):              'related_file': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.File']", 'null': 'True', 'blank': 'True'}),              'requested_operation_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_operations.OperationType']"}),              'research_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), -            'responsible_town_planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_context_records.Person']"}), +            'responsible_town_planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'saisine_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.SaisineType']", 'null': 'True', 'blank': 'True'}), -            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_context_records.Person']"}), +            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'total_developed_surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'total_surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), -            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'file'", 'symmetrical': 'False', 'to': "orm['archaeological_context_records.Town']"}), +            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'file'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}),              'year': ('django.db.models.fields.IntegerField', [], {'default': '2014'})          },          'archaeological_files.filetype': { @@ -224,7 +224,7 @@ class Migration(DataMigration):              'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operations'", 'null': 'True', 'to': "orm['archaeological_files.File']"}),              'cached_label': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}),              'cira_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), -            'cira_rapporteur': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_context_records.Person']"}), +            'cira_rapporteur': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'code_dracar': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),              'code_patriarche': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -240,27 +240,27 @@ class Migration(DataMigration):              'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['auth.User']"}),              'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), -            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_responsability'", 'null': 'True', 'to': "orm['archaeological_context_records.Person']"}), +            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_responsability'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'large_area_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'negative_result': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'operation_code': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'operation_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['archaeological_operations.OperationType']"}), -            'operator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.Organization']", 'null': 'True', 'blank': 'True'}), +            'operator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Organization']", 'null': 'True', 'blank': 'True'}),              'operator_reference': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),              'optional_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'periods': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_operations.Period']", 'symmetrical': 'False'}),              'remains': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_operations.RemainType']", 'symmetrical': 'False'}),              'report_delivery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'scheduled_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), -            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_scientist_responsability'", 'null': 'True', 'to': "orm['archaeological_context_records.Person']"}), +            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_scientist_responsability'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), -            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_context_records.Town']", 'symmetrical': 'False'}), +            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.Town']", 'symmetrical': 'False'}),              'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'zoning_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'})          },          'archaeological_operations.operationtype': { -            'Meta': {'ordering': "['label']", 'object_name': 'OperationType'}, +            'Meta': {'object_name': 'OperationType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), @@ -278,7 +278,7 @@ class Migration(DataMigration):              'operation': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parcels'", 'null': 'True', 'to': "orm['archaeological_operations.Operation']"}),              'parcel_number': ('django.db.models.fields.CharField', [], {'max_length': '6'}),              'section': ('django.db.models.fields.CharField', [], {'max_length': '4'}), -            'town': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parcels'", 'to': "orm['archaeological_context_records.Town']"}), +            'town': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parcels'", 'to': "orm['ishtar_common.Town']"}),              'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})          },          'archaeological_operations.period': { @@ -337,19 +337,19 @@ class Migration(DataMigration):              'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})          }, -        'archaeological_context_records.arrondissement': { +        'ishtar_common.arrondissement': {              'Meta': {'object_name': 'Arrondissement'}, -            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.Department']"}), +            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '30'})          }, -        'archaeological_context_records.author': { +        'ishtar_common.author': {              'Meta': {'object_name': 'Author'}, -            'author_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.AuthorType']"}), +            'author_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.AuthorType']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), -            'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'author'", 'to': "orm['archaeological_context_records.Person']"}) +            'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'author'", 'to': "orm['ishtar_common.Person']"})          }, -        'archaeological_context_records.authortype': { +        'ishtar_common.authortype': {              'Meta': {'object_name': 'AuthorType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -357,19 +357,19 @@ class Migration(DataMigration):              'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})          }, -        'archaeological_context_records.canton': { +        'ishtar_common.canton': {              'Meta': {'object_name': 'Canton'}, -            'arrondissement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.Arrondissement']"}), +            'arrondissement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Arrondissement']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '30'})          }, -        'archaeological_context_records.department': { +        'ishtar_common.department': {              'Meta': {'ordering': "['number']", 'object_name': 'Department'},              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'label': ('django.db.models.fields.CharField', [], {'max_length': '30'}),              'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'})          }, -        'archaeological_context_records.organization': { +        'ishtar_common.organization': {              'Meta': {'object_name': 'Organization'},              'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -379,12 +379,12 @@ class Migration(DataMigration):              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '300'}), -            'organization_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.OrganizationType']"}), +            'organization_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.OrganizationType']"}),              'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),              'town': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'})          }, -        'archaeological_context_records.organizationtype': { +        'ishtar_common.organizationtype': {              'Meta': {'ordering': "('label',)", 'object_name': 'OrganizationType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -392,11 +392,11 @@ class Migration(DataMigration):              'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})          }, -        'archaeological_context_records.person': { +        'ishtar_common.person': {              'Meta': {'object_name': 'Person'},              'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), -            'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'to': "orm['archaeological_context_records.Organization']"}), +            'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}),              'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),              'email': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),              'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['auth.User']"}), @@ -404,14 +404,14 @@ class Migration(DataMigration):              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '30'}), -            'person_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_context_records.PersonType']", 'symmetrical': 'False'}), +            'person_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.PersonType']", 'symmetrical': 'False'}),              'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),              'surname': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),              'title': ('django.db.models.fields.CharField', [], {'max_length': '2'}),              'town': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'})          }, -        'archaeological_context_records.persontype': { +        'ishtar_common.persontype': {              'Meta': {'ordering': "('label',)", 'object_name': 'PersonType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -420,7 +420,7 @@ class Migration(DataMigration):              'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})          }, -        'archaeological_context_records.sourcetype': { +        'ishtar_common.sourcetype': {              'Meta': {'object_name': 'SourceType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -428,11 +428,11 @@ class Migration(DataMigration):              'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})          }, -        'archaeological_context_records.town': { +        'ishtar_common.town': {              'Meta': {'ordering': "['numero_insee']", 'object_name': 'Town'}, -            'canton': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.Canton']", 'null': 'True', 'blank': 'True'}), +            'canton': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Canton']", 'null': 'True', 'blank': 'True'}),              'center': ('django.contrib.gis.db.models.fields.PointField', [], {'srid': '27572', 'null': 'True', 'blank': 'True'}), -            'departement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.Department']", 'null': 'True', 'blank': 'True'}), +            'departement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'numero_insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '6'}), diff --git a/archaeological_files/migrations/0016_init_history_creator.py b/archaeological_files/migrations/0016_init_history_creator.py index 0316ccc8f..32eef3c9c 100644 --- a/archaeological_files/migrations/0016_init_history_creator.py +++ b/archaeological_files/migrations/0016_init_history_creator.py @@ -33,20 +33,20 @@ class Migration(DataMigration):              'classified_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), -            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_files.Department']", 'null': 'True', 'blank': 'True'}), +            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}),              'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'file_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.FileType']"}), -            'general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_files.Person']"}), +            'general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['auth.User']"}),              'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), -            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_responsability'", 'null': 'True', 'to': "orm['archaeological_files.Person']"}), +            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_responsability'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True', 'blank': 'True'}),              'mh_listing': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'mh_register': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),              'numeric_reference': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), -            'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.Organization']", 'null': 'True', 'blank': 'True'}), +            'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Organization']", 'null': 'True', 'blank': 'True'}),              'permit_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True', 'blank': 'True'}),              'permit_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.PermitType']", 'null': 'True', 'blank': 'True'}),              'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), @@ -56,17 +56,17 @@ class Migration(DataMigration):              'related_file': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.File']", 'null': 'True', 'blank': 'True'}),              'requested_operation_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_operations.OperationType']"}),              'research_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), -            'responsible_town_planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_files.Person']"}), +            'responsible_town_planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'saisine_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.SaisineType']", 'null': 'True', 'blank': 'True'}), -            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_files.Person']"}), +            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'total_developed_surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'total_surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), -            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'file'", 'symmetrical': 'False', 'to': "orm['archaeological_files.Town']"}), +            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'file'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}),              'year': ('django.db.models.fields.IntegerField', [], {'default': '2014'})          },          'archaeological_files.filebydepartment': {              'Meta': {'object_name': 'FileByDepartment', 'db_table': "'file_department'", 'managed': 'False'}, -            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.Department']", 'null': 'True', 'blank': 'True'}), +            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}),              'file': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.File']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})          }, @@ -138,7 +138,7 @@ class Migration(DataMigration):              'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})          },          'archaeological_operations.operationtype': { -            'Meta': {'ordering': "['label']", 'object_name': 'OperationType'}, +            'Meta': {'object_name': 'OperationType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), @@ -182,25 +182,25 @@ class Migration(DataMigration):              'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})          }, -        'archaeological_files.arrondissement': { +        'ishtar_common.arrondissement': {              'Meta': {'object_name': 'Arrondissement'}, -            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.Department']"}), +            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '30'})          }, -        'archaeological_files.canton': { +        'ishtar_common.canton': {              'Meta': {'object_name': 'Canton'}, -            'arrondissement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.Arrondissement']"}), +            'arrondissement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Arrondissement']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '30'})          }, -        'archaeological_files.department': { +        'ishtar_common.department': {              'Meta': {'ordering': "['number']", 'object_name': 'Department'},              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'label': ('django.db.models.fields.CharField', [], {'max_length': '30'}),              'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'})          }, -        'archaeological_files.organization': { +        'ishtar_common.organization': {              'Meta': {'object_name': 'Organization'},              'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -210,12 +210,12 @@ class Migration(DataMigration):              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '300'}), -            'organization_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.OrganizationType']"}), +            'organization_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.OrganizationType']"}),              'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),              'town': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'})          }, -        'archaeological_files.organizationtype': { +        'ishtar_common.organizationtype': {              'Meta': {'ordering': "('label',)", 'object_name': 'OrganizationType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -223,11 +223,11 @@ class Migration(DataMigration):              'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})          }, -        'archaeological_files.person': { +        'ishtar_common.person': {              'Meta': {'object_name': 'Person'},              'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), -            'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'to': "orm['archaeological_files.Organization']"}), +            'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}),              'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),              'email': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),              'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['auth.User']"}), @@ -235,14 +235,14 @@ class Migration(DataMigration):              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '30'}), -            'person_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_files.PersonType']", 'symmetrical': 'False'}), +            'person_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.PersonType']", 'symmetrical': 'False'}),              'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),              'surname': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),              'title': ('django.db.models.fields.CharField', [], {'max_length': '2'}),              'town': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'})          }, -        'archaeological_files.persontype': { +        'ishtar_common.persontype': {              'Meta': {'ordering': "('label',)", 'object_name': 'PersonType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -251,11 +251,11 @@ class Migration(DataMigration):              'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})          }, -        'archaeological_files.town': { +        'ishtar_common.town': {              'Meta': {'ordering': "['numero_insee']", 'object_name': 'Town'}, -            'canton': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.Canton']", 'null': 'True', 'blank': 'True'}), +            'canton': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Canton']", 'null': 'True', 'blank': 'True'}),              'center': ('django.contrib.gis.db.models.fields.PointField', [], {'srid': '27572', 'null': 'True', 'blank': 'True'}), -            'departement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.Department']", 'null': 'True', 'blank': 'True'}), +            'departement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'numero_insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '6'}), diff --git a/archaeological_finds/migrations/0007_init_history_creator.py b/archaeological_finds/migrations/0007_init_history_creator.py index a8bd84a45..8d0a5a583 100644 --- a/archaeological_finds/migrations/0007_init_history_creator.py +++ b/archaeological_finds/migrations/0007_init_history_creator.py @@ -112,20 +112,20 @@ class Migration(DataMigration):              'classified_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), -            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_finds.Department']", 'null': 'True', 'blank': 'True'}), +            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}),              'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'file_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.FileType']"}), -            'general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_finds.Person']"}), +            'general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['auth.User']"}),              'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), -            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_responsability'", 'null': 'True', 'to': "orm['archaeological_finds.Person']"}), +            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_responsability'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True', 'blank': 'True'}),              'mh_listing': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'mh_register': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),              'numeric_reference': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), -            'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Organization']", 'null': 'True', 'blank': 'True'}), +            'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Organization']", 'null': 'True', 'blank': 'True'}),              'permit_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True', 'blank': 'True'}),              'permit_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.PermitType']", 'null': 'True', 'blank': 'True'}),              'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), @@ -135,12 +135,12 @@ class Migration(DataMigration):              'related_file': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.File']", 'null': 'True', 'blank': 'True'}),              'requested_operation_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_operations.OperationType']"}),              'research_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), -            'responsible_town_planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_finds.Person']"}), +            'responsible_town_planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'saisine_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.SaisineType']", 'null': 'True', 'blank': 'True'}), -            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_finds.Person']"}), +            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'total_developed_surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'total_surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), -            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'file'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.Town']"}), +            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'file'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}),              'year': ('django.db.models.fields.IntegerField', [], {'default': '2014'})          },          'archaeological_files.filetype': { @@ -213,14 +213,14 @@ class Migration(DataMigration):          'archaeological_finds.findsource': {              'Meta': {'object_name': 'FindSource'},              'associated_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), -            'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'findsource_related'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.Author']"}), +            'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'findsource_related'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Author']"}),              'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'find': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_finds.Find']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),              'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'reference': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), -            'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.SourceType']"}), +            'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}),              'title': ('django.db.models.fields.CharField', [], {'max_length': '300'})          },          'archaeological_finds.historicalbasefind': { @@ -300,7 +300,7 @@ class Migration(DataMigration):              'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),              'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), -            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Person']"}), +            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Person']"}),              'start_date': ('django.db.models.fields.DateField', [], {})          },          'archaeological_finds.treatment': { @@ -312,20 +312,20 @@ class Migration(DataMigration):              'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.Warehouse']", 'null': 'True', 'blank': 'True'}), -            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Person']", 'null': 'True', 'blank': 'True'}), +            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Person']", 'null': 'True', 'blank': 'True'}),              'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'treatment_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.TreatmentType']"})          },          'archaeological_finds.treatmentsource': {              'Meta': {'object_name': 'TreatmentSource'},              'associated_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), -            'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'treatmentsource_related'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.Author']"}), +            'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'treatmentsource_related'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Author']"}),              'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),              'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'reference': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), -            'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.SourceType']"}), +            'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}),              'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}),              'treatment': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_finds.Treatment']"})          }, @@ -340,7 +340,7 @@ class Migration(DataMigration):          },          'archaeological_operations.acttype': {              'Meta': {'ordering': "('label',)", 'object_name': 'ActType'}, -            'associated_template': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'acttypes'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['archaeological_finds.DocumentTemplate']"}), +            'associated_template': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'acttypes'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.DocumentTemplate']"}),              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -358,13 +358,13 @@ class Migration(DataMigration):              'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['auth.User']"}),              'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), -            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_finds.Person']"}), +            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'index': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'operation': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'administrative_act'", 'null': 'True', 'to': "orm['archaeological_operations.Operation']"}), -            'operator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Organization']", 'null': 'True', 'blank': 'True'}), +            'operator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Organization']", 'null': 'True', 'blank': 'True'}),              'ref_sra': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}), -            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_finds.Person']"}), -            'signatory': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_finds.Person']"}), +            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), +            'signatory': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'signature_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'})          },          'archaeological_operations.archaeologicalsite': { @@ -381,7 +381,7 @@ class Migration(DataMigration):              'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operations'", 'null': 'True', 'to': "orm['archaeological_files.File']"}),              'cached_label': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}),              'cira_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), -            'cira_rapporteur': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_finds.Person']"}), +            'cira_rapporteur': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'code_dracar': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),              'code_patriarche': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -397,27 +397,27 @@ class Migration(DataMigration):              'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['auth.User']"}),              'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), -            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_responsability'", 'null': 'True', 'to': "orm['archaeological_finds.Person']"}), +            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_responsability'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'large_area_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'negative_result': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'operation_code': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'operation_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['archaeological_operations.OperationType']"}), -            'operator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Organization']", 'null': 'True', 'blank': 'True'}), +            'operator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Organization']", 'null': 'True', 'blank': 'True'}),              'operator_reference': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),              'optional_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'periods': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_operations.Period']", 'symmetrical': 'False'}),              'remains': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_operations.RemainType']", 'symmetrical': 'False'}),              'report_delivery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'scheduled_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), -            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_scientist_responsability'", 'null': 'True', 'to': "orm['archaeological_finds.Person']"}), +            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_scientist_responsability'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), -            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_finds.Town']", 'symmetrical': 'False'}), +            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.Town']", 'symmetrical': 'False'}),              'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'zoning_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'})          },          'archaeological_operations.operationtype': { -            'Meta': {'ordering': "['label']", 'object_name': 'OperationType'}, +            'Meta': {'object_name': 'OperationType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), @@ -435,7 +435,7 @@ class Migration(DataMigration):              'operation': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parcels'", 'null': 'True', 'to': "orm['archaeological_operations.Operation']"}),              'parcel_number': ('django.db.models.fields.CharField', [], {'max_length': '6'}),              'section': ('django.db.models.fields.CharField', [], {'max_length': '4'}), -            'town': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parcels'", 'to': "orm['archaeological_finds.Town']"}), +            'town': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parcels'", 'to': "orm['ishtar_common.Town']"}),              'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})          },          'archaeological_operations.period': { @@ -493,7 +493,7 @@ class Migration(DataMigration):              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '40'}), -            'person_in_charge': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Person']", 'null': 'True', 'blank': 'True'}), +            'person_in_charge': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Person']", 'null': 'True', 'blank': 'True'}),              'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),              'town': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), @@ -543,19 +543,19 @@ class Migration(DataMigration):              'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})          }, -        'archaeological_finds.arrondissement': { +        'ishtar_common.arrondissement': {              'Meta': {'object_name': 'Arrondissement'}, -            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Department']"}), +            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '30'})          }, -        'archaeological_finds.author': { +        'ishtar_common.author': {              'Meta': {'object_name': 'Author'}, -            'author_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.AuthorType']"}), +            'author_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.AuthorType']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), -            'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'author'", 'to': "orm['archaeological_finds.Person']"}) +            'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'author'", 'to': "orm['ishtar_common.Person']"})          }, -        'archaeological_finds.authortype': { +        'ishtar_common.authortype': {              'Meta': {'object_name': 'AuthorType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -563,19 +563,19 @@ class Migration(DataMigration):              'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})          }, -        'archaeological_finds.canton': { +        'ishtar_common.canton': {              'Meta': {'object_name': 'Canton'}, -            'arrondissement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Arrondissement']"}), +            'arrondissement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Arrondissement']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '30'})          }, -        'archaeological_finds.department': { +        'ishtar_common.department': {              'Meta': {'ordering': "['number']", 'object_name': 'Department'},              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'label': ('django.db.models.fields.CharField', [], {'max_length': '30'}),              'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'})          }, -        'archaeological_finds.documenttemplate': { +        'ishtar_common.documenttemplate': {              'Meta': {'ordering': "['associated_object_name']", 'object_name': 'DocumentTemplate'},              'associated_object_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), @@ -583,7 +583,7 @@ class Migration(DataMigration):              'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'template': ('django.db.models.fields.files.FileField', [], {'max_length': '100'})          }, -        'archaeological_finds.organization': { +        'ishtar_common.organization': {              'Meta': {'object_name': 'Organization'},              'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -593,12 +593,12 @@ class Migration(DataMigration):              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '300'}), -            'organization_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.OrganizationType']"}), +            'organization_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.OrganizationType']"}),              'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),              'town': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'})          }, -        'archaeological_finds.organizationtype': { +        'ishtar_common.organizationtype': {              'Meta': {'ordering': "('label',)", 'object_name': 'OrganizationType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -606,11 +606,11 @@ class Migration(DataMigration):              'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})          }, -        'archaeological_finds.person': { +        'ishtar_common.person': {              'Meta': {'object_name': 'Person'},              'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), -            'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'to': "orm['archaeological_finds.Organization']"}), +            'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}),              'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),              'email': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),              'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['auth.User']"}), @@ -618,14 +618,14 @@ class Migration(DataMigration):              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '30'}), -            'person_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_finds.PersonType']", 'symmetrical': 'False'}), +            'person_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.PersonType']", 'symmetrical': 'False'}),              'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),              'surname': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),              'title': ('django.db.models.fields.CharField', [], {'max_length': '2'}),              'town': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'})          }, -        'archaeological_finds.persontype': { +        'ishtar_common.persontype': {              'Meta': {'ordering': "('label',)", 'object_name': 'PersonType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -634,7 +634,7 @@ class Migration(DataMigration):              'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})          }, -        'archaeological_finds.sourcetype': { +        'ishtar_common.sourcetype': {              'Meta': {'object_name': 'SourceType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -642,11 +642,11 @@ class Migration(DataMigration):              'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})          }, -        'archaeological_finds.town': { +        'ishtar_common.town': {              'Meta': {'ordering': "['numero_insee']", 'object_name': 'Town'}, -            'canton': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Canton']", 'null': 'True', 'blank': 'True'}), +            'canton': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Canton']", 'null': 'True', 'blank': 'True'}),              'center': ('django.contrib.gis.db.models.fields.PointField', [], {'srid': '27572', 'null': 'True', 'blank': 'True'}), -            'departement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Department']", 'null': 'True', 'blank': 'True'}), +            'departement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'numero_insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '6'}), diff --git a/archaeological_operations/migrations/0021_init_history_creator.py b/archaeological_operations/migrations/0021_init_history_creator.py index 0899cfe89..5d0f7c780 100644 --- a/archaeological_operations/migrations/0021_init_history_creator.py +++ b/archaeological_operations/migrations/0021_init_history_creator.py @@ -33,20 +33,20 @@ class Migration(DataMigration):              'classified_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), -            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.Department']", 'null': 'True', 'blank': 'True'}), +            'departments': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}),              'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'file_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.FileType']"}), -            'general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_operations.Person']"}), +            'general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['auth.User']"}),              'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), -            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_responsability'", 'null': 'True', 'to': "orm['archaeological_operations.Person']"}), +            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_responsability'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True', 'blank': 'True'}),              'mh_listing': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'mh_register': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),              'numeric_reference': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), -            'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Organization']", 'null': 'True', 'blank': 'True'}), +            'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Organization']", 'null': 'True', 'blank': 'True'}),              'permit_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True', 'blank': 'True'}),              'permit_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.PermitType']", 'null': 'True', 'blank': 'True'}),              'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), @@ -56,12 +56,12 @@ class Migration(DataMigration):              'related_file': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.File']", 'null': 'True', 'blank': 'True'}),              'requested_operation_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_operations.OperationType']"}),              'research_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), -            'responsible_town_planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_operations.Person']"}), +            'responsible_town_planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'saisine_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.SaisineType']", 'null': 'True', 'blank': 'True'}), -            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_operations.Person']"}), +            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'total_developed_surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'total_surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), -            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'file'", 'symmetrical': 'False', 'to': "orm['archaeological_operations.Town']"}), +            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'file'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}),              'year': ('django.db.models.fields.IntegerField', [], {'default': '2014'})          },          'archaeological_files.filetype': { @@ -91,7 +91,7 @@ class Migration(DataMigration):          },          'archaeological_operations.acttype': {              'Meta': {'ordering': "('label',)", 'object_name': 'ActType'}, -            'associated_template': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'acttypes'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['archaeological_operations.DocumentTemplate']"}), +            'associated_template': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'acttypes'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.DocumentTemplate']"}),              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -109,13 +109,13 @@ class Migration(DataMigration):              'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['auth.User']"}),              'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), -            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_operations.Person']"}), +            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'index': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'operation': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'administrative_act'", 'null': 'True', 'to': "orm['archaeological_operations.Operation']"}), -            'operator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Organization']", 'null': 'True', 'blank': 'True'}), +            'operator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Organization']", 'null': 'True', 'blank': 'True'}),              'ref_sra': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}), -            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_operations.Person']"}), -            'signatory': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_operations.Person']"}), +            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), +            'signatory': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'signature_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'})          },          'archaeological_operations.archaeologicalsite': { @@ -194,7 +194,7 @@ class Migration(DataMigration):              'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operations'", 'null': 'True', 'to': "orm['archaeological_files.File']"}),              'cached_label': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}),              'cira_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), -            'cira_rapporteur': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_operations.Person']"}), +            'cira_rapporteur': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'code_dracar': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),              'code_patriarche': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -210,35 +210,35 @@ class Migration(DataMigration):              'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['auth.User']"}),              'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), -            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_responsability'", 'null': 'True', 'to': "orm['archaeological_operations.Person']"}), +            'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_responsability'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'large_area_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'negative_result': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),              'operation_code': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'operation_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['archaeological_operations.OperationType']"}), -            'operator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Organization']", 'null': 'True', 'blank': 'True'}), +            'operator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Organization']", 'null': 'True', 'blank': 'True'}),              'operator_reference': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),              'optional_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'periods': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_operations.Period']", 'symmetrical': 'False'}),              'remains': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_operations.RemainType']", 'symmetrical': 'False'}),              'report_delivery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'scheduled_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), -            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_scientist_responsability'", 'null': 'True', 'to': "orm['archaeological_operations.Person']"}), +            'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_scientist_responsability'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),              'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), -            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_operations.Town']", 'symmetrical': 'False'}), +            'towns': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.Town']", 'symmetrical': 'False'}),              'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),              'zoning_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'})          },          'archaeological_operations.operationbydepartment': {              'Meta': {'object_name': 'OperationByDepartment', 'db_table': "'operation_department'", 'managed': 'False'}, -            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Department']", 'null': 'True', 'blank': 'True'}), +            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'operation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Operation']"})          },          'archaeological_operations.operationsource': {              'Meta': {'object_name': 'OperationSource'},              'associated_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), -            'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'operationsource_related'", 'symmetrical': 'False', 'to': "orm['archaeological_operations.Author']"}), +            'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'operationsource_related'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Author']"}),              'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'index': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), @@ -246,11 +246,11 @@ class Migration(DataMigration):              'operation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_operations.Operation']"}),              'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),              'reference': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), -            'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.SourceType']"}), +            'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}),              'title': ('django.db.models.fields.CharField', [], {'max_length': '300'})          },          'archaeological_operations.operationtype': { -            'Meta': {'ordering': "['label']", 'object_name': 'OperationType'}, +            'Meta': {'object_name': 'OperationType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), @@ -268,7 +268,7 @@ class Migration(DataMigration):              'operation': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parcels'", 'null': 'True', 'to': "orm['archaeological_operations.Operation']"}),              'parcel_number': ('django.db.models.fields.CharField', [], {'max_length': '6'}),              'section': ('django.db.models.fields.CharField', [], {'max_length': '4'}), -            'town': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parcels'", 'to': "orm['archaeological_operations.Town']"}), +            'town': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parcels'", 'to': "orm['ishtar_common.Town']"}),              'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})          },          'archaeological_operations.parcelowner': { @@ -278,7 +278,7 @@ class Migration(DataMigration):              'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),              'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), -            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Person']"}), +            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Person']"}),              'parcel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Parcel']"}),              'start_date': ('django.db.models.fields.DateField', [], {})          }, @@ -338,19 +338,19 @@ class Migration(DataMigration):              'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})          }, -        'archaeological_operations.arrondissement': { +        'ishtar_common.arrondissement': {              'Meta': {'object_name': 'Arrondissement'}, -            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Department']"}), +            'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '30'})          }, -        'archaeological_operations.author': { +        'ishtar_common.author': {              'Meta': {'object_name': 'Author'}, -            'author_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.AuthorType']"}), +            'author_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.AuthorType']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), -            'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'author'", 'to': "orm['archaeological_operations.Person']"}) +            'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'author'", 'to': "orm['ishtar_common.Person']"})          }, -        'archaeological_operations.authortype': { +        'ishtar_common.authortype': {              'Meta': {'object_name': 'AuthorType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -358,19 +358,19 @@ class Migration(DataMigration):              'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})          }, -        'archaeological_operations.canton': { +        'ishtar_common.canton': {              'Meta': {'object_name': 'Canton'}, -            'arrondissement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Arrondissement']"}), +            'arrondissement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Arrondissement']"}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '30'})          }, -        'archaeological_operations.department': { +        'ishtar_common.department': {              'Meta': {'ordering': "['number']", 'object_name': 'Department'},              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'label': ('django.db.models.fields.CharField', [], {'max_length': '30'}),              'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'})          }, -        'archaeological_operations.documenttemplate': { +        'ishtar_common.documenttemplate': {              'Meta': {'ordering': "['associated_object_name']", 'object_name': 'DocumentTemplate'},              'associated_object_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), @@ -378,7 +378,7 @@ class Migration(DataMigration):              'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'template': ('django.db.models.fields.files.FileField', [], {'max_length': '100'})          }, -        'archaeological_operations.organization': { +        'ishtar_common.organization': {              'Meta': {'object_name': 'Organization'},              'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -388,12 +388,12 @@ class Migration(DataMigration):              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '300'}), -            'organization_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.OrganizationType']"}), +            'organization_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.OrganizationType']"}),              'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),              'town': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'})          }, -        'archaeological_operations.organizationtype': { +        'ishtar_common.organizationtype': {              'Meta': {'ordering': "('label',)", 'object_name': 'OrganizationType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -401,11 +401,11 @@ class Migration(DataMigration):              'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})          }, -        'archaeological_operations.person': { +        'ishtar_common.person': {              'Meta': {'object_name': 'Person'},              'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),              'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), -            'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'to': "orm['archaeological_operations.Organization']"}), +            'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}),              'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),              'email': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),              'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['auth.User']"}), @@ -413,14 +413,14 @@ class Migration(DataMigration):              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '30'}), -            'person_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_operations.PersonType']", 'symmetrical': 'False'}), +            'person_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.PersonType']", 'symmetrical': 'False'}),              'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),              'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),              'surname': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),              'title': ('django.db.models.fields.CharField', [], {'max_length': '2'}),              'town': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'})          }, -        'archaeological_operations.persontype': { +        'ishtar_common.persontype': {              'Meta': {'ordering': "('label',)", 'object_name': 'PersonType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -429,7 +429,7 @@ class Migration(DataMigration):              'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})          }, -        'archaeological_operations.sourcetype': { +        'ishtar_common.sourcetype': {              'Meta': {'object_name': 'SourceType'},              'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),              'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), @@ -437,11 +437,11 @@ class Migration(DataMigration):              'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})          }, -        'archaeological_operations.town': { +        'ishtar_common.town': {              'Meta': {'ordering': "['numero_insee']", 'object_name': 'Town'}, -            'canton': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Canton']", 'null': 'True', 'blank': 'True'}), +            'canton': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Canton']", 'null': 'True', 'blank': 'True'}),              'center': ('django.contrib.gis.db.models.fields.PointField', [], {'srid': '27572', 'null': 'True', 'blank': 'True'}), -            'departement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Department']", 'null': 'True', 'blank': 'True'}), +            'departement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}),              'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),              'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),              'numero_insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '6'}), diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 79b2e1acc..2956444f8 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -41,7 +41,6 @@ class OperationType(GeneralType):      class Meta:          verbose_name = _(u"Operation type")          verbose_name_plural = _(u"Operation types") -        ordering = ['label']      @classmethod      def is_preventive(cls, ope_type_id, key=''): | 
