diff options
39 files changed, 7582 insertions, 2391 deletions
diff --git a/.gitignore b/.gitignore index 6cde18e26..bfc61f6ac 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ ishtar.egg-info .idea *.log example_project/ishtar +example_project/.coverage diff --git a/CHANGES.md b/CHANGES.md index e5c75bf17..b9f44172a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,19 @@ Ishtar changelog ================ +0.99.8 (2017-02-02) +------------------- + +### Features ### +- Add a footer with version number +- Finds: batch is now a real type +- Update french translation +- Importer configuration + +### Bug fixes ### +- Change field length in DB to match importers +- update-current-item: prevent errors when session is not well initialized + 0.99.7.2 (2017-01-30) --------------------- diff --git a/Makefile.example b/Makefile.example index 9db609d37..df62fe0b1 100644 --- a/Makefile.example +++ b/Makefile.example @@ -47,6 +47,11 @@ update: clean syncdb compilemessages collectstatic test: clean cd $(project); $(PYTHON) manage.py test $(apps) +coverage: clean + cd $(project); coverage run --source="ishtar_common,archaeological_operations,\ + archaeological_context_records,archaeological_files,archaeological_finds,archaeological_warehouse,\ + archaeological_files_pdl" ./manage.py test $(apps) && coverage report + test_gitlab: clean # test migrations cd $(project); $(PYTHON) ./manage.py syncdb --noinput diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index 2931bb8ee..75e6a2160 100644 --- a/archaeological_context_records/locale/django.pot +++ b/archaeological_context_records/locale/django.pot @@ -7,11 +7,11 @@ msgid "" msgstr "" -#: forms.py:47 forms.py:51 models.py:175 wizards.py:77 +#: forms.py:47 forms.py:51 models.py:176 models.py:488 wizards.py:77 msgid "Operation" msgstr "" -#: forms.py:59 forms.py:137 models.py:177 models.py:453 +#: forms.py:59 forms.py:137 models.py:178 models.py:456 msgid "ID" msgstr "" @@ -63,44 +63,44 @@ msgstr "" msgid "General" msgstr "" -#: forms.py:136 models.py:132 models.py:173 models.py:455 +#: forms.py:136 models.py:132 models.py:174 models.py:458 msgid "Parcel" msgstr "" -#: forms.py:139 models.py:178 models.py:456 +#: forms.py:139 models.py:179 models.py:459 #: templates/ishtar/sheet_contextrecord.html:27 msgid "Description" msgstr "" -#: forms.py:141 models.py:179 +#: forms.py:141 models.py:180 msgid "General comment" msgstr "" -#: forms.py:143 models.py:183 +#: forms.py:143 models.py:184 msgid "Length (m)" msgstr "" -#: forms.py:144 models.py:184 +#: forms.py:144 models.py:185 msgid "Width (m)" msgstr "" -#: forms.py:145 models.py:185 +#: forms.py:145 models.py:186 msgid "Thickness (m)" msgstr "" -#: forms.py:146 models.py:187 +#: forms.py:146 models.py:188 msgid "Depth (m)" msgstr "" -#: forms.py:147 models.py:195 models.py:454 +#: forms.py:147 models.py:196 models.py:457 msgid "Unit" msgstr "" -#: forms.py:148 models.py:197 +#: forms.py:148 models.py:198 msgid "Has furniture?" msgstr "" -#: forms.py:151 models.py:189 +#: forms.py:151 models.py:190 msgid "Location" msgstr "" @@ -127,7 +127,7 @@ msgstr "" msgid "Start date" msgstr "" -#: forms.py:235 models.py:57 models.py:182 +#: forms.py:235 models.py:57 models.py:183 msgid "End date" msgstr "" @@ -139,7 +139,7 @@ msgstr "" msgid "Dating type" msgstr "" -#: forms.py:264 ishtar_menu.py:29 models.py:514 +#: forms.py:264 ishtar_menu.py:29 models.py:518 msgid "Context record" msgstr "" @@ -147,7 +147,7 @@ msgstr "" msgid "Relations" msgstr "" -#: forms.py:289 forms.py:297 models.py:200 +#: forms.py:289 forms.py:297 models.py:201 #: templates/ishtar/sheet_contextrecord.html:39 msgid "Interpretation" msgstr "" @@ -156,31 +156,31 @@ msgstr "" msgid "Comments on dating" msgstr "" -#: forms.py:295 models.py:199 +#: forms.py:295 models.py:200 msgid "Filling" msgstr "" -#: forms.py:299 models.py:220 +#: forms.py:299 models.py:221 msgid "Activity" msgstr "" -#: forms.py:301 models.py:218 +#: forms.py:301 models.py:219 msgid "Identification" msgstr "" -#: forms.py:303 models.py:203 +#: forms.py:303 models.py:204 msgid "TAQ" msgstr "" -#: forms.py:304 models.py:207 +#: forms.py:304 models.py:208 msgid "Estimated TAQ" msgstr "" -#: forms.py:306 models.py:210 +#: forms.py:306 models.py:211 msgid "TPQ" msgstr "" -#: forms.py:307 models.py:214 +#: forms.py:307 models.py:215 msgid "Estimated TPQ" msgstr "" @@ -228,23 +228,23 @@ msgstr "" msgid "You should select a document." msgstr "" -#: ishtar_menu.py:31 ishtar_menu.py:50 +#: ishtar_menu.py:32 ishtar_menu.py:51 msgid "Search" msgstr "" -#: ishtar_menu.py:35 ishtar_menu.py:55 +#: ishtar_menu.py:36 ishtar_menu.py:56 msgid "Creation" msgstr "" -#: ishtar_menu.py:39 ishtar_menu.py:61 +#: ishtar_menu.py:40 ishtar_menu.py:62 msgid "Modification" msgstr "" -#: ishtar_menu.py:43 ishtar_menu.py:67 +#: ishtar_menu.py:44 ishtar_menu.py:68 msgid "Deletion" msgstr "" -#: ishtar_menu.py:47 +#: ishtar_menu.py:48 msgid "Documentation" msgstr "" @@ -300,176 +300,180 @@ msgstr "" msgid "Identification Types" msgstr "" -#: models.py:133 models.py:457 +#: models.py:133 models.py:460 msgid "Periods" msgstr "" -#: models.py:161 -msgid "Parcel (town)" +#: models.py:134 +msgid "Town" msgstr "" #: models.py:162 +msgid "Parcel (town)" +msgstr "" + +#: models.py:163 msgid "Related context records" msgstr "" -#: models.py:164 +#: models.py:165 msgid "Parcel (external ID)" msgstr "" -#: models.py:165 +#: models.py:166 msgid "Datings (period)" msgstr "" -#: models.py:166 +#: models.py:167 msgid "Parcel (year)" msgstr "" -#: models.py:170 +#: models.py:171 msgid "External ID" msgstr "" -#: models.py:172 +#: models.py:173 msgid "External ID is set automatically" msgstr "" -#: models.py:180 +#: models.py:181 msgid "Date d'ouverture" msgstr "" -#: models.py:190 +#: models.py:191 msgid "A short description of the location of the context record" msgstr "" -#: models.py:193 +#: models.py:194 msgid "Comment on datings" msgstr "" -#: models.py:204 +#: models.py:205 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: models.py:208 +#: models.py:209 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: models.py:211 +#: models.py:212 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: models.py:215 +#: models.py:216 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: models.py:223 +#: models.py:224 msgid "Point" msgstr "" -#: models.py:224 +#: models.py:225 msgid "Polygon" msgstr "" -#: models.py:225 +#: models.py:226 msgid "Cached name" msgstr "" -#: models.py:229 models.py:230 templates/ishtar/sheet_contextrecord.html:4 +#: models.py:230 models.py:231 templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "" -#: models.py:232 +#: models.py:233 msgid "Can view all Context Records" msgstr "" -#: models.py:234 +#: models.py:235 msgid "Can view own Context Record" msgstr "" -#: models.py:236 +#: models.py:237 msgid "Can add own Context Record" msgstr "" -#: models.py:238 +#: models.py:239 msgid "Can change own Context Record" msgstr "" -#: models.py:240 +#: models.py:241 msgid "Can delete own Context Record" msgstr "" -#: models.py:250 +#: models.py:251 msgctxt "short" msgid "Context record" msgstr "" -#: models.py:387 +#: models.py:390 msgid "Inverse relation" msgstr "" -#: models.py:391 models.py:414 models.py:452 +#: models.py:394 models.py:417 models.py:455 msgid "Relation type" msgstr "" -#: models.py:392 +#: models.py:395 msgid "Relation types" msgstr "" -#: models.py:409 +#: models.py:412 msgid "ID (left)" msgstr "" -#: models.py:410 +#: models.py:413 msgid "Unit (left)" msgstr "" -#: models.py:411 +#: models.py:414 msgid "Parcel (left)" msgstr "" -#: models.py:412 +#: models.py:415 msgid "Description (left)" msgstr "" -#: models.py:413 +#: models.py:416 msgid "Periods (left)" msgstr "" -#: models.py:415 +#: models.py:418 msgid "ID (right)" msgstr "" -#: models.py:416 +#: models.py:419 msgid "Unit (right)" msgstr "" -#: models.py:417 +#: models.py:420 msgid "Parcel (right)" msgstr "" -#: models.py:418 +#: models.py:421 msgid "Description (right)" msgstr "" -#: models.py:419 +#: models.py:422 msgid "Periods (right)" msgstr "" -#: models.py:428 +#: models.py:431 msgid "Record relation" msgstr "" -#: models.py:429 +#: models.py:432 msgid "Record relations" msgstr "" -#: models.py:511 +#: models.py:515 msgid "Context record documentation" msgstr "" -#: models.py:512 +#: models.py:516 msgid "Context record documentations" msgstr "" diff --git a/archaeological_context_records/migrations/0028_auto__chg_field_contextrecord_location__chg_field_historicalcontextrec.py b/archaeological_context_records/migrations/0028_auto__chg_field_contextrecord_location__chg_field_historicalcontextrec.py new file mode 100644 index 000000000..ef2c330cb --- /dev/null +++ b/archaeological_context_records/migrations/0028_auto__chg_field_contextrecord_location__chg_field_historicalcontextrec.py @@ -0,0 +1,655 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Changing field 'ContextRecord.location' + db.alter_column('archaeological_context_records_contextrecord', 'location', self.gf('django.db.models.fields.TextField')(null=True)) + + # Changing field 'HistoricalContextRecord.location' + db.alter_column('archaeological_context_records_historicalcontextrecord', 'location', self.gf('django.db.models.fields.TextField')(null=True)) + + def backwards(self, orm): + + # Changing field 'ContextRecord.location' + db.alter_column('archaeological_context_records_contextrecord', 'location', self.gf('django.db.models.fields.CharField')(max_length=200, null=True)) + + # Changing field 'HistoricalContextRecord.location' + db.alter_column('archaeological_context_records_historicalcontextrecord', 'location', self.gf('django.db.models.fields.CharField')(max_length=200, null=True)) + + models = { + 'archaeological_context_records.activitytype': { + 'Meta': {'ordering': "('order',)", 'object_name': 'ActivityType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.contextrecord': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'ContextRecord'}, + 'activity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.ActivityType']", 'null': 'True', 'blank': 'True'}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'closing_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'datings': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_context_records.Dating']", 'symmetrical': 'False'}), + 'datings_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'depth': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'filling': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'has_furniture': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'identification': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.IdentificationType']", 'null': 'True', 'blank': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_context_records_contextrecord'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'interpretation': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'length': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'location': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'opening_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'operation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'context_record'", 'to': "orm['archaeological_operations.Operation']"}), + 'parcel': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'context_record'", 'to': "orm['archaeological_operations.Parcel']"}), + 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'dim': '3', 'null': 'True', 'blank': 'True'}), + 'polygon': ('django.contrib.gis.db.models.fields.PolygonField', [], {'null': 'True', 'blank': 'True'}), + 'related_context_records': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_context_records.ContextRecord']", 'null': 'True', 'through': "orm['archaeological_context_records.RecordRelations']", 'blank': 'True'}), + 'taq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'taq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'thickness': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'tpq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'tpq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'unit': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_context_records.Unit']"}), + 'width': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_context_records.contextrecordsource': { + 'Meta': {'object_name': 'ContextRecordSource'}, + 'additional_information': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + '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['ishtar_common.Author']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + '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'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'duplicate': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '12', 'null': 'True', 'blank': 'True'}), + 'format_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Format']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'item_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'receipt_date_in_documentation': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'scale': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}), + 'support_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SupportType']", 'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}) + }, + 'archaeological_context_records.dating': { + 'Meta': {'object_name': 'Dating'}, + 'dating_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.DatingType']", 'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'period': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Period']"}), + 'precise_dating': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'quality': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.DatingQuality']", 'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_context_records.datingquality': { + 'Meta': {'ordering': "('label',)", 'object_name': 'DatingQuality'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.datingtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'DatingType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.historicalcontextrecord': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalContextRecord'}, + 'activity_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'closing_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'datings_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'depth': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'filling': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'has_furniture': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'identification_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'interpretation': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'length': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'location': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'opening_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'operation_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'parcel_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'dim': '3', 'null': 'True', 'blank': 'True'}), + 'polygon': ('django.contrib.gis.db.models.fields.PolygonField', [], {'null': 'True', 'blank': 'True'}), + 'taq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'taq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'thickness': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'tpq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'tpq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'unit_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'width': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_context_records.identificationtype': { + 'Meta': {'ordering': "('order', 'label')", 'object_name': 'IdentificationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.recordrelations': { + 'Meta': {'object_name': 'RecordRelations'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'left_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'right_relations'", 'to': "orm['archaeological_context_records.ContextRecord']"}), + 'relation_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.RelationType']"}), + 'right_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'left_relations'", 'to': "orm['archaeological_context_records.ContextRecord']"}) + }, + 'archaeological_context_records.recordrelationview': { + 'Meta': {'unique_together': "(('id', 'right_record'),)", 'object_name': 'RecordRelationView', 'db_table': "'record_relations'", 'managed': 'False'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'left_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'on_delete': 'models.DO_NOTHING', 'to': "orm['archaeological_context_records.ContextRecord']"}), + 'relation_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'on_delete': 'models.DO_NOTHING', 'to': "orm['archaeological_context_records.RelationType']"}), + 'right_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'on_delete': 'models.DO_NOTHING', 'to': "orm['archaeological_context_records.ContextRecord']"}) + }, + 'archaeological_context_records.relationtype': { + 'Meta': {'ordering': "('order', 'label')", 'object_name': 'RelationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'inverse_relation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.RelationType']", 'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'symmetrical': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'tiny_label': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.unit': { + 'Meta': {'ordering': "('order',)", 'object_name': 'Unit'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.Unit']", 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_files.file': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'File'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'cira_advised': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'classified_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'corporation_general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'general_contractor_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today', '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'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '120', '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': "'general_contractor_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imported_line': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_files_file'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'instruction_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True', 'blank': 'True'}), + 'locality': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'main_town': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_main'", 'null': 'True', 'to': "orm['ishtar_common.Town']"}), + '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.TextField', [], {'null': 'True', 'blank': 'True'}), + 'numeric_reference': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'permit_reference': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'permit_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.PermitType']", 'null': 'True', 'blank': 'True'}), + 'planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'planning_service_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'protected_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'raw_general_contractor': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'raw_town_planning_service': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'reception_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + '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['ishtar_common.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': "'responsible_town_planning_service_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', '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': "'scientist'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'total_developed_surface': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'total_surface': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'file'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_files.filetype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'FileType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_files.permittype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'PermitType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_files.saisinetype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'SaisineType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'delay': ('django.db.models.fields.IntegerField', [], {'default': '30'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_operations.archaeologicalsite': { + 'Meta': {'object_name': 'ArchaeologicalSite'}, + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_archaeologicalsite'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'periods': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}), + 'remains': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.RemainType']", 'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.operation': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'Operation'}, + 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'archaeological_sites': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.ArchaeologicalSite']", 'null': 'True', 'blank': 'True'}), + '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': "'cira_rapporteur'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'code_patriarche': ('django.db.models.fields.IntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'common_name': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), + 'documentation_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'documentation_received': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'eas_number': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), + 'effective_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'excavation_end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'finds_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'finds_received': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'fnap_cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'fnap_financing': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'geoarchaeological_context_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_operation'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'large_area_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'multi_polygon': ('django.contrib.gis.db.models.fields.MultiPolygonField', [], {'null': 'True', 'blank': 'True'}), + 'negative_result': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'old_code': ('django.db.models.fields.CharField', [], {'max_length': '200', '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['ishtar_common.OperationType']"}), + 'operator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operator'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + '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', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}), + 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'null': 'True', 'blank': 'True'}), + 'record_quality': ('django.db.models.fields.CharField', [], {'max_length': '2', 'null': 'True', 'blank': 'True'}), + 'remains': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.RemainType']", 'null': 'True', 'blank': 'True'}), + 'report_delivery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'report_processing': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.ReportState']", 'null': 'True', 'blank': 'True'}), + 'scheduled_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'scientific_documentation_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_scientist_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', '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'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'operations'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}), + 'virtual_operation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'zoning_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.parcel': { + 'Meta': {'ordering': "('year', 'section', 'parcel_number')", 'object_name': 'Parcel'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parcels'", 'null': 'True', 'to': "orm['archaeological_files.File']"}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_parcel'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + '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', 'null': 'True', 'blank': 'True'}), + 'public_domain': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'section': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}), + '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': { + 'Meta': {'ordering': "('order',)", 'object_name': 'Period'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.IntegerField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_operations.remaintype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'RemainType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_operations.reportstate': { + 'Meta': {'ordering': "('order',)", 'object_name': 'ReportState'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'ishtar_common.arrondissement': { + 'Meta': {'object_name': 'Arrondissement'}, + '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'}) + }, + 'ishtar_common.author': { + 'Meta': {'object_name': 'Author'}, + '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['ishtar_common.Person']"}) + }, + 'ishtar_common.authortype': { + 'Meta': {'object_name': 'AuthorType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.canton': { + 'Meta': {'object_name': 'Canton'}, + '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'}) + }, + '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'}), + 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.State']", 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.format': { + 'Meta': {'object_name': 'Format'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.import': { + 'Meta': {'object_name': 'Import'}, + 'conservative_import': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'encoding': ('django.db.models.fields.CharField', [], {'default': "'utf-8'", 'max_length': '15'}), + 'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'error_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imported_file': ('django.db.models.fields.files.FileField', [], {'max_length': '220'}), + 'imported_images': ('django.db.models.fields.files.FileField', [], {'max_length': '220', 'null': 'True', 'blank': 'True'}), + 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.ImporterType']"}), + 'match_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'result_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'seconds_remaining': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'skip_lines': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'state': ('django.db.models.fields.CharField', [], {'default': "'C'", 'max_length': '2'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']"}) + }, + 'ishtar_common.importertype': { + 'Meta': {'object_name': 'ImporterType'}, + 'associated_models': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'description': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_template': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'unicity_keys': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'users': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.ishtaruser': { + 'Meta': {'object_name': 'IshtarUser', '_ormbases': ['auth.User']}, + 'advanced_shortcut_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ishtaruser'", 'unique': 'True', 'to': "orm['ishtar_common.Person']"}), + 'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}) + }, + 'ishtar_common.operationtype': { + 'Meta': {'ordering': "['-preventive', 'order', 'label']", 'object_name': 'OperationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'preventive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + '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'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_organization'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}), + 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + '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'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.organizationtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'OrganizationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + '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'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'contact_type': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_person'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'old_title': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + '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'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_name': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'salutation': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'surname': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.TitleType']", 'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.persontype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'PersonType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.sourcetype': { + 'Meta': {'object_name': 'SourceType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.state': { + 'Meta': {'ordering': "['number']", 'object_name': 'State'}, + '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'}) + }, + 'ishtar_common.supporttype': { + 'Meta': {'object_name': 'SupportType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.titletype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'TitleType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.town': { + 'Meta': {'ordering': "['numero_insee']", 'object_name': 'Town'}, + '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['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_town'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'numero_insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '6'}), + 'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['archaeological_context_records']
\ No newline at end of file diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index cd0dd4268..75074c514 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -186,8 +186,8 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, thickness = models.FloatField(_(u"Thickness (m)"), blank=True, null=True) depth = models.FloatField(_(u"Depth (m)"), blank=True, null=True) - location = models.CharField( - _(u"Location"), blank=True, null=True, max_length=200, + location = models.TextField( + _(u"Location"), blank=True, null=True, help_text=_(u"A short description of the location of the context " u"record")) datings = models.ManyToManyField(Dating) diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot index b3e38bacf..111ba45c4 100644 --- a/archaeological_files/locale/django.pot +++ b/archaeological_files/locale/django.pot @@ -25,7 +25,7 @@ msgstr "" msgid "Parcel (section/number/public domain)" msgstr "" -#: forms.py:55 forms.py:407 forms.py:434 models.py:546 +#: forms.py:55 forms.py:407 forms.py:434 models.py:553 msgid "Department" msgstr "" @@ -253,43 +253,43 @@ msgstr "" msgid "Archaeological file" msgstr "" -#: ishtar_menu.py:37 ishtar_menu.py:60 +#: ishtar_menu.py:38 ishtar_menu.py:61 msgid "Search" msgstr "" -#: ishtar_menu.py:41 ishtar_menu.py:64 +#: ishtar_menu.py:42 ishtar_menu.py:65 msgid "Creation" msgstr "" -#: ishtar_menu.py:45 ishtar_menu.py:68 +#: ishtar_menu.py:46 ishtar_menu.py:69 msgid "Modification" msgstr "" -#: ishtar_menu.py:49 +#: ishtar_menu.py:50 msgid "Closing" msgstr "" -#: ishtar_menu.py:53 ishtar_menu.py:72 +#: ishtar_menu.py:54 ishtar_menu.py:73 msgid "Deletion" msgstr "" -#: ishtar_menu.py:57 +#: ishtar_menu.py:58 msgid "Administrative act" msgstr "" -#: ishtar_menu.py:76 +#: ishtar_menu.py:77 msgid "Documents" msgstr "" -#: ishtar_menu.py:82 +#: ishtar_menu.py:83 msgid "Dashboard" msgstr "" -#: ishtar_menu.py:84 +#: ishtar_menu.py:86 msgid "General informations" msgstr "" -#: ishtar_menu.py:87 models.py:221 +#: ishtar_menu.py:89 models.py:221 #: templates/ishtar/dashboards/dashboard_file.html:7 msgid "Archaeological files" msgstr "" @@ -406,15 +406,15 @@ msgstr "" msgid "FILE" msgstr "" -#: models.py:406 +#: models.py:413 msgid "Multi-town" msgstr "" -#: models.py:412 +#: models.py:419 msgid "No town" msgstr "" -#: models.py:545 +#: models.py:552 msgid "File" msgstr "" diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 3558b0346..7688b2340 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -129,6 +129,7 @@ class FindForm(ManageOldType, forms.Form): 'object_type': models.ObjectType, 'preservation_to_consider': models.PreservationType, 'integritie': models.IntegrityType, + 'get_first_base_find__batch': models.BatchType, 'remarkabilitie': models.RemarkabilityType, 'get_first_base_find__spatial_reference_system': SpatialReferenceSystem} @@ -139,7 +140,7 @@ class FindForm(ManageOldType, forms.Form): description = forms.CharField(label=_("Description"), widget=forms.Textarea, required=False) get_first_base_find__batch = forms.ChoiceField( - label=_(u"Batch/object"), choices=models.IS_ISOLATED_CHOICES, + label=_(u"Batch/object"), choices=[], required=False) is_complete = forms.NullBooleanField(label=_(u"Is complete?"), required=False) @@ -225,11 +226,19 @@ class FindForm(ManageOldType, forms.Form): SpatialReferenceSystem.get_help() self.fields['checked'].choices = models.CHECK_CHOICES self.fields['material_type'].help_text = models.MaterialType.get_help() + + self.fields['get_first_base_find__batch'].choices = \ + models.BatchType.get_types( + initial=self.init_data.get('get_first_base_find__batch')) + self.fields['get_first_base_find__batch'].help_text = \ + models.BatchType.get_help() + self.fields['conservatory_state'].choices = \ models.ConservatoryState.get_types( initial=self.init_data.get('conservatory_state')) self.fields['conservatory_state'].help_text = \ models.ConservatoryState.get_help() + self.fields['preservation_to_consider'].choices = \ models.PreservationType.get_types( empty_first=False, @@ -352,8 +361,7 @@ class FindSelect(TableSelect): choices=[]) base_finds__find__description = forms.CharField(label=_(u"Description")) base_finds__batch = forms.ChoiceField( - label=_(u"Batch/object"), - choices=[('', '--')] + list(models.IS_ISOLATED_CHOICES)) + label=_(u"Batch/object"), choices=[]) checked = forms.ChoiceField(label=_("Check")) image = forms.NullBooleanField(label=_(u"Has an image?")) @@ -369,6 +377,12 @@ class FindSelect(TableSelect): models.ConservatoryState.get_types() self.fields['conservatory_state'].help_text = \ models.ConservatoryState.get_help() + + self.fields['base_finds__batch'].choices = \ + models.BatchType.get_types() + self.fields['base_finds__batch'].help_text = \ + models.BatchType.get_help() + self.fields['object_types'].choices = \ models.ObjectType.get_types() self.fields['checked'].choices = \ diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index 9dc6a44d0..819cf38bf 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -4,6 +4,7 @@ # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015. # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" @@ -11,351 +12,351 @@ msgstr "" msgid "Context record" msgstr "" -#: forms.py:123 ishtar_menu.py:32 models_finds.py:480 models_finds.py:805 -#: models_finds.py:814 models_treatments.py:277 +#: forms.py:123 ishtar_menu.py:32 models_finds.py:484 models_finds.py:819 +#: models_finds.py:828 models_treatments.py:279 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "" -#: forms.py:136 forms.py:321 forms.py:545 models_finds.py:127 -#: models_finds.py:411 +#: forms.py:137 forms.py:330 forms.py:559 models_finds.py:130 +#: models_finds.py:415 msgid "Free ID" msgstr "" -#: forms.py:138 models_finds.py:463 +#: forms.py:139 models_finds.py:467 msgid "Previous ID" msgstr "" -#: forms.py:139 forms.py:353 forms_treatments.py:134 models_finds.py:131 -#: models_finds.py:412 models_treatments.py:123 +#: forms.py:140 forms.py:362 forms_treatments.py:134 models_finds.py:134 +#: models_finds.py:416 models_treatments.py:125 msgid "Description" msgstr "" -#: forms.py:142 forms.py:355 models_finds.py:140 +#: forms.py:143 forms.py:364 models_finds.py:143 msgid "Batch/object" msgstr "" -#: forms.py:144 models_finds.py:440 +#: forms.py:145 models_finds.py:444 msgid "Is complete?" msgstr "" -#: forms.py:147 forms.py:343 forms.py:549 models_finds.py:50 +#: forms.py:148 forms.py:352 forms.py:563 models_finds.py:50 msgid "Material type" msgstr "" -#: forms.py:148 forms.py:347 models_finds.py:62 models_finds.py:416 +#: forms.py:149 forms.py:356 models_finds.py:62 models_finds.py:420 msgid "Conservatory state" msgstr "" -#: forms.py:151 models_finds.py:418 +#: forms.py:152 models_finds.py:422 msgid "Conservatory comment" msgstr "" -#: forms.py:154 models_finds.py:102 models_finds.py:443 +#: forms.py:155 models_finds.py:112 models_finds.py:447 msgid "Object types" msgstr "" -#: forms.py:156 forms.py:346 models_finds.py:71 +#: forms.py:157 forms.py:355 models_finds.py:71 msgid "Preservation type" msgstr "" -#: forms.py:159 forms.py:349 models_finds.py:445 +#: forms.py:160 forms.py:358 models_finds.py:449 msgid "Integrity / interest" msgstr "" -#: forms.py:162 forms.py:351 models_finds.py:448 +#: forms.py:163 forms.py:360 models_finds.py:452 msgid "Remarkability" msgstr "" -#: forms.py:165 models_finds.py:145 +#: forms.py:166 models_finds.py:148 msgid "Point of topographic reference" msgstr "" -#: forms.py:168 models_finds.py:147 +#: forms.py:169 models_finds.py:150 msgid "X" msgstr "" -#: forms.py:170 models_finds.py:150 -msgid "Estimated error for X" +#: forms.py:170 models_finds.py:151 +msgid "Y" msgstr "" -#: forms.py:171 models_finds.py:148 -msgid "Y" +#: forms.py:171 models_finds.py:152 +msgid "Z" msgstr "" -#: forms.py:173 models_finds.py:152 -msgid "Estimated error for Y" +#: forms.py:173 models_finds.py:160 +msgid "Spatial Reference System" msgstr "" -#: forms.py:174 models_finds.py:149 -msgid "Z" +#: forms.py:176 models_finds.py:153 +msgid "Estimated error for X" msgstr "" -#: forms.py:176 models_finds.py:154 -msgid "Estimated error for Z" +#: forms.py:178 models_finds.py:155 +msgid "Estimated error for Y" msgstr "" -#: forms.py:178 models_finds.py:157 -msgid "Spatial Reference System" +#: forms.py:180 models_finds.py:157 +msgid "Estimated error for Z" msgstr "" -#: forms.py:180 models_finds.py:452 +#: forms.py:181 models_finds.py:456 msgid "Length (cm)" msgstr "" -#: forms.py:181 models_finds.py:453 +#: forms.py:182 models_finds.py:457 msgid "Width (cm)" msgstr "" -#: forms.py:182 models_finds.py:454 +#: forms.py:183 models_finds.py:458 msgid "Height (cm)" msgstr "" -#: forms.py:183 models_finds.py:455 +#: forms.py:184 models_finds.py:459 msgid "Diameter (cm)" msgstr "" -#: forms.py:184 models_finds.py:456 +#: forms.py:185 models_finds.py:460 msgid "Thickness (cm)" msgstr "" -#: forms.py:185 forms.py:550 models_finds.py:423 +#: forms.py:186 forms.py:564 models_finds.py:427 msgid "Volume (l)" msgstr "" -#: forms.py:186 forms.py:551 models_finds.py:424 +#: forms.py:187 forms.py:565 models_finds.py:428 msgid "Weight (g)" msgstr "" -#: forms.py:188 models_finds.py:457 +#: forms.py:189 models_finds.py:461 msgid "Dimensions comment" msgstr "" -#: forms.py:189 forms.py:552 models_finds.py:427 +#: forms.py:190 forms.py:566 models_finds.py:431 msgid "Find number" msgstr "" -#: forms.py:191 models_finds.py:451 +#: forms.py:192 models_finds.py:455 msgid "Minimum number of individuals (MNI)" msgstr "" -#: forms.py:192 models_finds.py:459 +#: forms.py:193 models_finds.py:463 msgid "Mark" msgstr "" -#: forms.py:193 forms.py:357 models_finds.py:465 +#: forms.py:194 forms.py:365 models_finds.py:469 msgid "Check" msgstr "" -#: forms.py:195 models_finds.py:467 +#: forms.py:196 models_finds.py:471 msgid "Check date" msgstr "" -#: forms.py:196 forms_treatments.py:132 forms_treatments.py:434 -#: models_finds.py:132 models_finds.py:460 models_treatments.py:122 -#: models_treatments.py:484 +#: forms.py:197 forms_treatments.py:132 forms_treatments.py:434 +#: models_finds.py:135 models_finds.py:464 models_treatments.py:124 +#: models_treatments.py:492 msgid "Comment" msgstr "" -#: forms.py:199 models_finds.py:461 +#: forms.py:200 models_finds.py:465 msgid "Comment on dating" msgstr "" -#: forms.py:200 models_finds.py:469 +#: forms.py:201 models_finds.py:473 msgid "Estimated value" msgstr "" -#: forms.py:202 forms_treatments.py:151 +#: forms.py:203 forms_treatments.py:151 msgid "Image" msgstr "" -#: forms.py:203 forms_treatments.py:152 +#: forms.py:204 forms_treatments.py:152 #, python-format msgid "" "<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</" "p>" msgstr "" -#: forms.py:269 +#: forms.py:278 msgid "You should at least provide X, Y and the spatial reference system used." msgstr "" -#: forms.py:278 +#: forms.py:287 msgid "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" -#: forms.py:284 forms.py:315 models_finds.py:435 +#: forms.py:293 forms.py:324 models_finds.py:439 msgid "Dating" msgstr "" -#: forms.py:289 forms.py:341 +#: forms.py:298 forms.py:350 msgid "Period" msgstr "" -#: forms.py:290 forms_treatments.py:138 forms_treatments.py:436 -#: models_finds.py:819 models_treatments.py:125 models_treatments.py:288 +#: forms.py:299 forms_treatments.py:138 forms_treatments.py:436 +#: models_finds.py:833 models_treatments.py:127 models_treatments.py:290 #: templates/ishtar/sheet_find.html:101 templates/ishtar/sheet_find.html:141 msgid "Start date" msgstr "" -#: forms.py:292 models_finds.py:820 models_treatments.py:289 +#: forms.py:301 models_finds.py:834 models_treatments.py:291 #: templates/ishtar/sheet_find.html:102 templates/ishtar/sheet_find.html:142 msgid "End date" msgstr "" -#: forms.py:293 +#: forms.py:302 msgid "Quality" msgstr "" -#: forms.py:295 +#: forms.py:304 msgid "Dating type" msgstr "" -#: forms.py:297 +#: forms.py:306 msgid "Precise dating" msgstr "" -#: forms.py:319 models_finds.py:164 +#: forms.py:328 models_finds.py:167 msgid "Short ID" msgstr "" -#: forms.py:320 models_finds.py:167 +#: forms.py:329 models_finds.py:170 msgid "Complete ID" msgstr "" -#: forms.py:324 forms_treatments.py:54 forms_treatments.py:96 +#: forms.py:333 forms_treatments.py:54 forms_treatments.py:96 #: forms_treatments.py:284 forms_treatments.py:356 forms_treatments.py:406 -#: forms_treatments.py:489 models_treatments.py:98 models_treatments.py:456 +#: forms_treatments.py:489 models_treatments.py:100 models_treatments.py:464 msgid "Year" msgstr "" -#: forms.py:326 +#: forms.py:335 msgid "Operation's number (index by year)" msgstr "" -#: forms.py:329 +#: forms.py:338 msgid "Code PATRIARCHE" msgstr "" -#: forms.py:333 +#: forms.py:342 msgid "Archaeological site" msgstr "" -#: forms.py:339 +#: forms.py:348 msgid "Search within related operations" msgstr "" -#: forms.py:344 models_finds.py:101 +#: forms.py:353 models_finds.py:111 msgid "Object type" msgstr "" -#: forms.py:358 forms_treatments.py:57 +#: forms.py:366 forms_treatments.py:57 msgid "Has an image?" msgstr "" -#: forms.py:400 forms.py:413 views.py:129 +#: forms.py:414 forms.py:427 views.py:130 msgid "Find search" msgstr "" -#: forms.py:427 templates/ishtar/sheet_treatment.html:46 +#: forms.py:441 templates/ishtar/sheet_treatment.html:46 msgid "Upstream finds" msgstr "" -#: forms.py:429 models_finds.py:481 +#: forms.py:443 models_finds.py:485 msgid "Finds" msgstr "" -#: forms.py:439 +#: forms.py:453 msgid "You should at least select one archaeological find." msgstr "" -#: forms.py:542 +#: forms.py:556 msgid "Resulting find" msgstr "" -#: forms.py:547 +#: forms.py:561 msgid "Precise description" msgstr "" -#: forms.py:562 +#: forms.py:576 msgid "Resulting finds" msgstr "" -#: forms.py:567 +#: forms.py:581 msgid "Would you like to delete this find?" msgstr "" -#: forms.py:571 models_treatments.py:90 +#: forms.py:585 models_treatments.py:90 msgid "Upstream find" msgstr "" -#: forms.py:584 +#: forms.py:598 msgid "Archaeological find search" msgstr "" -#: forms.py:586 +#: forms.py:600 msgid "You should select an archaeological find." msgstr "" -#: forms.py:591 +#: forms.py:605 msgid "Year of the operation" msgstr "" -#: forms.py:593 +#: forms.py:607 msgid "Numeric reference" msgstr "" -#: forms.py:600 +#: forms.py:614 msgid "Period of the archaeological find" msgstr "" -#: forms.py:602 +#: forms.py:616 msgid "Material type of the archaeological find" msgstr "" -#: forms.py:604 +#: forms.py:618 msgid "Description of the archaeological find" msgstr "" -#: forms.py:616 forms_treatments.py:590 forms_treatments.py:616 +#: forms.py:630 forms_treatments.py:590 forms_treatments.py:616 msgid "Documentation search" msgstr "" -#: forms.py:618 forms_treatments.py:592 forms_treatments.py:618 +#: forms.py:632 forms_treatments.py:592 forms_treatments.py:618 msgid "You should select a document." msgstr "" -#: forms.py:635 +#: forms.py:649 msgid "Another basket already exists with this name." msgstr "" -#: forms.py:645 forms.py:649 forms_treatments.py:175 ishtar_menu.py:56 +#: forms.py:659 forms.py:663 forms_treatments.py:175 ishtar_menu.py:57 msgid "Basket" msgstr "" -#: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:94 +#: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:96 #: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:136 msgid "Label" msgstr "" -#: forms_treatments.py:53 forms_treatments.py:95 models_treatments.py:96 +#: forms_treatments.py:53 forms_treatments.py:95 models_treatments.py:98 msgid "Other ref." msgstr "" #: forms_treatments.py:55 forms_treatments.py:237 forms_treatments.py:285 #: forms_treatments.py:348 forms_treatments.py:357 forms_treatments.py:459 -#: forms_treatments.py:490 forms_treatments.py:557 models_treatments.py:100 -#: models_treatments.py:458 +#: forms_treatments.py:490 forms_treatments.py:557 models_treatments.py:102 +#: models_treatments.py:466 msgid "Index" msgstr "" #: forms_treatments.py:56 forms_treatments.py:101 forms_treatments.py:301 -#: forms_treatments.py:578 models_treatments.py:56 models_treatments.py:105 -#: models_treatments.py:287 +#: forms_treatments.py:578 models_treatments.py:56 models_treatments.py:107 +#: models_treatments.py:289 msgid "Treatment type" msgstr "" -#: forms_treatments.py:68 forms_treatments.py:560 views.py:359 +#: forms_treatments.py:68 forms_treatments.py:560 views.py:360 msgid "Treatment search" msgstr "" @@ -363,7 +364,7 @@ msgstr "" msgid "Base treatment" msgstr "" -#: forms_treatments.py:103 models_treatments.py:107 +#: forms_treatments.py:103 models_treatments.py:109 msgid "State" msgstr "" @@ -371,15 +372,15 @@ msgstr "" msgid "Target" msgstr "" -#: forms_treatments.py:107 forms_treatments.py:417 models_treatments.py:115 +#: forms_treatments.py:107 forms_treatments.py:417 models_treatments.py:117 msgid "Responsible" msgstr "" -#: forms_treatments.py:113 models_treatments.py:118 +#: forms_treatments.py:113 models_treatments.py:120 msgid "Organization" msgstr "" -#: forms_treatments.py:119 models_treatments.py:110 models_treatments.py:290 +#: forms_treatments.py:119 models_treatments.py:112 models_treatments.py:292 msgid "Location" msgstr "" @@ -391,12 +392,12 @@ msgstr "" msgid "External ref." msgstr "" -#: forms_treatments.py:136 models_treatments.py:124 +#: forms_treatments.py:136 models_treatments.py:126 msgid "Goal" msgstr "" -#: forms_treatments.py:140 forms_treatments.py:442 models_treatments.py:126 -#: models_treatments.py:478 +#: forms_treatments.py:140 forms_treatments.py:442 models_treatments.py:128 +#: models_treatments.py:486 msgid "Closing date" msgstr "" @@ -442,12 +443,12 @@ msgstr "" msgid "Another treatment with this index exists for {}." msgstr "" -#: forms_treatments.py:262 models_treatments.py:103 +#: forms_treatments.py:262 models_treatments.py:105 msgid "Associated request" msgstr "" -#: forms_treatments.py:266 forms_treatments.py:397 ishtar_menu.py:107 -#: models_treatments.py:489 models_treatments.py:511 models_treatments.py:572 +#: forms_treatments.py:266 forms_treatments.py:397 ishtar_menu.py:108 +#: models_treatments.py:497 models_treatments.py:519 models_treatments.py:581 #: wizards.py:183 templates/ishtar/sheet_treatmentfile.html:5 msgid "Treatment request" msgstr "" @@ -471,7 +472,7 @@ msgstr "" msgid "Indexed?" msgstr "" -#: forms_treatments.py:288 forms_treatments.py:493 models_finds.py:120 +#: forms_treatments.py:288 forms_treatments.py:493 msgid "Object" msgstr "" @@ -503,7 +504,7 @@ msgstr "" msgid "Modified by" msgstr "" -#: forms_treatments.py:354 forms_treatments.py:404 models_treatments.py:463 +#: forms_treatments.py:354 forms_treatments.py:404 models_treatments.py:471 msgid "Name" msgstr "" @@ -513,7 +514,7 @@ msgstr "" #: forms_treatments.py:358 forms_treatments.py:415 #: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:137 -#: templates/ishtar/sheet_find.html:229 +#: templates/ishtar/sheet_find.html:227 msgid "Type" msgstr "" @@ -521,21 +522,21 @@ msgstr "" msgid "In charge" msgstr "" -#: forms_treatments.py:366 forms_treatments.py:423 models_treatments.py:472 +#: forms_treatments.py:366 forms_treatments.py:423 models_treatments.py:480 #: templates/ishtar/sheet_treatmentfile.html:31 msgid "Applicant" msgstr "" -#: forms_treatments.py:372 forms_treatments.py:429 models_treatments.py:476 +#: forms_treatments.py:372 forms_treatments.py:429 models_treatments.py:484 #: templates/ishtar/sheet_treatmentfile.html:38 msgid "Applicant organisation" msgstr "" -#: forms_treatments.py:385 forms_treatments.py:565 views.py:463 +#: forms_treatments.py:385 forms_treatments.py:565 views.py:464 msgid "Treatment request search" msgstr "" -#: forms_treatments.py:439 models_treatments.py:482 +#: forms_treatments.py:439 models_treatments.py:490 msgid "Reception date" msgstr "" @@ -567,8 +568,8 @@ msgstr "" msgid "Treatment request internal reference" msgstr "" -#: forms_treatments.py:508 forms_treatments.py:604 models_treatments.py:441 -#: models_treatments.py:465 +#: forms_treatments.py:508 forms_treatments.py:604 models_treatments.py:449 +#: models_treatments.py:473 msgid "Treatment request type" msgstr "" @@ -580,55 +581,55 @@ msgstr "" msgid "You should select a treatment request." msgstr "" -#: ishtar_menu.py:36 ishtar_menu.py:79 ishtar_menu.py:111 ishtar_menu.py:134 -#: ishtar_menu.py:158 ishtar_menu.py:190 ishtar_menu.py:214 ishtar_menu.py:238 +#: ishtar_menu.py:37 ishtar_menu.py:80 ishtar_menu.py:113 ishtar_menu.py:136 +#: ishtar_menu.py:160 ishtar_menu.py:193 ishtar_menu.py:217 ishtar_menu.py:241 msgid "Search" msgstr "" -#: ishtar_menu.py:41 ishtar_menu.py:59 ishtar_menu.py:84 ishtar_menu.py:116 -#: ishtar_menu.py:138 ishtar_menu.py:163 ishtar_menu.py:195 ishtar_menu.py:218 -#: ishtar_menu.py:243 +#: ishtar_menu.py:42 ishtar_menu.py:60 ishtar_menu.py:85 ishtar_menu.py:118 +#: ishtar_menu.py:140 ishtar_menu.py:165 ishtar_menu.py:198 ishtar_menu.py:221 +#: ishtar_menu.py:246 msgid "Creation" msgstr "" -#: ishtar_menu.py:46 ishtar_menu.py:89 ishtar_menu.py:121 ishtar_menu.py:142 -#: ishtar_menu.py:168 ishtar_menu.py:200 ishtar_menu.py:223 ishtar_menu.py:248 +#: ishtar_menu.py:47 ishtar_menu.py:90 ishtar_menu.py:123 ishtar_menu.py:144 +#: ishtar_menu.py:170 ishtar_menu.py:203 ishtar_menu.py:226 ishtar_menu.py:251 msgid "Modification" msgstr "" -#: ishtar_menu.py:51 ishtar_menu.py:70 ishtar_menu.py:94 ishtar_menu.py:126 -#: ishtar_menu.py:145 ishtar_menu.py:173 ishtar_menu.py:205 ishtar_menu.py:226 -#: ishtar_menu.py:253 +#: ishtar_menu.py:52 ishtar_menu.py:71 ishtar_menu.py:95 ishtar_menu.py:128 +#: ishtar_menu.py:147 ishtar_menu.py:175 ishtar_menu.py:208 ishtar_menu.py:229 +#: ishtar_menu.py:256 msgid "Deletion" msgstr "" -#: ishtar_menu.py:64 +#: ishtar_menu.py:65 msgid "Manage items" msgstr "" -#: ishtar_menu.py:76 +#: ishtar_menu.py:77 msgid "Documentation" msgstr "" -#: ishtar_menu.py:131 ishtar_menu.py:211 models_finds.py:816 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:830 msgid "Administrative act" msgstr "" -#: ishtar_menu.py:149 ishtar_menu.py:230 templates/ishtar/sheet_find.html:224 -#: templates/ishtar/sheet_find.html:226 +#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:222 +#: templates/ishtar/sheet_find.html:224 msgid "Documents" msgstr "" -#: ishtar_menu.py:155 ishtar_menu.py:235 +#: ishtar_menu.py:157 ishtar_menu.py:238 msgid "Source" msgstr "" -#: ishtar_menu.py:183 models_treatments.py:143 models_treatments.py:279 -#: models_treatments.py:556 templates/ishtar/sheet_treatment.html:5 +#: ishtar_menu.py:185 models_treatments.py:145 models_treatments.py:281 +#: models_treatments.py:565 templates/ishtar/sheet_treatment.html:5 msgid "Treatment" msgstr "" -#: ishtar_menu.py:187 +#: ishtar_menu.py:190 msgid "Simple treatments" msgstr "" @@ -644,7 +645,7 @@ msgstr "" msgid "Parent material" msgstr "" -#: models_finds.py:51 models_finds.py:414 +#: models_finds.py:51 models_finds.py:418 msgid "Material types" msgstr "" @@ -676,218 +677,219 @@ msgstr "" msgid "Remarkability types" msgstr "" -#: models_finds.py:98 -msgid "Parent" +#: models_finds.py:97 models_finds.py:414 models_treatments.py:40 +#: models_treatments.py:285 +msgid "Order" msgstr "" -#: models_finds.py:119 -msgid "Unknow" +#: models_finds.py:99 +msgid "Batch type" msgstr "" -#: models_finds.py:121 -msgid "Batch" +#: models_finds.py:100 +msgid "Batch types" msgstr "" -#: models_finds.py:128 models_finds.py:407 models_treatments.py:120 -#: models_treatments.py:461 +#: models_finds.py:108 +msgid "Parent" +msgstr "" + +#: models_finds.py:131 models_finds.py:411 models_treatments.py:122 +#: models_treatments.py:469 msgid "External ID" msgstr "" -#: models_finds.py:130 models_finds.py:409 +#: models_finds.py:133 models_finds.py:413 msgid "External ID is set automatically" msgstr "" -#: models_finds.py:133 +#: models_finds.py:136 msgid "Special interest" msgstr "" -#: models_finds.py:137 +#: models_finds.py:140 msgid "Context Record" msgstr "" -#: models_finds.py:138 +#: models_finds.py:141 msgid "Discovery date" msgstr "" -#: models_finds.py:143 +#: models_finds.py:146 msgid "Material index" msgstr "" -#: models_finds.py:159 +#: models_finds.py:162 msgid "Point (2D)" msgstr "" -#: models_finds.py:160 +#: models_finds.py:163 msgid "Point" msgstr "" -#: models_finds.py:161 +#: models_finds.py:164 msgid "Line" msgstr "" -#: models_finds.py:162 +#: models_finds.py:165 msgid "Polygon" msgstr "" -#: models_finds.py:165 models_finds.py:168 +#: models_finds.py:168 models_finds.py:171 msgid "Cached value - do not edit" msgstr "" -#: models_finds.py:173 models_finds.py:405 +#: models_finds.py:176 models_finds.py:409 msgid "Base find" msgstr "" -#: models_finds.py:174 +#: models_finds.py:177 msgid "Base finds" msgstr "" -#: models_finds.py:176 +#: models_finds.py:179 msgid "Can view all Base finds" msgstr "" -#: models_finds.py:177 +#: models_finds.py:180 msgid "Can view own Base find" msgstr "" -#: models_finds.py:178 +#: models_finds.py:181 msgid "Can add own Base find" msgstr "" -#: models_finds.py:179 +#: models_finds.py:182 msgid "Can change own Base find" msgstr "" -#: models_finds.py:180 +#: models_finds.py:183 msgid "Can delete own Base find" msgstr "" -#: models_finds.py:293 +#: models_finds.py:296 msgid "g" msgstr "" -#: models_finds.py:294 +#: models_finds.py:297 msgid "kg" msgstr "" -#: models_finds.py:296 +#: models_finds.py:299 msgid "Not checked" msgstr "" -#: models_finds.py:297 +#: models_finds.py:300 msgid "Checked but incorrect" msgstr "" -#: models_finds.py:298 +#: models_finds.py:301 msgid "Checked and correct" msgstr "" -#: models_finds.py:332 +#: models_finds.py:335 msgid "Periods" msgstr "" -#: models_finds.py:333 models_finds.py:438 models_treatments.py:127 -#: models_treatments.py:291 templates/ishtar/sheet_find.html:100 +#: models_finds.py:336 models_finds.py:442 models_treatments.py:129 +#: models_treatments.py:293 templates/ishtar/sheet_find.html:100 #: templates/ishtar/sheet_find.html:140 msgid "Container" msgstr "" -#: models_finds.py:343 +#: models_finds.py:346 msgid "Base find - Short ID" msgstr "" -#: models_finds.py:344 +#: models_finds.py:347 msgid "Base find - Complete ID" msgstr "" -#: models_finds.py:345 +#: models_finds.py:348 msgid "Base find - Comment" msgstr "" -#: models_finds.py:346 +#: models_finds.py:349 msgid "Base find - Description" msgstr "" -#: models_finds.py:347 +#: models_finds.py:350 msgid "Base find - Topographic localisation" msgstr "" -#: models_finds.py:349 +#: models_finds.py:352 msgid "Base find - Special interest" msgstr "" -#: models_finds.py:350 +#: models_finds.py:353 msgid "Base find - Discovery date" msgstr "" -#: models_finds.py:410 models_treatments.py:40 models_treatments.py:283 -msgid "Order" -msgstr "" - -#: models_finds.py:421 +#: models_finds.py:425 msgid "Type of preservation to consider" msgstr "" -#: models_finds.py:425 +#: models_finds.py:429 msgid "Weight unit" msgstr "" -#: models_finds.py:431 templates/ishtar/sheet_find.html:89 +#: models_finds.py:435 templates/ishtar/sheet_find.html:89 msgid "Upstream treatment" msgstr "" -#: models_finds.py:434 templates/ishtar/sheet_find.html:129 +#: models_finds.py:438 templates/ishtar/sheet_find.html:129 msgid "Downstream treatment" msgstr "" -#: models_finds.py:472 +#: models_finds.py:476 msgid "Collection" msgstr "" -#: models_finds.py:474 models_treatments.py:139 models_treatments.py:485 +#: models_finds.py:478 models_treatments.py:141 models_treatments.py:493 msgid "Cached name" msgstr "" -#: models_finds.py:483 +#: models_finds.py:487 msgid "Can view all Finds" msgstr "" -#: models_finds.py:484 +#: models_finds.py:488 msgid "Can view own Find" msgstr "" -#: models_finds.py:485 +#: models_finds.py:489 msgid "Can add own Find" msgstr "" -#: models_finds.py:486 +#: models_finds.py:490 msgid "Can change own Find" msgstr "" -#: models_finds.py:487 +#: models_finds.py:491 msgid "Can delete own Find" msgstr "" -#: models_finds.py:493 +#: models_finds.py:497 msgid "FIND" msgstr "" -#: models_finds.py:803 +#: models_finds.py:817 msgid "Find documentation" msgstr "" -#: models_finds.py:804 +#: models_finds.py:818 msgid "Find documentations" msgstr "" -#: models_finds.py:817 +#: models_finds.py:831 msgid "Person" msgstr "" -#: models_finds.py:823 +#: models_finds.py:837 msgid "Property" msgstr "" -#: models_finds.py:824 +#: models_finds.py:838 msgid "Properties" msgstr "" @@ -931,246 +933,245 @@ msgstr "" msgid "Downstream find" msgstr "" -#: models_treatments.py:112 +#: models_treatments.py:114 msgid "Location where the treatment is done. Target warehouse for a move." msgstr "" -#: models_treatments.py:129 +#: models_treatments.py:131 msgid "Estimated cost" msgstr "" -#: models_treatments.py:131 +#: models_treatments.py:133 msgid "Quoted cost" msgstr "" -#: models_treatments.py:133 +#: models_treatments.py:135 msgid "Realized cost" msgstr "" -#: models_treatments.py:135 +#: models_treatments.py:137 msgid "Insurance cost" msgstr "" -#: models_treatments.py:137 +#: models_treatments.py:139 msgid "Target a basket" msgstr "" -#: models_treatments.py:144 templates/ishtar/sheet_find.html:86 +#: models_treatments.py:146 templates/ishtar/sheet_find.html:86 #: templates/ishtar/sheet_treatmentfile.html:45 msgid "Treatments" msgstr "" -#: models_treatments.py:147 +#: models_treatments.py:149 msgid "Can view all Treatments" msgstr "" -#: models_treatments.py:148 +#: models_treatments.py:150 msgid "Can view own Treatment" msgstr "" -#: models_treatments.py:149 +#: models_treatments.py:151 msgid "Can add own Treatment" msgstr "" -#: models_treatments.py:150 +#: models_treatments.py:152 msgid "Can change own Treatment" msgstr "" -#: models_treatments.py:151 +#: models_treatments.py:153 msgid "Can delete own Treatment" msgstr "" -#: models_treatments.py:163 +#: models_treatments.py:165 msgid "TREATMENT" msgstr "" -#: models_treatments.py:292 templates/ishtar/sheet_find.html:99 +#: models_treatments.py:294 templates/ishtar/sheet_find.html:99 #: templates/ishtar/sheet_find.html:139 msgid "Doer" msgstr "" -#: models_treatments.py:293 models_treatments.py:294 -#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:138 +#: models_treatments.py:295 models_treatments.py:296 msgid "Related finds" msgstr "" -#: models_treatments.py:430 +#: models_treatments.py:438 msgid "Is upstream" msgstr "" -#: models_treatments.py:442 +#: models_treatments.py:450 msgid "Treatment request types" msgstr "" -#: models_treatments.py:459 +#: models_treatments.py:467 msgid "Internal reference" msgstr "" -#: models_treatments.py:468 +#: models_treatments.py:476 msgid "Person in charge" msgstr "" -#: models_treatments.py:480 +#: models_treatments.py:488 msgid "Creation date" msgstr "" -#: models_treatments.py:490 +#: models_treatments.py:498 msgid "Treatment requests" msgstr "" -#: models_treatments.py:494 +#: models_treatments.py:502 msgid "Can view all Treatment requests" msgstr "" -#: models_treatments.py:496 +#: models_treatments.py:504 msgid "Can view own Treatment request" msgstr "" -#: models_treatments.py:498 +#: models_treatments.py:506 msgid "Can add own Treatment request" msgstr "" -#: models_treatments.py:500 +#: models_treatments.py:508 msgid "Can change own Treatment request" msgstr "" -#: models_treatments.py:502 +#: models_treatments.py:510 msgid "Can delete own Treatment request" msgstr "" -#: models_treatments.py:562 +#: models_treatments.py:571 msgid "Treatment documentation" msgstr "" -#: models_treatments.py:563 +#: models_treatments.py:572 msgid "Treament documentations" msgstr "" -#: models_treatments.py:579 +#: models_treatments.py:588 msgid "Treatment request documentation" msgstr "" -#: models_treatments.py:580 +#: models_treatments.py:589 msgid "Treatment request documentations" msgstr "" -#: views.py:124 +#: views.py:125 msgid "New find" msgstr "" -#: views.py:138 +#: views.py:139 msgid "Find modification" msgstr "" -#: views.py:153 +#: views.py:154 msgid "Find deletion" msgstr "" -#: views.py:158 +#: views.py:159 msgid "Find: source search" msgstr "" -#: views.py:166 +#: views.py:167 msgid "Find: new source" msgstr "" -#: views.py:174 +#: views.py:175 msgid "Find: source modification" msgstr "" -#: views.py:189 +#: views.py:190 msgid "Find: source deletion" msgstr "" -#: views.py:203 +#: views.py:204 msgid "New basket" msgstr "" -#: views.py:222 +#: views.py:223 msgid "Manage items in basket" msgstr "" -#: views.py:242 +#: views.py:243 msgid "Manage basket" msgstr "" -#: views.py:330 +#: views.py:331 msgid "Delete basket" msgstr "" -#: views.py:380 +#: views.py:381 msgid "New treatment" msgstr "" -#: views.py:388 views.py:480 +#: views.py:389 views.py:481 msgid "Modify" msgstr "" -#: views.py:405 +#: views.py:406 msgid "Treatment deletion" msgstr "" -#: views.py:412 +#: views.py:413 msgid "Treatment: search administrative act" msgstr "" -#: views.py:421 +#: views.py:422 msgid "Treatment: new administrative act" msgstr "" -#: views.py:431 +#: views.py:432 msgid "Treatment: administrative act modification" msgstr "" -#: views.py:440 +#: views.py:441 msgid "Treatment: administrative act deletion" msgstr "" -#: views.py:473 +#: views.py:474 msgid "New treatment request" msgstr "" -#: views.py:496 +#: views.py:497 msgid "Treatment request deletion" msgstr "" -#: views.py:503 +#: views.py:504 msgid "Treatment request: search administrative act" msgstr "" -#: views.py:513 +#: views.py:514 msgid "Treatment request: new administrative act" msgstr "" -#: views.py:523 +#: views.py:524 msgid "Treatment request: administrative act modification" msgstr "" -#: views.py:532 +#: views.py:533 msgid "Treatment request: administrative act deletion" msgstr "" -#: views.py:558 +#: views.py:559 msgid "Treatment: source search" msgstr "" -#: views.py:573 +#: views.py:574 msgid "Treatment: source modification" msgstr "" -#: views.py:588 +#: views.py:589 msgid "Treatment: source deletion" msgstr "" -#: views.py:601 +#: views.py:602 msgid "Treatment request: source search" msgstr "" -#: views.py:617 +#: views.py:618 msgid "Treatment request: source modification" msgstr "" -#: views.py:635 +#: views.py:636 msgid "Treatment request: source deletion" msgstr "" @@ -1186,6 +1187,10 @@ msgstr "" msgid "Year - index" msgstr "" +#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:138 +msgid "Related finds (max. 15 displayed)" +msgstr "" + #: templates/ishtar/sheet_find.html:125 msgid "Export as CSV" msgstr "" @@ -1198,35 +1203,35 @@ msgstr "" msgid "Associated base finds" msgstr "" -#: templates/ishtar/sheet_find.html:205 +#: templates/ishtar/sheet_find.html:203 msgid "Coordinates:" msgstr "" -#: templates/ishtar/sheet_find.html:207 +#: templates/ishtar/sheet_find.html:205 msgid "X:" msgstr "" -#: templates/ishtar/sheet_find.html:208 +#: templates/ishtar/sheet_find.html:206 msgid "Y:" msgstr "" -#: templates/ishtar/sheet_find.html:209 +#: templates/ishtar/sheet_find.html:207 msgid "Z:" msgstr "" -#: templates/ishtar/sheet_find.html:212 +#: templates/ishtar/sheet_find.html:210 msgid "SRID:" msgstr "" -#: templates/ishtar/sheet_find.html:228 +#: templates/ishtar/sheet_find.html:226 msgid "Title" msgstr "" -#: templates/ishtar/sheet_find.html:230 +#: templates/ishtar/sheet_find.html:228 msgid "Authors" msgstr "" -#: templates/ishtar/sheet_find.html:231 +#: templates/ishtar/sheet_find.html:229 msgid "Link" msgstr "" diff --git a/archaeological_finds/migrations/0082_auto__add_batchtype__add_field_basefind_new_batch__add_field_historica.py b/archaeological_finds/migrations/0082_auto__add_batchtype__add_field_basefind_new_batch__add_field_historica.py new file mode 100644 index 000000000..1f1a8edc1 --- /dev/null +++ b/archaeological_finds/migrations/0082_auto__add_batchtype__add_field_basefind_new_batch__add_field_historica.py @@ -0,0 +1,1233 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'BatchType' + db.create_table('archaeological_finds_batchtype', ( + ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('label', self.gf('django.db.models.fields.CharField')(max_length=100)), + ('txt_idx', self.gf('django.db.models.fields.CharField')(unique=True, max_length=100)), + ('comment', self.gf('django.db.models.fields.TextField')(null=True, blank=True)), + ('available', self.gf('django.db.models.fields.BooleanField')(default=True)), + ('order', self.gf('django.db.models.fields.IntegerField')(default=10)), + )) + db.send_create_signal('archaeological_finds', ['BatchType']) + + # Adding field 'BaseFind.new_batch' + db.add_column('archaeological_finds_basefind', 'new_batch', + self.gf('django.db.models.fields.related.ForeignKey')(to=orm['archaeological_finds.BatchType'], null=True, blank=True), + keep_default=False) + + # Adding field 'HistoricalBaseFind.new_batch_id' + db.add_column('archaeological_finds_historicalbasefind', 'new_batch_id', + self.gf('django.db.models.fields.IntegerField')(db_index=True, null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting model 'BatchType' + db.delete_table('archaeological_finds_batchtype') + + # Deleting field 'BaseFind.new_batch' + db.delete_column('archaeological_finds_basefind', 'new_batch_id') + + # Deleting field 'HistoricalBaseFind.new_batch_id' + db.delete_column('archaeological_finds_historicalbasefind', 'new_batch_id') + + + models = { + 'archaeological_context_records.activitytype': { + 'Meta': {'ordering': "('order',)", 'object_name': 'ActivityType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.contextrecord': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'ContextRecord'}, + 'activity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.ActivityType']", 'null': 'True', 'blank': 'True'}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'closing_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'datings': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_context_records.Dating']", 'symmetrical': 'False'}), + 'datings_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'depth': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'filling': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'has_furniture': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'identification': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.IdentificationType']", 'null': 'True', 'blank': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_context_records_contextrecord'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'interpretation': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'length': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'location': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'opening_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'operation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'context_record'", 'to': "orm['archaeological_operations.Operation']"}), + 'parcel': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'context_record'", 'to': "orm['archaeological_operations.Parcel']"}), + 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'dim': '3', 'null': 'True', 'blank': 'True'}), + 'polygon': ('django.contrib.gis.db.models.fields.PolygonField', [], {'null': 'True', 'blank': 'True'}), + 'related_context_records': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_context_records.ContextRecord']", 'null': 'True', 'through': "orm['archaeological_context_records.RecordRelations']", 'blank': 'True'}), + 'taq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'taq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'thickness': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'tpq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'tpq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'unit': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_context_records.Unit']"}), + 'width': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_context_records.dating': { + 'Meta': {'object_name': 'Dating'}, + 'dating_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.DatingType']", 'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'period': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Period']"}), + 'precise_dating': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'quality': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.DatingQuality']", 'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_context_records.datingquality': { + 'Meta': {'ordering': "('label',)", 'object_name': 'DatingQuality'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.datingtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'DatingType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.identificationtype': { + 'Meta': {'ordering': "('order', 'label')", 'object_name': 'IdentificationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.recordrelations': { + 'Meta': {'object_name': 'RecordRelations'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'left_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'right_relations'", 'to': "orm['archaeological_context_records.ContextRecord']"}), + 'relation_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.RelationType']"}), + 'right_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'left_relations'", 'to': "orm['archaeological_context_records.ContextRecord']"}) + }, + 'archaeological_context_records.relationtype': { + 'Meta': {'ordering': "('order', 'label')", 'object_name': 'RelationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'inverse_relation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.RelationType']", 'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'symmetrical': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'tiny_label': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.unit': { + 'Meta': {'ordering': "('order',)", 'object_name': 'Unit'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.Unit']", 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_files.file': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'File'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'cira_advised': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'classified_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'corporation_general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'general_contractor_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today', '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'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '120', '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': "'general_contractor_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imported_line': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_files_file'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'instruction_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True', 'blank': 'True'}), + 'locality': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'main_town': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_main'", 'null': 'True', 'to': "orm['ishtar_common.Town']"}), + '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.TextField', [], {'null': 'True', 'blank': 'True'}), + 'numeric_reference': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'permit_reference': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'permit_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.PermitType']", 'null': 'True', 'blank': 'True'}), + 'planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'planning_service_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'protected_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'raw_general_contractor': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'raw_town_planning_service': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'reception_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + '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['ishtar_common.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': "'responsible_town_planning_service_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', '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': "'scientist'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'total_developed_surface': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'total_surface': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'file'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_files.filetype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'FileType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_files.permittype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'PermitType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_files.saisinetype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'SaisineType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'delay': ('django.db.models.fields.IntegerField', [], {'default': '30'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.basefind': { + 'Meta': {'object_name': 'BaseFind'}, + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'batch': ('django.db.models.fields.CharField', [], {'default': "'U'", 'max_length': '1'}), + 'cache_complete_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'cache_short_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'context_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'base_finds'", 'to': "orm['archaeological_context_records.ContextRecord']"}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'discovery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_x': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_y': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_z': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_finds_basefind'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'line': ('django.contrib.gis.db.models.fields.LineStringField', [], {'null': 'True', 'blank': 'True'}), + 'material_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'new_batch': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.BatchType']", 'null': 'True', 'blank': 'True'}), + 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'dim': '3', 'null': 'True', 'blank': 'True'}), + 'point_2d': ('django.contrib.gis.db.models.fields.PointField', [], {'null': 'True', 'blank': 'True'}), + 'polygon': ('django.contrib.gis.db.models.fields.PolygonField', [], {'null': 'True', 'blank': 'True'}), + 'spatial_reference_system': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SpatialReferenceSystem']", 'null': 'True', 'blank': 'True'}), + 'special_interest': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), + 'topographic_localisation': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), + 'x': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'y': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'z': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.batchtype': { + 'Meta': {'ordering': "('order',)", 'object_name': 'BatchType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '10'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.conservatorystate': { + 'Meta': {'ordering': "('label',)", 'object_name': 'ConservatoryState'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.ConservatoryState']", 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.find': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'Find'}, + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'base_finds': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.BaseFind']"}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'check_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), + 'checked': ('django.db.models.fields.CharField', [], {'default': "'NC'", 'max_length': '2'}), + 'collection': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'finds'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['archaeological_warehouse.Collection']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'conservatory_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'conservatory_state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.ConservatoryState']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), + 'container': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'finds'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['archaeological_warehouse.Container']"}), + 'dating_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'datings': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_context_records.Dating']"}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'diameter': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'dimensions_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'downstream_treatment': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'upstream'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['archaeological_finds.Treatment']"}), + 'estimated_value': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'find_number': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'height': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_finds_find'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'integrities': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.IntegrityType']"}), + 'is_complete': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'length': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'mark': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'material_types': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'finds'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.MaterialType']"}), + 'min_number_of_individuals': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'object_types': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.ObjectType']"}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'preservation_to_considers': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'finds'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.PreservationType']"}), + 'previous_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'remarkabilities': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.RemarkabilityType']"}), + 'thickness': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'upstream_treatment': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'downstream'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['archaeological_finds.Treatment']"}), + 'volume': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'weight': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'weight_unit': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}), + 'width': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.findbasket': { + 'Meta': {'unique_together': "(('label', 'user'),)", 'object_name': 'FindBasket'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'items': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'basket'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['archaeological_finds.Find']"}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.finddownstreamtreatments': { + 'Meta': {'ordering': "('find', '-treatment_nb')", 'unique_together': "(('find', 'treatment'),)", 'object_name': 'FindDownstreamTreatments', 'db_table': "'find_downtreatments'", 'managed': 'False'}, + 'find': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finddownstreamtreatments_related'", 'to': "orm['archaeological_finds.Find']"}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Treatment']", 'primary_key': 'True'}), + 'treatment_nb': ('django.db.models.fields.IntegerField', [], {}) + }, + 'archaeological_finds.findsource': { + 'Meta': {'object_name': 'FindSource'}, + 'additional_information': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + '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['ishtar_common.Author']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'duplicate': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '12', 'null': 'True', 'blank': 'True'}), + 'find': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_finds.Find']"}), + 'format_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Format']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'item_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'receipt_date_in_documentation': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'scale': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}), + 'support_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SupportType']", 'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}) + }, + 'archaeological_finds.findtreatments': { + 'Meta': {'ordering': "('find', 'upstream', '-treatment_nb')", 'unique_together': "(('find', 'treatment'),)", 'object_name': 'FindTreatments', 'db_table': "'find_treatments'", 'managed': 'False'}, + 'find': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'findtreatments_related'", 'to': "orm['archaeological_finds.Find']"}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Treatment']", 'primary_key': 'True'}), + 'treatment_nb': ('django.db.models.fields.IntegerField', [], {}), + 'upstream': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'archaeological_finds.findupstreamtreatments': { + 'Meta': {'ordering': "('find', '-treatment_nb')", 'unique_together': "(('find', 'treatment'),)", 'object_name': 'FindUpstreamTreatments', 'db_table': "'find_uptreatments'", 'managed': 'False'}, + 'find': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'findupstreamtreatments_related'", 'to': "orm['archaeological_finds.Find']"}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Treatment']", 'primary_key': 'True'}), + 'treatment_nb': ('django.db.models.fields.IntegerField', [], {}) + }, + 'archaeological_finds.historicalbasefind': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalBaseFind'}, + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'batch': ('django.db.models.fields.CharField', [], {'default': "'U'", 'max_length': '1'}), + 'cache_complete_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'cache_short_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'context_record_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'discovery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_x': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_y': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_z': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'line': ('django.contrib.gis.db.models.fields.LineStringField', [], {'null': 'True', 'blank': 'True'}), + 'material_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'new_batch_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'dim': '3', 'null': 'True', 'blank': 'True'}), + 'point_2d': ('django.contrib.gis.db.models.fields.PointField', [], {'null': 'True', 'blank': 'True'}), + 'polygon': ('django.contrib.gis.db.models.fields.PolygonField', [], {'null': 'True', 'blank': 'True'}), + 'spatial_reference_system_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'special_interest': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), + 'topographic_localisation': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), + 'x': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'y': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'z': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.historicalfind': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalFind'}, + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'check_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), + 'checked': ('django.db.models.fields.CharField', [], {'default': "'NC'", 'max_length': '2'}), + 'collection_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'conservatory_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'conservatory_state_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'container_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'dating_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'diameter': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'dimensions_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'downstream_treatment_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'estimated_value': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'find_number': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'height': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'is_complete': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'length': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'mark': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'min_number_of_individuals': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'previous_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'thickness': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'upstream_treatment_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'volume': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'weight': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'weight_unit': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}), + 'width': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.historicaltreatment': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalTreatment'}, + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'container_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'file_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'goal': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'insurance_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'location_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'organization_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'other_reference': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'person_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'quoted_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'realized_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'target_is_basket': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'treatment_state_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_finds.historicaltreatmentfile': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalTreatmentFile'}, + 'applicant_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'applicant_organisation_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'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', 'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'in_charge_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'reception_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'type_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_finds.integritytype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'IntegrityType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.materialtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'MaterialType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.MaterialType']", 'null': 'True', 'blank': 'True'}), + 'recommendation': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.objecttype': { + 'Meta': {'ordering': "('parent__label', 'label')", 'object_name': 'ObjectType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.ObjectType']", 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.preservationtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'PreservationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.property': { + 'Meta': {'object_name': 'Property'}, + 'administrative_act': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.AdministrativeAct']"}), + 'end_date': ('django.db.models.fields.DateField', [], {}), + 'find': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Find']"}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_finds_property'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'properties'", 'to': "orm['ishtar_common.Person']"}), + 'start_date': ('django.db.models.fields.DateField', [], {}) + }, + 'archaeological_finds.remarkabilitytype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'RemarkabilityType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.treatment': { + 'Meta': {'unique_together': "(('year', 'index'),)", 'object_name': 'Treatment'}, + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'container': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.Container']", 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatments'", 'null': 'True', 'to': "orm['archaeological_finds.TreatmentFile']"}), + 'goal': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_finds_treatment'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'insurance_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.Warehouse']", 'null': 'True', 'blank': 'True'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatments'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'other_reference': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatments'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'quoted_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'realized_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'target_is_basket': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'treatment_state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.TreatmentState']", 'null': 'True', 'blank': 'True'}), + 'treatment_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_finds.TreatmentType']", 'symmetrical': 'False'}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_finds.treatmentfile': { + 'Meta': {'ordering': "('cached_label',)", 'unique_together': "(('year', 'index'),)", 'object_name': 'TreatmentFile'}, + 'applicant': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatmentfile_applicant'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'applicant_organisation': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatmentfile_applicant'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'cached_label': ('django.db.models.fields.TextField', [], {'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', 'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_finds_treatmentfile'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatmentfile_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'reception_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.TreatmentFileType']"}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_finds.treatmentfilesource': { + 'Meta': {'object_name': 'TreatmentFileSource'}, + 'additional_information': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'associated_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'treatmentfilesource_related'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Author']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'duplicate': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '12', 'null': 'True', 'blank': 'True'}), + 'format_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Format']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'item_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'receipt_date_in_documentation': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'scale': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}), + 'support_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SupportType']", 'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'treatment_file': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_finds.TreatmentFile']"}) + }, + 'archaeological_finds.treatmentfiletype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'TreatmentFileType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.treatmentsource': { + 'Meta': {'object_name': 'TreatmentSource'}, + 'additional_information': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + '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['ishtar_common.Author']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'duplicate': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '12', 'null': 'True', 'blank': 'True'}), + 'format_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Format']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'item_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'receipt_date_in_documentation': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'scale': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}), + 'support_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SupportType']", 'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_finds.Treatment']"}) + }, + 'archaeological_finds.treatmentstate': { + 'Meta': {'ordering': "('label',)", 'object_name': 'TreatmentState'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.treatmenttype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'TreatmentType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'downstream_is_many': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '10'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.TreatmentType']", 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}), + 'upstream_is_many': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'virtual': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + '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['ishtar_common.DocumentTemplate']"}), + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'indexed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'intented_to': ('django.db.models.fields.CharField', [], {'max_length': '2'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_operations.administrativeact': { + 'Meta': {'ordering': "('year', 'signature_date', 'index', 'act_type')", 'object_name': 'AdministrativeAct'}, + 'act_object': ('django.db.models.fields.TextField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'act_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.ActType']"}), + 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'administrative_act'", 'null': 'True', 'to': "orm['archaeological_files.File']"}), + 'departments_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_administrativeact'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'adminact_operation_in_charge'", 'null': 'True', 'on_delete': 'models.SET_NULL', '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', [], {'blank': 'True', 'related_name': "'adminact_operator'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + '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': "'adminact_scientist'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'signatory': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'signatory'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'signature_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'towns_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'administrative_act'", 'null': 'True', 'to': "orm['archaeological_finds.Treatment']"}), + 'treatment_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'administrative_act'", 'null': 'True', 'to': "orm['archaeological_finds.TreatmentFile']"}), + 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.archaeologicalsite': { + 'Meta': {'object_name': 'ArchaeologicalSite'}, + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_archaeologicalsite'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'periods': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}), + 'remains': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.RemainType']", 'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.operation': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'Operation'}, + 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'archaeological_sites': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.ArchaeologicalSite']", 'null': 'True', 'blank': 'True'}), + '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': "'cira_rapporteur'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'code_patriarche': ('django.db.models.fields.IntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'common_name': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), + 'documentation_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'documentation_received': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'eas_number': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), + 'effective_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'excavation_end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'finds_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'finds_received': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'fnap_cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'fnap_financing': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'geoarchaeological_context_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_operation'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'large_area_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'multi_polygon': ('django.contrib.gis.db.models.fields.MultiPolygonField', [], {'null': 'True', 'blank': 'True'}), + 'negative_result': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'old_code': ('django.db.models.fields.CharField', [], {'max_length': '200', '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['ishtar_common.OperationType']"}), + 'operator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operator'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + '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', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}), + 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'null': 'True', 'blank': 'True'}), + 'record_quality': ('django.db.models.fields.CharField', [], {'max_length': '2', 'null': 'True', 'blank': 'True'}), + 'remains': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.RemainType']", 'null': 'True', 'blank': 'True'}), + 'report_delivery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'report_processing': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.ReportState']", 'null': 'True', 'blank': 'True'}), + 'scheduled_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'scientific_documentation_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_scientist_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', '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'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'operations'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}), + 'virtual_operation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'zoning_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.parcel': { + 'Meta': {'ordering': "('year', 'section', 'parcel_number')", 'object_name': 'Parcel'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parcels'", 'null': 'True', 'to': "orm['archaeological_files.File']"}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_parcel'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + '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', 'null': 'True', 'blank': 'True'}), + 'public_domain': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'section': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}), + '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': { + 'Meta': {'ordering': "('order',)", 'object_name': 'Period'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.IntegerField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_operations.remaintype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'RemainType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_operations.reportstate': { + 'Meta': {'ordering': "('order',)", 'object_name': 'ReportState'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_warehouse.collection': { + 'Meta': {'ordering': "('name',)", 'object_name': 'Collection'}, + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_warehouse_collection'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'warehouse': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'collections'", 'to': "orm['archaeological_warehouse.Warehouse']"}) + }, + 'archaeological_warehouse.container': { + 'Meta': {'ordering': "('cached_label',)", 'unique_together': "(('index', 'location'),)", 'object_name': 'Container'}, + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'cached_location': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'container_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.ContainerType']"}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_warehouse_container'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'containers'", 'to': "orm['archaeological_warehouse.Warehouse']"}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'responsible': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owned_containers'", 'to': "orm['archaeological_warehouse.Warehouse']"}) + }, + 'archaeological_warehouse.containertype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'ContainerType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'length': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}), + 'volume': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_warehouse.warehouse': { + 'Meta': {'object_name': 'Warehouse'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'associated_divisions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_warehouse.WarehouseDivision']", 'symmetrical': 'False', 'through': "orm['archaeological_warehouse.WarehouseDivisionLink']", 'blank': 'True'}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_warehouse_warehouse'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'person_in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'warehouse_in_charge'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'warehouse_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.WarehouseType']"}) + }, + 'archaeological_warehouse.warehousedivision': { + 'Meta': {'object_name': 'WarehouseDivision'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_warehouse.warehousedivisionlink': { + 'Meta': {'ordering': "('warehouse', 'order')", 'unique_together': "(('warehouse', 'division'),)", 'object_name': 'WarehouseDivisionLink'}, + 'division': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.WarehouseDivision']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '10'}), + 'warehouse': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.Warehouse']"}) + }, + 'archaeological_warehouse.warehousetype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'WarehouseType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'ishtar_common.arrondissement': { + 'Meta': {'object_name': 'Arrondissement'}, + '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'}) + }, + 'ishtar_common.author': { + 'Meta': {'object_name': 'Author'}, + '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['ishtar_common.Person']"}) + }, + 'ishtar_common.authortype': { + 'Meta': {'object_name': 'AuthorType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.canton': { + 'Meta': {'object_name': 'Canton'}, + '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'}) + }, + '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'}), + 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.State']", 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.documenttemplate': { + 'Meta': {'ordering': "['associated_object_name', 'name']", 'object_name': 'DocumentTemplate'}, + 'associated_object_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'template': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}) + }, + 'ishtar_common.format': { + 'Meta': {'object_name': 'Format'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.import': { + 'Meta': {'object_name': 'Import'}, + 'conservative_import': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'encoding': ('django.db.models.fields.CharField', [], {'default': "'utf-8'", 'max_length': '15'}), + 'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'error_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imported_file': ('django.db.models.fields.files.FileField', [], {'max_length': '220'}), + 'imported_images': ('django.db.models.fields.files.FileField', [], {'max_length': '220', 'null': 'True', 'blank': 'True'}), + 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.ImporterType']"}), + 'match_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'result_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'seconds_remaining': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'skip_lines': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'state': ('django.db.models.fields.CharField', [], {'default': "'C'", 'max_length': '2'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']"}) + }, + 'ishtar_common.importertype': { + 'Meta': {'object_name': 'ImporterType'}, + 'associated_models': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'description': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_template': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'unicity_keys': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'users': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.ishtaruser': { + 'Meta': {'object_name': 'IshtarUser', '_ormbases': ['auth.User']}, + 'advanced_shortcut_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ishtaruser'", 'unique': 'True', 'to': "orm['ishtar_common.Person']"}), + 'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}) + }, + 'ishtar_common.operationtype': { + 'Meta': {'ordering': "['-preventive', 'order', 'label']", 'object_name': 'OperationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'preventive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + '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'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_organization'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}), + 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + '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'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.organizationtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'OrganizationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + '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'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'contact_type': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_person'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'old_title': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + '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'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_name': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'salutation': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'surname': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.TitleType']", 'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.persontype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'PersonType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.sourcetype': { + 'Meta': {'object_name': 'SourceType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.spatialreferencesystem': { + 'Meta': {'ordering': "('label',)", 'object_name': 'SpatialReferenceSystem'}, + 'auth_name': ('django.db.models.fields.CharField', [], {'default': "'EPSG'", 'max_length': '256'}), + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '10'}), + 'srid': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.state': { + 'Meta': {'ordering': "['number']", 'object_name': 'State'}, + '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'}) + }, + 'ishtar_common.supporttype': { + 'Meta': {'object_name': 'SupportType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.titletype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'TitleType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.town': { + 'Meta': {'ordering': "['numero_insee']", 'object_name': 'Town'}, + '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['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_town'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'numero_insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '6'}), + 'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['archaeological_finds']
\ No newline at end of file diff --git a/archaeological_finds/migrations/0083_batch_to_new_batch.py b/archaeological_finds/migrations/0083_batch_to_new_batch.py new file mode 100644 index 000000000..2a982d391 --- /dev/null +++ b/archaeological_finds/migrations/0083_batch_to_new_batch.py @@ -0,0 +1,1221 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models +from django.template.defaultfilters import slugify + + +class Migration(SchemaMigration): + + def forwards(self, orm): + IS_ISOLATED_CHOICES = ( + ('U', u"Inconnu"), + ('O', u"Objet"), + ('B', u"Lot") + ) + for idx, v in enumerate(IS_ISOLATED_CHOICES): + value, lbl = v + txt_idx = slugify(lbl) + batch, created = orm['archaeological_finds.BatchType'].objects\ + .get_or_create(txt_idx=txt_idx, + defaults={'label': lbl, 'order': idx}) + for bf in orm['archaeological_finds.BaseFind'].objects.filter( + batch=value).all(): + bf.new_batch = batch + bf.skip_history_when_saving = True + bf.save() + + def backwards(self, orm): + pass + + models = { + 'archaeological_context_records.activitytype': { + 'Meta': {'ordering': "('order',)", 'object_name': 'ActivityType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.contextrecord': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'ContextRecord'}, + 'activity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.ActivityType']", 'null': 'True', 'blank': 'True'}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'closing_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'datings': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_context_records.Dating']", 'symmetrical': 'False'}), + 'datings_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'depth': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'filling': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'has_furniture': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'identification': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.IdentificationType']", 'null': 'True', 'blank': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_context_records_contextrecord'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'interpretation': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'length': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'location': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'opening_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'operation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'context_record'", 'to': "orm['archaeological_operations.Operation']"}), + 'parcel': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'context_record'", 'to': "orm['archaeological_operations.Parcel']"}), + 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'dim': '3', 'null': 'True', 'blank': 'True'}), + 'polygon': ('django.contrib.gis.db.models.fields.PolygonField', [], {'null': 'True', 'blank': 'True'}), + 'related_context_records': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_context_records.ContextRecord']", 'null': 'True', 'through': "orm['archaeological_context_records.RecordRelations']", 'blank': 'True'}), + 'taq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'taq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'thickness': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'tpq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'tpq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'unit': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_context_records.Unit']"}), + 'width': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_context_records.dating': { + 'Meta': {'object_name': 'Dating'}, + 'dating_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.DatingType']", 'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'period': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Period']"}), + 'precise_dating': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'quality': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.DatingQuality']", 'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_context_records.datingquality': { + 'Meta': {'ordering': "('label',)", 'object_name': 'DatingQuality'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.datingtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'DatingType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.identificationtype': { + 'Meta': {'ordering': "('order', 'label')", 'object_name': 'IdentificationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.recordrelations': { + 'Meta': {'object_name': 'RecordRelations'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'left_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'right_relations'", 'to': "orm['archaeological_context_records.ContextRecord']"}), + 'relation_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.RelationType']"}), + 'right_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'left_relations'", 'to': "orm['archaeological_context_records.ContextRecord']"}) + }, + 'archaeological_context_records.relationtype': { + 'Meta': {'ordering': "('order', 'label')", 'object_name': 'RelationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'inverse_relation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.RelationType']", 'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'symmetrical': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'tiny_label': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.unit': { + 'Meta': {'ordering': "('order',)", 'object_name': 'Unit'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.Unit']", 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_files.file': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'File'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'cira_advised': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'classified_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'corporation_general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'general_contractor_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today', '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'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '120', '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': "'general_contractor_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imported_line': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_files_file'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'instruction_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True', 'blank': 'True'}), + 'locality': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'main_town': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_main'", 'null': 'True', 'to': "orm['ishtar_common.Town']"}), + '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.TextField', [], {'null': 'True', 'blank': 'True'}), + 'numeric_reference': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'permit_reference': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'permit_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.PermitType']", 'null': 'True', 'blank': 'True'}), + 'planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'planning_service_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'protected_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'raw_general_contractor': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'raw_town_planning_service': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'reception_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + '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['ishtar_common.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': "'responsible_town_planning_service_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', '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': "'scientist'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'total_developed_surface': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'total_surface': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'file'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_files.filetype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'FileType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_files.permittype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'PermitType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_files.saisinetype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'SaisineType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'delay': ('django.db.models.fields.IntegerField', [], {'default': '30'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.basefind': { + 'Meta': {'object_name': 'BaseFind'}, + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'batch': ('django.db.models.fields.CharField', [], {'default': "'U'", 'max_length': '1'}), + 'cache_complete_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'cache_short_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'context_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'base_finds'", 'to': "orm['archaeological_context_records.ContextRecord']"}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'discovery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_x': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_y': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_z': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_finds_basefind'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'line': ('django.contrib.gis.db.models.fields.LineStringField', [], {'null': 'True', 'blank': 'True'}), + 'material_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'new_batch': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.BatchType']", 'null': 'True', 'blank': 'True'}), + 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'dim': '3', 'null': 'True', 'blank': 'True'}), + 'point_2d': ('django.contrib.gis.db.models.fields.PointField', [], {'null': 'True', 'blank': 'True'}), + 'polygon': ('django.contrib.gis.db.models.fields.PolygonField', [], {'null': 'True', 'blank': 'True'}), + 'spatial_reference_system': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SpatialReferenceSystem']", 'null': 'True', 'blank': 'True'}), + 'special_interest': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), + 'topographic_localisation': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), + 'x': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'y': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'z': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.batchtype': { + 'Meta': {'ordering': "('order',)", 'object_name': 'BatchType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '10'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.conservatorystate': { + 'Meta': {'ordering': "('label',)", 'object_name': 'ConservatoryState'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.ConservatoryState']", 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.find': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'Find'}, + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'base_finds': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.BaseFind']"}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'check_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), + 'checked': ('django.db.models.fields.CharField', [], {'default': "'NC'", 'max_length': '2'}), + 'collection': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'finds'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['archaeological_warehouse.Collection']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'conservatory_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'conservatory_state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.ConservatoryState']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), + 'container': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'finds'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['archaeological_warehouse.Container']"}), + 'dating_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'datings': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_context_records.Dating']"}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'diameter': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'dimensions_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'downstream_treatment': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'upstream'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['archaeological_finds.Treatment']"}), + 'estimated_value': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'find_number': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'height': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_finds_find'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'integrities': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.IntegrityType']"}), + 'is_complete': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'length': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'mark': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'material_types': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'finds'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.MaterialType']"}), + 'min_number_of_individuals': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'object_types': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.ObjectType']"}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'preservation_to_considers': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'finds'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.PreservationType']"}), + 'previous_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'remarkabilities': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.RemarkabilityType']"}), + 'thickness': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'upstream_treatment': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'downstream'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['archaeological_finds.Treatment']"}), + 'volume': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'weight': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'weight_unit': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}), + 'width': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.findbasket': { + 'Meta': {'unique_together': "(('label', 'user'),)", 'object_name': 'FindBasket'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'items': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'basket'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['archaeological_finds.Find']"}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.finddownstreamtreatments': { + 'Meta': {'ordering': "('find', '-treatment_nb')", 'unique_together': "(('find', 'treatment'),)", 'object_name': 'FindDownstreamTreatments', 'db_table': "'find_downtreatments'", 'managed': 'False'}, + 'find': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finddownstreamtreatments_related'", 'to': "orm['archaeological_finds.Find']"}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Treatment']", 'primary_key': 'True'}), + 'treatment_nb': ('django.db.models.fields.IntegerField', [], {}) + }, + 'archaeological_finds.findsource': { + 'Meta': {'object_name': 'FindSource'}, + 'additional_information': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + '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['ishtar_common.Author']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'duplicate': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '12', 'null': 'True', 'blank': 'True'}), + 'find': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_finds.Find']"}), + 'format_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Format']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'item_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'receipt_date_in_documentation': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'scale': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}), + 'support_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SupportType']", 'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}) + }, + 'archaeological_finds.findtreatments': { + 'Meta': {'ordering': "('find', 'upstream', '-treatment_nb')", 'unique_together': "(('find', 'treatment'),)", 'object_name': 'FindTreatments', 'db_table': "'find_treatments'", 'managed': 'False'}, + 'find': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'findtreatments_related'", 'to': "orm['archaeological_finds.Find']"}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Treatment']", 'primary_key': 'True'}), + 'treatment_nb': ('django.db.models.fields.IntegerField', [], {}), + 'upstream': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'archaeological_finds.findupstreamtreatments': { + 'Meta': {'ordering': "('find', '-treatment_nb')", 'unique_together': "(('find', 'treatment'),)", 'object_name': 'FindUpstreamTreatments', 'db_table': "'find_uptreatments'", 'managed': 'False'}, + 'find': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'findupstreamtreatments_related'", 'to': "orm['archaeological_finds.Find']"}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Treatment']", 'primary_key': 'True'}), + 'treatment_nb': ('django.db.models.fields.IntegerField', [], {}) + }, + 'archaeological_finds.historicalbasefind': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalBaseFind'}, + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'batch': ('django.db.models.fields.CharField', [], {'default': "'U'", 'max_length': '1'}), + 'cache_complete_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'cache_short_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'context_record_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'discovery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_x': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_y': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_z': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'line': ('django.contrib.gis.db.models.fields.LineStringField', [], {'null': 'True', 'blank': 'True'}), + 'material_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'new_batch_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'dim': '3', 'null': 'True', 'blank': 'True'}), + 'point_2d': ('django.contrib.gis.db.models.fields.PointField', [], {'null': 'True', 'blank': 'True'}), + 'polygon': ('django.contrib.gis.db.models.fields.PolygonField', [], {'null': 'True', 'blank': 'True'}), + 'spatial_reference_system_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'special_interest': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), + 'topographic_localisation': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), + 'x': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'y': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'z': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.historicalfind': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalFind'}, + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'check_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), + 'checked': ('django.db.models.fields.CharField', [], {'default': "'NC'", 'max_length': '2'}), + 'collection_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'conservatory_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'conservatory_state_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'container_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'dating_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'diameter': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'dimensions_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'downstream_treatment_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'estimated_value': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'find_number': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'height': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'is_complete': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'length': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'mark': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'min_number_of_individuals': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'previous_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'thickness': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'upstream_treatment_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'volume': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'weight': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'weight_unit': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}), + 'width': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.historicaltreatment': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalTreatment'}, + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'container_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'file_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'goal': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'insurance_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'location_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'organization_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'other_reference': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'person_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'quoted_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'realized_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'target_is_basket': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'treatment_state_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_finds.historicaltreatmentfile': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalTreatmentFile'}, + 'applicant_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'applicant_organisation_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'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', 'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'in_charge_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'reception_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'type_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_finds.integritytype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'IntegrityType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.materialtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'MaterialType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.MaterialType']", 'null': 'True', 'blank': 'True'}), + 'recommendation': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.objecttype': { + 'Meta': {'ordering': "('parent__label', 'label')", 'object_name': 'ObjectType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.ObjectType']", 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.preservationtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'PreservationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.property': { + 'Meta': {'object_name': 'Property'}, + 'administrative_act': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.AdministrativeAct']"}), + 'end_date': ('django.db.models.fields.DateField', [], {}), + 'find': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Find']"}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_finds_property'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'properties'", 'to': "orm['ishtar_common.Person']"}), + 'start_date': ('django.db.models.fields.DateField', [], {}) + }, + 'archaeological_finds.remarkabilitytype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'RemarkabilityType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.treatment': { + 'Meta': {'unique_together': "(('year', 'index'),)", 'object_name': 'Treatment'}, + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'container': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.Container']", 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatments'", 'null': 'True', 'to': "orm['archaeological_finds.TreatmentFile']"}), + 'goal': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_finds_treatment'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'insurance_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.Warehouse']", 'null': 'True', 'blank': 'True'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatments'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'other_reference': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatments'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'quoted_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'realized_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'target_is_basket': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'treatment_state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.TreatmentState']", 'null': 'True', 'blank': 'True'}), + 'treatment_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_finds.TreatmentType']", 'symmetrical': 'False'}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_finds.treatmentfile': { + 'Meta': {'ordering': "('cached_label',)", 'unique_together': "(('year', 'index'),)", 'object_name': 'TreatmentFile'}, + 'applicant': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatmentfile_applicant'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'applicant_organisation': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatmentfile_applicant'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'cached_label': ('django.db.models.fields.TextField', [], {'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', 'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_finds_treatmentfile'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatmentfile_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'reception_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.TreatmentFileType']"}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_finds.treatmentfilesource': { + 'Meta': {'object_name': 'TreatmentFileSource'}, + 'additional_information': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'associated_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'treatmentfilesource_related'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Author']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'duplicate': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '12', 'null': 'True', 'blank': 'True'}), + 'format_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Format']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'item_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'receipt_date_in_documentation': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'scale': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}), + 'support_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SupportType']", 'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'treatment_file': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_finds.TreatmentFile']"}) + }, + 'archaeological_finds.treatmentfiletype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'TreatmentFileType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.treatmentsource': { + 'Meta': {'object_name': 'TreatmentSource'}, + 'additional_information': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + '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['ishtar_common.Author']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'duplicate': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '12', 'null': 'True', 'blank': 'True'}), + 'format_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Format']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'item_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'receipt_date_in_documentation': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'scale': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}), + 'support_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SupportType']", 'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_finds.Treatment']"}) + }, + 'archaeological_finds.treatmentstate': { + 'Meta': {'ordering': "('label',)", 'object_name': 'TreatmentState'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.treatmenttype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'TreatmentType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'downstream_is_many': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '10'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.TreatmentType']", 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}), + 'upstream_is_many': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'virtual': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + '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['ishtar_common.DocumentTemplate']"}), + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'indexed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'intented_to': ('django.db.models.fields.CharField', [], {'max_length': '2'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_operations.administrativeact': { + 'Meta': {'ordering': "('year', 'signature_date', 'index', 'act_type')", 'object_name': 'AdministrativeAct'}, + 'act_object': ('django.db.models.fields.TextField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'act_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.ActType']"}), + 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'administrative_act'", 'null': 'True', 'to': "orm['archaeological_files.File']"}), + 'departments_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_administrativeact'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'adminact_operation_in_charge'", 'null': 'True', 'on_delete': 'models.SET_NULL', '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', [], {'blank': 'True', 'related_name': "'adminact_operator'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + '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': "'adminact_scientist'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'signatory': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'signatory'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'signature_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'towns_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'administrative_act'", 'null': 'True', 'to': "orm['archaeological_finds.Treatment']"}), + 'treatment_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'administrative_act'", 'null': 'True', 'to': "orm['archaeological_finds.TreatmentFile']"}), + 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.archaeologicalsite': { + 'Meta': {'object_name': 'ArchaeologicalSite'}, + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_archaeologicalsite'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'periods': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}), + 'remains': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.RemainType']", 'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.operation': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'Operation'}, + 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'archaeological_sites': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.ArchaeologicalSite']", 'null': 'True', 'blank': 'True'}), + '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': "'cira_rapporteur'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'code_patriarche': ('django.db.models.fields.IntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'common_name': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), + 'documentation_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'documentation_received': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'eas_number': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), + 'effective_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'excavation_end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'finds_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'finds_received': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'fnap_cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'fnap_financing': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'geoarchaeological_context_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_operation'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'large_area_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'multi_polygon': ('django.contrib.gis.db.models.fields.MultiPolygonField', [], {'null': 'True', 'blank': 'True'}), + 'negative_result': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'old_code': ('django.db.models.fields.CharField', [], {'max_length': '200', '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['ishtar_common.OperationType']"}), + 'operator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operator'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + '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', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}), + 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'null': 'True', 'blank': 'True'}), + 'record_quality': ('django.db.models.fields.CharField', [], {'max_length': '2', 'null': 'True', 'blank': 'True'}), + 'remains': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.RemainType']", 'null': 'True', 'blank': 'True'}), + 'report_delivery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'report_processing': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.ReportState']", 'null': 'True', 'blank': 'True'}), + 'scheduled_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'scientific_documentation_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_scientist_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', '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'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'operations'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}), + 'virtual_operation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'zoning_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.parcel': { + 'Meta': {'ordering': "('year', 'section', 'parcel_number')", 'object_name': 'Parcel'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parcels'", 'null': 'True', 'to': "orm['archaeological_files.File']"}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_parcel'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + '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', 'null': 'True', 'blank': 'True'}), + 'public_domain': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'section': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}), + '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': { + 'Meta': {'ordering': "('order',)", 'object_name': 'Period'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.IntegerField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_operations.remaintype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'RemainType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_operations.reportstate': { + 'Meta': {'ordering': "('order',)", 'object_name': 'ReportState'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_warehouse.collection': { + 'Meta': {'ordering': "('name',)", 'object_name': 'Collection'}, + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_warehouse_collection'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'warehouse': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'collections'", 'to': "orm['archaeological_warehouse.Warehouse']"}) + }, + 'archaeological_warehouse.container': { + 'Meta': {'ordering': "('cached_label',)", 'unique_together': "(('index', 'location'),)", 'object_name': 'Container'}, + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'cached_location': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'container_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.ContainerType']"}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_warehouse_container'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'containers'", 'to': "orm['archaeological_warehouse.Warehouse']"}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'responsible': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owned_containers'", 'to': "orm['archaeological_warehouse.Warehouse']"}) + }, + 'archaeological_warehouse.containertype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'ContainerType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'length': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}), + 'volume': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_warehouse.warehouse': { + 'Meta': {'object_name': 'Warehouse'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'associated_divisions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_warehouse.WarehouseDivision']", 'symmetrical': 'False', 'through': "orm['archaeological_warehouse.WarehouseDivisionLink']", 'blank': 'True'}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_warehouse_warehouse'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'person_in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'warehouse_in_charge'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'warehouse_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.WarehouseType']"}) + }, + 'archaeological_warehouse.warehousedivision': { + 'Meta': {'object_name': 'WarehouseDivision'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_warehouse.warehousedivisionlink': { + 'Meta': {'ordering': "('warehouse', 'order')", 'unique_together': "(('warehouse', 'division'),)", 'object_name': 'WarehouseDivisionLink'}, + 'division': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.WarehouseDivision']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '10'}), + 'warehouse': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.Warehouse']"}) + }, + 'archaeological_warehouse.warehousetype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'WarehouseType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'ishtar_common.arrondissement': { + 'Meta': {'object_name': 'Arrondissement'}, + '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'}) + }, + 'ishtar_common.author': { + 'Meta': {'object_name': 'Author'}, + '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['ishtar_common.Person']"}) + }, + 'ishtar_common.authortype': { + 'Meta': {'object_name': 'AuthorType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.canton': { + 'Meta': {'object_name': 'Canton'}, + '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'}) + }, + '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'}), + 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.State']", 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.documenttemplate': { + 'Meta': {'ordering': "['associated_object_name', 'name']", 'object_name': 'DocumentTemplate'}, + 'associated_object_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'template': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}) + }, + 'ishtar_common.format': { + 'Meta': {'object_name': 'Format'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.import': { + 'Meta': {'object_name': 'Import'}, + 'conservative_import': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'encoding': ('django.db.models.fields.CharField', [], {'default': "'utf-8'", 'max_length': '15'}), + 'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'error_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imported_file': ('django.db.models.fields.files.FileField', [], {'max_length': '220'}), + 'imported_images': ('django.db.models.fields.files.FileField', [], {'max_length': '220', 'null': 'True', 'blank': 'True'}), + 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.ImporterType']"}), + 'match_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'result_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'seconds_remaining': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'skip_lines': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'state': ('django.db.models.fields.CharField', [], {'default': "'C'", 'max_length': '2'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']"}) + }, + 'ishtar_common.importertype': { + 'Meta': {'object_name': 'ImporterType'}, + 'associated_models': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'description': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_template': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'unicity_keys': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'users': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.ishtaruser': { + 'Meta': {'object_name': 'IshtarUser', '_ormbases': ['auth.User']}, + 'advanced_shortcut_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ishtaruser'", 'unique': 'True', 'to': "orm['ishtar_common.Person']"}), + 'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}) + }, + 'ishtar_common.operationtype': { + 'Meta': {'ordering': "['-preventive', 'order', 'label']", 'object_name': 'OperationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'preventive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + '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'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_organization'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}), + 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + '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'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.organizationtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'OrganizationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + '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'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'contact_type': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_person'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'old_title': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + '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'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_name': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'salutation': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'surname': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.TitleType']", 'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.persontype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'PersonType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.sourcetype': { + 'Meta': {'object_name': 'SourceType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.spatialreferencesystem': { + 'Meta': {'ordering': "('label',)", 'object_name': 'SpatialReferenceSystem'}, + 'auth_name': ('django.db.models.fields.CharField', [], {'default': "'EPSG'", 'max_length': '256'}), + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '10'}), + 'srid': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.state': { + 'Meta': {'ordering': "['number']", 'object_name': 'State'}, + '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'}) + }, + 'ishtar_common.supporttype': { + 'Meta': {'object_name': 'SupportType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.titletype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'TitleType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.town': { + 'Meta': {'ordering': "['numero_insee']", 'object_name': 'Town'}, + '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['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_town'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'numero_insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '6'}), + 'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['archaeological_finds']
\ No newline at end of file diff --git a/archaeological_finds/migrations/0084_auto__del_field_basefind_new_batch__chg_field_basefind_batch__del_fiel.py b/archaeological_finds/migrations/0084_auto__del_field_basefind_new_batch__chg_field_basefind_batch__del_fiel.py new file mode 100644 index 000000000..404fb76eb --- /dev/null +++ b/archaeological_finds/migrations/0084_auto__del_field_basefind_new_batch__chg_field_basefind_batch__del_fiel.py @@ -0,0 +1,1219 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + db.delete_column('archaeological_finds_basefind', 'batch') + db.rename_column('archaeological_finds_basefind', 'new_batch_id', + 'batch_id') + + db.delete_column('archaeological_finds_historicalbasefind', 'batch') + db.rename_column('archaeological_finds_historicalbasefind', + 'new_batch_id', 'batch_id') + + def backwards(self, orm): + db.add_column('archaeological_finds_basefind', 'batch', + self.gf('django.db.models.fields.CharField')(default='U', max_length=1), + keep_default=False) + db.rename_column('archaeological_finds_basefind', 'batch_id', + 'new_batch_id') + + db.add_column('archaeological_finds_historicalbasefind', 'batch', + self.gf('django.db.models.fields.CharField')(default='U', max_length=1), + keep_default=False) + db.rename_column('archaeological_finds_historicalbasefind', + 'batch_id', 'new_batch_id') + + models = { + 'archaeological_context_records.activitytype': { + 'Meta': {'ordering': "('order',)", 'object_name': 'ActivityType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.contextrecord': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'ContextRecord'}, + 'activity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.ActivityType']", 'null': 'True', 'blank': 'True'}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'closing_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'datings': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_context_records.Dating']", 'symmetrical': 'False'}), + 'datings_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'depth': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'filling': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'has_furniture': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'identification': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.IdentificationType']", 'null': 'True', 'blank': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_context_records_contextrecord'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'interpretation': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'length': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'location': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'opening_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'operation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'context_record'", 'to': "orm['archaeological_operations.Operation']"}), + 'parcel': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'context_record'", 'to': "orm['archaeological_operations.Parcel']"}), + 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'dim': '3', 'null': 'True', 'blank': 'True'}), + 'polygon': ('django.contrib.gis.db.models.fields.PolygonField', [], {'null': 'True', 'blank': 'True'}), + 'related_context_records': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_context_records.ContextRecord']", 'null': 'True', 'through': "orm['archaeological_context_records.RecordRelations']", 'blank': 'True'}), + 'taq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'taq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'thickness': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'tpq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'tpq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'unit': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_context_records.Unit']"}), + 'width': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_context_records.dating': { + 'Meta': {'object_name': 'Dating'}, + 'dating_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.DatingType']", 'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'period': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Period']"}), + 'precise_dating': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'quality': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.DatingQuality']", 'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_context_records.datingquality': { + 'Meta': {'ordering': "('label',)", 'object_name': 'DatingQuality'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.datingtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'DatingType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.identificationtype': { + 'Meta': {'ordering': "('order', 'label')", 'object_name': 'IdentificationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.recordrelations': { + 'Meta': {'object_name': 'RecordRelations'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'left_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'right_relations'", 'to': "orm['archaeological_context_records.ContextRecord']"}), + 'relation_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.RelationType']"}), + 'right_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'left_relations'", 'to': "orm['archaeological_context_records.ContextRecord']"}) + }, + 'archaeological_context_records.relationtype': { + 'Meta': {'ordering': "('order', 'label')", 'object_name': 'RelationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'inverse_relation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.RelationType']", 'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'symmetrical': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'tiny_label': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.unit': { + 'Meta': {'ordering': "('order',)", 'object_name': 'Unit'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.Unit']", 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_files.file': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'File'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'cira_advised': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'classified_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'corporation_general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'general_contractor_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today', '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'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '120', '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': "'general_contractor_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imported_line': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_files_file'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'instruction_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True', 'blank': 'True'}), + 'locality': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'main_town': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_main'", 'null': 'True', 'to': "orm['ishtar_common.Town']"}), + '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.TextField', [], {'null': 'True', 'blank': 'True'}), + 'numeric_reference': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'permit_reference': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'permit_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.PermitType']", 'null': 'True', 'blank': 'True'}), + 'planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'planning_service_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'protected_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'raw_general_contractor': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'raw_town_planning_service': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'reception_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + '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['ishtar_common.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': "'responsible_town_planning_service_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', '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': "'scientist'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'total_developed_surface': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'total_surface': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'file'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_files.filetype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'FileType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_files.permittype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'PermitType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_files.saisinetype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'SaisineType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'delay': ('django.db.models.fields.IntegerField', [], {'default': '30'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.basefind': { + 'Meta': {'object_name': 'BaseFind'}, + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'batch': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.BatchType']", 'null': 'True', 'blank': 'True'}), + 'cache_complete_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'cache_short_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'context_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'base_finds'", 'to': "orm['archaeological_context_records.ContextRecord']"}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'discovery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_x': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_y': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_z': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_finds_basefind'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'line': ('django.contrib.gis.db.models.fields.LineStringField', [], {'null': 'True', 'blank': 'True'}), + 'material_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'dim': '3', 'null': 'True', 'blank': 'True'}), + 'point_2d': ('django.contrib.gis.db.models.fields.PointField', [], {'null': 'True', 'blank': 'True'}), + 'polygon': ('django.contrib.gis.db.models.fields.PolygonField', [], {'null': 'True', 'blank': 'True'}), + 'spatial_reference_system': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SpatialReferenceSystem']", 'null': 'True', 'blank': 'True'}), + 'special_interest': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), + 'topographic_localisation': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), + 'x': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'y': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'z': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.batchtype': { + 'Meta': {'ordering': "('order',)", 'object_name': 'BatchType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '10'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.conservatorystate': { + 'Meta': {'ordering': "('label',)", 'object_name': 'ConservatoryState'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.ConservatoryState']", 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.find': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'Find'}, + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'base_finds': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.BaseFind']"}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'check_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), + 'checked': ('django.db.models.fields.CharField', [], {'default': "'NC'", 'max_length': '2'}), + 'collection': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'finds'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['archaeological_warehouse.Collection']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'conservatory_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'conservatory_state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.ConservatoryState']", 'null': 'True', 'on_delete': 'models.SET_NULL', 'blank': 'True'}), + 'container': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'finds'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['archaeological_warehouse.Container']"}), + 'dating_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'datings': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_context_records.Dating']"}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'diameter': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'dimensions_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'downstream_treatment': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'upstream'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['archaeological_finds.Treatment']"}), + 'estimated_value': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'find_number': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'height': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_finds_find'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'integrities': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.IntegrityType']"}), + 'is_complete': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'length': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'mark': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'material_types': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'finds'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.MaterialType']"}), + 'min_number_of_individuals': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'object_types': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.ObjectType']"}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'preservation_to_considers': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'finds'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.PreservationType']"}), + 'previous_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'remarkabilities': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.RemarkabilityType']"}), + 'thickness': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'upstream_treatment': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'downstream'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['archaeological_finds.Treatment']"}), + 'volume': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'weight': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'weight_unit': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}), + 'width': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.findbasket': { + 'Meta': {'unique_together': "(('label', 'user'),)", 'object_name': 'FindBasket'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'items': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'basket'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['archaeological_finds.Find']"}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '1000'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.finddownstreamtreatments': { + 'Meta': {'ordering': "('find', '-treatment_nb')", 'unique_together': "(('find', 'treatment'),)", 'object_name': 'FindDownstreamTreatments', 'db_table': "'find_downtreatments'", 'managed': 'False'}, + 'find': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'finddownstreamtreatments_related'", 'to': "orm['archaeological_finds.Find']"}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Treatment']", 'primary_key': 'True'}), + 'treatment_nb': ('django.db.models.fields.IntegerField', [], {}) + }, + 'archaeological_finds.findsource': { + 'Meta': {'object_name': 'FindSource'}, + 'additional_information': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + '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['ishtar_common.Author']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'duplicate': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '12', 'null': 'True', 'blank': 'True'}), + 'find': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_finds.Find']"}), + 'format_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Format']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'item_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'receipt_date_in_documentation': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'scale': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}), + 'support_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SupportType']", 'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}) + }, + 'archaeological_finds.findtreatments': { + 'Meta': {'ordering': "('find', 'upstream', '-treatment_nb')", 'unique_together': "(('find', 'treatment'),)", 'object_name': 'FindTreatments', 'db_table': "'find_treatments'", 'managed': 'False'}, + 'find': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'findtreatments_related'", 'to': "orm['archaeological_finds.Find']"}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Treatment']", 'primary_key': 'True'}), + 'treatment_nb': ('django.db.models.fields.IntegerField', [], {}), + 'upstream': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'archaeological_finds.findupstreamtreatments': { + 'Meta': {'ordering': "('find', '-treatment_nb')", 'unique_together': "(('find', 'treatment'),)", 'object_name': 'FindUpstreamTreatments', 'db_table': "'find_uptreatments'", 'managed': 'False'}, + 'find': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'findupstreamtreatments_related'", 'to': "orm['archaeological_finds.Find']"}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Treatment']", 'primary_key': 'True'}), + 'treatment_nb': ('django.db.models.fields.IntegerField', [], {}) + }, + 'archaeological_finds.historicalbasefind': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalBaseFind'}, + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'batch_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'cache_complete_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'cache_short_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'context_record_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'discovery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_x': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_y': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_error_z': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'line': ('django.contrib.gis.db.models.fields.LineStringField', [], {'null': 'True', 'blank': 'True'}), + 'material_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'dim': '3', 'null': 'True', 'blank': 'True'}), + 'point_2d': ('django.contrib.gis.db.models.fields.PointField', [], {'null': 'True', 'blank': 'True'}), + 'polygon': ('django.contrib.gis.db.models.fields.PolygonField', [], {'null': 'True', 'blank': 'True'}), + 'spatial_reference_system_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'special_interest': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), + 'topographic_localisation': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), + 'x': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'y': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'z': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.historicalfind': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalFind'}, + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'check_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), + 'checked': ('django.db.models.fields.CharField', [], {'default': "'NC'", 'max_length': '2'}), + 'collection_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'conservatory_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'conservatory_state_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'container_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'dating_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'diameter': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'dimensions_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'downstream_treatment_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'estimated_value': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'find_number': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'height': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'is_complete': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'length': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'mark': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'min_number_of_individuals': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'previous_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'thickness': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'upstream_treatment_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'volume': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'weight': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'weight_unit': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}), + 'width': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.historicaltreatment': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalTreatment'}, + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'container_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'file_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'goal': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'insurance_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'location_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'organization_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'other_reference': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'person_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'quoted_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'realized_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'target_is_basket': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'treatment_state_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_finds.historicaltreatmentfile': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalTreatmentFile'}, + 'applicant_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'applicant_organisation_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'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', 'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'in_charge_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'reception_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'type_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_finds.integritytype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'IntegrityType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.materialtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'MaterialType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.MaterialType']", 'null': 'True', 'blank': 'True'}), + 'recommendation': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.objecttype': { + 'Meta': {'ordering': "('parent__label', 'label')", 'object_name': 'ObjectType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.ObjectType']", 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.preservationtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'PreservationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.property': { + 'Meta': {'object_name': 'Property'}, + 'administrative_act': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.AdministrativeAct']"}), + 'end_date': ('django.db.models.fields.DateField', [], {}), + 'find': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Find']"}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_finds_property'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'properties'", 'to': "orm['ishtar_common.Person']"}), + 'start_date': ('django.db.models.fields.DateField', [], {}) + }, + 'archaeological_finds.remarkabilitytype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'RemarkabilityType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.treatment': { + 'Meta': {'unique_together': "(('year', 'index'),)", 'object_name': 'Treatment'}, + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'container': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.Container']", 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'estimated_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatments'", 'null': 'True', 'to': "orm['archaeological_finds.TreatmentFile']"}), + 'goal': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_finds_treatment'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'insurance_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.Warehouse']", 'null': 'True', 'blank': 'True'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatments'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'other_reference': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatments'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'quoted_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'realized_cost': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'target_is_basket': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'treatment_state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.TreatmentState']", 'null': 'True', 'blank': 'True'}), + 'treatment_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_finds.TreatmentType']", 'symmetrical': 'False'}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_finds.treatmentfile': { + 'Meta': {'ordering': "('cached_label',)", 'unique_together': "(('year', 'index'),)", 'object_name': 'TreatmentFile'}, + 'applicant': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatmentfile_applicant'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'applicant_organisation': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatmentfile_applicant'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'cached_label': ('django.db.models.fields.TextField', [], {'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', 'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_finds_treatmentfile'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'treatmentfile_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'reception_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.TreatmentFileType']"}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2017'}) + }, + 'archaeological_finds.treatmentfilesource': { + 'Meta': {'object_name': 'TreatmentFileSource'}, + 'additional_information': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'associated_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'treatmentfilesource_related'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Author']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'duplicate': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '12', 'null': 'True', 'blank': 'True'}), + 'format_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Format']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'item_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'receipt_date_in_documentation': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'scale': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}), + 'support_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SupportType']", 'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'treatment_file': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_finds.TreatmentFile']"}) + }, + 'archaeological_finds.treatmentfiletype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'TreatmentFileType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.treatmentsource': { + 'Meta': {'object_name': 'TreatmentSource'}, + 'additional_information': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + '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['ishtar_common.Author']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'duplicate': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '12', 'null': 'True', 'blank': 'True'}), + 'format_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Format']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'item_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'receipt_date_in_documentation': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'scale': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}), + 'support_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SupportType']", 'null': 'True', 'blank': 'True'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_finds.Treatment']"}) + }, + 'archaeological_finds.treatmentstate': { + 'Meta': {'ordering': "('label',)", 'object_name': 'TreatmentState'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_finds.treatmenttype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'TreatmentType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'downstream_is_many': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '10'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.TreatmentType']", 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}), + 'upstream_is_many': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'virtual': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + '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['ishtar_common.DocumentTemplate']"}), + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'indexed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'intented_to': ('django.db.models.fields.CharField', [], {'max_length': '2'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_operations.administrativeact': { + 'Meta': {'ordering': "('year', 'signature_date', 'index', 'act_type')", 'object_name': 'AdministrativeAct'}, + 'act_object': ('django.db.models.fields.TextField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'act_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.ActType']"}), + 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'administrative_act'", 'null': 'True', 'to': "orm['archaeological_files.File']"}), + 'departments_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_administrativeact'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'adminact_operation_in_charge'", 'null': 'True', 'on_delete': 'models.SET_NULL', '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', [], {'blank': 'True', 'related_name': "'adminact_operator'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + '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': "'adminact_scientist'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'signatory': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'signatory'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'signature_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'towns_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'administrative_act'", 'null': 'True', 'to': "orm['archaeological_finds.Treatment']"}), + 'treatment_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'administrative_act'", 'null': 'True', 'to': "orm['archaeological_finds.TreatmentFile']"}), + 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.archaeologicalsite': { + 'Meta': {'object_name': 'ArchaeologicalSite'}, + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_archaeologicalsite'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'periods': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}), + 'remains': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.RemainType']", 'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.operation': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'Operation'}, + 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'archaeological_sites': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.ArchaeologicalSite']", 'null': 'True', 'blank': 'True'}), + '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': "'cira_rapporteur'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'code_patriarche': ('django.db.models.fields.IntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'common_name': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), + 'documentation_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'documentation_received': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'eas_number': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), + 'effective_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'excavation_end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'finds_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'finds_received': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'fnap_cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'fnap_financing': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'geoarchaeological_context_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_operation'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'large_area_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'multi_polygon': ('django.contrib.gis.db.models.fields.MultiPolygonField', [], {'null': 'True', 'blank': 'True'}), + 'negative_result': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'old_code': ('django.db.models.fields.CharField', [], {'max_length': '200', '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['ishtar_common.OperationType']"}), + 'operator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operator'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + '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', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}), + 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'null': 'True', 'blank': 'True'}), + 'record_quality': ('django.db.models.fields.CharField', [], {'max_length': '2', 'null': 'True', 'blank': 'True'}), + 'remains': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.RemainType']", 'null': 'True', 'blank': 'True'}), + 'report_delivery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'report_processing': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.ReportState']", 'null': 'True', 'blank': 'True'}), + 'scheduled_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'scientific_documentation_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_scientist_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', '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'}), + 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'operations'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}), + 'virtual_operation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'zoning_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.parcel': { + 'Meta': {'ordering': "('year', 'section', 'parcel_number')", 'object_name': 'Parcel'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parcels'", 'null': 'True', 'to': "orm['archaeological_files.File']"}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_parcel'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + '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', 'null': 'True', 'blank': 'True'}), + 'public_domain': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'section': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}), + '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': { + 'Meta': {'ordering': "('order',)", 'object_name': 'Period'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.IntegerField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_operations.remaintype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'RemainType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_operations.reportstate': { + 'Meta': {'ordering': "('order',)", 'object_name': 'ReportState'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_warehouse.collection': { + 'Meta': {'ordering': "('name',)", 'object_name': 'Collection'}, + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_warehouse_collection'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'warehouse': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'collections'", 'to': "orm['archaeological_warehouse.Warehouse']"}) + }, + 'archaeological_warehouse.container': { + 'Meta': {'ordering': "('cached_label',)", 'unique_together': "(('index', 'location'),)", 'object_name': 'Container'}, + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'cached_location': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'container_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.ContainerType']"}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_warehouse_container'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'containers'", 'to': "orm['archaeological_warehouse.Warehouse']"}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'responsible': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owned_containers'", 'to': "orm['archaeological_warehouse.Warehouse']"}) + }, + 'archaeological_warehouse.containertype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'ContainerType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'length': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}), + 'volume': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_warehouse.warehouse': { + 'Meta': {'object_name': 'Warehouse'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'associated_divisions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_warehouse.WarehouseDivision']", 'symmetrical': 'False', 'through': "orm['archaeological_warehouse.WarehouseDivisionLink']", 'blank': 'True'}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_warehouse_warehouse'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'person_in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'warehouse_in_charge'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'warehouse_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.WarehouseType']"}) + }, + 'archaeological_warehouse.warehousedivision': { + 'Meta': {'object_name': 'WarehouseDivision'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_warehouse.warehousedivisionlink': { + 'Meta': {'ordering': "('warehouse', 'order')", 'unique_together': "(('warehouse', 'division'),)", 'object_name': 'WarehouseDivisionLink'}, + 'division': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.WarehouseDivision']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '10'}), + 'warehouse': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.Warehouse']"}) + }, + 'archaeological_warehouse.warehousetype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'WarehouseType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'ishtar_common.arrondissement': { + 'Meta': {'object_name': 'Arrondissement'}, + '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'}) + }, + 'ishtar_common.author': { + 'Meta': {'object_name': 'Author'}, + '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['ishtar_common.Person']"}) + }, + 'ishtar_common.authortype': { + 'Meta': {'object_name': 'AuthorType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.canton': { + 'Meta': {'object_name': 'Canton'}, + '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'}) + }, + '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'}), + 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.State']", 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.documenttemplate': { + 'Meta': {'ordering': "['associated_object_name', 'name']", 'object_name': 'DocumentTemplate'}, + 'associated_object_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'template': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}) + }, + 'ishtar_common.format': { + 'Meta': {'object_name': 'Format'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.import': { + 'Meta': {'object_name': 'Import'}, + 'conservative_import': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'encoding': ('django.db.models.fields.CharField', [], {'default': "'utf-8'", 'max_length': '15'}), + 'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'error_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imported_file': ('django.db.models.fields.files.FileField', [], {'max_length': '220'}), + 'imported_images': ('django.db.models.fields.files.FileField', [], {'max_length': '220', 'null': 'True', 'blank': 'True'}), + 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.ImporterType']"}), + 'match_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'result_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'seconds_remaining': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'skip_lines': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'state': ('django.db.models.fields.CharField', [], {'default': "'C'", 'max_length': '2'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']"}) + }, + 'ishtar_common.importertype': { + 'Meta': {'object_name': 'ImporterType'}, + 'associated_models': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'description': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_template': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'unicity_keys': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'users': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.ishtaruser': { + 'Meta': {'object_name': 'IshtarUser', '_ormbases': ['auth.User']}, + 'advanced_shortcut_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ishtaruser'", 'unique': 'True', 'to': "orm['ishtar_common.Person']"}), + 'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}) + }, + 'ishtar_common.operationtype': { + 'Meta': {'ordering': "['-preventive', 'order', 'label']", 'object_name': 'OperationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'preventive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + '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'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_organization'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}), + 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + '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'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.organizationtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'OrganizationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + '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'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'contact_type': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_person'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'old_title': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + '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'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_name': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'salutation': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'surname': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.TitleType']", 'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.persontype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'PersonType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.sourcetype': { + 'Meta': {'object_name': 'SourceType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.spatialreferencesystem': { + 'Meta': {'ordering': "('label',)", 'object_name': 'SpatialReferenceSystem'}, + 'auth_name': ('django.db.models.fields.CharField', [], {'default': "'EPSG'", 'max_length': '256'}), + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '10'}), + 'srid': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.state': { + 'Meta': {'ordering': "['number']", 'object_name': 'State'}, + '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'}) + }, + 'ishtar_common.supporttype': { + 'Meta': {'object_name': 'SupportType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.titletype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'TitleType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.town': { + 'Meta': {'ordering': "['numero_insee']", 'object_name': 'Town'}, + '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['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_town'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'numero_insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '6'}), + 'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['archaeological_finds']
\ No newline at end of file diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py index 50c42ef30..1a1ef063d 100644 --- a/archaeological_finds/models.py +++ b/archaeological_finds/models.py @@ -1,6 +1,6 @@ from archaeological_finds.models_finds import MaterialType, ConservatoryState,\ PreservationType, IntegrityType, RemarkabilityType, ObjectType, BaseFind, \ - FindBasket, Find, FindSource, Property, IS_ISOLATED_CHOICES, CHECK_CHOICES + FindBasket, Find, FindSource, Property, CHECK_CHOICES, BatchType from archaeological_finds.models_treatments import TreatmentType, Treatment, \ AbsFindTreatments, FindUpstreamTreatments, FindDownstreamTreatments, \ FindTreatments, TreatmentSource, TreatmentFile, TreatmentFileType, \ @@ -9,8 +9,7 @@ from archaeological_finds.models_treatments import TreatmentType, Treatment, \ __all__ = ['MaterialType', 'ConservatoryState', 'PreservationType', 'IntegrityType', 'RemarkabilityType', 'ObjectType', 'BaseFind', 'FindBasket', 'Find', 'FindSource', 'Property', - 'IS_ISOLATED_CHOICES', 'CHECK_CHOICES', - 'TreatmentType', 'TreatmentState', 'Treatment', 'AbsFindTreatments', - 'FindUpstreamTreatments', 'FindDownstreamTreatments', - 'FindTreatments', 'TreatmentSource', 'TreatmentFile', - 'TreatmentFileType', 'TreatmentFileSource'] + 'CHECK_CHOICES', 'BatchType', 'TreatmentType', 'TreatmentState', + 'Treatment', 'AbsFindTreatments', 'FindUpstreamTreatments', + 'FindDownstreamTreatments', 'FindTreatments', 'TreatmentSource', + 'TreatmentFile', 'TreatmentFileType', 'TreatmentFileSource'] diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index bbb74e4f3..c8903fc10 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -93,6 +93,16 @@ post_save.connect(post_save_cache, sender=RemarkabilityType) post_delete.connect(post_save_cache, sender=RemarkabilityType) +class BatchType(GeneralType): + order = models.IntegerField(_(u"Order"), default=10) + class Meta: + verbose_name = _(u"Batch type") + verbose_name_plural = _(u"Batch types") + ordering = ('order',) +post_save.connect(post_save_cache, sender=BatchType) +post_delete.connect(post_save_cache, sender=BatchType) + + class ObjectType(GeneralType): parent = models.ForeignKey("ObjectType", blank=True, null=True, verbose_name=_(u"Parent")) @@ -115,15 +125,8 @@ class ObjectType(GeneralType): post_save.connect(post_save_cache, sender=ObjectType) post_delete.connect(post_save_cache, sender=ObjectType) -IS_ISOLATED_CHOICES = ( - ('U', _(u"Unknow")), - ('O', _(u"Object")), - ('B', _(u"Batch")) -) - class BaseFind(BaseHistorizedItem, OwnPerms): - IS_ISOLATED_DICT = dict(IS_ISOLATED_CHOICES) label = models.TextField(_(u"Free ID")) external_id = models.TextField(_(u"External ID"), blank=True, null=True) auto_external_id = models.BooleanField( @@ -137,8 +140,8 @@ class BaseFind(BaseHistorizedItem, OwnPerms): verbose_name=_(u"Context Record")) discovery_date = models.DateField(_(u"Discovery date"), blank=True, null=True) - batch = models.CharField(_(u"Batch/object"), max_length=1, default="U", - choices=IS_ISOLATED_CHOICES) + batch = models.ForeignKey(BatchType, verbose_name=_(u"Batch/object"), + blank=True, null=True) index = models.IntegerField(u"Index", default=0) material_index = models.IntegerField(_(u"Material index"), default=0) topographic_localisation = models.CharField( diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index d7425eda2..bb2e629c7 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -186,9 +186,7 @@ {% endwith %} {% endwith %} {% endif %} -{% if base_find.IS_ISOLATED_DICT %} -{% field_li "Batch/object" base_find.batch|from_dict:base_find.IS_ISOLATED_DICT %} -{% endif %} +{% field_li "Batch/object" base_find.batch %} {% if base_find.history_object and base_find.history_object.IS_ISOLATED_DICT %} {% field_li "Batch/object" base_find.batch|from_dict:base_find.history_object.IS_ISOLATED_DICT %} {% endif %} diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index ffcb3c355..f43875269 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -10,12 +10,12 @@ msgid "" msgstr "" #: forms.py:69 forms.py:371 forms.py:1009 forms.py:1031 forms.py:1035 -#: models.py:1216 templates/ishtar/sheet_operation.html:144 +#: models.py:1217 templates/ishtar/sheet_operation.html:144 #: templates/ishtar/blocks/window_tables/parcels.html:10 msgid "Parcels" msgstr "" -#: forms.py:72 forms.py:205 forms.py:985 models.py:1202 +#: forms.py:72 forms.py:205 forms.py:985 models.py:1203 #: templates/ishtar/blocks/window_tables/parcels.html:7 #: templates/ishtar/dashboards/dashboard_operation.html:432 #: templates/ishtar/dashboards/dashboard_operation.html:446 @@ -25,21 +25,21 @@ msgid "Town" msgstr "" #: forms.py:74 forms.py:455 forms.py:752 forms.py:1255 models.py:274 -#: models.py:1008 models.py:1200 +#: models.py:1009 models.py:1201 #: templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Year" msgstr "" -#: forms.py:77 models.py:1203 +#: forms.py:77 models.py:1204 #: templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Section" msgstr "" -#: forms.py:80 models.py:1205 +#: forms.py:80 models.py:1206 msgid "Parcel number" msgstr "" -#: forms.py:82 models.py:1207 models.py:1224 models.py:1273 +#: forms.py:82 models.py:1208 models.py:1225 models.py:1274 msgid "Public domain" msgstr "" @@ -75,8 +75,8 @@ msgstr "" msgid "Relation type" msgstr "" -#: forms.py:383 ishtar_menu.py:30 models.py:369 models.py:829 models.py:859 -#: models.py:887 models.py:990 models.py:1199 wizards.py:344 wizards.py:355 +#: forms.py:383 ishtar_menu.py:30 models.py:369 models.py:830 models.py:860 +#: models.py:888 models.py:991 models.py:1200 wizards.py:344 wizards.py:355 #: templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "" @@ -113,7 +113,7 @@ msgstr "" msgid "Parcel (section/number/public domain)" msgstr "" -#: forms.py:465 forms.py:1269 models.py:830 +#: forms.py:465 forms.py:1269 models.py:831 #: templates/ishtar/dashboards/dashboard_operation.html:390 #: templates/ishtar/dashboards/dashboard_operation.html:411 #: templates/ishtar/dashboards/dashboard_operation.html:643 @@ -139,7 +139,7 @@ msgstr "" msgid "In charge" msgstr "" -#: forms.py:485 models.py:984 +#: forms.py:485 models.py:985 msgid "Scientist in charge" msgstr "" @@ -245,7 +245,7 @@ msgstr "" msgid "Associated file" msgstr "" -#: forms.py:640 forms.py:933 models.py:496 models.py:886 models.py:995 +#: forms.py:640 forms.py:933 models.py:497 models.py:887 models.py:996 #: wizards.py:80 msgid "Archaeological file" msgstr "" @@ -339,7 +339,7 @@ msgstr "" msgid "Total surface (m2)" msgstr "" -#: forms.py:800 models.py:53 models.py:258 models.py:1389 +#: forms.py:800 models.py:53 models.py:258 models.py:1399 msgid "Start date" msgstr "" @@ -390,7 +390,7 @@ msgstr "" msgid "Bad operation code" msgstr "" -#: forms.py:929 models.py:511 +#: forms.py:929 models.py:512 msgid "Operation code" msgstr "" @@ -431,11 +431,11 @@ msgstr "" msgid "Prescription on geoarchaeological context" msgstr "" -#: forms.py:983 forms.py:1005 models.py:286 models.py:1018 +#: forms.py:983 forms.py:1005 models.py:286 models.py:1019 msgid "Towns" msgstr "" -#: forms.py:1012 models.py:1215 models.py:1387 +#: forms.py:1012 models.py:1216 models.py:1397 msgid "Parcel" msgstr "" @@ -469,7 +469,7 @@ msgstr "" msgid "Associated archaeological sites" msgstr "" -#: forms.py:1167 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92 +#: forms.py:1167 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93 msgid "Search" msgstr "" @@ -481,7 +481,7 @@ msgstr "" msgid "Would you like to delete this operation?" msgstr "" -#: forms.py:1186 forms.py:1256 forms.py:1392 models.py:861 models.py:975 +#: forms.py:1186 forms.py:1256 forms.py:1392 models.py:862 models.py:976 msgid "Index" msgstr "" @@ -508,7 +508,7 @@ msgstr "" msgid "You should select a document." msgstr "" -#: forms.py:1263 forms.py:1330 models.py:900 models.py:969 +#: forms.py:1263 forms.py:1330 models.py:901 models.py:970 msgid "Act type" msgstr "" @@ -516,7 +516,7 @@ msgstr "" msgid "Indexed?" msgstr "" -#: forms.py:1270 forms.py:1335 models.py:1009 +#: forms.py:1270 forms.py:1335 models.py:1010 #: templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" @@ -529,7 +529,7 @@ msgstr "" msgid "You should select an administrative act." msgstr "" -#: forms.py:1338 models.py:1006 +#: forms.py:1338 models.py:1007 msgid "Signature date" msgstr "" @@ -564,62 +564,62 @@ msgstr "" msgid "Generate the associated doc?" msgstr "" -#: forms.py:1471 ishtar_menu.py:121 views.py:382 +#: forms.py:1471 ishtar_menu.py:123 views.py:382 msgctxt "admin act register" msgid "Register" msgstr "" -#: ishtar_menu.py:38 ishtar_menu.py:69 ishtar_menu.py:97 +#: ishtar_menu.py:39 ishtar_menu.py:70 ishtar_menu.py:98 msgid "Creation" msgstr "" -#: ishtar_menu.py:43 ishtar_menu.py:74 ishtar_menu.py:102 +#: ishtar_menu.py:44 ishtar_menu.py:75 ishtar_menu.py:103 msgid "Modification" msgstr "" -#: ishtar_menu.py:48 +#: ishtar_menu.py:49 msgid "Closing" msgstr "" -#: ishtar_menu.py:52 ishtar_menu.py:79 ishtar_menu.py:107 +#: ishtar_menu.py:53 ishtar_menu.py:80 ishtar_menu.py:108 msgid "Deletion" msgstr "" -#: ishtar_menu.py:58 models.py:1025 +#: ishtar_menu.py:59 models.py:1026 #: templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" -#: ishtar_menu.py:84 +#: ishtar_menu.py:85 msgid "Documents" msgstr "" -#: ishtar_menu.py:89 +#: ishtar_menu.py:90 msgid "Documentation" msgstr "" -#: ishtar_menu.py:116 +#: ishtar_menu.py:117 msgid "Administrative Act" msgstr "" -#: ishtar_menu.py:129 +#: ishtar_menu.py:131 msgid "Dashboard" msgstr "" -#: ishtar_menu.py:132 +#: ishtar_menu.py:135 msgid "General informations" msgstr "" -#: ishtar_menu.py:136 models.py:370 +#: ishtar_menu.py:139 models.py:370 #: templates/ishtar/dashboards/dashboard_operation.html:8 msgid "Operations" msgstr "" -#: models.py:52 models.py:70 models.py:1851 +#: models.py:52 models.py:70 models.py:1861 msgid "Order" msgstr "" -#: models.py:54 models.py:1390 +#: models.py:54 models.py:1400 msgid "End date" msgstr "" @@ -739,7 +739,7 @@ msgstr "" msgid "In charge scientist" msgstr "" -#: models.py:279 models.py:1195 +#: models.py:279 models.py:1196 msgid "File" msgstr "" @@ -792,252 +792,252 @@ msgstr "" msgid "Can close Operation" msgstr "" -#: models.py:405 +#: models.py:406 msgid "OPE" msgstr "" -#: models.py:465 +#: models.py:466 msgid "Intercommunal" msgstr "" -#: models.py:497 +#: models.py:498 msgid "Code patriarche" msgstr "" -#: models.py:537 +#: models.py:538 msgid "This operation code already exists for this year" msgstr "" -#: models.py:570 +#: models.py:563 msgid "Number of parcels" msgstr "" -#: models.py:588 +#: models.py:581 msgid "Number of administrative acts" msgstr "" -#: models.py:596 +#: models.py:589 msgid "Number of indexed administrative acts" msgstr "" -#: models.py:604 +#: models.py:597 msgid "Number of context records" msgstr "" -#: models.py:640 +#: models.py:633 msgid "Number of finds" msgstr "" -#: models.py:685 +#: models.py:678 msgid "No type" msgstr "" -#: models.py:716 +#: models.py:709 msgid "Number of sources" msgstr "" -#: models.py:758 templates/ishtar/dashboards/dashboard_operation.html:309 +#: models.py:751 templates/ishtar/dashboards/dashboard_operation.html:309 #: templates/ishtar/dashboards/dashboard_operation.html:575 #: templates/ishtar/dashboards/dashboard_operation.html:611 msgid "Mean" msgstr "" -#: models.py:800 +#: models.py:801 msgid "Inverse relation" msgstr "" -#: models.py:804 +#: models.py:805 msgid "Operation relation type" msgstr "" -#: models.py:805 +#: models.py:806 msgid "Operation relation types" msgstr "" -#: models.py:818 +#: models.py:819 msgid "Operation record relation" msgstr "" -#: models.py:819 +#: models.py:820 msgid "Operation record relations" msgstr "" -#: models.py:865 +#: models.py:866 msgid "Operation documentation" msgstr "" -#: models.py:866 +#: models.py:867 msgid "Operation documentations" msgstr "" -#: models.py:869 +#: models.py:870 msgid "Can view all Operation sources" msgstr "" -#: models.py:871 +#: models.py:872 msgid "Can view own Operation source" msgstr "" -#: models.py:873 +#: models.py:874 msgid "Can add own Operation source" msgstr "" -#: models.py:875 +#: models.py:876 msgid "Can change own Operation source" msgstr "" -#: models.py:877 +#: models.py:878 msgid "Can delete own Operation source" msgstr "" -#: models.py:888 models.py:1000 +#: models.py:889 models.py:1001 msgid "Treatment request" msgstr "" -#: models.py:889 models.py:1005 +#: models.py:890 models.py:1006 msgid "Treatment" msgstr "" -#: models.py:891 +#: models.py:892 msgid "Intended to" msgstr "" -#: models.py:893 +#: models.py:894 msgid "Code" msgstr "" -#: models.py:896 +#: models.py:897 msgid "Associated template" msgstr "" -#: models.py:897 +#: models.py:898 msgid "Indexed" msgstr "" -#: models.py:901 +#: models.py:902 msgid "Act types" msgstr "" -#: models.py:973 +#: models.py:974 msgid "Person in charge of the operation" msgstr "" -#: models.py:979 +#: models.py:980 msgid "Archaeological preventive operator" msgstr "" -#: models.py:987 +#: models.py:988 msgid "Signatory" msgstr "" -#: models.py:1015 +#: models.py:1016 msgid "Departments" msgstr "" -#: models.py:1016 +#: models.py:1017 msgid "Cached values get from associated departments" msgstr "" -#: models.py:1019 +#: models.py:1020 msgid "Cached values get from associated towns" msgstr "" -#: models.py:1026 templates/ishtar/sheet_operation.html:102 +#: models.py:1027 templates/ishtar/sheet_operation.html:102 #: templates/ishtar/sheet_operation.html:138 msgid "Administrative acts" msgstr "" -#: models.py:1029 +#: models.py:1030 msgid "Can view all Administrative acts" msgstr "" -#: models.py:1031 +#: models.py:1032 msgid "Can view own Administrative act" msgstr "" -#: models.py:1033 +#: models.py:1034 msgid "Can add own Administrative act" msgstr "" -#: models.py:1035 +#: models.py:1036 msgid "Can change own Administrative act" msgstr "" -#: models.py:1037 +#: models.py:1038 msgid "Can delete own Administrative act" msgstr "" -#: models.py:1046 +#: models.py:1047 #: templates/ishtar/blocks/window_tables/administrativacts.html:7 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 msgid "Ref." msgstr "" -#: models.py:1140 +#: models.py:1141 msgid "This index already exists for this year" msgstr "" -#: models.py:1208 +#: models.py:1209 msgid "External ID" msgstr "" -#: models.py:1211 +#: models.py:1212 msgid "External ID is set automatically" msgstr "" -#: models.py:1212 +#: models.py:1213 msgid "Address - Locality" msgstr "" -#: models.py:1385 +#: models.py:1395 msgid "Owner" msgstr "" -#: models.py:1393 +#: models.py:1403 msgid "Parcel owner" msgstr "" -#: models.py:1394 +#: models.py:1404 msgid "Parcel owners" msgstr "" -#: models.py:1420 +#: models.py:1430 msgid "Recorded" msgstr "" -#: models.py:1421 +#: models.py:1431 msgid "Effective" msgstr "" -#: models.py:1422 +#: models.py:1432 msgid "Active" msgstr "" -#: models.py:1423 +#: models.py:1433 msgid "Field completed" msgstr "" -#: models.py:1424 +#: models.py:1434 msgid "Associated report" msgstr "" -#: models.py:1425 +#: models.py:1435 msgid "Closed" msgstr "" -#: models.py:1426 +#: models.py:1436 msgid "Documented and closed" msgstr "" -#: models.py:1852 +#: models.py:1862 msgid "Is preventive" msgstr "" -#: models.py:1855 +#: models.py:1865 msgid "Operation type old" msgstr "" -#: models.py:1856 +#: models.py:1866 msgid "Operation types old" msgstr "" diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot index 42adb9633..1de8d8f51 100644 --- a/archaeological_warehouse/locale/django.pot +++ b/archaeological_warehouse/locale/django.pot @@ -7,16 +7,16 @@ msgid "" msgstr "" -#: forms.py:35 forms.py:91 ishtar_menu.py:39 models.py:60 models.py:88 +#: forms.py:35 forms.py:91 ishtar_menu.py:40 models.py:63 models.py:103 #: templates/ishtar/sheet_warehouse.html:4 msgid "Warehouse" msgstr "" -#: forms.py:44 forms.py:49 models.py:239 +#: forms.py:44 forms.py:49 models.py:280 msgid "Division" msgstr "" -#: forms.py:51 models.py:112 +#: forms.py:51 models.py:127 msgid "Order" msgstr "" @@ -24,7 +24,7 @@ msgstr "" msgid "Divisions" msgstr "" -#: forms.py:66 forms.py:95 models.py:45 models.py:85 +#: forms.py:66 forms.py:95 models.py:45 models.py:100 msgid "Name" msgstr "" @@ -44,7 +44,7 @@ msgstr "" msgid "Person in charge" msgstr "" -#: forms.py:106 forms.py:168 models.py:51 models.py:165 +#: forms.py:106 forms.py:168 models.py:51 models.py:180 msgid "Comment" msgstr "" @@ -76,16 +76,16 @@ msgstr "" msgid "Would you like to delete this warehouse?" msgstr "" -#: forms.py:150 models.py:173 models.py:237 +#: forms.py:150 models.py:191 models.py:278 #: templates/ishtar/sheet_container.html:4 msgid "Container" msgstr "" -#: forms.py:154 forms.py:221 models.py:127 +#: forms.py:154 forms.py:221 models.py:142 msgid "Ref." msgstr "" -#: forms.py:155 forms.py:220 models.py:130 models.py:163 +#: forms.py:155 forms.py:220 models.py:145 models.py:178 msgid "Container type" msgstr "" @@ -93,7 +93,7 @@ msgstr "" msgid "Current location (warehouse)" msgstr "" -#: forms.py:163 models.py:160 +#: forms.py:163 models.py:175 msgid "Responsible warehouse" msgstr "" @@ -105,7 +105,7 @@ msgstr "" msgid "This ID already exists for this warehouse." msgstr "" -#: forms.py:231 forms.py:237 views.py:127 +#: forms.py:231 forms.py:237 views.py:131 msgid "Container search" msgstr "" @@ -117,7 +117,7 @@ msgstr "" msgid "Add a new container" msgstr "" -#: forms.py:244 ishtar_menu.py:35 views.py:93 +#: forms.py:244 ishtar_menu.py:36 views.py:93 msgid "Packaging" msgstr "" @@ -133,7 +133,7 @@ msgstr "" msgid "Packaged finds" msgstr "" -#: forms.py:264 models.py:166 +#: forms.py:264 models.py:181 msgid "Localisation" msgstr "" @@ -145,23 +145,23 @@ msgstr "" msgid "Treatment" msgstr "" -#: ishtar_menu.py:42 ishtar_menu.py:57 +#: ishtar_menu.py:44 ishtar_menu.py:59 msgid "Search" msgstr "" -#: ishtar_menu.py:45 ishtar_menu.py:60 +#: ishtar_menu.py:47 ishtar_menu.py:62 msgid "Creation" msgstr "" -#: ishtar_menu.py:48 ishtar_menu.py:63 +#: ishtar_menu.py:50 ishtar_menu.py:65 msgid "Modification" msgstr "" -#: ishtar_menu.py:51 ishtar_menu.py:66 +#: ishtar_menu.py:53 ishtar_menu.py:68 msgid "Deletion" msgstr "" -#: ishtar_menu.py:55 models.py:174 templates/ishtar/sheet_warehouse.html:17 +#: ishtar_menu.py:57 models.py:192 templates/ishtar/sheet_warehouse.html:17 msgid "Containers" msgstr "" @@ -169,123 +169,131 @@ msgstr "" msgid "Warehouse types" msgstr "" -#: models.py:61 +#: models.py:56 models.py:186 +msgid "External ID" +msgstr "" + +#: models.py:58 models.py:188 +msgid "External ID is set automatically" +msgstr "" + +#: models.py:64 msgid "Warehouses" msgstr "" -#: models.py:63 +#: models.py:66 msgid "Can view all Warehouses" msgstr "" -#: models.py:64 +#: models.py:67 msgid "Can view own Warehouse" msgstr "" -#: models.py:65 +#: models.py:68 msgid "Can add own Warehouse" msgstr "" -#: models.py:66 +#: models.py:69 msgid "Can change own Warehouse" msgstr "" -#: models.py:67 +#: models.py:70 msgid "Can delete own Warehouse" msgstr "" -#: models.py:87 +#: models.py:102 msgid "Description" msgstr "" -#: models.py:92 models.py:93 +#: models.py:107 models.py:108 msgid "Collection" msgstr "" -#: models.py:102 +#: models.py:117 msgid "Warehouse division" msgstr "" -#: models.py:103 +#: models.py:118 msgid "Warehouse divisions" msgstr "" -#: models.py:123 +#: models.py:138 msgid "Length (mm)" msgstr "" -#: models.py:124 +#: models.py:139 msgid "Width (mm)" msgstr "" -#: models.py:125 +#: models.py:140 msgid "Height (mm)" msgstr "" -#: models.py:126 +#: models.py:141 msgid "Volume (l)" msgstr "" -#: models.py:131 +#: models.py:146 msgid "Container types" msgstr "" -#: models.py:149 +#: models.py:164 msgid "Location - index" msgstr "" -#: models.py:150 +#: models.py:165 msgid "Precise localisation" msgstr "" -#: models.py:151 +#: models.py:166 msgid "Type" msgstr "" -#: models.py:157 +#: models.py:172 msgid "Location (warehouse)" msgstr "" -#: models.py:164 +#: models.py:179 msgid "Container ref." msgstr "" -#: models.py:168 +#: models.py:183 msgid "Cached location" msgstr "" -#: models.py:240 +#: models.py:281 msgid "Reference" msgstr "" -#: models.py:243 +#: models.py:284 msgid "Container localisation" msgstr "" -#: models.py:244 +#: models.py:285 msgid "Container localisations" msgstr "" -#: views.py:106 +#: views.py:110 msgid "Warehouse creation" msgstr "" -#: views.py:115 +#: views.py:119 msgid "Warehouse modification" msgstr "" -#: views.py:122 +#: views.py:126 msgid "Warehouse deletion" msgstr "" -#: views.py:138 +#: views.py:142 msgid "Container creation" msgstr "" -#: views.py:147 +#: views.py:151 msgid "Container modification" msgstr "" -#: views.py:154 +#: views.py:158 msgid "Container deletion" msgstr "" diff --git a/example_project/.coveragerc b/example_project/.coveragerc new file mode 100644 index 000000000..43462778f --- /dev/null +++ b/example_project/.coveragerc @@ -0,0 +1,9 @@ +[report] +show_missing = True +exclude_lines = + pragma: no cover + raise NotImplementedError +[run] +omit = + */migrations/* + diff --git a/example_project/settings.py b/example_project/settings.py index 437c75673..35bd590c8 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -29,7 +29,7 @@ STATIC_URL = '/static/' STATIC_ROOT = ROOT_PATH + 'static/' BASE_URL = "/" URL_PATH = "" -EXTRA_VERSION = '' +EXTRA_VERSION = 'git' ODT_TEMPLATE = ROOT_PATH + "../ishtar_common/static/template.odt" diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py index 47cbac02d..8e14d8506 100644 --- a/ishtar_common/context_processors.py +++ b/ishtar_common/context_processors.py @@ -20,7 +20,7 @@ from django.conf import settings from django.contrib.sites.models import Site -from ishtar_common.version import VERSION +from ishtar_common.version import __version__ from ishtar_common.models import get_current_profile from menus import Menu @@ -54,9 +54,9 @@ def get_base_context(request): dct['JQUERY_URL'] = settings.JQUERY_URL dct['JQUERY_UI_URL'] = settings.JQUERY_UI_URL dct['COUNTRY'] = settings.COUNTRY - dct['VERSION'] = u".".join([unicode(n) for n in VERSION]) + dct['VERSION'] = __version__ if settings.EXTRA_VERSION: - dct['VERSION'] += unicode(settings.EXTRA_VERSION) + dct['VERSION'] += "-" + unicode(settings.EXTRA_VERSION) profile = get_current_profile() if profile: dct['raw_css'] = profile.get_raw_css() diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index 90b6fa225..a8a7c8935 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -2533,7 +2533,7 @@ "description": "Index (num\u00e9ro par ann\u00e9e), le couple ann\u00e9e + index doit \u00eatre unique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Index (num\u00e9ro par ann\u00e9e)", "importer_type": 17 } }, @@ -2545,7 +2545,7 @@ "description": "Type d'op\u00e9ration (parmi une liste)", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Type d'op\u00e9ration", "importer_type": 17 } }, @@ -2569,7 +2569,7 @@ "description": "R\u00e9f\u00e9rence du dossier administratif associ\u00e9 \u00e0 l'op\u00e9ration sous la forme ANNEE-INDEX. Exemple : \"2002-4\".", "regexp_pre_filter": null, "required": false, - "label": "", + "label": "R\u00e9f\u00e9rence du dossier administratif", "importer_type": 17 } }, @@ -2581,7 +2581,7 @@ "description": "Identifiants des sites (entit\u00e9s arch\u00e9ologiques) concern\u00e9es par l'op\u00e9ration, s\u00e9par\u00e9es par \u00ab\u00a0&\u00a0\u00bb. \r\nExemple : \"44 125 0028 & 44 125 0029\"", "regexp_pre_filter": null, "required": false, - "label": "", + "label": "Identifiants des sites (EAs)", "importer_type": 17 } }, @@ -2593,7 +2593,7 @@ "description": "Types de vestiges (s\u00e9par\u00e9s par un \u00ab\u00a0&\u00a0\u00bb)\r\nExemple : \"four & fosses & villa\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Types de vestiges", "importer_type": 17 } }, @@ -2605,7 +2605,7 @@ "description": "P\u00e9riodes concern\u00e9es (s\u00e9par\u00e9es par un \u00ab\u00a0&\u00a0\u00bb). \r\nExemple : \"Gallo-romain & Fer & Med\".", "regexp_pre_filter": null, "required": false, - "label": "", + "label": "P\u00e9riodes", "importer_type": 17 } }, @@ -2614,10 +2614,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 11, - "description": "Titre (M., Mme), du responsable d'op\u00e9ration (RO)", + "description": "Titre (M., Mme, etc.) du responsable scientifique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Titre du responsable scientifique", "importer_type": 17 } }, @@ -2626,10 +2626,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 12, - "description": "Pr\u00e9nom du Responsable scientifique (responsable d'op\u00e9ration)", + "description": "Pr\u00e9nom du responsable scientifique (responsable d'op\u00e9ration)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Pr\u00e9nom du responsable scientifique", "importer_type": 17 } }, @@ -2638,10 +2638,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 13, - "description": "Nom du Responsable scientifique (responsable d'op\u00e9ration)", + "description": "Nom du responsable scientifique (responsable d'op\u00e9ration)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nom du responsable scientifique", "importer_type": 17 } }, @@ -2650,10 +2650,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 14, - "description": "Rattachement du Responsable scientifique (responsable d'op\u00e9ration)\r\nExemple : \"INRAP\" ou plus pr\u00e9cis \"INRAP Direction interr\u00e9gionale Grand Ouest\" selon votre degr\u00e9 de pr\u00e9cision dans la gestion des rattachements et des organisations.", + "description": "Rattachement du responsable scientifique (responsable d'op\u00e9ration)\r\nExemple : \"INRAP\" ou plus pr\u00e9cis \"INRAP Direction interr\u00e9gionale Grand Ouest\" selon votre degr\u00e9 de pr\u00e9cision dans la gestion des rattachements et des organisations.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Rattachement du responsable scientifique", "importer_type": 17 } }, @@ -2665,7 +2665,7 @@ "description": "Nom de l'op\u00e9rateur (organisation). Peut \u00eatre diff\u00e9rent de l'organisation de rattachement du responsable d'op\u00e9ration.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nom de l'op\u00e9rateur", "importer_type": 17 } }, @@ -2677,7 +2677,7 @@ "description": "R\u00e9f\u00e9rence de l'op\u00e9rateur (code ou autre r\u00e9f\u00e9rence interne de l'op\u00e9rateur)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "R\u00e9f\u00e9rence de l'op\u00e9rateur", "importer_type": 17 } }, @@ -2686,10 +2686,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 17, - "description": "Titre (M., Mme), du responsable du suivi scientifique", + "description": "Titre (M., Mme, etc.) du responsable du suivi scientifique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Titre du responsable du suivi scientifique", "importer_type": 17 } }, @@ -2701,7 +2701,7 @@ "description": "Pr\u00e9nom du responsable du suivi scientifique (ex\u00a0: resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Pr\u00e9nom du responsable du suivi scientifique", "importer_type": 17 } }, @@ -2713,7 +2713,7 @@ "description": "Nom du responsable du suivi scientifique (ex : resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nom du responsable du suivi scientifique", "importer_type": 17 } }, @@ -2725,7 +2725,7 @@ "description": "Rattachement du resp. du suivi scientifique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Rattachement du responsable du suivi scientifique", "importer_type": 17 } }, @@ -2737,7 +2737,7 @@ "description": "Surface couverte par l'op\u00e9ration (m2)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Surface couverte par l'op\u00e9ration", "importer_type": 17 } }, @@ -2749,7 +2749,7 @@ "description": "Date de d\u00e9but de l'op\u00e9ration (d\u00e9but du terrain d'ordinaire mais vous pouvez utiliser autre chose)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date de d\u00e9but de l'op\u00e9ration", "importer_type": 17 } }, @@ -2761,7 +2761,7 @@ "description": "Date de fin de l'op\u00e9ration (fin du terrain d'ordinaire mais vous pouvez utiliser autre chose)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date de fin de l'op\u00e9ration", "importer_type": 17 } }, @@ -2773,7 +2773,7 @@ "description": "Date de cl\u00f4ture (peut-\u00eatre la date de rendu de la documentation, la fin de la recherche associ\u00e9e ou autre) d\u2019ordinaire cela repr\u00e9sente la date \u00e0 partir de laquelle la documentation issue de l'op\u00e9ration n'est plus du ressort du responsable d'op\u00e9ration, mais vous pouvez utiliser autre chose.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date de cl\u00f4ture", "importer_type": 17 } }, @@ -2785,7 +2785,7 @@ "description": "Date d'avis (ex\u00a0: avis de CIRA ou autre selon votre usage)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date d'avis", "importer_type": 17 } }, @@ -2797,7 +2797,7 @@ "description": "R\u00e9sultats consid\u00e9r\u00e9s comme n\u00e9gatif (d\u2019ordinaire utilis\u00e9 pour les diagnostics n\u00e9gatifs)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "R\u00e9sultats consid\u00e9r\u00e9s comme n\u00e9gatif", "importer_type": 17 } }, @@ -2809,7 +2809,7 @@ "description": "Pr\u00e9nom du rapporteur (CIRA ou autre selon votre usage de la notion d'avis)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Pr\u00e9nom du rapporteur", "importer_type": 17 } }, @@ -2821,7 +2821,7 @@ "description": "Nom du rapporteur (CIRA ou autre selon votre usage de la notion d'avis)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nom du rapporteur", "importer_type": 17 } }, @@ -2833,7 +2833,7 @@ "description": "Rattachement rapporteur (organisation)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Rattachement du rapporteur", "importer_type": 17 } }, @@ -2845,7 +2845,7 @@ "description": "Date limite pr\u00e9vue pour le rendu de la documentation scientifique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date limite pour le rendu de la documentation", "importer_type": 17 } }, @@ -2857,7 +2857,7 @@ "description": "Documentation re\u00e7ue", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Documentation re\u00e7ue", "importer_type": 17 } }, @@ -2869,7 +2869,7 @@ "description": "Date limite pr\u00e9vue pour le rendu du mobilier", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date limite rendu du mobilier", "importer_type": 17 } }, @@ -2881,7 +2881,7 @@ "description": "Mobilier re\u00e7u ou livr\u00e9 selon vos usages et proc\u00e9dures", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Mobilier re\u00e7u", "importer_type": 17 } }, @@ -2893,7 +2893,7 @@ "description": "Commentaire g\u00e9n\u00e9ral", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire g\u00e9n\u00e9ral", "importer_type": 17 } }, @@ -2905,7 +2905,7 @@ "description": "Date de livraison du rapport", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date de livraison du rapport", "importer_type": 17 } }, @@ -2917,7 +2917,7 @@ "description": "\u00c9tat de traitement du rapport", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "\u00c9tat de traitement du rapport", "importer_type": 17 } }, @@ -2929,7 +2929,7 @@ "description": "Commentaire sur la documentation scientifique (y compris mobilier)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire sur la documentation", "importer_type": 17 } }, @@ -2941,7 +2941,7 @@ "description": "Nom du fichier image (jpg ou png), exemple \"IMG_5023.jpg\"\r\nLes fichiers images doivent \u00eatre joints \u00e0 l'import dans un fichier ZIP", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Image", "importer_type": 17 } }, @@ -2998,7 +2998,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 5, - "description": "Label / Identifiant (externe) de l'UE, ex: \"US 145\", \"Tranch\u00e9e 145\", \"145\", \"St 17\" etc.\r\nDoit \u00eatre unique pour une parcelle donn\u00e9e", + "description": "Label / Identifiant (externe) de l'UE, ex: \"US 145\", \"Tranch\u00e9e 145\", \"145\", \"St 17\" etc.\r\nDoit \u00eatre unique pour une parcelle donn\u00e9e. Maximum 200 caract\u00e8res.", "regexp_pre_filter": null, "required": true, "label": "Label UE", @@ -3022,7 +3022,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 7, - "description": "Description (texte, 1000 carac. max.)", + "description": "Description.", "regexp_pre_filter": null, "required": false, "label": "Description", @@ -3034,10 +3034,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 8, - "description": "Commentaire g\u00e9n\u00e9ral (1000 carac. max.)", + "description": "Commentaire g\u00e9n\u00e9ral.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire g\u00e9n\u00e9ral", "importer_type": 18 } }, @@ -3049,7 +3049,7 @@ "description": "Taille ou longueur (en m\u00e8tre), exemple \"1.2\", \"12\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Taille ou longueur", "importer_type": 18 } }, @@ -3061,7 +3061,7 @@ "description": "Largeur (en m\u00e8tre), exemple \"1.2\", \"12\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Largeur", "importer_type": 18 } }, @@ -3073,7 +3073,7 @@ "description": "\u00c9paisseur (en m\u00e8tre), exemple \"0.2\", \"2\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "\u00c9paisseur", "importer_type": 18 } }, @@ -3085,7 +3085,7 @@ "description": "Profondeur (en m\u00e8tre), exemple \"0.2\", \"2\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Profondeur", "importer_type": 18 } }, @@ -3097,7 +3097,7 @@ "description": "Lieu, description textuelle de la localisation exemple : \"Au pied de l'arbre du P\u00e8re Jahouen\", \"En limite nord de la parcelle\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Lieu, localisation", "importer_type": 18 } }, @@ -3109,7 +3109,7 @@ "description": "Contient ou non du mobilier (oui/non)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Contient du mobilier", "importer_type": 18 } }, @@ -3121,7 +3121,7 @@ "description": "Nom du fichier image (jpg ou png), exemple \"IMG_5023.jpg\".\r\nLes fichiers images doivent \u00eatre joints \u00e0 l'import dans un fichier ZIP", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Image", "importer_type": 18 } }, @@ -3142,10 +3142,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 17, - "description": "Commentaire sur les datations (texte 1000 carac. max.), exemple : \"IIe - IIIe s.\", \"fin XVe ou plus tard\", etc.", + "description": "Commentaire sur les datations, exemple : \"IIe - IIIe s.\", \"fin XVe ou plus tard\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire sur les datations", "importer_type": 18 } }, @@ -3154,10 +3154,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 18, - "description": "Description du remplissage, 1000 carac. max. exemple \"Limons argileux brun riche en charbons\"", + "description": "Description du remplissage. exemple \"Limons argileux brun riche en charbons\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Description du remplissage", "importer_type": 18 } }, @@ -3166,7 +3166,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 19, - "description": "Interpr\u00e9tation, texte 1000 carac. max., exemple \"Mur de cl\u00f4ture\", \"Sol couvert d'une mosa\u00efque, \"Pal\u00e9osol du d\u00e9but de l'Holoc\u00e8ne\", \"Four de r\u00e9duction de minerai de fer\", \"TP\", etc.", + "description": "Interpr\u00e9tation., exemple \"Mur de cl\u00f4ture\", \"Sol couvert d'une mosa\u00efque, \"Pal\u00e9osol du d\u00e9but de l'Holoc\u00e8ne\", \"Four de r\u00e9duction de minerai de fer\", \"TP\", etc.", "regexp_pre_filter": null, "required": false, "label": "Interpr\u00e9tation", @@ -3418,7 +3418,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 7, - "description": "R\u00e9f\u00e9rence du point topo, d'ordinaire un entier mais peut \u00eatre autre chose. Champ texte, max. 120 caract\u00e8res. Exemple : \"7220\", \"pt. 72\", etc.\r\n", + "description": "R\u00e9f\u00e9rence du point topo, d'ordinaire un entier mais peut \u00eatre autre chose. Champ texte, max. 120 caract\u00e8res. Exemple : \"7220\", \"pt. 72\", etc.", "regexp_pre_filter": null, "required": false, "label": "Ref. point topo", @@ -3442,7 +3442,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 9, - "description": "D\u00e9finit si on enregistre ici un objet seul (parfois appel\u00e9 Isolation) ou un lot d'objets. Exemple : \"lot\", \"objet\", \"Iso\", \"vrac\", etc.\r\nEst ici traduit en binaire : \"objet\" ou \"lot\".", + "description": "D\u00e9finit si on enregistre ici un objet seul (parfois appel\u00e9 Isolation) ou un lot d'objets. Exemple : \"lot\", \"objet\", \"Iso\", \"vrac\", etc.\r\nEst ici traduit en binaire (est seul ?) : \"objet\" (vrai) ou \"lot\" (faux).", "regexp_pre_filter": null, "required": false, "label": "Lot ou objet", @@ -3454,7 +3454,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 10, - "description": "D\u00e9finit si un objet est complet ou non. Exemple : \"complet\", \"est complet\", \"incomplet\".\r\nEst ici traduit en binaire : \"complet\" ou \"incomplet\". ", + "description": "D\u00e9finit si un objet est complet ou non. Exemple : \"complet\", \"est complet\", \"incomplet\".\r\nEst ici traduit en binaire : \"complet\" (vrai) ou \"incomplet\" (faux). ", "regexp_pre_filter": null, "required": false, "label": "Compl\u00e9tude", @@ -3502,7 +3502,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 14, - "description": "Type(s) d'objet(s), s\u00e9par\u00e9s par des \"&\". Exemple : \"tesson & charbon\", \"vase\", \"scapula\", \"fibule & bague\", \"lame & lamelle\", \"\u00e9clat & nucl\u00e9us\", etc.", + "description": "Type(s) d'objet(s), s\u00e9par\u00e9s par des \"&\". Exemple : \"tesson & charbon\", \"os & m\u00e9tal\", \"faune\", \"fibule & bague\", \"lame & lamelle\", \"\u00e9clat & nucl\u00e9us\", etc.", "regexp_pre_filter": null, "required": false, "label": "Type(s) d'objet(s)", @@ -3622,7 +3622,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 24, - "description": "Marquage visible sur le mobilier. Champ texte, max. 1000 caract\u00e8res. Exemple : \"id1234 la Roche aux F\u00e9es\", \"MTX-45\", etc.\r\nCeci reproduit d'ordinaire un marquage r\u00e9alis\u00e9 par un arch\u00e9ologue. Il ne s'agit pas ici de reproduire une \u00e9pigraphie ou tout autre inscription arch\u00e9ologique (graffito, d\u00e9dicaces, defixio, etc.) , mais vous pouvez l'utiliser pour cela si vous n'avez pas \u00e0 utiliser de marquage arch\u00e9ologique.", + "description": "Marquage visible sur le mobilier. Champ texte. Exemple : \"id1234 la Roche aux F\u00e9es\", \"MTX-45\", etc.\r\nCeci reproduit d'ordinaire un marquage r\u00e9alis\u00e9 par un arch\u00e9ologue. Il ne s'agit pas ici de reproduire une \u00e9pigraphie ou tout autre inscription arch\u00e9ologique (graffito, d\u00e9dicaces, defixio, etc.) , mais vous pouvez l'utiliser pour cela si vous n'avez pas \u00e0 utiliser de marquage arch\u00e9ologique.", "regexp_pre_filter": null, "required": false, "label": "Marque", @@ -3634,7 +3634,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 25, - "description": "Commentaire g\u00e9n\u00e9ral libre. Champ texte, max. 2000 caract\u00e8res. Exemple : \"habillage en nid d'abeille, poli g\u00e9n\u00e9ralis\u00e9, encoche emmanchement lat\u00e9ral ouvert sur la face sup\u00e9rieure\", \"1 bord + bec tubulaire\", \"fibule de Langton Down\", etc.", + "description": "Commentaire g\u00e9n\u00e9ral libre. Champ texte. Exemple : \"habillage en nid d'abeille, poli g\u00e9n\u00e9ralis\u00e9, encoche emmanchement lat\u00e9ral ouvert sur la face sup\u00e9rieure\", \"1 bord + bec tubulaire\", \"fibule de Langton Down\", etc.", "regexp_pre_filter": null, "required": false, "label": "Commentaire g\u00e9n\u00e9ral", @@ -3646,7 +3646,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 26, - "description": "Commentaire g\u00e9n\u00e9ral sur les datations, si besoin. Champ texte, max. 1000 caract\u00e8res. Exemple : \"plut\u00f4t fin IIe s. ou d\u00e9but IIIe s.\", \"Datation \u00e0 pr\u00e9ciser avant publication\", \" Datation rapide faite par M. Dupont\", etc.", + "description": "Commentaire g\u00e9n\u00e9ral sur les datations, si besoin. Champ texte. Exemple : \"plut\u00f4t fin IIe s. ou d\u00e9but IIIe s.\", \"Datation \u00e0 pr\u00e9ciser avant publication\", \" Datation rapide faite par M. Dupont\", etc.", "regexp_pre_filter": null, "required": false, "label": "Commentaire g\u00e9n\u00e9ral sur les datations", @@ -3730,7 +3730,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 33, - "description": "Code permettant de qualifi\u00e9 le mode de projection des donnes (SRS /EPSG). Exemple : \"EPSG:2154\" pour le Lambert 93", + "description": "Code permettant de qualifier le mode de projection des donnes (SRS /EPSG). Exemple : \"EPSG:2154\" pour le Lambert 93", "regexp_pre_filter": null, "required": false, "label": "Syst\u00e8me de r\u00e9f\u00e9rence spatiale", @@ -4536,48 +4536,6 @@ } }, { - "pk": 302, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "operator__name", - "column": 278, - "formater_type": 36, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 38, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "label", - "column": 37, - "formater_type": 3, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 305, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "in_charge__surname", - "column": 281, - "formater_type": 31, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 308, "model": "ishtar_common.importtarget", "fields": { @@ -4606,20 +4564,6 @@ } }, { - "pk": 314, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "cira_rapporteur__surname", - "column": 290, - "formater_type": 36, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 317, "model": "ishtar_common.importtarget", "fields": { @@ -4746,20 +4690,6 @@ } }, { - "pk": 341, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "description", - "column": 316, - "formater_type": 16, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 344, "model": "ishtar_common.importtarget", "fields": { @@ -4774,20 +4704,6 @@ } }, { - "pk": 347, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "location", - "column": 322, - "formater_type": 16, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 349, "model": "ishtar_common.importtarget", "fields": { @@ -4802,20 +4718,6 @@ } }, { - "pk": 353, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "interpretation", - "column": 328, - "formater_type": 16, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 356, "model": "ishtar_common.importtarget", "fields": { @@ -4858,6 +4760,20 @@ } }, { + "pk": 368, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "is_isolated", + "column": 344, + "formater_type": 19, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { "pk": 371, "model": "ishtar_common.importtarget", "fields": { @@ -4928,28 +4844,42 @@ } }, { - "pk": 384, + "pk": 350, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__comment", - "column": 360, - "formater_type": 33, + "target": "datings__period", + "column": 325, + "formater_type": 6, "concat_str": "", "regexp_filter": null, "concat": false, + "force_new": true + } + }, + { + "pk": 335, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "parcel__external_id", + "column": 311, + "formater_type": 28, + "concat_str": "-", + "regexp_filter": null, + "concat": false, "force_new": false } }, { - "pk": 385, + "pk": 38, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__dating_comment", - "column": 361, - "formater_type": 16, - "concat_str": "", + "target": "label", + "column": 37, + "formater_type": 3, + "concat_str": null, "regexp_filter": null, "concat": false, "force_new": false @@ -5026,20 +4956,6 @@ } }, { - "pk": 306, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "in_charge__name", - "column": 282, - "formater_type": 3, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 309, "model": "ishtar_common.importtarget", "fields": { @@ -5068,20 +4984,6 @@ } }, { - "pk": 315, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "cira_rapporteur__name", - "column": 291, - "formater_type": 3, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 318, "model": "ishtar_common.importtarget", "fields": { @@ -5166,34 +5068,6 @@ } }, { - "pk": 339, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "label", - "column": 314, - "formater_type": 3, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 342, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "comment", - "column": 317, - "formater_type": 16, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 345, "model": "ishtar_common.importtarget", "fields": { @@ -5278,13 +5152,13 @@ } }, { - "pk": 366, + "pk": 384, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__previous_id", - "column": 341, - "formater_type": 3, + "target": "find__comment", + "column": 360, + "formater_type": 35, "concat_str": "", "regexp_filter": null, "concat": false, @@ -5292,13 +5166,181 @@ } }, { - "pk": 372, + "pk": 385, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__conservatory_comment", - "column": 348, - "formater_type": 16, + "target": "find__dating_comment", + "column": 361, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 388, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "find__datings__period", + "column": 364, + "formater_type": 6, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": true + } + }, + { + "pk": 342, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "comment", + "column": 317, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 347, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "location", + "column": 322, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 353, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "interpretation", + "column": 328, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 341, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "description", + "column": 316, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 339, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "label", + "column": 314, + "formater_type": 30, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 302, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "operator__name", + "column": 278, + "formater_type": 10, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 305, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "in_charge__surname", + "column": 281, + "formater_type": 39, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 306, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "in_charge__name", + "column": 282, + "formater_type": 30, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 314, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "cira_rapporteur__surname", + "column": 290, + "formater_type": 39, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 315, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "cira_rapporteur__name", + "column": 291, + "formater_type": 30, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 366, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "find__previous_id", + "column": 341, + "formater_type": 3, "concat_str": "", "regexp_filter": null, "concat": false, @@ -5362,13 +5404,13 @@ } }, { - "pk": 383, + "pk": 386, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__mark", - "column": 359, - "formater_type": 16, + "target": "find__estimated_value", + "column": 362, + "formater_type": 21, "concat_str": "", "regexp_filter": null, "concat": false, @@ -5376,13 +5418,13 @@ } }, { - "pk": 386, + "pk": 297, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__estimated_value", - "column": 362, - "formater_type": 21, + "target": "archaeological_sites__reference", + "column": 271, + "formater_type": 45, "concat_str": "", "regexp_filter": null, "concat": false, @@ -5390,14 +5432,14 @@ } }, { - "pk": 297, + "pk": 336, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "archaeological_sites__reference", - "column": 271, - "formater_type": 45, - "concat_str": "", + "target": "parcel__external_id", + "column": 312, + "formater_type": 11, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false @@ -6062,76 +6104,6 @@ } }, { - "pk": 336, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "parcel__external_id", - "column": 312, - "formater_type": 11, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 335, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "parcel__external_id", - "column": 311, - "formater_type": 28, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 362, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "context_record__external_id", - "column": 337, - "formater_type": 28, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 363, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "context_record__external_id", - "column": 338, - "formater_type": 35, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 388, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__datings__period", - "column": 364, - "formater_type": 6, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": true - } - }, - { "pk": 99, "model": "ishtar_common.importtarget", "fields": { @@ -6748,6 +6720,34 @@ } }, { + "pk": 372, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "find__conservatory_comment", + "column": 348, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 383, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "find__mark", + "column": 359, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { "pk": 240, "model": "ishtar_common.importtarget", "fields": { @@ -7182,34 +7182,6 @@ } }, { - "pk": 298, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "scientist__title", - "column": 274, - "formater_type": 11, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 304, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "in_charge__title", - "column": 280, - "formater_type": 11, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 310, "model": "ishtar_common.importtarget", "fields": { @@ -7392,13 +7364,13 @@ } }, { - "pk": 307, + "pk": 355, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "in_charge__attached_to__name", - "column": 283, - "formater_type": 3, + "target": "identification", + "column": 330, + "formater_type": 24, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7406,13 +7378,13 @@ } }, { - "pk": 316, + "pk": 358, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "cira_rapporteur__attached_to__name", - "column": 292, - "formater_type": 3, + "target": "taq_estimated", + "column": 333, + "formater_type": 1, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7420,13 +7392,13 @@ } }, { - "pk": 352, + "pk": 370, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "filling", - "column": 327, - "formater_type": 16, + "target": "find__material_types", + "column": 346, + "formater_type": 20, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7434,13 +7406,13 @@ } }, { - "pk": 355, + "pk": 373, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "identification", - "column": 330, - "formater_type": 24, + "target": "find__object_types", + "column": 349, + "formater_type": 26, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7448,13 +7420,13 @@ } }, { - "pk": 358, + "pk": 376, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "taq_estimated", - "column": 333, - "formater_type": 1, + "target": "find__remarkabilities", + "column": 352, + "formater_type": 44, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7462,13 +7434,13 @@ } }, { - "pk": 367, + "pk": 387, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__description", - "column": 342, - "formater_type": 16, + "target": "find__image", + "column": 363, + "formater_type": 27, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7476,42 +7448,42 @@ } }, { - "pk": 370, + "pk": 361, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__material_types", - "column": 346, - "formater_type": 20, - "concat_str": "", + "target": "context_record__external_id", + "column": 336, + "formater_type": 11, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 373, + "pk": 362, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__object_types", - "column": 349, - "formater_type": 26, - "concat_str": "", + "target": "context_record__external_id", + "column": 337, + "formater_type": 28, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 376, + "pk": 363, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__remarkabilities", - "column": 352, - "formater_type": 44, - "concat_str": "", + "target": "context_record__external_id", + "column": 338, + "formater_type": 35, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false @@ -7532,13 +7504,13 @@ } }, { - "pk": 381, + "pk": 389, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__dimensions_comment", - "column": 357, - "formater_type": 16, + "target": "topographic_localisation", + "column": 343, + "formater_type": 3, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7546,13 +7518,13 @@ } }, { - "pk": 387, + "pk": 367, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__image", - "column": 363, - "formater_type": 27, + "target": "find__description", + "column": 342, + "formater_type": 35, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7560,13 +7532,13 @@ } }, { - "pk": 389, + "pk": 381, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "topographic_localisation", - "column": 343, - "formater_type": 3, + "target": "find__dimensions_comment", + "column": 357, + "formater_type": 35, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7616,27 +7588,27 @@ } }, { - "pk": 350, + "pk": 393, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "datings__period", - "column": 325, - "formater_type": 6, + "target": "spatial_reference_system", + "column": 368, + "formater_type": 46, "concat_str": "", "regexp_filter": null, "concat": false, - "force_new": true + "force_new": false } }, { - "pk": 393, + "pk": 352, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "spatial_reference_system", - "column": 368, - "formater_type": 46, + "target": "filling", + "column": 327, + "formater_type": 35, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7644,14 +7616,56 @@ } }, { - "pk": 361, + "pk": 304, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "context_record__external_id", - "column": 336, - "formater_type": 11, - "concat_str": "-", + "target": "in_charge__title", + "column": 280, + "formater_type": 47, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 298, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "scientist__title", + "column": 274, + "formater_type": 47, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 307, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "in_charge__attached_to__name", + "column": 283, + "formater_type": 10, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 316, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "cira_rapporteur__attached_to__name", + "column": 292, + "formater_type": 10, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false @@ -7883,6 +7897,15 @@ } }, { + "pk": 47, + "model": "ishtar_common.formatertype", + "fields": { + "formater_type": "TypeFormater", + "many_split": "", + "options": "TitleType" + } + }, + { "pk": 35, "model": "ishtar_common.formatertype", "fields": { diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 42440b19a..458368a35 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -6,6 +6,7 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata # Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" @@ -99,31 +100,31 @@ msgstr "" msgid "Not imported" msgstr "" -#: data_importer.py:1441 +#: data_importer.py:1444 msgid "line" msgstr "" -#: data_importer.py:1441 +#: data_importer.py:1444 msgid "col" msgstr "" -#: data_importer.py:1441 +#: data_importer.py:1444 msgid "error" msgstr "" -#: data_importer.py:1447 +#: data_importer.py:1450 msgid "field" msgstr "" -#: data_importer.py:1447 +#: data_importer.py:1450 msgid "source" msgstr "" -#: data_importer.py:1447 +#: data_importer.py:1450 msgid "result" msgstr "" -#: data_importer.py:1463 +#: data_importer.py:1466 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -156,12 +157,12 @@ msgstr "" msgid "Add a new item" msgstr "" -#: forms.py:262 models.py:1368 +#: forms.py:262 models.py:1473 msgid "Template" msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:182 -#: forms_common.py:406 models.py:1434 models.py:2826 +#: forms_common.py:406 models.py:1539 models.py:2940 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -177,8 +178,8 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.</p>" msgstr "" -#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1607 -#: models.py:2453 models.py:2635 models.py:2696 +#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1712 +#: models.py:2567 models.py:2749 models.py:2810 #: templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -190,63 +191,63 @@ msgid "" msgstr "" #: forms_common.py:170 forms_common.py:327 forms_common.py:451 -#: ishtar_menu.py:75 models.py:1608 models.py:2339 +#: ishtar_menu.py:75 models.py:1713 models.py:2450 models.py:2541 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" #: forms_common.py:173 forms_common.py:210 forms_common.py:322 -#: forms_common.py:376 forms_common.py:446 models.py:1034 models.py:1367 -#: models.py:1653 models.py:1872 models.py:2333 models.py:2439 models.py:2812 +#: forms_common.py:376 forms_common.py:446 models.py:1094 models.py:1472 +#: models.py:1758 models.py:1977 models.py:2444 models.py:2553 models.py:2926 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "" -#: forms_common.py:174 models.py:1589 models.py:2003 +#: forms_common.py:174 models.py:1694 models.py:2108 msgid "Organization type" msgstr "" -#: forms_common.py:176 forms_common.py:400 models.py:1429 +#: forms_common.py:176 forms_common.py:400 models.py:1534 #: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "" -#: forms_common.py:178 forms_common.py:403 models.py:1430 +#: forms_common.py:178 forms_common.py:403 models.py:1535 #: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "" -#: forms_common.py:180 forms_common.py:404 models.py:1432 +#: forms_common.py:180 forms_common.py:404 models.py:1537 #: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "" -#: forms_common.py:183 forms_common.py:407 models.py:1435 +#: forms_common.py:183 forms_common.py:407 models.py:1540 msgid "Country" msgstr "" #: forms_common.py:185 forms_common.py:324 forms_common.py:380 -#: forms_common.py:448 forms_common.py:572 models.py:1462 +#: forms_common.py:448 forms_common.py:572 models.py:1567 msgid "Email" msgstr "" -#: forms_common.py:186 forms_common.py:383 models.py:1447 +#: forms_common.py:186 forms_common.py:383 models.py:1552 #: templates/ishtar/sheet_organization.html:14 #: templates/ishtar/sheet_person.html:19 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "" -#: forms_common.py:187 forms_common.py:392 models.py:1459 +#: forms_common.py:187 forms_common.py:392 models.py:1564 #: templates/ishtar/sheet_organization.html:15 #: templates/ishtar/sheet_person.html:37 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "" -#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2033 -#: models.py:2335 models.py:2747 templates/sheet_ope.html:85 +#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2144 +#: models.py:2446 models.py:2861 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:23 @@ -254,7 +255,7 @@ msgstr "" msgid "Type" msgstr "" -#: forms_common.py:220 views.py:142 +#: forms_common.py:220 views.py:146 msgid "Organization search" msgstr "" @@ -270,12 +271,12 @@ msgstr "" msgid "Organization to merge" msgstr "" -#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2437 +#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2551 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "" -#: forms_common.py:339 forms_common.py:434 views.py:107 +#: forms_common.py:339 forms_common.py:434 views.py:111 msgid "Person search" msgstr "" @@ -288,25 +289,25 @@ msgstr "" msgid "Identity" msgstr "" -#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2004 -#: models.py:2431 models.py:2433 models.py:2744 templates/sheet_ope.html:104 +#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2109 +#: models.py:2545 models.py:2547 models.py:2858 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" -#: forms_common.py:372 models.py:2435 +#: forms_common.py:372 models.py:2549 msgid "Salutation" msgstr "" -#: forms_common.py:378 models.py:2441 +#: forms_common.py:378 models.py:2555 msgid "Raw name" msgstr "" -#: forms_common.py:381 models.py:1448 +#: forms_common.py:381 models.py:1553 msgid "Phone description" msgstr "" -#: forms_common.py:384 models.py:1450 models.py:1452 +#: forms_common.py:384 models.py:1555 models.py:1557 msgid "Phone description 2" msgstr "" @@ -314,11 +315,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: forms_common.py:388 models.py:1456 +#: forms_common.py:388 models.py:1561 msgid "Phone description 3" msgstr "" -#: forms_common.py:390 models.py:1454 +#: forms_common.py:390 models.py:1559 msgid "Phone 3" msgstr "" @@ -326,23 +327,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: forms_common.py:409 models.py:1437 +#: forms_common.py:409 models.py:1542 msgid "Other address: address" msgstr "" -#: forms_common.py:412 models.py:1440 +#: forms_common.py:412 models.py:1545 msgid "Other address: address complement" msgstr "" -#: forms_common.py:414 models.py:1441 +#: forms_common.py:414 models.py:1546 msgid "Other address: postal code" msgstr "" -#: forms_common.py:416 models.py:1443 +#: forms_common.py:416 models.py:1548 msgid "Other address: town" msgstr "" -#: forms_common.py:418 models.py:1445 +#: forms_common.py:418 models.py:1550 msgid "Other address: country" msgstr "" @@ -358,7 +359,7 @@ msgstr "" msgid "Account search" msgstr "" -#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2387 +#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2498 msgid "Person type" msgstr "" @@ -366,7 +367,7 @@ msgstr "" msgid "Account" msgstr "" -#: forms_common.py:575 wizards.py:1256 +#: forms_common.py:575 wizards.py:1281 msgid "New password" msgstr "" @@ -390,7 +391,7 @@ msgstr "" msgid "Send the new password by email?" msgstr "" -#: forms_common.py:628 forms_common.py:641 models.py:2827 +#: forms_common.py:628 forms_common.py:641 models.py:2941 msgid "Towns" msgstr "" @@ -406,7 +407,7 @@ msgstr "" msgid "Documentation informations" msgstr "" -#: forms_common.py:775 forms_common.py:823 models.py:2005 models.py:2721 +#: forms_common.py:775 forms_common.py:823 models.py:2110 models.py:2835 msgid "Source type" msgstr "" @@ -418,37 +419,37 @@ msgstr "" msgid "Internal reference" msgstr "" -#: forms_common.py:783 models.py:2758 +#: forms_common.py:783 models.py:2872 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:784 models.py:2760 +#: forms_common.py:784 models.py:2874 msgid "Receipt date" msgstr "" -#: forms_common.py:786 models.py:2162 models.py:2762 +#: forms_common.py:786 models.py:2273 models.py:2876 msgid "Creation date" msgstr "" -#: forms_common.py:789 models.py:2765 +#: forms_common.py:789 models.py:2879 msgid "Receipt date in documentation" msgstr "" -#: forms_common.py:791 forms_common.py:827 models.py:323 models.py:634 -#: models.py:1899 models.py:2445 models.py:2772 +#: forms_common.py:791 forms_common.py:827 models.py:376 models.py:687 +#: models.py:2004 models.py:2559 models.py:2886 msgid "Comment" msgstr "" -#: forms_common.py:793 forms_common.py:826 models.py:1036 models.py:1657 -#: models.py:1831 models.py:1873 models.py:2771 templates/sheet_ope.html:128 +#: forms_common.py:793 forms_common.py:826 models.py:1096 models.py:1762 +#: models.py:1936 models.py:1978 models.py:2885 templates/sheet_ope.html:128 msgid "Description" msgstr "" -#: forms_common.py:796 models.py:2773 +#: forms_common.py:796 models.py:2887 msgid "Additional information" msgstr "" -#: forms_common.py:798 forms_common.py:830 models.py:2775 +#: forms_common.py:798 forms_common.py:830 models.py:2889 msgid "Has a duplicate" msgstr "" @@ -463,7 +464,7 @@ msgid "" "p>" msgstr "" -#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2701 +#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2815 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" @@ -476,7 +477,7 @@ msgstr "" msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:856 models.py:2006 models.py:2689 models.py:2698 +#: forms_common.py:856 models.py:2111 models.py:2803 models.py:2812 msgid "Author type" msgstr "" @@ -488,7 +489,7 @@ msgstr "" msgid "There are identical authors." msgstr "" -#: forms_common.py:893 models.py:2702 models.py:2754 +#: forms_common.py:893 models.py:2816 models.py:2868 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -506,7 +507,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:39 models.py:1163 views.py:1530 +#: ishtar_menu.py:39 models.py:1268 views.py:1548 msgid "Global variables" msgstr "" @@ -534,19 +535,19 @@ msgstr "" msgid "Manual merge" msgstr "" -#: ishtar_menu.py:109 models.py:2173 +#: ishtar_menu.py:109 models.py:2284 msgid "Imports" msgstr "" -#: ishtar_menu.py:112 views.py:1538 +#: ishtar_menu.py:112 views.py:1556 msgid "New import" msgstr "" -#: ishtar_menu.py:116 views.py:1552 +#: ishtar_menu.py:116 views.py:1570 msgid "Current imports" msgstr "" -#: ishtar_menu.py:120 views.py:1588 +#: ishtar_menu.py:120 views.py:1606 msgid "Old imports" msgstr "" @@ -562,204 +563,250 @@ msgstr "" msgid "This item already exists." msgstr "" -#: models.py:319 models.py:633 models.py:1402 models.py:1414 models.py:1828 +#: models.py:372 models.py:686 models.py:1507 models.py:1519 models.py:1933 msgid "Label" msgstr "" -#: models.py:321 +#: models.py:374 msgid "Textual ID" msgstr "" -#: models.py:324 models.py:636 models.py:1371 +#: models.py:377 models.py:689 models.py:1476 msgid "Available" msgstr "" -#: models.py:655 models.py:1945 +#: models.py:713 models.py:2050 msgid "Key" msgstr "" -#: models.py:661 +#: models.py:719 msgid "Specific key to an import" msgstr "" -#: models.py:753 +#: models.py:811 msgid "Last editor" msgstr "" -#: models.py:756 +#: models.py:814 msgid "Creator" msgstr "" -#: models.py:898 models.py:2838 models.py:2894 +#: models.py:956 models.py:2952 models.py:3008 msgid "Order" msgstr "" -#: models.py:899 +#: models.py:957 msgid "Symmetrical" msgstr "" -#: models.py:900 +#: models.py:958 msgid "Tiny label" msgstr "" -#: models.py:914 +#: models.py:972 msgid "Cannot have symmetrical and an inverse_relation" msgstr "" -#: models.py:1028 +#: models.py:1088 msgid "Euro" msgstr "" -#: models.py:1029 +#: models.py:1089 msgid "US dollar" msgstr "" -#: models.py:1035 models.py:1655 +#: models.py:1095 models.py:1760 msgid "Slug" msgstr "" -#: models.py:1037 +#: models.py:1098 +msgid "CSS color code for base module" +msgstr "" + +#: models.py:1100 msgid "Files module" msgstr "" -#: models.py:1038 +#: models.py:1102 +msgid "CSS color code for files module" +msgstr "" + +#: models.py:1104 msgid "Context records module" msgstr "" -#: models.py:1040 +#: models.py:1107 +msgid "CSS color code for context record module" +msgstr "" + +#: models.py:1109 msgid "Finds module" msgstr "" -#: models.py:1041 +#: models.py:1110 msgid "Need context records module" msgstr "" -#: models.py:1043 +#: models.py:1112 +msgid "CSS color code for find module" +msgstr "" + +#: models.py:1115 msgid "Warehouses module" msgstr "" -#: models.py:1044 +#: models.py:1116 msgid "Need finds module" msgstr "" -#: models.py:1045 +#: models.py:1118 +msgid "CSS code for warehouse module" +msgstr "" + +#: models.py:1120 msgid "Mapping module" msgstr "" -#: models.py:1047 +#: models.py:1122 +msgid "CSS code for mapping module" +msgstr "" + +#: models.py:1125 msgid "Home page" msgstr "" -#: models.py:1048 +#: models.py:1126 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " "markdown syntax. {random_image} can be used to display a random image." msgstr "" -#: models.py:1052 +#: models.py:1130 msgid "File external id" msgstr "" -#: models.py:1054 +#: models.py:1132 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1059 +#: models.py:1137 msgid "Parcel external id" msgstr "" -#: models.py:1062 +#: models.py:1140 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1067 +#: models.py:1145 msgid "Context record external id" msgstr "" -#: models.py:1069 +#: models.py:1147 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1074 +#: models.py:1152 msgid "Base find external id" msgstr "" -#: models.py:1076 +#: models.py:1154 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1081 +#: models.py:1159 msgid "Find external id" msgstr "" -#: models.py:1083 +#: models.py:1161 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1088 +#: models.py:1166 +msgid "Container external id" +msgstr "" + +#: models.py:1168 +msgid "" +"Formula to manage container external ID. Change this with care. With " +"incorrect formula, the application might be unusable and import of external " +"data can be destructive." +msgstr "" + +#: models.py:1173 +msgid "Warehouse external id" +msgstr "" + +#: models.py:1175 +msgid "" +"Formula to manage warehouse external ID. Change this with care. With " +"incorrect formula, the application might be unusable and import of external " +"data can be destructive." +msgstr "" + +#: models.py:1180 msgid "Raw name for person" msgstr "" -#: models.py:1090 +#: models.py:1182 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1094 +#: models.py:1186 msgid "Current active" msgstr "" -#: models.py:1095 +#: models.py:1187 msgid "Currency" msgstr "" -#: models.py:1099 +#: models.py:1191 msgid "Ishtar site profile" msgstr "" -#: models.py:1100 +#: models.py:1192 msgid "Ishtar site profiles" msgstr "" -#: models.py:1156 +#: models.py:1261 msgid "Variable name" msgstr "" -#: models.py:1157 +#: models.py:1262 msgid "Description of the variable" msgstr "" -#: models.py:1159 models.py:1946 +#: models.py:1264 models.py:2051 msgid "Value" msgstr "" -#: models.py:1162 +#: models.py:1267 msgid "Global variable" msgstr "" -#: models.py:1272 models.py:1302 +#: models.py:1377 models.py:1407 msgid "Total" msgstr "" -#: models.py:1279 models.py:1403 models.py:1415 +#: models.py:1384 models.py:1508 models.py:1520 #: templates/ishtar/sheet_person.html:22 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 @@ -767,726 +814,746 @@ msgstr "" msgid "Number" msgstr "" -#: models.py:1366 +#: models.py:1471 msgid "Administrative Act" msgstr "" -#: models.py:1370 +#: models.py:1475 msgid "Associated object" msgstr "" -#: models.py:1374 +#: models.py:1479 msgid "Document template" msgstr "" -#: models.py:1375 +#: models.py:1480 msgid "Document templates" msgstr "" -#: models.py:1406 models.py:1416 models.py:2157 +#: models.py:1511 models.py:1521 models.py:2268 msgid "State" msgstr "" -#: models.py:1420 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1525 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: models.py:1421 +#: models.py:1526 msgid "Departments" msgstr "" -#: models.py:1458 +#: models.py:1563 msgid "Raw phone" msgstr "" -#: models.py:1464 +#: models.py:1569 msgid "Alternative address is prefered" msgstr "" -#: models.py:1503 +#: models.py:1608 msgid "Tel: " msgstr "" -#: models.py:1507 +#: models.py:1612 msgid "Mobile: " msgstr "" -#: models.py:1511 +#: models.py:1616 msgid "Email: " msgstr "" -#: models.py:1516 +#: models.py:1621 msgid "Merge key" msgstr "" -#: models.py:1590 +#: models.py:1695 msgid "Organization types" msgstr "" -#: models.py:1609 views.py:237 +#: models.py:1714 views.py:241 msgid "Operation" msgstr "" -#: models.py:1611 +#: models.py:1716 msgid "Archaeological site" msgstr "" -#: models.py:1612 +#: models.py:1717 msgid "Parcels" msgstr "" -#: models.py:1614 +#: models.py:1719 msgid "Operation source" msgstr "" -#: models.py:1617 views.py:1346 views.py:1396 +#: models.py:1722 views.py:1364 views.py:1414 msgid "Archaeological files" msgstr "" -#: models.py:1619 views.py:1349 views.py:1404 +#: models.py:1724 views.py:1367 views.py:1422 msgid "Context records" msgstr "" -#: models.py:1621 +#: models.py:1726 msgid "Context record relations" msgstr "" -#: models.py:1623 +#: models.py:1728 msgid "Base finds" msgstr "" -#: models.py:1659 templates/ishtar/dashboards/dashboard_main.html:25 +#: models.py:1764 templates/ishtar/dashboards/dashboard_main.html:25 msgid "Users" msgstr "" -#: models.py:1661 +#: models.py:1766 msgid "Associated model" msgstr "" -#: models.py:1664 +#: models.py:1769 msgid "Is template" msgstr "" -#: models.py:1665 +#: models.py:1770 msgid "Unicity keys (separator \";\")" msgstr "" -#: models.py:1669 +#: models.py:1774 msgid "Importer - Type" msgstr "" -#: models.py:1670 +#: models.py:1775 msgid "Importer - Types" msgstr "" -#: models.py:1760 +#: models.py:1865 msgid "Importer - Default" msgstr "" -#: models.py:1761 +#: models.py:1866 msgid "Importer - Defaults" msgstr "" -#: models.py:1796 +#: models.py:1901 msgid "Importer - Default value" msgstr "" -#: models.py:1797 +#: models.py:1902 msgid "Importer - Default values" msgstr "" -#: models.py:1830 +#: models.py:1935 msgid "Column number" msgstr "" -#: models.py:1833 +#: models.py:1938 msgid "Required" msgstr "" -#: models.py:1836 +#: models.py:1941 msgid "Importer - Column" msgstr "" -#: models.py:1837 +#: models.py:1942 msgid "Importer - Columns" msgstr "" -#: models.py:1857 +#: models.py:1962 msgid "Field name" msgstr "" -#: models.py:1859 models.py:1893 +#: models.py:1964 models.py:1998 msgid "Force creation of new items" msgstr "" -#: models.py:1861 models.py:1895 +#: models.py:1966 models.py:2000 msgid "Concatenate with existing" msgstr "" -#: models.py:1863 models.py:1897 +#: models.py:1968 models.py:2002 msgid "Concatenate character" msgstr "" -#: models.py:1867 +#: models.py:1972 msgid "Importer - Duplicate field" msgstr "" -#: models.py:1868 +#: models.py:1973 msgid "Importer - Duplicate fields" msgstr "" -#: models.py:1875 +#: models.py:1980 msgid "Regular expression" msgstr "" -#: models.py:1878 +#: models.py:1983 msgid "Importer - Regular expression" msgstr "" -#: models.py:1879 +#: models.py:1984 msgid "Importer - Regular expressions" msgstr "" -#: models.py:1902 +#: models.py:2007 msgid "Importer - Target" msgstr "" -#: models.py:1903 +#: models.py:2008 msgid "Importer - Targets" msgstr "" -#: models.py:1927 views.py:536 +#: models.py:2032 views.py:545 msgid "True" msgstr "" -#: models.py:1928 views.py:538 +#: models.py:2033 views.py:547 msgid "False" msgstr "" -#: models.py:1947 +#: models.py:2052 msgid "Is set" msgstr "" -#: models.py:1954 +#: models.py:2059 msgid "Importer - Target key" msgstr "" -#: models.py:1955 +#: models.py:2060 msgid "Importer - Targets keys" msgstr "" -#: models.py:2007 models.py:2737 models.py:2750 +#: models.py:2112 models.py:2851 models.py:2864 msgid "Format" msgstr "" -#: models.py:2008 models.py:2842 +#: models.py:2113 models.py:2956 msgid "Operation type" msgstr "" -#: models.py:2009 +#: models.py:2114 msgid "Period" msgstr "" -#: models.py:2010 +#: models.py:2115 msgid "Report state" msgstr "" -#: models.py:2011 +#: models.py:2116 msgid "Remain type" msgstr "" -#: models.py:2012 +#: models.py:2117 msgid "Unit" msgstr "" -#: models.py:2013 +#: models.py:2118 msgid "Activity type" msgstr "" -#: models.py:2014 +#: models.py:2119 msgid "Material" msgstr "" -#: models.py:2016 +#: models.py:2121 msgid "Conservatory state" msgstr "" -#: models.py:2017 +#: models.py:2122 +msgid "Container type" +msgstr "" + +#: models.py:2123 msgid "Preservation type" msgstr "" -#: models.py:2018 +#: models.py:2124 msgid "Object type" msgstr "" -#: models.py:2020 +#: models.py:2125 +msgid "Integrity type" +msgstr "" + +#: models.py:2126 +msgid "Remarkability type" +msgstr "" + +#: models.py:2127 +msgid "Batch type" +msgstr "" + +#: models.py:2129 msgid "Identification type" msgstr "" -#: models.py:2022 +#: models.py:2131 msgid "Context record relation type" msgstr "" -#: models.py:2023 models.py:2729 +#: models.py:2132 models.py:3014 +msgid "Spatial reference system" +msgstr "" + +#: models.py:2133 models.py:2843 msgid "Support type" msgstr "" -#: models.py:2029 +#: models.py:2134 models.py:2510 +msgid "Title type" +msgstr "" + +#: models.py:2140 msgid "Integer" msgstr "" -#: models.py:2030 +#: models.py:2141 msgid "Float" msgstr "" -#: models.py:2031 +#: models.py:2142 msgid "String" msgstr "" -#: models.py:2032 templates/sheet_ope.html:86 +#: models.py:2143 templates/sheet_ope.html:86 msgid "Date" msgstr "" -#: models.py:2034 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2145 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "" -#: models.py:2035 +#: models.py:2146 msgid "String to boolean" msgstr "" -#: models.py:2036 +#: models.py:2147 msgctxt "filesystem" msgid "File" msgstr "" -#: models.py:2037 +#: models.py:2148 msgid "Unknow type" msgstr "" -#: models.py:2053 +#: models.py:2164 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: models.py:2054 +#: models.py:2165 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: models.py:2055 +#: models.py:2166 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: models.py:2065 +#: models.py:2176 msgid "Options" msgstr "" -#: models.py:2067 +#: models.py:2178 msgid "Split character(s)" msgstr "" -#: models.py:2071 +#: models.py:2182 msgid "Importer - Formater type" msgstr "" -#: models.py:2072 +#: models.py:2183 msgid "Importer - Formater types" msgstr "" -#: models.py:2121 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2232 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "" -#: models.py:2122 +#: models.py:2233 msgid "Analyse in progress" msgstr "" -#: models.py:2123 +#: models.py:2234 msgid "Analysed" msgstr "" -#: models.py:2124 +#: models.py:2235 msgid "Import pending" msgstr "" -#: models.py:2125 +#: models.py:2236 msgid "Import in progress" msgstr "" -#: models.py:2126 +#: models.py:2237 msgid "Finished with errors" msgstr "" -#: models.py:2127 +#: models.py:2238 msgid "Finished" msgstr "" -#: models.py:2128 +#: models.py:2239 msgid "Archived" msgstr "" -#: models.py:2140 +#: models.py:2252 msgid "Imported file" msgstr "" -#: models.py:2143 +#: models.py:2254 msgid "Associated images (zip file)" msgstr "" -#: models.py:2145 +#: models.py:2256 msgid "Encoding" msgstr "" -#: models.py:2147 +#: models.py:2258 msgid "Skip lines" msgstr "" -#: models.py:2148 templates/ishtar/import_list.html:47 +#: models.py:2259 templates/ishtar/import_list.html:47 msgid "Error file" msgstr "" -#: models.py:2151 +#: models.py:2262 msgid "Result file" msgstr "" -#: models.py:2154 templates/ishtar/import_list.html:53 +#: models.py:2265 templates/ishtar/import_list.html:53 msgid "Match file" msgstr "" -#: models.py:2160 +#: models.py:2271 msgid "Conservative import" msgstr "" -#: models.py:2165 +#: models.py:2276 msgid "End date" msgstr "" -#: models.py:2167 +#: models.py:2278 msgid "Remaining seconds" msgstr "" -#: models.py:2172 +#: models.py:2283 msgid "Import" msgstr "" -#: models.py:2189 +#: models.py:2300 msgid "Analyse" msgstr "" -#: models.py:2191 models.py:2194 +#: models.py:2302 models.py:2305 msgid "Re-analyse" msgstr "" -#: models.py:2192 +#: models.py:2303 msgid "Launch import" msgstr "" -#: models.py:2195 +#: models.py:2306 msgid "Re-import" msgstr "" -#: models.py:2196 +#: models.py:2307 msgid "Archive" msgstr "" -#: models.py:2198 +#: models.py:2309 msgid "Unarchive" msgstr "" -#: models.py:2199 widgets.py:130 templates/ishtar/form_delete.html:11 +#: models.py:2310 widgets.py:130 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "" -#: models.py:2340 +#: models.py:2451 msgid "Organizations" msgstr "" -#: models.py:2342 +#: models.py:2453 msgid "Can view all Organizations" msgstr "" -#: models.py:2343 +#: models.py:2454 msgid "Can view own Organization" msgstr "" -#: models.py:2344 +#: models.py:2455 msgid "Can add own Organization" msgstr "" -#: models.py:2346 +#: models.py:2457 msgid "Can change own Organization" msgstr "" -#: models.py:2348 +#: models.py:2459 msgid "Can delete own Organization" msgstr "" -#: models.py:2383 +#: models.py:2494 msgid "Groups" msgstr "" -#: models.py:2388 +#: models.py:2499 msgid "Person types" msgstr "" -#: models.py:2399 -msgid "Title type" -msgstr "" - -#: models.py:2400 +#: models.py:2511 msgid "Title types" msgstr "" -#: models.py:2409 +#: models.py:2520 msgid "Mr" msgstr "" -#: models.py:2410 +#: models.py:2521 msgid "Miss" msgstr "" -#: models.py:2411 +#: models.py:2522 msgid "Mr and Mrs" msgstr "" -#: models.py:2412 +#: models.py:2523 msgid "Mrs" msgstr "" -#: models.py:2413 +#: models.py:2524 msgid "Doctor" msgstr "" -#: models.py:2443 +#: models.py:2557 msgid "Contact type" msgstr "" -#: models.py:2446 models.py:2510 +#: models.py:2560 models.py:2624 msgid "Types" msgstr "" -#: models.py:2449 +#: models.py:2563 msgid "Is attached to" msgstr "" -#: models.py:2454 +#: models.py:2568 msgid "Persons" msgstr "" -#: models.py:2456 +#: models.py:2570 msgid "Can view all Persons" msgstr "" -#: models.py:2457 +#: models.py:2571 msgid "Can view own Person" msgstr "" -#: models.py:2458 +#: models.py:2572 msgid "Can add own Person" msgstr "" -#: models.py:2459 +#: models.py:2573 msgid "Can change own Person" msgstr "" -#: models.py:2460 +#: models.py:2574 msgid "Can delete own Person" msgstr "" -#: models.py:2638 +#: models.py:2752 msgid "Advanced shortcut menu" msgstr "" -#: models.py:2641 +#: models.py:2755 msgid "Ishtar user" msgstr "" -#: models.py:2642 +#: models.py:2756 msgid "Ishtar users" msgstr "" -#: models.py:2684 +#: models.py:2798 msgid "To modify the password use the form in Auth > User" msgstr "" -#: models.py:2690 +#: models.py:2804 msgid "Author types" msgstr "" -#: models.py:2722 +#: models.py:2836 msgid "Source types" msgstr "" -#: models.py:2730 +#: models.py:2844 msgid "Support types" msgstr "" -#: models.py:2738 +#: models.py:2852 msgid "Formats" msgstr "" -#: models.py:2745 +#: models.py:2859 msgid "External ID" msgstr "" -#: models.py:2748 +#: models.py:2862 msgid "Support" msgstr "" -#: models.py:2752 +#: models.py:2866 msgid "Scale" msgstr "" -#: models.py:2766 +#: models.py:2880 msgid "Item number" msgstr "" -#: models.py:2767 +#: models.py:2881 msgid "Ref." msgstr "" -#: models.py:2770 +#: models.py:2884 msgid "Internal ref." msgstr "" -#: models.py:2813 +#: models.py:2927 msgid "Surface (m2)" msgstr "" -#: models.py:2814 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2928 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "" -#: models.py:2839 +#: models.py:2953 msgid "Is preventive" msgstr "" -#: models.py:2843 +#: models.py:2957 msgid "Operation types" msgstr "" -#: models.py:2872 +#: models.py:2986 msgid "Preventive" msgstr "" -#: models.py:2873 +#: models.py:2987 msgid "Research" msgstr "" -#: models.py:2895 -msgid "SRID" +#: models.py:3010 +msgid "Authority name" msgstr "" -#: models.py:2898 -msgid "Spatial reference system" +#: models.py:3011 +msgid "Authority SRID" msgstr "" -#: models.py:2899 +#: models.py:3015 msgid "Spatial reference systems" msgstr "" -#: utils.py:83 +#: utils.py:84 msgid " (...)" msgstr "" -#: utils.py:116 +#: utils.py:130 msgid "Load another random image?" msgstr "" -#: views.py:114 +#: views.py:118 msgid "New person" msgstr "" -#: views.py:122 +#: views.py:126 msgid "Person modification" msgstr "" -#: views.py:137 +#: views.py:141 msgid "Person deletion" msgstr "" -#: views.py:148 +#: views.py:152 msgid "New organization" msgstr "" -#: views.py:155 +#: views.py:159 msgid "Organization modification" msgstr "" -#: views.py:171 +#: views.py:175 msgid "Organization deletion" msgstr "" -#: views.py:178 +#: views.py:182 msgid "Account management" msgstr "" -#: views.py:184 +#: views.py:188 msgid "Account deletion" msgstr "" -#: views.py:236 +#: views.py:240 msgid "Archaeological file" msgstr "" -#: views.py:239 +#: views.py:243 msgid "Context record" msgstr "" -#: views.py:241 +#: views.py:245 msgid "Find" msgstr "" -#: views.py:243 +#: views.py:247 msgid "Treatment request" msgstr "" -#: views.py:244 +#: views.py:248 msgid "Treatment" msgstr "" -#: views.py:1285 views.py:1328 +#: views.py:1303 views.py:1346 msgid "Operation not permitted." msgstr "" -#: views.py:1287 +#: views.py:1305 #, python-format msgid "New %s" msgstr "" -#: views.py:1347 views.py:1400 +#: views.py:1365 views.py:1418 msgid "Operations" msgstr "" -#: views.py:1351 views.py:1407 +#: views.py:1369 views.py:1425 msgid "Finds" msgstr "" -#: views.py:1600 templates/ishtar/import_list.html:43 +#: views.py:1618 templates/ishtar/import_list.html:43 msgid "Link unmatched items" msgstr "" -#: views.py:1615 +#: views.py:1633 msgid "Delete import" msgstr "" -#: views.py:1654 +#: views.py:1672 msgid "Merge persons" msgstr "" -#: views.py:1678 +#: views.py:1696 msgid "Select the main person" msgstr "" -#: views.py:1687 +#: views.py:1705 msgid "Merge organization" msgstr "" -#: views.py:1697 +#: views.py:1715 msgid "Select the main organization" msgstr "" -#: views.py:1737 views.py:1753 +#: views.py:1755 views.py:1771 msgid "Corporation manager" msgstr "" @@ -1506,15 +1573,15 @@ msgstr "" msgid "Remove" msgstr "" -#: wizards.py:342 templates/ishtar/import_delete.html:20 +#: wizards.py:343 templates/ishtar/import_delete.html:20 msgid "Yes" msgstr "" -#: wizards.py:344 +#: wizards.py:345 msgid "No" msgstr "" -#: wizards.py:1313 +#: wizards.py:1338 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "" @@ -1579,13 +1646,13 @@ msgstr "" msgid "Log in" msgstr "" -#: templates/base.html:59 -msgid "Lang" +#: templates/base.html:82 +msgid "Current items" msgstr "" -#: templates/base.html:59 templates/base.html.py:83 templates/welcome.html:8 -#: templates/welcome.html.py:9 templates/welcome.html:10 -#: templates/welcome.html.py:11 templates/ishtar/manage_basket.html:4 +#: templates/base.html:84 templates/welcome.html:8 templates/welcome.html.py:9 +#: templates/welcome.html:10 templates/welcome.html.py:11 +#: templates/ishtar/manage_basket.html:4 #: templates/ishtar/blocks/window_field.html:1 #: templates/ishtar/blocks/window_field_detail.html:1 #: templates/ishtar/blocks/window_field_multiple.html:1 @@ -1593,23 +1660,19 @@ msgstr "" msgid ":" msgstr "" -#: templates/base.html:81 -msgid "Current items" -msgstr "" - -#: templates/base.html:115 +#: templates/base.html:120 msgid "Processing..." msgstr "" -#: templates/base.html:116 +#: templates/base.html:121 msgid "This can be long." msgstr "" -#: templates/base.html:117 +#: templates/base.html:122 msgid "Time to take a coffee?" msgstr "" -#: templates/base.html:118 +#: templates/base.html:123 msgid "Time to take another coffee?" msgstr "" @@ -2214,6 +2277,13 @@ msgstr "" msgid "Unpin" msgstr "" +#: templates/ishtar/blocks/footer.html:2 +#, python-format +msgid "" +"Powered by <a href=\"https://ishtar-archeo.net/\">Ishtar</a> v%(VERSION)s - " +"a free software under AGPL v3 license." +msgstr "" + #: templates/ishtar/blocks/window_nav.html:6 msgid "Previous version" msgstr "" @@ -2363,7 +2433,7 @@ msgstr "" msgid "Add/Modify" msgstr "" -#: templates/ishtar/wizard/default_wizard.html:59 +#: templates/ishtar/wizard/default_wizard.html:64 msgid "" "The form has changed. If you don't validate it, all your changes will be " "lost." diff --git a/ishtar_common/migrations/0069_auto__chg_field_import_error_file__chg_field_import_match_file__chg_fi.py b/ishtar_common/migrations/0069_auto__chg_field_import_error_file__chg_field_import_match_file__chg_fi.py new file mode 100644 index 000000000..1fbccf642 --- /dev/null +++ b/ishtar_common/migrations/0069_auto__chg_field_import_error_file__chg_field_import_match_file__chg_fi.py @@ -0,0 +1,507 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Changing field 'Import.error_file' + db.alter_column('ishtar_common_import', 'error_file', self.gf('django.db.models.fields.files.FileField')(max_length=255, null=True)) + + # Changing field 'Import.match_file' + db.alter_column('ishtar_common_import', 'match_file', self.gf('django.db.models.fields.files.FileField')(max_length=255, null=True)) + + # Changing field 'Import.imported_file' + db.alter_column('ishtar_common_import', 'imported_file', self.gf('django.db.models.fields.files.FileField')(max_length=220)) + + # Changing field 'Import.result_file' + db.alter_column('ishtar_common_import', 'result_file', self.gf('django.db.models.fields.files.FileField')(max_length=255, null=True)) + + # Changing field 'Import.imported_images' + db.alter_column('ishtar_common_import', 'imported_images', self.gf('django.db.models.fields.files.FileField')(max_length=220, null=True)) + + def backwards(self, orm): + + # Changing field 'Import.error_file' + db.alter_column('ishtar_common_import', 'error_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) + + # Changing field 'Import.match_file' + db.alter_column('ishtar_common_import', 'match_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) + + # Changing field 'Import.imported_file' + db.alter_column('ishtar_common_import', 'imported_file', self.gf('django.db.models.fields.files.FileField')(max_length=100)) + + # Changing field 'Import.result_file' + db.alter_column('ishtar_common_import', 'result_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) + + # Changing field 'Import.imported_images' + db.alter_column('ishtar_common_import', 'imported_images', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'ishtar_common.arrondissement': { + 'Meta': {'object_name': 'Arrondissement'}, + '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'}) + }, + 'ishtar_common.author': { + 'Meta': {'object_name': 'Author'}, + '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['ishtar_common.Person']"}) + }, + 'ishtar_common.authortype': { + 'Meta': {'object_name': 'AuthorType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.canton': { + 'Meta': {'object_name': 'Canton'}, + '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'}) + }, + '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'}), + 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.State']", 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.documenttemplate': { + 'Meta': {'ordering': "['associated_object_name', 'name']", 'object_name': 'DocumentTemplate'}, + 'associated_object_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'template': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}) + }, + 'ishtar_common.format': { + 'Meta': {'object_name': 'Format'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.formatertype': { + 'Meta': {'ordering': "('formater_type', 'options')", 'unique_together': "(('formater_type', 'options', 'many_split'),)", 'object_name': 'FormaterType'}, + 'formater_type': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'many_split': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'options': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.globalvar': { + 'Meta': {'ordering': "['slug']", 'object_name': 'GlobalVar'}, + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.historicalorganization': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalOrganization'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + 'organization_type_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.historicalperson': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalPerson'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'attached_to_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'contact_type': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'old_title': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_name': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'salutation': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'surname': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'title_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.import': { + 'Meta': {'object_name': 'Import'}, + 'conservative_import': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'encoding': ('django.db.models.fields.CharField', [], {'default': "'utf-8'", 'max_length': '15'}), + 'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'error_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imported_file': ('django.db.models.fields.files.FileField', [], {'max_length': '220'}), + 'imported_images': ('django.db.models.fields.files.FileField', [], {'max_length': '220', 'null': 'True', 'blank': 'True'}), + 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.ImporterType']"}), + 'match_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'result_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'seconds_remaining': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'skip_lines': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'state': ('django.db.models.fields.CharField', [], {'default': "'C'", 'max_length': '2'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']"}) + }, + 'ishtar_common.importercolumn': { + 'Meta': {'ordering': "('importer_type', 'col_number')", 'unique_together': "(('importer_type', 'col_number'),)", 'object_name': 'ImporterColumn'}, + 'col_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'columns'", 'to': "orm['ishtar_common.ImporterType']"}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'regexp_pre_filter': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Regexp']", 'null': 'True', 'blank': 'True'}), + 'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'ishtar_common.importerdefault': { + 'Meta': {'object_name': 'ImporterDefault'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'defaults'", 'to': "orm['ishtar_common.ImporterType']"}), + 'target': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'ishtar_common.importerdefaultvalues': { + 'Meta': {'object_name': 'ImporterDefaultValues'}, + 'default_target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'default_values'", 'to': "orm['ishtar_common.ImporterDefault']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'target': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + 'value': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'ishtar_common.importerduplicatefield': { + 'Meta': {'object_name': 'ImporterDuplicateField'}, + 'column': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'duplicate_fields'", 'to': "orm['ishtar_common.ImporterColumn']"}), + 'concat': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'concat_str': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True', 'blank': 'True'}), + 'field_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'force_new': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'ishtar_common.importertype': { + 'Meta': {'object_name': 'ImporterType'}, + 'associated_models': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'description': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_template': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'unicity_keys': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'users': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.importtarget': { + 'Meta': {'object_name': 'ImportTarget'}, + 'column': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'targets'", 'to': "orm['ishtar_common.ImporterColumn']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'concat': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'concat_str': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True', 'blank': 'True'}), + 'force_new': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'formater_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.FormaterType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'regexp_filter': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Regexp']", 'null': 'True', 'blank': 'True'}), + 'target': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'ishtar_common.ishtarsiteprofile': { + 'Meta': {'ordering': "['label']", 'object_name': 'IshtarSiteProfile'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'base_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(0, 0, 0, 0)'", 'max_length': '200'}), + 'base_find_external_id': ('django.db.models.fields.TextField', [], {'default': "'{context_record__external_id}-{label}'"}), + 'container_external_id': ('django.db.models.fields.TextField', [], {'default': "'{responsible__external_id}-{index}'"}), + 'context_record': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'context_record_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(210,200,0,0.2)'", 'max_length': '200'}), + 'context_record_external_id': ('django.db.models.fields.TextField', [], {'default': "'{parcel__external_id}-{label}'"}), + 'currency': ('django.db.models.fields.CharField', [], {'default': "u'\\u20ac'", 'max_length': "'5'"}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'file_external_id': ('django.db.models.fields.TextField', [], {'default': "'{year}-{numeric_reference}'"}), + 'files': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'files_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(0, 32, 210, 0.1)'", 'max_length': '200'}), + 'find': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'find_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(210,0,0,0.15)'", 'max_length': '200'}), + 'find_external_id': ('django.db.models.fields.TextField', [], {'default': "'{get_first_base_find__context_record__external_id}-{label}'"}), + 'homepage': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'mapping': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'mapping_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(72, 236, 0, 0.15)'", 'max_length': '200'}), + 'parcel_external_id': ('django.db.models.fields.TextField', [], {'default': "'{associated_file__external_id}{operation__code_patriarche}-{town__numero_insee}-{section}{parcel_number}'"}), + 'person_raw_name': ('django.db.models.fields.TextField', [], {'default': "'{name|upper} {surname}'"}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'warehouse': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'warehouse_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(10,20,200,0.15)'", 'max_length': '200'}), + 'warehouse_external_id': ('django.db.models.fields.TextField', [], {'default': "'{name|slug}'"}) + }, + 'ishtar_common.ishtaruser': { + 'Meta': {'object_name': 'IshtarUser', '_ormbases': ['auth.User']}, + 'advanced_shortcut_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ishtaruser'", 'unique': 'True', 'to': "orm['ishtar_common.Person']"}), + 'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}) + }, + 'ishtar_common.itemkey': { + 'Meta': {'object_name': 'ItemKey'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'importer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Import']", 'null': 'True', 'blank': 'True'}), + 'key': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}) + }, + 'ishtar_common.operationtype': { + 'Meta': {'ordering': "['-preventive', 'order', 'label']", 'object_name': 'OperationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'preventive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + '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'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_organization'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}), + 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + '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'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.organizationtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'OrganizationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + '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'}), + 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}), + 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}), + 'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'contact_type': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_person'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'old_title': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + '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'}), + 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'raw_name': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'salutation': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'surname': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.TitleType']", 'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.persontype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'PersonType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.regexp': { + 'Meta': {'object_name': 'Regexp'}, + 'description': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'regexp': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'ishtar_common.sourcetype': { + 'Meta': {'object_name': 'SourceType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.spatialreferencesystem': { + 'Meta': {'ordering': "('label',)", 'object_name': 'SpatialReferenceSystem'}, + 'auth_name': ('django.db.models.fields.CharField', [], {'default': "'EPSG'", 'max_length': '256'}), + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '10'}), + 'srid': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.state': { + 'Meta': {'ordering': "['number']", 'object_name': 'State'}, + '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'}) + }, + 'ishtar_common.supporttype': { + 'Meta': {'object_name': 'SupportType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.targetkey': { + 'Meta': {'unique_together': "(('target', 'key', 'associated_user', 'associated_import'),)", 'object_name': 'TargetKey'}, + 'associated_import': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Import']", 'null': 'True', 'blank': 'True'}), + 'associated_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_set': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'key': ('django.db.models.fields.TextField', [], {}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'keys'", 'to': "orm['ishtar_common.ImportTarget']"}), + 'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.titletype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'TitleType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'ishtar_common.town': { + 'Meta': {'ordering': "['numero_insee']", 'object_name': 'Town'}, + '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['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_town'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'numero_insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '6'}), + 'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['ishtar_common'] diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 572bd85e7..723125149 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2124,12 +2124,14 @@ TARGET_MODELS = [ ('archaeological_finds.models.ObjectType', _(u"Object type")), ('archaeological_finds.models.IntegrityType', _(u"Integrity type")), ('archaeological_finds.models.RemarkabilityType', _(u"Remarkability type")), + ('archaeological_finds.models.BatchType', _(u"Batch type")), ('archaeological_context_records.models.IdentificationType', _("Identification type")), ('archaeological_context_records.models.RelationType', _(u"Context record relation type")), ('SpatialReferenceSystem', _(u"Spatial reference system")), ('SupportType', _(u"Support type")), + ('TitleType', _(u"Title type")), ] TARGET_MODELS_KEYS = [tm[0] for tm in TARGET_MODELS] @@ -2246,23 +2248,23 @@ ENCODINGS = [(settings.ENCODING, settings.ENCODING), class Import(models.Model): user = models.ForeignKey('IshtarUser') importer_type = models.ForeignKey(ImporterType) - imported_file = models.FileField(_(u"Imported file"), - upload_to="upload/imports/") + imported_file = models.FileField( + _(u"Imported file"), upload_to="upload/imports/", max_length=220) imported_images = models.FileField( _(u"Associated images (zip file)"), upload_to="upload/imports/", - blank=True, null=True) + blank=True, null=True, max_length=220) encoding = models.CharField(_(u"Encoding"), choices=ENCODINGS, default='utf-8', max_length=15) skip_lines = models.IntegerField(_(u"Skip lines"), default=1) error_file = models.FileField(_(u"Error file"), upload_to="upload/imports/", - blank=True, null=True) + blank=True, null=True, max_length=255) result_file = models.FileField(_(u"Result file"), upload_to="upload/imports/", - blank=True, null=True) + blank=True, null=True, max_length=255) match_file = models.FileField(_(u"Match file"), upload_to="upload/imports/", - blank=True, null=True) + blank=True, null=True, max_length=255) state = models.CharField(_(u"State"), max_length=2, choices=IMPORT_STATE, default='C') conservative_import = models.BooleanField( diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 6fe6e6532..5ff9e9895 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -395,7 +395,7 @@ div#validation-bar.big{ } a.button{ - padding: 8px; + padding: 7px; } #reset_wizards{ diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 870409e41..614a83595 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -1,4 +1,4 @@ -{% load i18n %}{% load url from future%}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +{% load i18n %}{% load url from future %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{LANGUAGE_CODE}}" lang="{{LANGUAGE_CODE}}"> @@ -109,10 +109,11 @@ {% block content %}{% endblock %} </div> + {% block footer %} <div id="footer"> - {% block footer %} - {% endblock %} + {% include 'ishtar/blocks/footer.html' %} </div> + {% endblock %} <div id="progress"> <div id='progress-content'> <p class='progress-detail progress-1'>{% trans "Processing..." %}</p> diff --git a/ishtar_common/templates/ishtar/blocks/footer.html b/ishtar_common/templates/ishtar/blocks/footer.html new file mode 100644 index 000000000..8705c5892 --- /dev/null +++ b/ishtar_common/templates/ishtar/blocks/footer.html @@ -0,0 +1,3 @@ +{% load i18n %}<div id="foot"> + {% blocktrans %}Powered by <a href="https://ishtar-archeo.net/">Ishtar</a> v{{VERSION}} - a free software under AGPL v3 license.{% endblocktrans %} +</div>
\ No newline at end of file diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html index fad1895bd..e77484e61 100644 --- a/ishtar_common/templates/ishtar/wizard/default_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html @@ -44,9 +44,14 @@ {% endblock %} <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" /> {{ previous_fields|safe }} +{% block "footer" %} + <div id="footer"> {% block "validation_bar" %} {% include 'ishtar/wizard/validation_bar.html' %} {% endblock %} +{% include 'ishtar/blocks/footer.html' %} +{% endblock %} + </div> </div> </form> {% endblock %} diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 9ced28ea6..9e5fc3466 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -355,7 +355,7 @@ class ShortMenuTest(TestCase): if not user: user = self.other_user from archaeological_operations.models import Operation, OperationType - ope_type = OperationType.objects.create() + ope_type, created = OperationType.objects.get_or_create(label="test") return Operation.objects.create( operation_type=ope_type, history_modifier=user, @@ -662,6 +662,28 @@ class ShortMenuTest(TestCase): self.assertEqual(response.status_code, 200) self.assertFalse(str(treat.cached_label) in response.content) + def test_update_current_item(self): + c = Client() + c.login(username=self.username, password=self.password) + base_find, find = self._create_find() + + response = c.get(reverse('pin', args=['find', find.pk])) + self.assertEqual(response.status_code, 200) + # the selected find is pined + self.assertEqual(c.session['find'], str(find.pk)) + # dependant items are also pined + self.assertEqual(c.session['contextrecord'], + str(base_find.context_record.pk)) + self.assertEqual(c.session['operation'], + str(base_find.context_record.operation.pk)) + + # pin another operation - dependant items are nullify + ope = self._create_ope() + response = c.get(reverse('pin', args=['operation', ope.pk])) + self.assertEqual(response.status_code, 200) + self.assertFalse(c.session['find']) + self.assertFalse(c.session['contextrecord']) + class ImportTest(TestCase): def testDeleteRelated(self): diff --git a/ishtar_common/views.py b/ishtar_common/views.py index e8ae1a458..33f4fac7f 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -368,14 +368,14 @@ def update_current_item(request, item_type=None, pk=None): request.session["operation"] = '' currents['operation'] = None if item_type in ('operation', 'file') and currents['contextrecord'] and \ - (not request.session["operation"] or + (not request.session.get("operation", None) or currents['contextrecord'].operation != currents['operation']): request.session["contextrecord"] = '' currents['contextrecord'] = None from archaeological_finds.models import Find if item_type in ('contextrecord', 'operation', 'file') and \ currents['find'] and \ - (not request.session["contextrecord"] or + (not request.session.get("contextrecord", None) or not Find.objects.filter( downstream_treatment__isnull=True, base_finds__context_record__pk=request.session["contextrecord"], diff --git a/ishtar_pdl/static/pdl/styles.css b/ishtar_pdl/static/pdl/styles.css index 0f7980033..b35d0ade2 100644 --- a/ishtar_pdl/static/pdl/styles.css +++ b/ishtar_pdl/static/pdl/styles.css @@ -1,14 +1,24 @@ -div#validation-bar{ +div#footer{ position: fixed; bottom: 0px; background-color: #CCC; width: 100%; left: 0px; - height: 40px; - padding: 5px; z-index: 101; } +div#validation-bar{ + padding-top: 5px; + margin-bottom: 7px; +} + +div#foot{ + font-size: 0.75em; + text-align: center; + background-color: #bbb; + padding: 0.2em; +} + #reset_wizards{ right:50px; position:absolute; diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po index db0d1594e..6aae6aaa7 100644 --- a/translations/de/ishtar_common.po +++ b/translations/de/ishtar_common.po @@ -101,31 +101,31 @@ msgstr "" msgid "Not imported" msgstr "" -#: data_importer.py:1441 +#: data_importer.py:1444 msgid "line" msgstr "" -#: data_importer.py:1441 +#: data_importer.py:1444 msgid "col" msgstr "" -#: data_importer.py:1441 +#: data_importer.py:1444 msgid "error" msgstr "" -#: data_importer.py:1447 +#: data_importer.py:1450 msgid "field" msgstr "" -#: data_importer.py:1447 +#: data_importer.py:1450 msgid "source" msgstr "" -#: data_importer.py:1447 +#: data_importer.py:1450 msgid "result" msgstr "" -#: data_importer.py:1463 +#: data_importer.py:1466 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -158,12 +158,12 @@ msgstr "" msgid "Add a new item" msgstr "" -#: forms.py:262 models.py:1368 +#: forms.py:262 models.py:1473 msgid "Template" msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:182 -#: forms_common.py:406 models.py:1434 models.py:2826 +#: forms_common.py:406 models.py:1539 models.py:2940 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -179,8 +179,8 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.</p>" msgstr "" -#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1607 -#: models.py:2453 models.py:2635 models.py:2696 +#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1712 +#: models.py:2567 models.py:2749 models.py:2810 #: templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -192,63 +192,63 @@ msgid "" msgstr "" #: forms_common.py:170 forms_common.py:327 forms_common.py:451 -#: ishtar_menu.py:75 models.py:1608 models.py:2339 +#: ishtar_menu.py:75 models.py:1713 models.py:2450 models.py:2541 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" #: forms_common.py:173 forms_common.py:210 forms_common.py:322 -#: forms_common.py:376 forms_common.py:446 models.py:1034 models.py:1367 -#: models.py:1653 models.py:1872 models.py:2333 models.py:2439 models.py:2812 +#: forms_common.py:376 forms_common.py:446 models.py:1094 models.py:1472 +#: models.py:1758 models.py:1977 models.py:2444 models.py:2553 models.py:2926 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "" -#: forms_common.py:174 models.py:1589 models.py:2003 +#: forms_common.py:174 models.py:1694 models.py:2108 msgid "Organization type" msgstr "" -#: forms_common.py:176 forms_common.py:400 models.py:1429 +#: forms_common.py:176 forms_common.py:400 models.py:1534 #: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "" -#: forms_common.py:178 forms_common.py:403 models.py:1430 +#: forms_common.py:178 forms_common.py:403 models.py:1535 #: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "" -#: forms_common.py:180 forms_common.py:404 models.py:1432 +#: forms_common.py:180 forms_common.py:404 models.py:1537 #: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "" -#: forms_common.py:183 forms_common.py:407 models.py:1435 +#: forms_common.py:183 forms_common.py:407 models.py:1540 msgid "Country" msgstr "" #: forms_common.py:185 forms_common.py:324 forms_common.py:380 -#: forms_common.py:448 forms_common.py:572 models.py:1462 +#: forms_common.py:448 forms_common.py:572 models.py:1567 msgid "Email" msgstr "" -#: forms_common.py:186 forms_common.py:383 models.py:1447 +#: forms_common.py:186 forms_common.py:383 models.py:1552 #: templates/ishtar/sheet_organization.html:14 #: templates/ishtar/sheet_person.html:19 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "" -#: forms_common.py:187 forms_common.py:392 models.py:1459 +#: forms_common.py:187 forms_common.py:392 models.py:1564 #: templates/ishtar/sheet_organization.html:15 #: templates/ishtar/sheet_person.html:37 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "" -#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2033 -#: models.py:2335 models.py:2747 templates/sheet_ope.html:85 +#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2144 +#: models.py:2446 models.py:2861 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:23 @@ -256,7 +256,7 @@ msgstr "" msgid "Type" msgstr "" -#: forms_common.py:220 views.py:142 +#: forms_common.py:220 views.py:146 msgid "Organization search" msgstr "" @@ -272,12 +272,12 @@ msgstr "" msgid "Organization to merge" msgstr "" -#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2437 +#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2551 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "" -#: forms_common.py:339 forms_common.py:434 views.py:107 +#: forms_common.py:339 forms_common.py:434 views.py:111 msgid "Person search" msgstr "" @@ -290,25 +290,25 @@ msgstr "" msgid "Identity" msgstr "" -#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2004 -#: models.py:2431 models.py:2433 models.py:2744 templates/sheet_ope.html:104 +#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2109 +#: models.py:2545 models.py:2547 models.py:2858 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" -#: forms_common.py:372 models.py:2435 +#: forms_common.py:372 models.py:2549 msgid "Salutation" msgstr "" -#: forms_common.py:378 models.py:2441 +#: forms_common.py:378 models.py:2555 msgid "Raw name" msgstr "" -#: forms_common.py:381 models.py:1448 +#: forms_common.py:381 models.py:1553 msgid "Phone description" msgstr "" -#: forms_common.py:384 models.py:1450 models.py:1452 +#: forms_common.py:384 models.py:1555 models.py:1557 msgid "Phone description 2" msgstr "" @@ -316,11 +316,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: forms_common.py:388 models.py:1456 +#: forms_common.py:388 models.py:1561 msgid "Phone description 3" msgstr "" -#: forms_common.py:390 models.py:1454 +#: forms_common.py:390 models.py:1559 msgid "Phone 3" msgstr "" @@ -328,23 +328,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: forms_common.py:409 models.py:1437 +#: forms_common.py:409 models.py:1542 msgid "Other address: address" msgstr "" -#: forms_common.py:412 models.py:1440 +#: forms_common.py:412 models.py:1545 msgid "Other address: address complement" msgstr "" -#: forms_common.py:414 models.py:1441 +#: forms_common.py:414 models.py:1546 msgid "Other address: postal code" msgstr "" -#: forms_common.py:416 models.py:1443 +#: forms_common.py:416 models.py:1548 msgid "Other address: town" msgstr "" -#: forms_common.py:418 models.py:1445 +#: forms_common.py:418 models.py:1550 msgid "Other address: country" msgstr "" @@ -360,7 +360,7 @@ msgstr "" msgid "Account search" msgstr "" -#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2387 +#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2498 msgid "Person type" msgstr "" @@ -368,7 +368,7 @@ msgstr "" msgid "Account" msgstr "" -#: forms_common.py:575 wizards.py:1256 +#: forms_common.py:575 wizards.py:1281 msgid "New password" msgstr "" @@ -392,7 +392,7 @@ msgstr "" msgid "Send the new password by email?" msgstr "" -#: forms_common.py:628 forms_common.py:641 models.py:2827 +#: forms_common.py:628 forms_common.py:641 models.py:2941 msgid "Towns" msgstr "" @@ -408,7 +408,7 @@ msgstr "" msgid "Documentation informations" msgstr "" -#: forms_common.py:775 forms_common.py:823 models.py:2005 models.py:2721 +#: forms_common.py:775 forms_common.py:823 models.py:2110 models.py:2835 msgid "Source type" msgstr "" @@ -420,37 +420,37 @@ msgstr "" msgid "Internal reference" msgstr "" -#: forms_common.py:783 models.py:2758 +#: forms_common.py:783 models.py:2872 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:784 models.py:2760 +#: forms_common.py:784 models.py:2874 msgid "Receipt date" msgstr "" -#: forms_common.py:786 models.py:2162 models.py:2762 +#: forms_common.py:786 models.py:2273 models.py:2876 msgid "Creation date" msgstr "" -#: forms_common.py:789 models.py:2765 +#: forms_common.py:789 models.py:2879 msgid "Receipt date in documentation" msgstr "" -#: forms_common.py:791 forms_common.py:827 models.py:323 models.py:634 -#: models.py:1899 models.py:2445 models.py:2772 +#: forms_common.py:791 forms_common.py:827 models.py:376 models.py:687 +#: models.py:2004 models.py:2559 models.py:2886 msgid "Comment" msgstr "" -#: forms_common.py:793 forms_common.py:826 models.py:1036 models.py:1657 -#: models.py:1831 models.py:1873 models.py:2771 templates/sheet_ope.html:128 +#: forms_common.py:793 forms_common.py:826 models.py:1096 models.py:1762 +#: models.py:1936 models.py:1978 models.py:2885 templates/sheet_ope.html:128 msgid "Description" msgstr "" -#: forms_common.py:796 models.py:2773 +#: forms_common.py:796 models.py:2887 msgid "Additional information" msgstr "" -#: forms_common.py:798 forms_common.py:830 models.py:2775 +#: forms_common.py:798 forms_common.py:830 models.py:2889 msgid "Has a duplicate" msgstr "" @@ -465,7 +465,7 @@ msgid "" "p>" msgstr "" -#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2701 +#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2815 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" @@ -478,7 +478,7 @@ msgstr "" msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:856 models.py:2006 models.py:2689 models.py:2698 +#: forms_common.py:856 models.py:2111 models.py:2803 models.py:2812 msgid "Author type" msgstr "" @@ -490,7 +490,7 @@ msgstr "" msgid "There are identical authors." msgstr "" -#: forms_common.py:893 models.py:2702 models.py:2754 +#: forms_common.py:893 models.py:2816 models.py:2868 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -508,7 +508,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:39 models.py:1163 views.py:1530 +#: ishtar_menu.py:39 models.py:1268 views.py:1548 msgid "Global variables" msgstr "" @@ -536,19 +536,19 @@ msgstr "" msgid "Manual merge" msgstr "" -#: ishtar_menu.py:109 models.py:2173 +#: ishtar_menu.py:109 models.py:2284 msgid "Imports" msgstr "" -#: ishtar_menu.py:112 views.py:1538 +#: ishtar_menu.py:112 views.py:1556 msgid "New import" msgstr "" -#: ishtar_menu.py:116 views.py:1552 +#: ishtar_menu.py:116 views.py:1570 msgid "Current imports" msgstr "" -#: ishtar_menu.py:120 views.py:1588 +#: ishtar_menu.py:120 views.py:1606 msgid "Old imports" msgstr "" @@ -564,204 +564,250 @@ msgstr "" msgid "This item already exists." msgstr "" -#: models.py:319 models.py:633 models.py:1402 models.py:1414 models.py:1828 +#: models.py:372 models.py:686 models.py:1507 models.py:1519 models.py:1933 msgid "Label" msgstr "" -#: models.py:321 +#: models.py:374 msgid "Textual ID" msgstr "" -#: models.py:324 models.py:636 models.py:1371 +#: models.py:377 models.py:689 models.py:1476 msgid "Available" msgstr "" -#: models.py:655 models.py:1945 +#: models.py:713 models.py:2050 msgid "Key" msgstr "" -#: models.py:661 +#: models.py:719 msgid "Specific key to an import" msgstr "" -#: models.py:753 +#: models.py:811 msgid "Last editor" msgstr "" -#: models.py:756 +#: models.py:814 msgid "Creator" msgstr "" -#: models.py:898 models.py:2838 models.py:2894 +#: models.py:956 models.py:2952 models.py:3008 msgid "Order" msgstr "" -#: models.py:899 +#: models.py:957 msgid "Symmetrical" msgstr "" -#: models.py:900 +#: models.py:958 msgid "Tiny label" msgstr "" -#: models.py:914 +#: models.py:972 msgid "Cannot have symmetrical and an inverse_relation" msgstr "" -#: models.py:1028 +#: models.py:1088 msgid "Euro" msgstr "" -#: models.py:1029 +#: models.py:1089 msgid "US dollar" msgstr "" -#: models.py:1035 models.py:1655 +#: models.py:1095 models.py:1760 msgid "Slug" msgstr "" -#: models.py:1037 +#: models.py:1098 +msgid "CSS color code for base module" +msgstr "" + +#: models.py:1100 msgid "Files module" msgstr "" -#: models.py:1038 +#: models.py:1102 +msgid "CSS color code for files module" +msgstr "" + +#: models.py:1104 msgid "Context records module" msgstr "" -#: models.py:1040 +#: models.py:1107 +msgid "CSS color code for context record module" +msgstr "" + +#: models.py:1109 msgid "Finds module" msgstr "" -#: models.py:1041 +#: models.py:1110 msgid "Need context records module" msgstr "" -#: models.py:1043 +#: models.py:1112 +msgid "CSS color code for find module" +msgstr "" + +#: models.py:1115 msgid "Warehouses module" msgstr "" -#: models.py:1044 +#: models.py:1116 msgid "Need finds module" msgstr "" -#: models.py:1045 +#: models.py:1118 +msgid "CSS code for warehouse module" +msgstr "" + +#: models.py:1120 msgid "Mapping module" msgstr "" -#: models.py:1047 +#: models.py:1122 +msgid "CSS code for mapping module" +msgstr "" + +#: models.py:1125 msgid "Home page" msgstr "" -#: models.py:1048 +#: models.py:1126 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " "markdown syntax. {random_image} can be used to display a random image." msgstr "" -#: models.py:1052 +#: models.py:1130 msgid "File external id" msgstr "" -#: models.py:1054 +#: models.py:1132 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1059 +#: models.py:1137 msgid "Parcel external id" msgstr "" -#: models.py:1062 +#: models.py:1140 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1067 +#: models.py:1145 msgid "Context record external id" msgstr "" -#: models.py:1069 +#: models.py:1147 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1074 +#: models.py:1152 msgid "Base find external id" msgstr "" -#: models.py:1076 +#: models.py:1154 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1081 +#: models.py:1159 msgid "Find external id" msgstr "" -#: models.py:1083 +#: models.py:1161 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1088 +#: models.py:1166 +msgid "Container external id" +msgstr "" + +#: models.py:1168 +msgid "" +"Formula to manage container external ID. Change this with care. With " +"incorrect formula, the application might be unusable and import of external " +"data can be destructive." +msgstr "" + +#: models.py:1173 +msgid "Warehouse external id" +msgstr "" + +#: models.py:1175 +msgid "" +"Formula to manage warehouse external ID. Change this with care. With " +"incorrect formula, the application might be unusable and import of external " +"data can be destructive." +msgstr "" + +#: models.py:1180 msgid "Raw name for person" msgstr "" -#: models.py:1090 +#: models.py:1182 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1094 +#: models.py:1186 msgid "Current active" msgstr "" -#: models.py:1095 +#: models.py:1187 msgid "Currency" msgstr "" -#: models.py:1099 +#: models.py:1191 msgid "Ishtar site profile" msgstr "" -#: models.py:1100 +#: models.py:1192 msgid "Ishtar site profiles" msgstr "" -#: models.py:1156 +#: models.py:1261 msgid "Variable name" msgstr "" -#: models.py:1157 +#: models.py:1262 msgid "Description of the variable" msgstr "" -#: models.py:1159 models.py:1946 +#: models.py:1264 models.py:2051 msgid "Value" msgstr "" -#: models.py:1162 +#: models.py:1267 msgid "Global variable" msgstr "" -#: models.py:1272 models.py:1302 +#: models.py:1377 models.py:1407 msgid "Total" msgstr "" -#: models.py:1279 models.py:1403 models.py:1415 +#: models.py:1384 models.py:1508 models.py:1520 #: templates/ishtar/sheet_person.html:22 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 @@ -769,726 +815,746 @@ msgstr "" msgid "Number" msgstr "" -#: models.py:1366 +#: models.py:1471 msgid "Administrative Act" msgstr "" -#: models.py:1370 +#: models.py:1475 msgid "Associated object" msgstr "" -#: models.py:1374 +#: models.py:1479 msgid "Document template" msgstr "" -#: models.py:1375 +#: models.py:1480 msgid "Document templates" msgstr "" -#: models.py:1406 models.py:1416 models.py:2157 +#: models.py:1511 models.py:1521 models.py:2268 msgid "State" msgstr "" -#: models.py:1420 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1525 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: models.py:1421 +#: models.py:1526 msgid "Departments" msgstr "" -#: models.py:1458 +#: models.py:1563 msgid "Raw phone" msgstr "" -#: models.py:1464 +#: models.py:1569 msgid "Alternative address is prefered" msgstr "" -#: models.py:1503 +#: models.py:1608 msgid "Tel: " msgstr "" -#: models.py:1507 +#: models.py:1612 msgid "Mobile: " msgstr "" -#: models.py:1511 +#: models.py:1616 msgid "Email: " msgstr "" -#: models.py:1516 +#: models.py:1621 msgid "Merge key" msgstr "" -#: models.py:1590 +#: models.py:1695 msgid "Organization types" msgstr "" -#: models.py:1609 views.py:237 +#: models.py:1714 views.py:241 msgid "Operation" msgstr "" -#: models.py:1611 +#: models.py:1716 msgid "Archaeological site" msgstr "" -#: models.py:1612 +#: models.py:1717 msgid "Parcels" msgstr "" -#: models.py:1614 +#: models.py:1719 msgid "Operation source" msgstr "" -#: models.py:1617 views.py:1346 views.py:1396 +#: models.py:1722 views.py:1364 views.py:1414 msgid "Archaeological files" msgstr "" -#: models.py:1619 views.py:1349 views.py:1404 +#: models.py:1724 views.py:1367 views.py:1422 msgid "Context records" msgstr "" -#: models.py:1621 +#: models.py:1726 msgid "Context record relations" msgstr "" -#: models.py:1623 +#: models.py:1728 msgid "Base finds" msgstr "" -#: models.py:1659 templates/ishtar/dashboards/dashboard_main.html:25 +#: models.py:1764 templates/ishtar/dashboards/dashboard_main.html:25 msgid "Users" msgstr "" -#: models.py:1661 +#: models.py:1766 msgid "Associated model" msgstr "" -#: models.py:1664 +#: models.py:1769 msgid "Is template" msgstr "" -#: models.py:1665 +#: models.py:1770 msgid "Unicity keys (separator \";\")" msgstr "" -#: models.py:1669 +#: models.py:1774 msgid "Importer - Type" msgstr "" -#: models.py:1670 +#: models.py:1775 msgid "Importer - Types" msgstr "" -#: models.py:1760 +#: models.py:1865 msgid "Importer - Default" msgstr "" -#: models.py:1761 +#: models.py:1866 msgid "Importer - Defaults" msgstr "" -#: models.py:1796 +#: models.py:1901 msgid "Importer - Default value" msgstr "" -#: models.py:1797 +#: models.py:1902 msgid "Importer - Default values" msgstr "" -#: models.py:1830 +#: models.py:1935 msgid "Column number" msgstr "" -#: models.py:1833 +#: models.py:1938 msgid "Required" msgstr "" -#: models.py:1836 +#: models.py:1941 msgid "Importer - Column" msgstr "" -#: models.py:1837 +#: models.py:1942 msgid "Importer - Columns" msgstr "" -#: models.py:1857 +#: models.py:1962 msgid "Field name" msgstr "" -#: models.py:1859 models.py:1893 +#: models.py:1964 models.py:1998 msgid "Force creation of new items" msgstr "" -#: models.py:1861 models.py:1895 +#: models.py:1966 models.py:2000 msgid "Concatenate with existing" msgstr "" -#: models.py:1863 models.py:1897 +#: models.py:1968 models.py:2002 msgid "Concatenate character" msgstr "" -#: models.py:1867 +#: models.py:1972 msgid "Importer - Duplicate field" msgstr "" -#: models.py:1868 +#: models.py:1973 msgid "Importer - Duplicate fields" msgstr "" -#: models.py:1875 +#: models.py:1980 msgid "Regular expression" msgstr "" -#: models.py:1878 +#: models.py:1983 msgid "Importer - Regular expression" msgstr "" -#: models.py:1879 +#: models.py:1984 msgid "Importer - Regular expressions" msgstr "" -#: models.py:1902 +#: models.py:2007 msgid "Importer - Target" msgstr "" -#: models.py:1903 +#: models.py:2008 msgid "Importer - Targets" msgstr "" -#: models.py:1927 views.py:536 +#: models.py:2032 views.py:545 msgid "True" msgstr "" -#: models.py:1928 views.py:538 +#: models.py:2033 views.py:547 msgid "False" msgstr "" -#: models.py:1947 +#: models.py:2052 msgid "Is set" msgstr "" -#: models.py:1954 +#: models.py:2059 msgid "Importer - Target key" msgstr "" -#: models.py:1955 +#: models.py:2060 msgid "Importer - Targets keys" msgstr "" -#: models.py:2007 models.py:2737 models.py:2750 +#: models.py:2112 models.py:2851 models.py:2864 msgid "Format" msgstr "" -#: models.py:2008 models.py:2842 +#: models.py:2113 models.py:2956 msgid "Operation type" msgstr "" -#: models.py:2009 +#: models.py:2114 msgid "Period" msgstr "" -#: models.py:2010 +#: models.py:2115 msgid "Report state" msgstr "" -#: models.py:2011 +#: models.py:2116 msgid "Remain type" msgstr "" -#: models.py:2012 +#: models.py:2117 msgid "Unit" msgstr "" -#: models.py:2013 +#: models.py:2118 msgid "Activity type" msgstr "" -#: models.py:2014 +#: models.py:2119 msgid "Material" msgstr "" -#: models.py:2016 +#: models.py:2121 msgid "Conservatory state" msgstr "" -#: models.py:2017 +#: models.py:2122 +msgid "Container type" +msgstr "" + +#: models.py:2123 msgid "Preservation type" msgstr "" -#: models.py:2018 +#: models.py:2124 msgid "Object type" msgstr "" -#: models.py:2020 +#: models.py:2125 +msgid "Integrity type" +msgstr "" + +#: models.py:2126 +msgid "Remarkability type" +msgstr "" + +#: models.py:2127 +msgid "Batch type" +msgstr "" + +#: models.py:2129 msgid "Identification type" msgstr "" -#: models.py:2022 +#: models.py:2131 msgid "Context record relation type" msgstr "" -#: models.py:2023 models.py:2729 +#: models.py:2132 models.py:3014 +msgid "Spatial reference system" +msgstr "" + +#: models.py:2133 models.py:2843 msgid "Support type" msgstr "" -#: models.py:2029 +#: models.py:2134 models.py:2510 +msgid "Title type" +msgstr "" + +#: models.py:2140 msgid "Integer" msgstr "" -#: models.py:2030 +#: models.py:2141 msgid "Float" msgstr "" -#: models.py:2031 +#: models.py:2142 msgid "String" msgstr "" -#: models.py:2032 templates/sheet_ope.html:86 +#: models.py:2143 templates/sheet_ope.html:86 msgid "Date" msgstr "" -#: models.py:2034 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2145 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "" -#: models.py:2035 +#: models.py:2146 msgid "String to boolean" msgstr "" -#: models.py:2036 +#: models.py:2147 msgctxt "filesystem" msgid "File" msgstr "" -#: models.py:2037 +#: models.py:2148 msgid "Unknow type" msgstr "" -#: models.py:2053 +#: models.py:2164 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: models.py:2054 +#: models.py:2165 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: models.py:2055 +#: models.py:2166 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: models.py:2065 +#: models.py:2176 msgid "Options" msgstr "" -#: models.py:2067 +#: models.py:2178 msgid "Split character(s)" msgstr "" -#: models.py:2071 +#: models.py:2182 msgid "Importer - Formater type" msgstr "" -#: models.py:2072 +#: models.py:2183 msgid "Importer - Formater types" msgstr "" -#: models.py:2121 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2232 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "" -#: models.py:2122 +#: models.py:2233 msgid "Analyse in progress" msgstr "" -#: models.py:2123 +#: models.py:2234 msgid "Analysed" msgstr "" -#: models.py:2124 +#: models.py:2235 msgid "Import pending" msgstr "" -#: models.py:2125 +#: models.py:2236 msgid "Import in progress" msgstr "" -#: models.py:2126 +#: models.py:2237 msgid "Finished with errors" msgstr "" -#: models.py:2127 +#: models.py:2238 msgid "Finished" msgstr "" -#: models.py:2128 +#: models.py:2239 msgid "Archived" msgstr "" -#: models.py:2140 +#: models.py:2252 msgid "Imported file" msgstr "" -#: models.py:2143 +#: models.py:2254 msgid "Associated images (zip file)" msgstr "" -#: models.py:2145 +#: models.py:2256 msgid "Encoding" msgstr "" -#: models.py:2147 +#: models.py:2258 msgid "Skip lines" msgstr "" -#: models.py:2148 templates/ishtar/import_list.html:47 +#: models.py:2259 templates/ishtar/import_list.html:47 msgid "Error file" msgstr "" -#: models.py:2151 +#: models.py:2262 msgid "Result file" msgstr "" -#: models.py:2154 templates/ishtar/import_list.html:53 +#: models.py:2265 templates/ishtar/import_list.html:53 msgid "Match file" msgstr "" -#: models.py:2160 +#: models.py:2271 msgid "Conservative import" msgstr "" -#: models.py:2165 +#: models.py:2276 msgid "End date" msgstr "" -#: models.py:2167 +#: models.py:2278 msgid "Remaining seconds" msgstr "" -#: models.py:2172 +#: models.py:2283 msgid "Import" msgstr "" -#: models.py:2189 +#: models.py:2300 msgid "Analyse" msgstr "" -#: models.py:2191 models.py:2194 +#: models.py:2302 models.py:2305 msgid "Re-analyse" msgstr "" -#: models.py:2192 +#: models.py:2303 msgid "Launch import" msgstr "" -#: models.py:2195 +#: models.py:2306 msgid "Re-import" msgstr "" -#: models.py:2196 +#: models.py:2307 msgid "Archive" msgstr "" -#: models.py:2198 +#: models.py:2309 msgid "Unarchive" msgstr "" -#: models.py:2199 widgets.py:130 templates/ishtar/form_delete.html:11 +#: models.py:2310 widgets.py:130 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "" -#: models.py:2340 +#: models.py:2451 msgid "Organizations" msgstr "" -#: models.py:2342 +#: models.py:2453 msgid "Can view all Organizations" msgstr "" -#: models.py:2343 +#: models.py:2454 msgid "Can view own Organization" msgstr "" -#: models.py:2344 +#: models.py:2455 msgid "Can add own Organization" msgstr "" -#: models.py:2346 +#: models.py:2457 msgid "Can change own Organization" msgstr "" -#: models.py:2348 +#: models.py:2459 msgid "Can delete own Organization" msgstr "" -#: models.py:2383 +#: models.py:2494 msgid "Groups" msgstr "" -#: models.py:2388 +#: models.py:2499 msgid "Person types" msgstr "" -#: models.py:2399 -msgid "Title type" -msgstr "" - -#: models.py:2400 +#: models.py:2511 msgid "Title types" msgstr "" -#: models.py:2409 +#: models.py:2520 msgid "Mr" msgstr "" -#: models.py:2410 +#: models.py:2521 msgid "Miss" msgstr "" -#: models.py:2411 +#: models.py:2522 msgid "Mr and Mrs" msgstr "" -#: models.py:2412 +#: models.py:2523 msgid "Mrs" msgstr "" -#: models.py:2413 +#: models.py:2524 msgid "Doctor" msgstr "" -#: models.py:2443 +#: models.py:2557 msgid "Contact type" msgstr "" -#: models.py:2446 models.py:2510 +#: models.py:2560 models.py:2624 msgid "Types" msgstr "" -#: models.py:2449 +#: models.py:2563 msgid "Is attached to" msgstr "" -#: models.py:2454 +#: models.py:2568 msgid "Persons" msgstr "" -#: models.py:2456 +#: models.py:2570 msgid "Can view all Persons" msgstr "" -#: models.py:2457 +#: models.py:2571 msgid "Can view own Person" msgstr "" -#: models.py:2458 +#: models.py:2572 msgid "Can add own Person" msgstr "" -#: models.py:2459 +#: models.py:2573 msgid "Can change own Person" msgstr "" -#: models.py:2460 +#: models.py:2574 msgid "Can delete own Person" msgstr "" -#: models.py:2638 +#: models.py:2752 msgid "Advanced shortcut menu" msgstr "" -#: models.py:2641 +#: models.py:2755 msgid "Ishtar user" msgstr "" -#: models.py:2642 +#: models.py:2756 msgid "Ishtar users" msgstr "" -#: models.py:2684 +#: models.py:2798 msgid "To modify the password use the form in Auth > User" msgstr "" -#: models.py:2690 +#: models.py:2804 msgid "Author types" msgstr "" -#: models.py:2722 +#: models.py:2836 msgid "Source types" msgstr "" -#: models.py:2730 +#: models.py:2844 msgid "Support types" msgstr "" -#: models.py:2738 +#: models.py:2852 msgid "Formats" msgstr "" -#: models.py:2745 +#: models.py:2859 msgid "External ID" msgstr "" -#: models.py:2748 +#: models.py:2862 msgid "Support" msgstr "" -#: models.py:2752 +#: models.py:2866 msgid "Scale" msgstr "" -#: models.py:2766 +#: models.py:2880 msgid "Item number" msgstr "" -#: models.py:2767 +#: models.py:2881 msgid "Ref." msgstr "" -#: models.py:2770 +#: models.py:2884 msgid "Internal ref." msgstr "" -#: models.py:2813 +#: models.py:2927 msgid "Surface (m2)" msgstr "" -#: models.py:2814 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2928 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "" -#: models.py:2839 +#: models.py:2953 msgid "Is preventive" msgstr "" -#: models.py:2843 +#: models.py:2957 msgid "Operation types" msgstr "" -#: models.py:2872 +#: models.py:2986 msgid "Preventive" msgstr "" -#: models.py:2873 +#: models.py:2987 msgid "Research" msgstr "" -#: models.py:2895 -msgid "SRID" +#: models.py:3010 +msgid "Authority name" msgstr "" -#: models.py:2898 -msgid "Spatial reference system" +#: models.py:3011 +msgid "Authority SRID" msgstr "" -#: models.py:2899 +#: models.py:3015 msgid "Spatial reference systems" msgstr "" -#: utils.py:83 +#: utils.py:84 msgid " (...)" msgstr "" -#: utils.py:116 +#: utils.py:130 msgid "Load another random image?" msgstr "" -#: views.py:114 +#: views.py:118 msgid "New person" msgstr "" -#: views.py:122 +#: views.py:126 msgid "Person modification" msgstr "" -#: views.py:137 +#: views.py:141 msgid "Person deletion" msgstr "" -#: views.py:148 +#: views.py:152 msgid "New organization" msgstr "" -#: views.py:155 +#: views.py:159 msgid "Organization modification" msgstr "" -#: views.py:171 +#: views.py:175 msgid "Organization deletion" msgstr "" -#: views.py:178 +#: views.py:182 msgid "Account management" msgstr "" -#: views.py:184 +#: views.py:188 msgid "Account deletion" msgstr "" -#: views.py:236 +#: views.py:240 msgid "Archaeological file" msgstr "" -#: views.py:239 +#: views.py:243 msgid "Context record" msgstr "" -#: views.py:241 +#: views.py:245 msgid "Find" msgstr "" -#: views.py:243 +#: views.py:247 msgid "Treatment request" msgstr "" -#: views.py:244 +#: views.py:248 msgid "Treatment" msgstr "" -#: views.py:1285 views.py:1328 +#: views.py:1303 views.py:1346 msgid "Operation not permitted." msgstr "" -#: views.py:1287 +#: views.py:1305 #, python-format msgid "New %s" msgstr "" -#: views.py:1347 views.py:1400 +#: views.py:1365 views.py:1418 msgid "Operations" msgstr "" -#: views.py:1351 views.py:1407 +#: views.py:1369 views.py:1425 msgid "Finds" msgstr "" -#: views.py:1600 templates/ishtar/import_list.html:43 +#: views.py:1618 templates/ishtar/import_list.html:43 msgid "Link unmatched items" msgstr "" -#: views.py:1615 +#: views.py:1633 msgid "Delete import" msgstr "" -#: views.py:1654 +#: views.py:1672 msgid "Merge persons" msgstr "" -#: views.py:1678 +#: views.py:1696 msgid "Select the main person" msgstr "" -#: views.py:1687 +#: views.py:1705 msgid "Merge organization" msgstr "" -#: views.py:1697 +#: views.py:1715 msgid "Select the main organization" msgstr "" -#: views.py:1737 views.py:1753 +#: views.py:1755 views.py:1771 msgid "Corporation manager" msgstr "" @@ -1508,15 +1574,15 @@ msgstr "" msgid "Remove" msgstr "" -#: wizards.py:342 templates/ishtar/import_delete.html:20 +#: wizards.py:343 templates/ishtar/import_delete.html:20 msgid "Yes" msgstr "" -#: wizards.py:344 +#: wizards.py:345 msgid "No" msgstr "" -#: wizards.py:1313 +#: wizards.py:1338 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "" @@ -1581,13 +1647,13 @@ msgstr "" msgid "Log in" msgstr "" -#: templates/base.html:59 -msgid "Lang" +#: templates/base.html:82 +msgid "Current items" msgstr "" -#: templates/base.html:59 templates/base.html.py:83 templates/welcome.html:8 -#: templates/welcome.html.py:9 templates/welcome.html:10 -#: templates/welcome.html.py:11 templates/ishtar/manage_basket.html:4 +#: templates/base.html:84 templates/welcome.html:8 templates/welcome.html.py:9 +#: templates/welcome.html:10 templates/welcome.html.py:11 +#: templates/ishtar/manage_basket.html:4 #: templates/ishtar/blocks/window_field.html:1 #: templates/ishtar/blocks/window_field_detail.html:1 #: templates/ishtar/blocks/window_field_multiple.html:1 @@ -1595,23 +1661,19 @@ msgstr "" msgid ":" msgstr "" -#: templates/base.html:81 -msgid "Current items" -msgstr "" - -#: templates/base.html:115 +#: templates/base.html:120 msgid "Processing..." msgstr "" -#: templates/base.html:116 +#: templates/base.html:121 msgid "This can be long." msgstr "" -#: templates/base.html:117 +#: templates/base.html:122 msgid "Time to take a coffee?" msgstr "" -#: templates/base.html:118 +#: templates/base.html:123 msgid "Time to take another coffee?" msgstr "" @@ -2216,6 +2278,13 @@ msgstr "" msgid "Unpin" msgstr "" +#: templates/ishtar/blocks/footer.html:2 +#, python-format +msgid "" +"Powered by <a href=\"https://ishtar-archeo.net/\">Ishtar</a> v%(VERSION)s - " +"a free software under AGPL v3 license." +msgstr "" + #: templates/ishtar/blocks/window_nav.html:6 msgid "Previous version" msgstr "" @@ -2365,7 +2434,7 @@ msgstr "" msgid "Add/Modify" msgstr "" -#: templates/ishtar/wizard/default_wizard.html:59 +#: templates/ishtar/wizard/default_wizard.html:64 msgid "" "The form has changed. If you don't validate it, all your changes will be " "lost." diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index 04aea6bec..633a55cec 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -3,24 +3,24 @@ # This file is distributed under the same license as the Ishtar package. # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015. # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata -# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata +# Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-01-09 01:15-0500\n" -"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" +"PO-Revision-Date: 2017-02-02 10:17-0500\n" +"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" -#: forms.py:47 forms.py:51 models.py:175 wizards.py:77 +#: forms.py:47 forms.py:51 models.py:176 models.py:488 wizards.py:77 msgid "Operation" msgstr "Opération" -#: forms.py:59 forms.py:137 models.py:177 models.py:453 +#: forms.py:59 forms.py:137 models.py:178 models.py:456 msgid "ID" msgstr "Identifiant" @@ -72,44 +72,44 @@ msgstr "Vous devez sélectionner au moins une Unité d'Enregistrement." msgid "General" msgstr "Général" -#: forms.py:136 models.py:132 models.py:173 models.py:455 +#: forms.py:136 models.py:132 models.py:174 models.py:458 msgid "Parcel" msgstr "Parcelle" -#: forms.py:139 models.py:178 models.py:456 +#: forms.py:139 models.py:179 models.py:459 #: templates/ishtar/sheet_contextrecord.html:27 msgid "Description" msgstr "Description" -#: forms.py:141 models.py:179 +#: forms.py:141 models.py:180 msgid "General comment" msgstr "Commentaire général" -#: forms.py:143 models.py:183 +#: forms.py:143 models.py:184 msgid "Length (m)" msgstr "Taille (m)" -#: forms.py:144 models.py:184 +#: forms.py:144 models.py:185 msgid "Width (m)" msgstr "Largeur (m)" -#: forms.py:145 models.py:185 +#: forms.py:145 models.py:186 msgid "Thickness (m)" msgstr "Épaisseur (m)" -#: forms.py:146 models.py:187 +#: forms.py:146 models.py:188 msgid "Depth (m)" msgstr "Profondeur (m)" -#: forms.py:147 models.py:195 models.py:454 +#: forms.py:147 models.py:196 models.py:457 msgid "Unit" msgstr "Unité" -#: forms.py:148 models.py:197 +#: forms.py:148 models.py:198 msgid "Has furniture?" msgstr "Contient du mobilier ?" -#: forms.py:151 models.py:189 +#: forms.py:151 models.py:190 msgid "Location" msgstr "Lieu" @@ -138,7 +138,7 @@ msgstr "Datation" msgid "Start date" msgstr "Date de début" -#: forms.py:235 models.py:57 models.py:182 +#: forms.py:235 models.py:57 models.py:183 msgid "End date" msgstr "Date de fin" @@ -150,7 +150,7 @@ msgstr "Qualité" msgid "Dating type" msgstr "Type de datation" -#: forms.py:264 ishtar_menu.py:29 models.py:514 +#: forms.py:264 ishtar_menu.py:29 models.py:518 msgid "Context record" msgstr "Unité d'Enregistrement" @@ -158,7 +158,7 @@ msgstr "Unité d'Enregistrement" msgid "Relations" msgstr "Relations" -#: forms.py:289 forms.py:297 models.py:200 +#: forms.py:289 forms.py:297 models.py:201 #: templates/ishtar/sheet_contextrecord.html:39 msgid "Interpretation" msgstr "Interprétation" @@ -167,31 +167,31 @@ msgstr "Interprétation" msgid "Comments on dating" msgstr "Commentaires sur la datation" -#: forms.py:295 models.py:199 +#: forms.py:295 models.py:200 msgid "Filling" msgstr "Remplissage" -#: forms.py:299 models.py:220 +#: forms.py:299 models.py:221 msgid "Activity" msgstr "Activité" -#: forms.py:301 models.py:218 +#: forms.py:301 models.py:219 msgid "Identification" msgstr "Identification" -#: forms.py:303 models.py:203 +#: forms.py:303 models.py:204 msgid "TAQ" msgstr "TAQ" -#: forms.py:304 models.py:207 +#: forms.py:304 models.py:208 msgid "Estimated TAQ" msgstr "TAQ estimé" -#: forms.py:306 models.py:210 +#: forms.py:306 models.py:211 msgid "TPQ" msgstr "TPQ" -#: forms.py:307 models.py:214 +#: forms.py:307 models.py:215 msgid "Estimated TPQ" msgstr "TPQ estimé" @@ -239,23 +239,23 @@ msgstr "Rechercher une documentation" msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: ishtar_menu.py:31 ishtar_menu.py:50 +#: ishtar_menu.py:32 ishtar_menu.py:51 msgid "Search" msgstr "Recherche" -#: ishtar_menu.py:35 ishtar_menu.py:55 +#: ishtar_menu.py:36 ishtar_menu.py:56 msgid "Creation" msgstr "Ajout" -#: ishtar_menu.py:39 ishtar_menu.py:61 +#: ishtar_menu.py:40 ishtar_menu.py:62 msgid "Modification" msgstr "Modification" -#: ishtar_menu.py:43 ishtar_menu.py:67 +#: ishtar_menu.py:44 ishtar_menu.py:68 msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:47 +#: ishtar_menu.py:48 msgid "Documentation" msgstr "Documentation" @@ -311,51 +311,55 @@ msgstr "Type d'identification" msgid "Identification Types" msgstr "Types d'identification" -#: models.py:133 models.py:457 +#: models.py:133 models.py:460 msgid "Periods" msgstr "Périodes" -#: models.py:161 +#: models.py:134 +msgid "Town" +msgstr "Ville" + +#: models.py:162 msgid "Parcel (town)" msgstr "Parcelle (commune)" -#: models.py:162 +#: models.py:163 msgid "Related context records" msgstr "Unités d'Enregistrement liées" -#: models.py:164 +#: models.py:165 msgid "Parcel (external ID)" msgstr "Parcelle (identifiant externe)" -#: models.py:165 +#: models.py:166 msgid "Datings (period)" -msgstr "Datations" +msgstr "Datations (période)" -#: models.py:166 +#: models.py:167 msgid "Parcel (year)" msgstr "Parcelle (année)" -#: models.py:170 +#: models.py:171 msgid "External ID" msgstr "ID externe" -#: models.py:172 +#: models.py:173 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" -#: models.py:180 +#: models.py:181 msgid "Date d'ouverture" msgstr "Date d'ouverture" -#: models.py:190 +#: models.py:191 msgid "A short description of the location of the context record" msgstr "Une courte description de la localisation de l'Unité d'Enregistrement" -#: models.py:193 +#: models.py:194 msgid "Comment on datings" msgstr "Commentaire sur les datations" -#: models.py:204 +#: models.py:205 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" @@ -363,11 +367,11 @@ msgstr "" "« Terminus Ante Quem » l'Unité d'Enregistrement ne peut avoir été créée " "après cette date" -#: models.py:208 +#: models.py:209 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "Estimation d'un « Terminus Ante Quem »" -#: models.py:211 +#: models.py:212 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" @@ -375,116 +379,116 @@ msgstr "" "« Terminus Post Quem » l'Unité d'Enregistrement ne peut avoir été créée " "avant cette date" -#: models.py:215 +#: models.py:216 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »" -#: models.py:223 +#: models.py:224 msgid "Point" msgstr "Point" -#: models.py:224 +#: models.py:225 msgid "Polygon" msgstr "Polygone" -#: models.py:225 +#: models.py:226 msgid "Cached name" msgstr "Nom en cache" -#: models.py:229 models.py:230 templates/ishtar/sheet_contextrecord.html:4 +#: models.py:230 models.py:231 templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: models.py:232 +#: models.py:233 msgid "Can view all Context Records" msgstr "Peut voir toutes les Unités d'Enregistrement" -#: models.py:234 +#: models.py:235 msgid "Can view own Context Record" msgstr "Peut voir sa propre Unité d'Enregistrement" -#: models.py:236 +#: models.py:237 msgid "Can add own Context Record" msgstr "Peut ajouter sa propre Unité d'Enregistrement" -#: models.py:238 +#: models.py:239 msgid "Can change own Context Record" msgstr "Peut modifier sa propre Unité d'Enregistrement" -#: models.py:240 +#: models.py:241 msgid "Can delete own Context Record" msgstr "Peut supprimer sa propre Unité d'Enregistrement" -#: models.py:250 +#: models.py:251 msgctxt "short" msgid "Context record" msgstr "UE" -#: models.py:387 +#: models.py:390 msgid "Inverse relation" msgstr "Relation inverse" -#: models.py:391 models.py:414 models.py:452 +#: models.py:394 models.py:417 models.py:455 msgid "Relation type" msgstr "Type de relation" -#: models.py:392 +#: models.py:395 msgid "Relation types" msgstr "Types de relation" -#: models.py:409 +#: models.py:412 msgid "ID (left)" msgstr "ID (gauche)" -#: models.py:410 +#: models.py:413 msgid "Unit (left)" msgstr "Unité (gauche)" -#: models.py:411 +#: models.py:414 msgid "Parcel (left)" msgstr "Parcelle (gauche)" -#: models.py:412 +#: models.py:415 msgid "Description (left)" msgstr "Description (gauche)" -#: models.py:413 +#: models.py:416 msgid "Periods (left)" msgstr "Périodes (gauche)" -#: models.py:415 +#: models.py:418 msgid "ID (right)" msgstr "ID (droit)" -#: models.py:416 +#: models.py:419 msgid "Unit (right)" msgstr "Unité (droite)" -#: models.py:417 +#: models.py:420 msgid "Parcel (right)" msgstr "Parcelle (droite)" -#: models.py:418 +#: models.py:421 msgid "Description (right)" msgstr "Description (droite)" -#: models.py:419 +#: models.py:422 msgid "Periods (right)" msgstr "Périodes (droite)" -#: models.py:428 +#: models.py:431 msgid "Record relation" msgstr "Relation entre Unités d'Enregistrement" -#: models.py:429 +#: models.py:432 msgid "Record relations" msgstr "Relations entre Unités d'Enregistrement" -#: models.py:511 +#: models.py:515 msgid "Context record documentation" msgstr "Documentation d'une Unité d'Enregistrement" -#: models.py:512 +#: models.py:516 msgid "Context record documentations" msgstr "Documentations des Unités d'Enregistrement" diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po index 5d1df6224..61dcf1376 100644 --- a/translations/fr/archaeological_files.po +++ b/translations/fr/archaeological_files.po @@ -5,13 +5,14 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata # Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata +# Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2016-11-15 04:16-0500\n" -"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" +"PO-Revision-Date: 2017-02-02 10:01-0500\n" +"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=n>1;\n" @@ -34,7 +35,7 @@ msgstr "Autre référence" msgid "Parcel (section/number/public domain)" msgstr "Parcelle (section/numéro/domaine public)" -#: forms.py:55 forms.py:407 forms.py:434 models.py:546 +#: forms.py:55 forms.py:407 forms.py:434 models.py:553 msgid "Department" msgstr "Département" @@ -262,43 +263,43 @@ msgstr "Dossier : réf. du permis" msgid "Archaeological file" msgstr "Dossier" -#: ishtar_menu.py:37 ishtar_menu.py:60 +#: ishtar_menu.py:38 ishtar_menu.py:61 msgid "Search" msgstr "Recherche" -#: ishtar_menu.py:41 ishtar_menu.py:64 +#: ishtar_menu.py:42 ishtar_menu.py:65 msgid "Creation" msgstr "Ajout" -#: ishtar_menu.py:45 ishtar_menu.py:68 +#: ishtar_menu.py:46 ishtar_menu.py:69 msgid "Modification" msgstr "Modification" -#: ishtar_menu.py:49 +#: ishtar_menu.py:50 msgid "Closing" msgstr "Clôture" -#: ishtar_menu.py:53 ishtar_menu.py:72 +#: ishtar_menu.py:54 ishtar_menu.py:73 msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:57 +#: ishtar_menu.py:58 msgid "Administrative act" msgstr "Acte administratif" -#: ishtar_menu.py:76 +#: ishtar_menu.py:77 msgid "Documents" msgstr "Documents" -#: ishtar_menu.py:82 +#: ishtar_menu.py:83 msgid "Dashboard" msgstr "Tableau de bord" -#: ishtar_menu.py:84 +#: ishtar_menu.py:86 msgid "General informations" msgstr "Informations générales" -#: ishtar_menu.py:87 models.py:221 +#: ishtar_menu.py:89 models.py:221 #: templates/ishtar/dashboards/dashboard_file.html:7 msgid "Archaeological files" msgstr "Dossiers archéologiques" @@ -415,15 +416,15 @@ msgstr "Peut fermer un Dossier" msgid "FILE" msgstr "DOSSIER" -#: models.py:406 +#: models.py:413 msgid "Multi-town" msgstr "Intercommunal" -#: models.py:412 +#: models.py:419 msgid "No town" msgstr "Pas de commune" -#: models.py:545 +#: models.py:552 msgid "File" msgstr "Dossier" diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po index 3268bbb38..88e73087a 100644 --- a/translations/fr/archaeological_finds.po +++ b/translations/fr/archaeological_finds.po @@ -4,13 +4,12 @@ # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015. # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata -# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-01-12 04:02-0500\n" +"PO-Revision-Date: 2017-02-02 09:58-0500\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" @@ -21,165 +20,165 @@ msgstr "" msgid "Context record" msgstr "Unité d'Enregistrement" -#: forms.py:123 ishtar_menu.py:32 models_finds.py:480 models_finds.py:805 -#: models_finds.py:814 models_treatments.py:277 +#: forms.py:123 ishtar_menu.py:32 models_finds.py:484 models_finds.py:819 +#: models_finds.py:828 models_treatments.py:279 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "Mobilier" -#: forms.py:136 forms.py:321 forms.py:545 models_finds.py:127 -#: models_finds.py:411 +#: forms.py:137 forms.py:330 forms.py:559 models_finds.py:130 +#: models_finds.py:415 msgid "Free ID" msgstr "ID libre" -#: forms.py:138 models_finds.py:463 +#: forms.py:139 models_finds.py:467 msgid "Previous ID" msgstr "Identifiant précédent" -#: forms.py:139 forms.py:353 forms_treatments.py:134 models_finds.py:131 -#: models_finds.py:412 models_treatments.py:123 +#: forms.py:140 forms.py:362 forms_treatments.py:134 models_finds.py:134 +#: models_finds.py:416 models_treatments.py:125 msgid "Description" msgstr "Description" -#: forms.py:142 forms.py:355 models_finds.py:140 +#: forms.py:143 forms.py:364 models_finds.py:143 msgid "Batch/object" msgstr "Lot/objet" -#: forms.py:144 models_finds.py:440 +#: forms.py:145 models_finds.py:444 msgid "Is complete?" msgstr "Est complet ?" -#: forms.py:147 forms.py:343 forms.py:549 models_finds.py:50 +#: forms.py:148 forms.py:352 forms.py:563 models_finds.py:50 msgid "Material type" msgstr "Type de matériau" -#: forms.py:148 forms.py:347 models_finds.py:62 models_finds.py:416 +#: forms.py:149 forms.py:356 models_finds.py:62 models_finds.py:420 msgid "Conservatory state" msgstr "État sanitaire" -#: forms.py:151 models_finds.py:418 +#: forms.py:152 models_finds.py:422 msgid "Conservatory comment" msgstr "Commentaire relatif à la conservation" -#: forms.py:154 models_finds.py:102 models_finds.py:443 +#: forms.py:155 models_finds.py:112 models_finds.py:447 msgid "Object types" msgstr "Types d'objet" -#: forms.py:156 forms.py:346 models_finds.py:71 +#: forms.py:157 forms.py:355 models_finds.py:71 msgid "Preservation type" msgstr "Type de conservation" -#: forms.py:159 forms.py:349 models_finds.py:445 +#: forms.py:160 forms.py:358 models_finds.py:449 msgid "Integrity / interest" msgstr "Intégrité / intérêt" -#: forms.py:162 forms.py:351 models_finds.py:448 +#: forms.py:163 forms.py:360 models_finds.py:452 msgid "Remarkability" msgstr "Remarquabilité" -#: forms.py:165 models_finds.py:145 +#: forms.py:166 models_finds.py:148 msgid "Point of topographic reference" msgstr "Point de référence topographique" -#: forms.py:168 models_finds.py:147 +#: forms.py:169 models_finds.py:150 msgid "X" msgstr "X" -#: forms.py:170 models_finds.py:150 -msgid "Estimated error for X" -msgstr "Erreur estimée pour X" - -#: forms.py:171 models_finds.py:148 +#: forms.py:170 models_finds.py:151 msgid "Y" msgstr "Y" -#: forms.py:173 models_finds.py:152 -msgid "Estimated error for Y" -msgstr "Erreur estimée pour Y" - -#: forms.py:174 models_finds.py:149 +#: forms.py:171 models_finds.py:152 msgid "Z" msgstr "Z" -#: forms.py:176 models_finds.py:154 -msgid "Estimated error for Z" -msgstr "Erreur estimée pour Z" - -#: forms.py:178 models_finds.py:157 +#: forms.py:173 models_finds.py:160 msgid "Spatial Reference System" msgstr "Système de référence spatiale" -#: forms.py:180 models_finds.py:452 +#: forms.py:176 models_finds.py:153 +msgid "Estimated error for X" +msgstr "Erreur estimée pour X" + +#: forms.py:178 models_finds.py:155 +msgid "Estimated error for Y" +msgstr "Erreur estimée pour Y" + +#: forms.py:180 models_finds.py:157 +msgid "Estimated error for Z" +msgstr "Erreur estimée pour Z" + +#: forms.py:181 models_finds.py:456 msgid "Length (cm)" msgstr "Longueur (cm)" -#: forms.py:181 models_finds.py:453 +#: forms.py:182 models_finds.py:457 msgid "Width (cm)" msgstr "Largeur (cm)" -#: forms.py:182 models_finds.py:454 +#: forms.py:183 models_finds.py:458 msgid "Height (cm)" msgstr "Hauteur (cm)" -#: forms.py:183 models_finds.py:455 +#: forms.py:184 models_finds.py:459 msgid "Diameter (cm)" msgstr "Diamètre (cm)" -#: forms.py:184 models_finds.py:456 +#: forms.py:185 models_finds.py:460 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" -#: forms.py:185 forms.py:550 models_finds.py:423 +#: forms.py:186 forms.py:564 models_finds.py:427 msgid "Volume (l)" msgstr "Volume (l)" -#: forms.py:186 forms.py:551 models_finds.py:424 +#: forms.py:187 forms.py:565 models_finds.py:428 msgid "Weight (g)" msgstr "Poids (g)" -#: forms.py:188 models_finds.py:457 +#: forms.py:189 models_finds.py:461 msgid "Dimensions comment" msgstr "Commentaire concernant les dimensions" -#: forms.py:189 forms.py:552 models_finds.py:427 +#: forms.py:190 forms.py:566 models_finds.py:431 msgid "Find number" msgstr "Mobilier (en nombre)" -#: forms.py:191 models_finds.py:451 +#: forms.py:192 models_finds.py:455 msgid "Minimum number of individuals (MNI)" msgstr "Nombre minimum d'individus (NMI)" -#: forms.py:192 models_finds.py:459 +#: forms.py:193 models_finds.py:463 msgid "Mark" msgstr "Marque" -#: forms.py:193 forms.py:357 models_finds.py:465 +#: forms.py:194 forms.py:365 models_finds.py:469 msgid "Check" msgstr "Vérification" -#: forms.py:195 models_finds.py:467 +#: forms.py:196 models_finds.py:471 msgid "Check date" msgstr "Date de vérification" -#: forms.py:196 forms_treatments.py:132 forms_treatments.py:434 -#: models_finds.py:132 models_finds.py:460 models_treatments.py:122 -#: models_treatments.py:484 +#: forms.py:197 forms_treatments.py:132 forms_treatments.py:434 +#: models_finds.py:135 models_finds.py:464 models_treatments.py:124 +#: models_treatments.py:492 msgid "Comment" msgstr "Commentaires" -#: forms.py:199 models_finds.py:461 +#: forms.py:200 models_finds.py:465 msgid "Comment on dating" msgstr "Commentaire général sur les datations" -#: forms.py:200 models_finds.py:469 +#: forms.py:201 models_finds.py:473 msgid "Estimated value" msgstr "Valeur estimée" -#: forms.py:202 forms_treatments.py:151 +#: forms.py:203 forms_treatments.py:151 msgid "Image" msgstr "Image" -#: forms.py:203 forms_treatments.py:152 +#: forms.py:204 forms_treatments.py:152 #, python-format msgid "" "<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</" @@ -188,192 +187,192 @@ msgstr "" "<p>Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).</p>" -#: forms.py:269 +#: forms.py:278 msgid "" "You should at least provide X, Y and the spatial reference system used." msgstr "" "Vous devez au minimum fournir X, Y et le système de référence spatiale " "utilisé." -#: forms.py:278 +#: forms.py:287 msgid "" "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" "Les coordonnées ne sont pas pertinentes pour le système de référence " "spatiale utilisé : {}." -#: forms.py:284 forms.py:315 models_finds.py:435 +#: forms.py:293 forms.py:324 models_finds.py:439 msgid "Dating" msgstr "Datation" -#: forms.py:289 forms.py:341 +#: forms.py:298 forms.py:350 msgid "Period" msgstr "Période" -#: forms.py:290 forms_treatments.py:138 forms_treatments.py:436 -#: models_finds.py:819 models_treatments.py:125 models_treatments.py:288 +#: forms.py:299 forms_treatments.py:138 forms_treatments.py:436 +#: models_finds.py:833 models_treatments.py:127 models_treatments.py:290 #: templates/ishtar/sheet_find.html:101 templates/ishtar/sheet_find.html:141 msgid "Start date" msgstr "Date de début" -#: forms.py:292 models_finds.py:820 models_treatments.py:289 +#: forms.py:301 models_finds.py:834 models_treatments.py:291 #: templates/ishtar/sheet_find.html:102 templates/ishtar/sheet_find.html:142 msgid "End date" msgstr "Date de fin" -#: forms.py:293 +#: forms.py:302 msgid "Quality" msgstr "Qualité" -#: forms.py:295 +#: forms.py:304 msgid "Dating type" msgstr "Type de datation" -#: forms.py:297 +#: forms.py:306 msgid "Precise dating" msgstr "Datation précise" -#: forms.py:319 models_finds.py:164 +#: forms.py:328 models_finds.py:167 msgid "Short ID" msgstr "ID court" -#: forms.py:320 models_finds.py:167 +#: forms.py:329 models_finds.py:170 msgid "Complete ID" msgstr "ID complet" -#: forms.py:324 forms_treatments.py:54 forms_treatments.py:96 +#: forms.py:333 forms_treatments.py:54 forms_treatments.py:96 #: forms_treatments.py:284 forms_treatments.py:356 forms_treatments.py:406 -#: forms_treatments.py:489 models_treatments.py:98 models_treatments.py:456 +#: forms_treatments.py:489 models_treatments.py:100 models_treatments.py:464 msgid "Year" msgstr "Année" -#: forms.py:326 +#: forms.py:335 msgid "Operation's number (index by year)" msgstr "Numéro de l'opération (index par année)" -#: forms.py:329 +#: forms.py:338 msgid "Code PATRIARCHE" msgstr "Code PATRIARCHE" -#: forms.py:333 +#: forms.py:342 msgid "Archaeological site" msgstr "Entité archéologique" -#: forms.py:339 +#: forms.py:348 msgid "Search within related operations" msgstr "Rechercher parmi les opérations liées" -#: forms.py:344 models_finds.py:101 +#: forms.py:353 models_finds.py:111 msgid "Object type" msgstr "Type d'objet" -#: forms.py:358 forms_treatments.py:57 +#: forms.py:366 forms_treatments.py:57 msgid "Has an image?" msgstr "Dispose d'une image ?" -#: forms.py:400 forms.py:413 views.py:129 +#: forms.py:414 forms.py:427 views.py:130 msgid "Find search" msgstr "Rechercher un mobilier" -#: forms.py:427 templates/ishtar/sheet_treatment.html:46 +#: forms.py:441 templates/ishtar/sheet_treatment.html:46 msgid "Upstream finds" msgstr "Mobilier amont" -#: forms.py:429 models_finds.py:481 +#: forms.py:443 models_finds.py:485 msgid "Finds" msgstr "Mobilier" -#: forms.py:439 +#: forms.py:453 msgid "You should at least select one archaeological find." msgstr "Vous devez sélectionner au moins un mobilier archéologique." -#: forms.py:542 +#: forms.py:556 msgid "Resulting find" msgstr "Mobilier résultant" -#: forms.py:547 +#: forms.py:561 msgid "Precise description" msgstr "Description précise" -#: forms.py:562 +#: forms.py:576 msgid "Resulting finds" msgstr "Mobiliers résultants" -#: forms.py:567 +#: forms.py:581 msgid "Would you like to delete this find?" msgstr "Voulez-vous supprimer ce mobilier ?" -#: forms.py:571 models_treatments.py:90 +#: forms.py:585 models_treatments.py:90 msgid "Upstream find" msgstr "Mobilier amont" -#: forms.py:584 +#: forms.py:598 msgid "Archaeological find search" msgstr "Rechercher un mobilier" -#: forms.py:586 +#: forms.py:600 msgid "You should select an archaeological find." msgstr "Vous devez sélectionner du mobilier." -#: forms.py:591 +#: forms.py:605 msgid "Year of the operation" msgstr "Année de l'opération" -#: forms.py:593 +#: forms.py:607 msgid "Numeric reference" msgstr "Référence numérique" -#: forms.py:600 +#: forms.py:614 msgid "Period of the archaeological find" msgstr "Période du mobilier" -#: forms.py:602 +#: forms.py:616 msgid "Material type of the archaeological find" msgstr "Type de matériau du mobilier" -#: forms.py:604 +#: forms.py:618 msgid "Description of the archaeological find" msgstr "Description du mobilier" -#: forms.py:616 forms_treatments.py:590 forms_treatments.py:616 +#: forms.py:630 forms_treatments.py:590 forms_treatments.py:616 msgid "Documentation search" msgstr "Rechercher une documentation" -#: forms.py:618 forms_treatments.py:592 forms_treatments.py:618 +#: forms.py:632 forms_treatments.py:592 forms_treatments.py:618 msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: forms.py:635 +#: forms.py:649 msgid "Another basket already exists with this name." msgstr "Un autre panier existant utilise déjà ce nom." -#: forms.py:645 forms.py:649 forms_treatments.py:175 ishtar_menu.py:56 +#: forms.py:659 forms.py:663 forms_treatments.py:175 ishtar_menu.py:57 msgid "Basket" msgstr "Panier" -#: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:94 +#: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:96 #: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:136 msgid "Label" msgstr "Intitulé" -#: forms_treatments.py:53 forms_treatments.py:95 models_treatments.py:96 +#: forms_treatments.py:53 forms_treatments.py:95 models_treatments.py:98 msgid "Other ref." msgstr "Autre réf." #: forms_treatments.py:55 forms_treatments.py:237 forms_treatments.py:285 #: forms_treatments.py:348 forms_treatments.py:357 forms_treatments.py:459 -#: forms_treatments.py:490 forms_treatments.py:557 models_treatments.py:100 -#: models_treatments.py:458 +#: forms_treatments.py:490 forms_treatments.py:557 models_treatments.py:102 +#: models_treatments.py:466 msgid "Index" msgstr "Index" #: forms_treatments.py:56 forms_treatments.py:101 forms_treatments.py:301 -#: forms_treatments.py:578 models_treatments.py:56 models_treatments.py:105 -#: models_treatments.py:287 +#: forms_treatments.py:578 models_treatments.py:56 models_treatments.py:107 +#: models_treatments.py:289 msgid "Treatment type" msgstr "Type de traitement" -#: forms_treatments.py:68 forms_treatments.py:560 views.py:359 +#: forms_treatments.py:68 forms_treatments.py:560 views.py:360 msgid "Treatment search" msgstr "Rechercher un traitement" @@ -381,7 +380,7 @@ msgstr "Rechercher un traitement" msgid "Base treatment" msgstr "Traitement de base" -#: forms_treatments.py:103 models_treatments.py:107 +#: forms_treatments.py:103 models_treatments.py:109 msgid "State" msgstr "État" @@ -389,15 +388,15 @@ msgstr "État" msgid "Target" msgstr "Destination" -#: forms_treatments.py:107 forms_treatments.py:417 models_treatments.py:115 +#: forms_treatments.py:107 forms_treatments.py:417 models_treatments.py:117 msgid "Responsible" msgstr "Responsable" -#: forms_treatments.py:113 models_treatments.py:118 +#: forms_treatments.py:113 models_treatments.py:120 msgid "Organization" msgstr "Organisation" -#: forms_treatments.py:119 models_treatments.py:110 models_treatments.py:290 +#: forms_treatments.py:119 models_treatments.py:112 models_treatments.py:292 msgid "Location" msgstr "Lieu" @@ -409,12 +408,12 @@ msgstr "Contenant (pertinent dans le cadre du conditionnement)" msgid "External ref." msgstr "Réf. externe" -#: forms_treatments.py:136 models_treatments.py:124 +#: forms_treatments.py:136 models_treatments.py:126 msgid "Goal" msgstr "But" -#: forms_treatments.py:140 forms_treatments.py:442 models_treatments.py:126 -#: models_treatments.py:478 +#: forms_treatments.py:140 forms_treatments.py:442 models_treatments.py:128 +#: models_treatments.py:486 msgid "Closing date" msgstr "Date de clôture" @@ -436,7 +435,7 @@ msgstr "Coût réalisé ({currency})" #: forms_treatments.py:148 #, python-brace-format msgid "Insurance cost ({currency})" -msgstr "Coût d'assurance ({currency})" +msgstr "Coût d''assurance ({currency})" #: forms_treatments.py:175 msgid "Single find" @@ -463,12 +462,12 @@ msgstr "Un responsable ou une organisation doit être défini." msgid "Another treatment with this index exists for {}." msgstr "Un autre traitement avec cet index existe pour {}." -#: forms_treatments.py:262 models_treatments.py:103 +#: forms_treatments.py:262 models_treatments.py:105 msgid "Associated request" msgstr "Demande associée" -#: forms_treatments.py:266 forms_treatments.py:397 ishtar_menu.py:107 -#: models_treatments.py:489 models_treatments.py:511 models_treatments.py:572 +#: forms_treatments.py:266 forms_treatments.py:397 ishtar_menu.py:108 +#: models_treatments.py:497 models_treatments.py:519 models_treatments.py:581 #: wizards.py:183 templates/ishtar/sheet_treatmentfile.html:5 msgid "Treatment request" msgstr "Demande de traitement" @@ -495,7 +494,7 @@ msgstr "Type d'acte" msgid "Indexed?" msgstr "Indexé ?" -#: forms_treatments.py:288 forms_treatments.py:493 models_finds.py:120 +#: forms_treatments.py:288 forms_treatments.py:493 msgid "Object" msgstr "Objet" @@ -527,7 +526,7 @@ msgstr "Référence interne du traitement" msgid "Modified by" msgstr "Modifié par" -#: forms_treatments.py:354 forms_treatments.py:404 models_treatments.py:463 +#: forms_treatments.py:354 forms_treatments.py:404 models_treatments.py:471 msgid "Name" msgstr "Nom" @@ -537,7 +536,7 @@ msgstr "Réf. interne" #: forms_treatments.py:358 forms_treatments.py:415 #: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:137 -#: templates/ishtar/sheet_find.html:229 +#: templates/ishtar/sheet_find.html:227 msgid "Type" msgstr "Type" @@ -545,21 +544,21 @@ msgstr "Type" msgid "In charge" msgstr "Responsable" -#: forms_treatments.py:366 forms_treatments.py:423 models_treatments.py:472 +#: forms_treatments.py:366 forms_treatments.py:423 models_treatments.py:480 #: templates/ishtar/sheet_treatmentfile.html:31 msgid "Applicant" msgstr "Demandeur" -#: forms_treatments.py:372 forms_treatments.py:429 models_treatments.py:476 +#: forms_treatments.py:372 forms_treatments.py:429 models_treatments.py:484 #: templates/ishtar/sheet_treatmentfile.html:38 msgid "Applicant organisation" msgstr "Organisation du demandeur" -#: forms_treatments.py:385 forms_treatments.py:565 views.py:463 +#: forms_treatments.py:385 forms_treatments.py:565 views.py:464 msgid "Treatment request search" msgstr "Rechercher une demande de traitement" -#: forms_treatments.py:439 models_treatments.py:482 +#: forms_treatments.py:439 models_treatments.py:490 msgid "Reception date" msgstr "Date de réception" @@ -591,8 +590,8 @@ msgstr "Index de la demande de traitement" msgid "Treatment request internal reference" msgstr "Référence interne de la demande de traitement" -#: forms_treatments.py:508 forms_treatments.py:604 models_treatments.py:441 -#: models_treatments.py:465 +#: forms_treatments.py:508 forms_treatments.py:604 models_treatments.py:449 +#: models_treatments.py:473 msgid "Treatment request type" msgstr "Type de demande de traitement" @@ -604,55 +603,55 @@ msgstr "Vous devez sélectionner un traitement." msgid "You should select a treatment request." msgstr "Vous devez sélectionner une demande de traitement." -#: ishtar_menu.py:36 ishtar_menu.py:79 ishtar_menu.py:111 ishtar_menu.py:134 -#: ishtar_menu.py:158 ishtar_menu.py:190 ishtar_menu.py:214 ishtar_menu.py:238 +#: ishtar_menu.py:37 ishtar_menu.py:80 ishtar_menu.py:113 ishtar_menu.py:136 +#: ishtar_menu.py:160 ishtar_menu.py:193 ishtar_menu.py:217 ishtar_menu.py:241 msgid "Search" msgstr "Recherche" -#: ishtar_menu.py:41 ishtar_menu.py:59 ishtar_menu.py:84 ishtar_menu.py:116 -#: ishtar_menu.py:138 ishtar_menu.py:163 ishtar_menu.py:195 ishtar_menu.py:218 -#: ishtar_menu.py:243 +#: ishtar_menu.py:42 ishtar_menu.py:60 ishtar_menu.py:85 ishtar_menu.py:118 +#: ishtar_menu.py:140 ishtar_menu.py:165 ishtar_menu.py:198 ishtar_menu.py:221 +#: ishtar_menu.py:246 msgid "Creation" msgstr "Ajout" -#: ishtar_menu.py:46 ishtar_menu.py:89 ishtar_menu.py:121 ishtar_menu.py:142 -#: ishtar_menu.py:168 ishtar_menu.py:200 ishtar_menu.py:223 ishtar_menu.py:248 +#: ishtar_menu.py:47 ishtar_menu.py:90 ishtar_menu.py:123 ishtar_menu.py:144 +#: ishtar_menu.py:170 ishtar_menu.py:203 ishtar_menu.py:226 ishtar_menu.py:251 msgid "Modification" msgstr "Modification" -#: ishtar_menu.py:51 ishtar_menu.py:70 ishtar_menu.py:94 ishtar_menu.py:126 -#: ishtar_menu.py:145 ishtar_menu.py:173 ishtar_menu.py:205 ishtar_menu.py:226 -#: ishtar_menu.py:253 +#: ishtar_menu.py:52 ishtar_menu.py:71 ishtar_menu.py:95 ishtar_menu.py:128 +#: ishtar_menu.py:147 ishtar_menu.py:175 ishtar_menu.py:208 ishtar_menu.py:229 +#: ishtar_menu.py:256 msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:64 +#: ishtar_menu.py:65 msgid "Manage items" msgstr "Gestion des éléments" -#: ishtar_menu.py:76 +#: ishtar_menu.py:77 msgid "Documentation" msgstr "Documentation" -#: ishtar_menu.py:131 ishtar_menu.py:211 models_finds.py:816 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:830 msgid "Administrative act" msgstr "Acte administratif" -#: ishtar_menu.py:149 ishtar_menu.py:230 templates/ishtar/sheet_find.html:224 -#: templates/ishtar/sheet_find.html:226 +#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:222 +#: templates/ishtar/sheet_find.html:224 msgid "Documents" msgstr "Documents" -#: ishtar_menu.py:155 ishtar_menu.py:235 +#: ishtar_menu.py:157 ishtar_menu.py:238 msgid "Source" msgstr "Documentation" -#: ishtar_menu.py:183 models_treatments.py:143 models_treatments.py:279 -#: models_treatments.py:556 templates/ishtar/sheet_treatment.html:5 +#: ishtar_menu.py:185 models_treatments.py:145 models_treatments.py:281 +#: models_treatments.py:565 templates/ishtar/sheet_treatment.html:5 msgid "Treatment" msgstr "Traitement" -#: ishtar_menu.py:187 +#: ishtar_menu.py:190 msgid "Simple treatments" msgstr "Traitements simples" @@ -668,7 +667,7 @@ msgstr "Recommandation" msgid "Parent material" msgstr "Matériau parent" -#: models_finds.py:51 models_finds.py:414 +#: models_finds.py:51 models_finds.py:418 msgid "Material types" msgstr "Types de matériau" @@ -700,218 +699,219 @@ msgstr "Type de remarquabilité" msgid "Remarkability types" msgstr "Types de remarquabilité" -#: models_finds.py:98 -msgid "Parent" -msgstr "Parent" +#: models_finds.py:97 models_finds.py:414 models_treatments.py:40 +#: models_treatments.py:285 +msgid "Order" +msgstr "Ordre" -#: models_finds.py:119 -msgid "Unknow" -msgstr "Inconnu" +#: models_finds.py:99 +msgid "Batch type" +msgstr "Type de lot" -#: models_finds.py:121 -msgid "Batch" -msgstr "Lot" +#: models_finds.py:100 +msgid "Batch types" +msgstr "Types de lot" -#: models_finds.py:128 models_finds.py:407 models_treatments.py:120 -#: models_treatments.py:461 +#: models_finds.py:108 +msgid "Parent" +msgstr "Parent" + +#: models_finds.py:131 models_finds.py:411 models_treatments.py:122 +#: models_treatments.py:469 msgid "External ID" msgstr "ID externe" -#: models_finds.py:130 models_finds.py:409 +#: models_finds.py:133 models_finds.py:413 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" -#: models_finds.py:133 +#: models_finds.py:136 msgid "Special interest" msgstr "Intérêt spécifique" -#: models_finds.py:137 +#: models_finds.py:140 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: models_finds.py:138 +#: models_finds.py:141 msgid "Discovery date" msgstr "Date de découverte" -#: models_finds.py:143 +#: models_finds.py:146 msgid "Material index" msgstr "Index matériel" -#: models_finds.py:159 +#: models_finds.py:162 msgid "Point (2D)" msgstr "Point (2D)" -#: models_finds.py:160 +#: models_finds.py:163 msgid "Point" msgstr "Point" -#: models_finds.py:161 +#: models_finds.py:164 msgid "Line" msgstr "Ligne" -#: models_finds.py:162 +#: models_finds.py:165 msgid "Polygon" msgstr "Polygon" -#: models_finds.py:165 models_finds.py:168 +#: models_finds.py:168 models_finds.py:171 msgid "Cached value - do not edit" msgstr "Valeur en cache - ne pas éditer" -#: models_finds.py:173 models_finds.py:405 +#: models_finds.py:176 models_finds.py:409 msgid "Base find" msgstr "Mobilier de base" -#: models_finds.py:174 +#: models_finds.py:177 msgid "Base finds" msgstr "Mobilier de base" -#: models_finds.py:176 +#: models_finds.py:179 msgid "Can view all Base finds" msgstr "Peut voir tout le Mobilier de base" -#: models_finds.py:177 +#: models_finds.py:180 msgid "Can view own Base find" msgstr "Peut voir son propre Mobilier de base" -#: models_finds.py:178 +#: models_finds.py:181 msgid "Can add own Base find" msgstr "Peut ajouter son propre Mobilier de base" -#: models_finds.py:179 +#: models_finds.py:182 msgid "Can change own Base find" msgstr "Peut modifier son propre Mobilier de base" -#: models_finds.py:180 +#: models_finds.py:183 msgid "Can delete own Base find" msgstr "Peut supprimer son propre Mobilier de base" -#: models_finds.py:293 +#: models_finds.py:296 msgid "g" msgstr "g" -#: models_finds.py:294 +#: models_finds.py:297 msgid "kg" msgstr "kg" -#: models_finds.py:296 +#: models_finds.py:299 msgid "Not checked" msgstr "Non vérifié" -#: models_finds.py:297 +#: models_finds.py:300 msgid "Checked but incorrect" msgstr "Vérifié mais incorrect" -#: models_finds.py:298 +#: models_finds.py:301 msgid "Checked and correct" msgstr "Vérifié et correct" -#: models_finds.py:332 +#: models_finds.py:335 msgid "Periods" msgstr "Périodes" -#: models_finds.py:333 models_finds.py:438 models_treatments.py:127 -#: models_treatments.py:291 templates/ishtar/sheet_find.html:100 +#: models_finds.py:336 models_finds.py:442 models_treatments.py:129 +#: models_treatments.py:293 templates/ishtar/sheet_find.html:100 #: templates/ishtar/sheet_find.html:140 msgid "Container" msgstr "Contenant" -#: models_finds.py:343 +#: models_finds.py:346 msgid "Base find - Short ID" msgstr "Mobilier de base - ID court" -#: models_finds.py:344 +#: models_finds.py:347 msgid "Base find - Complete ID" msgstr "Mobilier de base - ID complet" -#: models_finds.py:345 +#: models_finds.py:348 msgid "Base find - Comment" msgstr "Mobilier de base - Commentaires" -#: models_finds.py:346 +#: models_finds.py:349 msgid "Base find - Description" msgstr "Mobilier de base - Description" -#: models_finds.py:347 +#: models_finds.py:350 msgid "Base find - Topographic localisation" msgstr "Mobilier de base - Localisation topographique" -#: models_finds.py:349 +#: models_finds.py:352 msgid "Base find - Special interest" msgstr "Mobilier de base - Intérêt spécifique" -#: models_finds.py:350 +#: models_finds.py:353 msgid "Base find - Discovery date" msgstr "Mobilier de base - Date de découverte" -#: models_finds.py:410 models_treatments.py:40 models_treatments.py:283 -msgid "Order" -msgstr "Ordre" - -#: models_finds.py:421 +#: models_finds.py:425 msgid "Type of preservation to consider" msgstr "Mesures de conservation à envisager" -#: models_finds.py:425 +#: models_finds.py:429 msgid "Weight unit" msgstr "Unité de poids" -#: models_finds.py:431 templates/ishtar/sheet_find.html:89 +#: models_finds.py:435 templates/ishtar/sheet_find.html:89 msgid "Upstream treatment" msgstr "Traitement amont" -#: models_finds.py:434 templates/ishtar/sheet_find.html:129 +#: models_finds.py:438 templates/ishtar/sheet_find.html:129 msgid "Downstream treatment" msgstr "Traitement aval" -#: models_finds.py:472 +#: models_finds.py:476 msgid "Collection" msgstr "Collection" -#: models_finds.py:474 models_treatments.py:139 models_treatments.py:485 +#: models_finds.py:478 models_treatments.py:141 models_treatments.py:493 msgid "Cached name" msgstr "Nom en cache" -#: models_finds.py:483 +#: models_finds.py:487 msgid "Can view all Finds" msgstr "Peut voir tout le Mobilier" -#: models_finds.py:484 +#: models_finds.py:488 msgid "Can view own Find" msgstr "Peut voir son propre Mobilier" -#: models_finds.py:485 +#: models_finds.py:489 msgid "Can add own Find" msgstr "Peut ajouter son propre Mobilier" -#: models_finds.py:486 +#: models_finds.py:490 msgid "Can change own Find" msgstr "Peut modifier son propre Mobilier" -#: models_finds.py:487 +#: models_finds.py:491 msgid "Can delete own Find" msgstr "Peut supprimer son propre Mobilier" -#: models_finds.py:493 +#: models_finds.py:497 msgid "FIND" msgstr "MOBILIER" -#: models_finds.py:803 +#: models_finds.py:817 msgid "Find documentation" msgstr "Documentation de mobilier" -#: models_finds.py:804 +#: models_finds.py:818 msgid "Find documentations" msgstr "Documentations de mobilier" -#: models_finds.py:817 +#: models_finds.py:831 msgid "Person" msgstr "Individu" -#: models_finds.py:823 +#: models_finds.py:837 msgid "Property" msgstr "Propriété" -#: models_finds.py:824 +#: models_finds.py:838 msgid "Properties" msgstr "Propriétés" @@ -959,248 +959,247 @@ msgstr "Types d'état de traitement" msgid "Downstream find" msgstr "Mobilier aval" -#: models_treatments.py:112 +#: models_treatments.py:114 msgid "Location where the treatment is done. Target warehouse for a move." msgstr "" "Endroit où le traitement est réalisé. Renseignez le dépôt de destination " "pour un déplacement." -#: models_treatments.py:129 +#: models_treatments.py:131 msgid "Estimated cost" msgstr "Coût estimé" -#: models_treatments.py:131 +#: models_treatments.py:133 msgid "Quoted cost" msgstr "Coût devisé" -#: models_treatments.py:133 +#: models_treatments.py:135 msgid "Realized cost" msgstr "Coût réalisé" -#: models_treatments.py:135 +#: models_treatments.py:137 msgid "Insurance cost" msgstr "Coût d'assurance" -#: models_treatments.py:137 +#: models_treatments.py:139 msgid "Target a basket" -msgstr "Cibler un panier" +msgstr "Appliquer à un panier" -#: models_treatments.py:144 templates/ishtar/sheet_find.html:86 +#: models_treatments.py:146 templates/ishtar/sheet_find.html:86 #: templates/ishtar/sheet_treatmentfile.html:45 msgid "Treatments" msgstr "Traitements" -#: models_treatments.py:147 +#: models_treatments.py:149 msgid "Can view all Treatments" msgstr "Peut voir tous les Traitements" -#: models_treatments.py:148 +#: models_treatments.py:150 msgid "Can view own Treatment" msgstr "Peut voir son propre Traitement" -#: models_treatments.py:149 +#: models_treatments.py:151 msgid "Can add own Treatment" msgstr "Peut ajouter son propre Traitement" -#: models_treatments.py:150 +#: models_treatments.py:152 msgid "Can change own Treatment" msgstr "Peut modifier son propre Traitement" -#: models_treatments.py:151 +#: models_treatments.py:153 msgid "Can delete own Treatment" msgstr "Peut supprimer son propre Traitement" -#: models_treatments.py:163 +#: models_treatments.py:165 msgid "TREATMENT" msgstr "TRAITEMENT" -#: models_treatments.py:292 templates/ishtar/sheet_find.html:99 +#: models_treatments.py:294 templates/ishtar/sheet_find.html:99 #: templates/ishtar/sheet_find.html:139 msgid "Doer" msgstr "Opérateur" -#: models_treatments.py:293 models_treatments.py:294 -#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:138 +#: models_treatments.py:295 models_treatments.py:296 msgid "Related finds" msgstr "Mobilier associé" -#: models_treatments.py:430 +#: models_treatments.py:438 msgid "Is upstream" msgstr "Est en amont" -#: models_treatments.py:442 +#: models_treatments.py:450 msgid "Treatment request types" msgstr "Types de demande de traitement" -#: models_treatments.py:459 +#: models_treatments.py:467 msgid "Internal reference" msgstr "Référence interne" -#: models_treatments.py:468 +#: models_treatments.py:476 msgid "Person in charge" msgstr "Personne responsable" -#: models_treatments.py:480 +#: models_treatments.py:488 msgid "Creation date" msgstr "Date de création" -#: models_treatments.py:490 +#: models_treatments.py:498 msgid "Treatment requests" msgstr "Demandes de traitement" -#: models_treatments.py:494 +#: models_treatments.py:502 msgid "Can view all Treatment requests" msgstr "Peut voir toutes les Demandes de traitement" -#: models_treatments.py:496 +#: models_treatments.py:504 msgid "Can view own Treatment request" msgstr "Peut voir sa propre Demande de traitement" -#: models_treatments.py:498 +#: models_treatments.py:506 msgid "Can add own Treatment request" msgstr "Peut ajouter sa propre Demande de traitement" -#: models_treatments.py:500 +#: models_treatments.py:508 msgid "Can change own Treatment request" msgstr "Peut modifier sa propre Demande de traitement" -#: models_treatments.py:502 +#: models_treatments.py:510 msgid "Can delete own Treatment request" msgstr "Peut supprimer sa propre Demande de traitement" -#: models_treatments.py:562 +#: models_treatments.py:571 msgid "Treatment documentation" msgstr "Documentation de traitement" -#: models_treatments.py:563 +#: models_treatments.py:572 msgid "Treament documentations" msgstr "Documentations de traitement" -#: models_treatments.py:579 +#: models_treatments.py:588 msgid "Treatment request documentation" msgstr "Documentation de demande de traitement" -#: models_treatments.py:580 +#: models_treatments.py:589 msgid "Treatment request documentations" msgstr "Documentations de demande de traitement" -#: views.py:124 +#: views.py:125 msgid "New find" msgstr "Ajouter un mobilier" -#: views.py:138 +#: views.py:139 msgid "Find modification" msgstr "Modifier un mobilier" -#: views.py:153 +#: views.py:154 msgid "Find deletion" msgstr "Supprimer un mobilier" -#: views.py:158 +#: views.py:159 msgid "Find: source search" msgstr "Mobilier : rechercher une documentation associée" -#: views.py:166 +#: views.py:167 msgid "Find: new source" msgstr "Mobilier : ajouter une documentation associée" -#: views.py:174 +#: views.py:175 msgid "Find: source modification" msgstr "Mobilier : modifier une documentation associée" -#: views.py:189 +#: views.py:190 msgid "Find: source deletion" msgstr "Mobilier : supprimer un mobilier associé" -#: views.py:203 +#: views.py:204 msgid "New basket" msgstr "Ajouter un panier" -#: views.py:222 +#: views.py:223 msgid "Manage items in basket" msgstr "Gérer les éléments dans un panier" -#: views.py:242 +#: views.py:243 msgid "Manage basket" msgstr "Gérer un panier" -#: views.py:330 +#: views.py:331 msgid "Delete basket" msgstr "Supprimer un panier" -#: views.py:380 +#: views.py:381 msgid "New treatment" msgstr "Ajouter un traitement" -#: views.py:388 views.py:480 +#: views.py:389 views.py:481 msgid "Modify" msgstr "Modifier" -#: views.py:405 +#: views.py:406 msgid "Treatment deletion" msgstr "Supprimer un traitement" -#: views.py:412 +#: views.py:413 msgid "Treatment: search administrative act" msgstr "Traitement : rechercher un acte administratif" -#: views.py:421 +#: views.py:422 msgid "Treatment: new administrative act" msgstr "Traitement : ajouter un acte administratif" -#: views.py:431 +#: views.py:432 msgid "Treatment: administrative act modification" msgstr "Traitement : modifier un acte administratif" -#: views.py:440 +#: views.py:441 msgid "Treatment: administrative act deletion" msgstr "Traitement : supprimer un acte administratif" -#: views.py:473 +#: views.py:474 msgid "New treatment request" msgstr "Ajouter une demande de traitement" -#: views.py:496 +#: views.py:497 msgid "Treatment request deletion" msgstr "Supprimer une demande de traitement" -#: views.py:503 +#: views.py:504 msgid "Treatment request: search administrative act" msgstr "Demande de traitement : rechercher un acte administratif" -#: views.py:513 +#: views.py:514 msgid "Treatment request: new administrative act" msgstr "Demande de traitement : ajouter un acte administratif" -#: views.py:523 +#: views.py:524 msgid "Treatment request: administrative act modification" msgstr "Demande de traitement : modifier un acte administratif" -#: views.py:532 +#: views.py:533 msgid "Treatment request: administrative act deletion" msgstr "Demande de traitement : supprimer un acte administratif" -#: views.py:558 +#: views.py:559 msgid "Treatment: source search" msgstr "Traitement : rechercher une documentation associée" -#: views.py:573 +#: views.py:574 msgid "Treatment: source modification" msgstr "Traitement : modifier une documentation associée" -#: views.py:588 +#: views.py:589 msgid "Treatment: source deletion" msgstr "Traitement : supprimer une documentation associée" -#: views.py:601 +#: views.py:602 msgid "Treatment request: source search" msgstr "Demande de traitement : rechercher une documentation associée" -#: views.py:617 +#: views.py:618 msgid "Treatment request: source modification" msgstr "Demande de traitement : modifier une documentation associée" -#: views.py:635 +#: views.py:636 msgid "Treatment request: source deletion" msgstr "Demande de traitement : supprimer une documentation associée" @@ -1216,6 +1215,10 @@ msgstr "Dépôt" msgid "Year - index" msgstr "Année - index" +#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:138 +msgid "Related finds (max. 15 displayed)" +msgstr "Mobilier associé (max. 15 affichés)" + #: templates/ishtar/sheet_find.html:125 msgid "Export as CSV" msgstr "Export en CSV" @@ -1228,35 +1231,35 @@ msgstr "CSV" msgid "Associated base finds" msgstr "Mobilier de base associé" -#: templates/ishtar/sheet_find.html:205 +#: templates/ishtar/sheet_find.html:203 msgid "Coordinates:" msgstr "Cordonnées :" -#: templates/ishtar/sheet_find.html:207 +#: templates/ishtar/sheet_find.html:205 msgid "X:" msgstr "X :" -#: templates/ishtar/sheet_find.html:208 +#: templates/ishtar/sheet_find.html:206 msgid "Y:" msgstr "Y :" -#: templates/ishtar/sheet_find.html:209 +#: templates/ishtar/sheet_find.html:207 msgid "Z:" msgstr "Z :" -#: templates/ishtar/sheet_find.html:212 +#: templates/ishtar/sheet_find.html:210 msgid "SRID:" msgstr "SRID :" -#: templates/ishtar/sheet_find.html:228 +#: templates/ishtar/sheet_find.html:226 msgid "Title" msgstr "Titre" -#: templates/ishtar/sheet_find.html:230 +#: templates/ishtar/sheet_find.html:228 msgid "Authors" msgstr "Auteurs" -#: templates/ishtar/sheet_find.html:231 +#: templates/ishtar/sheet_find.html:229 msgid "Link" msgstr "Lien" @@ -1284,7 +1287,7 @@ msgstr "Mobilier aval" #: templates/ishtar/sheet_treatment.html:56 msgid "Related operations" -msgstr "Opérations concernées" +msgstr "Opérations associées" #: templates/ishtar/sheet_treatmentfile.html:16 msgctxt "Treatment request" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index e80671558..df903a8ec 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -11,20 +11,20 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-01-09 05:30-0500\n" -"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" +"PO-Revision-Date: 2017-02-02 10:02-0500\n" +"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n" "Language-Team: \n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" #: forms.py:69 forms.py:371 forms.py:1009 forms.py:1031 forms.py:1035 -#: models.py:1216 templates/ishtar/sheet_operation.html:144 +#: models.py:1217 templates/ishtar/sheet_operation.html:144 #: templates/ishtar/blocks/window_tables/parcels.html:10 msgid "Parcels" msgstr "Parcelles" -#: forms.py:72 forms.py:205 forms.py:985 models.py:1202 +#: forms.py:72 forms.py:205 forms.py:985 models.py:1203 #: templates/ishtar/blocks/window_tables/parcels.html:7 #: templates/ishtar/dashboards/dashboard_operation.html:432 #: templates/ishtar/dashboards/dashboard_operation.html:446 @@ -34,21 +34,21 @@ msgid "Town" msgstr "Commune" #: forms.py:74 forms.py:455 forms.py:752 forms.py:1255 models.py:274 -#: models.py:1008 models.py:1200 +#: models.py:1009 models.py:1201 #: templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Year" msgstr "Année" -#: forms.py:77 models.py:1203 +#: forms.py:77 models.py:1204 #: templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Section" msgstr "Section" -#: forms.py:80 models.py:1205 +#: forms.py:80 models.py:1206 msgid "Parcel number" msgstr "Numéro de parcelle" -#: forms.py:82 models.py:1207 models.py:1224 models.py:1273 +#: forms.py:82 models.py:1208 models.py:1225 models.py:1274 msgid "Public domain" msgstr "Domaine public" @@ -84,8 +84,8 @@ msgstr "Il y a des parcelles identiques." msgid "Relation type" msgstr "Type de relation" -#: forms.py:383 ishtar_menu.py:30 models.py:369 models.py:829 models.py:859 -#: models.py:887 models.py:990 models.py:1199 wizards.py:344 wizards.py:355 +#: forms.py:383 ishtar_menu.py:30 models.py:369 models.py:830 models.py:860 +#: models.py:888 models.py:991 models.py:1200 wizards.py:344 wizards.py:355 #: templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "Opération" @@ -122,7 +122,7 @@ msgstr "Identifiant numérique" msgid "Parcel (section/number/public domain)" msgstr "Parcelle (section/numéro/domaine public)" -#: forms.py:465 forms.py:1269 models.py:830 +#: forms.py:465 forms.py:1269 models.py:831 #: templates/ishtar/dashboards/dashboard_operation.html:390 #: templates/ishtar/dashboards/dashboard_operation.html:411 #: templates/ishtar/dashboards/dashboard_operation.html:643 @@ -148,7 +148,7 @@ msgstr "Est ouvert ?" msgid "In charge" msgstr "Responsable" -#: forms.py:485 models.py:984 +#: forms.py:485 models.py:985 msgid "Scientist in charge" msgstr "Responsable scientifique" @@ -254,7 +254,7 @@ msgstr "Rechercher une opération" msgid "Associated file" msgstr "Dossier associé" -#: forms.py:640 forms.py:933 models.py:496 models.py:886 models.py:995 +#: forms.py:640 forms.py:933 models.py:497 models.py:887 models.py:996 #: wizards.py:80 msgid "Archaeological file" msgstr "Dossier archéologique" @@ -348,7 +348,7 @@ msgstr "Référence de l'opérateur" msgid "Total surface (m2)" msgstr "Surface totale (m2)" -#: forms.py:800 models.py:53 models.py:258 models.py:1389 +#: forms.py:800 models.py:53 models.py:258 models.py:1399 msgid "Start date" msgstr "Date de début" @@ -406,7 +406,7 @@ msgstr "" msgid "Bad operation code" msgstr "Mauvais code d'opération" -#: forms.py:929 models.py:511 +#: forms.py:929 models.py:512 msgid "Operation code" msgstr "Code de l'opération" @@ -447,11 +447,11 @@ msgstr "Prescription sur une vaste surface" msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" -#: forms.py:983 forms.py:1005 models.py:286 models.py:1018 +#: forms.py:983 forms.py:1005 models.py:286 models.py:1019 msgid "Towns" msgstr "Communes" -#: forms.py:1012 models.py:1215 models.py:1387 +#: forms.py:1012 models.py:1216 models.py:1397 msgid "Parcel" msgstr "Parcelle" @@ -485,7 +485,7 @@ msgstr "Entités archéologiques" msgid "Associated archaeological sites" msgstr "Entités archéologiques associées" -#: forms.py:1167 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92 +#: forms.py:1167 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93 msgid "Search" msgstr "Recherche" @@ -497,7 +497,7 @@ msgstr "Voulez-vous clore cette opération ?" msgid "Would you like to delete this operation?" msgstr "Voulez-vous supprimer cette opération ?" -#: forms.py:1186 forms.py:1256 forms.py:1392 models.py:861 models.py:975 +#: forms.py:1186 forms.py:1256 forms.py:1392 models.py:862 models.py:976 msgid "Index" msgstr "Index" @@ -526,7 +526,7 @@ msgstr "Rechercher une documentation" msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: forms.py:1263 forms.py:1330 models.py:900 models.py:969 +#: forms.py:1263 forms.py:1330 models.py:901 models.py:970 msgid "Act type" msgstr "Type d'acte" @@ -534,7 +534,7 @@ msgstr "Type d'acte" msgid "Indexed?" msgstr "Indexé ?" -#: forms.py:1270 forms.py:1335 models.py:1009 +#: forms.py:1270 forms.py:1335 models.py:1010 #: templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "Objet" @@ -547,7 +547,7 @@ msgstr "Rechercher un acte administratif" msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: forms.py:1338 models.py:1006 +#: forms.py:1338 models.py:1007 msgid "Signature date" msgstr "Date de signature" @@ -584,62 +584,62 @@ msgstr "Génération de document" msgid "Generate the associated doc?" msgstr "Générer le document associé ?" -#: forms.py:1471 ishtar_menu.py:121 views.py:382 +#: forms.py:1471 ishtar_menu.py:123 views.py:382 msgctxt "admin act register" msgid "Register" msgstr "Registre" -#: ishtar_menu.py:38 ishtar_menu.py:69 ishtar_menu.py:97 +#: ishtar_menu.py:39 ishtar_menu.py:70 ishtar_menu.py:98 msgid "Creation" msgstr "Ajout" -#: ishtar_menu.py:43 ishtar_menu.py:74 ishtar_menu.py:102 +#: ishtar_menu.py:44 ishtar_menu.py:75 ishtar_menu.py:103 msgid "Modification" msgstr "Modification" -#: ishtar_menu.py:48 +#: ishtar_menu.py:49 msgid "Closing" msgstr "Clôture" -#: ishtar_menu.py:52 ishtar_menu.py:79 ishtar_menu.py:107 +#: ishtar_menu.py:53 ishtar_menu.py:80 ishtar_menu.py:108 msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:58 models.py:1025 +#: ishtar_menu.py:59 models.py:1026 #: templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "Acte administratif" -#: ishtar_menu.py:84 +#: ishtar_menu.py:85 msgid "Documents" msgstr "Documents" -#: ishtar_menu.py:89 +#: ishtar_menu.py:90 msgid "Documentation" msgstr "Documentation" -#: ishtar_menu.py:116 +#: ishtar_menu.py:117 msgid "Administrative Act" msgstr "Acte administratif" -#: ishtar_menu.py:129 +#: ishtar_menu.py:131 msgid "Dashboard" msgstr "Tableau de bord" -#: ishtar_menu.py:132 +#: ishtar_menu.py:135 msgid "General informations" msgstr "Informations générales" -#: ishtar_menu.py:136 models.py:370 +#: ishtar_menu.py:139 models.py:370 #: templates/ishtar/dashboards/dashboard_operation.html:8 msgid "Operations" msgstr "Opérations" -#: models.py:52 models.py:70 models.py:1851 +#: models.py:52 models.py:70 models.py:1861 msgid "Order" msgstr "Ordre" -#: models.py:54 models.py:1390 +#: models.py:54 models.py:1400 msgid "End date" msgstr "Date de fin" @@ -759,7 +759,7 @@ msgstr "Date de clôture" msgid "In charge scientist" msgstr "Responsable scientifique" -#: models.py:279 models.py:1195 +#: models.py:279 models.py:1196 msgid "File" msgstr "Dossier" @@ -814,252 +814,252 @@ msgstr "Peut supprimer sa propre Opération" msgid "Can close Operation" msgstr "Peut fermer une Opération" -#: models.py:405 +#: models.py:406 msgid "OPE" msgstr "OPE" -#: models.py:465 +#: models.py:466 msgid "Intercommunal" msgstr "Intercommunal" -#: models.py:497 +#: models.py:498 msgid "Code patriarche" msgstr "Code patriarche" -#: models.py:537 +#: models.py:538 msgid "This operation code already exists for this year" msgstr "Ce code d'opération existe déjà pour cette année." -#: models.py:570 +#: models.py:563 msgid "Number of parcels" msgstr "Nombre de parcelles" -#: models.py:588 +#: models.py:581 msgid "Number of administrative acts" msgstr "Nombre d'actes administratifs" -#: models.py:596 +#: models.py:589 msgid "Number of indexed administrative acts" msgstr "Nombre d'actes administratifs indexés" -#: models.py:604 +#: models.py:597 msgid "Number of context records" msgstr "Nombre d'Unités d'Enregistrement" -#: models.py:640 +#: models.py:633 msgid "Number of finds" msgstr "Nombre d'éléments de mobilier" -#: models.py:685 +#: models.py:678 msgid "No type" msgstr "Pas de type" -#: models.py:716 +#: models.py:709 msgid "Number of sources" msgstr "Nombre de documents" -#: models.py:758 templates/ishtar/dashboards/dashboard_operation.html:309 +#: models.py:751 templates/ishtar/dashboards/dashboard_operation.html:309 #: templates/ishtar/dashboards/dashboard_operation.html:575 #: templates/ishtar/dashboards/dashboard_operation.html:611 msgid "Mean" msgstr "Moyenne" -#: models.py:800 +#: models.py:801 msgid "Inverse relation" msgstr "Relation inverse" -#: models.py:804 +#: models.py:805 msgid "Operation relation type" msgstr "Type de relation entre opérations" -#: models.py:805 +#: models.py:806 msgid "Operation relation types" msgstr "Types de relation entre opérations" -#: models.py:818 +#: models.py:819 msgid "Operation record relation" msgstr "Relation entre opérations" -#: models.py:819 +#: models.py:820 msgid "Operation record relations" msgstr "Relations entre opérations" -#: models.py:865 +#: models.py:866 msgid "Operation documentation" msgstr "Documentation d'une opération" -#: models.py:866 +#: models.py:867 msgid "Operation documentations" msgstr "Documentations des opérations" -#: models.py:869 +#: models.py:870 msgid "Can view all Operation sources" msgstr "Peut voir toutes les Documentations d'opération" -#: models.py:871 +#: models.py:872 msgid "Can view own Operation source" msgstr "Peut voir sa propre Documentation d'opération" -#: models.py:873 +#: models.py:874 msgid "Can add own Operation source" msgstr "Peut ajouter sa propre Documentation d'opération" -#: models.py:875 +#: models.py:876 msgid "Can change own Operation source" msgstr "Peut modifier sa propre Documentation d'opération" -#: models.py:877 +#: models.py:878 msgid "Can delete own Operation source" msgstr "Peut supprimer sa propre Documentation d'opération" -#: models.py:888 models.py:1000 +#: models.py:889 models.py:1001 msgid "Treatment request" msgstr "Demande de traitement" -#: models.py:889 models.py:1005 +#: models.py:890 models.py:1006 msgid "Treatment" msgstr "Traitement" -#: models.py:891 +#: models.py:892 msgid "Intended to" msgstr "Destiné à" -#: models.py:893 +#: models.py:894 msgid "Code" msgstr "Code" -#: models.py:896 +#: models.py:897 msgid "Associated template" msgstr "Patron associé" -#: models.py:897 +#: models.py:898 msgid "Indexed" msgstr "Indexé" -#: models.py:901 +#: models.py:902 msgid "Act types" msgstr "Types d'acte" -#: models.py:973 +#: models.py:974 msgid "Person in charge of the operation" msgstr "Responsable d'opération" -#: models.py:979 +#: models.py:980 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: models.py:987 +#: models.py:988 msgid "Signatory" msgstr "Signataire" -#: models.py:1015 +#: models.py:1016 msgid "Departments" msgstr "Départements" -#: models.py:1016 +#: models.py:1017 msgid "Cached values get from associated departments" msgstr "Valeur en cache des départements associés" -#: models.py:1019 +#: models.py:1020 msgid "Cached values get from associated towns" msgstr "Valeur en cache des communes associées" -#: models.py:1026 templates/ishtar/sheet_operation.html:102 +#: models.py:1027 templates/ishtar/sheet_operation.html:102 #: templates/ishtar/sheet_operation.html:138 msgid "Administrative acts" msgstr "Actes administratifs" -#: models.py:1029 +#: models.py:1030 msgid "Can view all Administrative acts" msgstr "Peut voir tous les Actes administratifs" -#: models.py:1031 +#: models.py:1032 msgid "Can view own Administrative act" msgstr "Peut voir son propre Acte administratif" -#: models.py:1033 +#: models.py:1034 msgid "Can add own Administrative act" msgstr "Peut ajouter son propre Acte administratif" -#: models.py:1035 +#: models.py:1036 msgid "Can change own Administrative act" msgstr "Peut modifier son propre Acte administratif" -#: models.py:1037 +#: models.py:1038 msgid "Can delete own Administrative act" msgstr "Peut supprimer son propre Acte administratif" -#: models.py:1046 +#: models.py:1047 #: templates/ishtar/blocks/window_tables/administrativacts.html:7 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 msgid "Ref." msgstr "Réf." -#: models.py:1140 +#: models.py:1141 msgid "This index already exists for this year" msgstr "Cet index existe déjà pour cette année." -#: models.py:1208 +#: models.py:1209 msgid "External ID" msgstr "ID externe" -#: models.py:1211 +#: models.py:1212 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" -#: models.py:1212 +#: models.py:1213 msgid "Address - Locality" msgstr "Adresse - Lieu-dit" -#: models.py:1385 +#: models.py:1395 msgid "Owner" msgstr "Propriétaire" -#: models.py:1393 +#: models.py:1403 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: models.py:1394 +#: models.py:1404 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: models.py:1420 +#: models.py:1430 msgid "Recorded" msgstr "Enregistré" -#: models.py:1421 +#: models.py:1431 msgid "Effective" msgstr "Effectif" -#: models.py:1422 +#: models.py:1432 msgid "Active" msgstr "Actif" -#: models.py:1423 +#: models.py:1433 msgid "Field completed" msgstr "Terrain achevé" -#: models.py:1424 +#: models.py:1434 msgid "Associated report" msgstr "Rapport associé" -#: models.py:1425 +#: models.py:1435 msgid "Closed" msgstr "Clos" -#: models.py:1426 +#: models.py:1436 msgid "Documented and closed" msgstr "Documenté et clos" -#: models.py:1852 +#: models.py:1862 msgid "Is preventive" msgstr "Préventif" -#: models.py:1855 +#: models.py:1865 msgid "Operation type old" msgstr "Type d'opération - ancien" -#: models.py:1856 +#: models.py:1866 msgid "Operation types old" msgstr "Types d'opération - ancien" diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po index 3e2110836..7071aec57 100644 --- a/translations/fr/archaeological_warehouse.po +++ b/translations/fr/archaeological_warehouse.po @@ -9,23 +9,23 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-01-09 05:42-0500\n" +"PO-Revision-Date: 2017-02-02 10:17-0500\n" "Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" -#: forms.py:35 forms.py:91 ishtar_menu.py:39 models.py:60 models.py:88 +#: forms.py:35 forms.py:91 ishtar_menu.py:40 models.py:63 models.py:103 #: templates/ishtar/sheet_warehouse.html:4 msgid "Warehouse" msgstr "Dépôt" -#: forms.py:44 forms.py:49 models.py:239 +#: forms.py:44 forms.py:49 models.py:280 msgid "Division" msgstr "Division" -#: forms.py:51 models.py:112 +#: forms.py:51 models.py:127 msgid "Order" msgstr "Ordre" @@ -33,7 +33,7 @@ msgstr "Ordre" msgid "Divisions" msgstr "Divisions" -#: forms.py:66 forms.py:95 models.py:45 models.py:85 +#: forms.py:66 forms.py:95 models.py:45 models.py:100 msgid "Name" msgstr "Nom" @@ -53,7 +53,7 @@ msgstr "Rechercher un dépôt" msgid "Person in charge" msgstr "Responsable" -#: forms.py:106 forms.py:168 models.py:51 models.py:165 +#: forms.py:106 forms.py:168 models.py:51 models.py:180 msgid "Comment" msgstr "Commentaires" @@ -85,16 +85,16 @@ msgstr "Téléphone mobile" msgid "Would you like to delete this warehouse?" msgstr "Voulez-vous supprimer ce dépôt ?" -#: forms.py:150 models.py:173 models.py:237 +#: forms.py:150 models.py:191 models.py:278 #: templates/ishtar/sheet_container.html:4 msgid "Container" msgstr "Contenant" -#: forms.py:154 forms.py:221 models.py:127 +#: forms.py:154 forms.py:221 models.py:142 msgid "Ref." msgstr "Réf." -#: forms.py:155 forms.py:220 models.py:130 models.py:163 +#: forms.py:155 forms.py:220 models.py:145 models.py:178 msgid "Container type" msgstr "Type de contenant" @@ -102,7 +102,7 @@ msgstr "Type de contenant" msgid "Current location (warehouse)" msgstr "Lieu actuel (dépôt)" -#: forms.py:163 models.py:160 +#: forms.py:163 models.py:175 msgid "Responsible warehouse" msgstr "Dépôt responsable" @@ -114,7 +114,7 @@ msgstr "Index" msgid "This ID already exists for this warehouse." msgstr "Cet identifiant existe déjà pour ce dépôt." -#: forms.py:231 forms.py:237 views.py:127 +#: forms.py:231 forms.py:237 views.py:131 msgid "Container search" msgstr "Rechercher un contenant" @@ -126,7 +126,7 @@ msgstr "Vous devez sélectionner un contenant." msgid "Add a new container" msgstr "Ajouter un nouveau contenant" -#: forms.py:244 ishtar_menu.py:35 views.py:93 +#: forms.py:244 ishtar_menu.py:36 views.py:93 msgid "Packaging" msgstr "Conditionnement" @@ -142,7 +142,7 @@ msgstr "Date" msgid "Packaged finds" msgstr "Mobilier conditionné" -#: forms.py:264 models.py:166 +#: forms.py:264 models.py:181 msgid "Localisation" msgstr "Localisation" @@ -154,23 +154,23 @@ msgstr "Voulez-vous supprimer ce contenant ?" msgid "Treatment" msgstr "Traitement" -#: ishtar_menu.py:42 ishtar_menu.py:57 +#: ishtar_menu.py:44 ishtar_menu.py:59 msgid "Search" msgstr "Recherche" -#: ishtar_menu.py:45 ishtar_menu.py:60 +#: ishtar_menu.py:47 ishtar_menu.py:62 msgid "Creation" msgstr "Ajout" -#: ishtar_menu.py:48 ishtar_menu.py:63 +#: ishtar_menu.py:50 ishtar_menu.py:65 msgid "Modification" msgstr "Modification" -#: ishtar_menu.py:51 ishtar_menu.py:66 +#: ishtar_menu.py:53 ishtar_menu.py:68 msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:55 models.py:174 templates/ishtar/sheet_warehouse.html:17 +#: ishtar_menu.py:57 models.py:192 templates/ishtar/sheet_warehouse.html:17 msgid "Containers" msgstr "Contenants" @@ -178,123 +178,131 @@ msgstr "Contenants" msgid "Warehouse types" msgstr "Types de dépôts" -#: models.py:61 +#: models.py:56 models.py:186 +msgid "External ID" +msgstr "ID externe" + +#: models.py:58 models.py:188 +msgid "External ID is set automatically" +msgstr "L'ID externe est attribué automatiquement" + +#: models.py:64 msgid "Warehouses" msgstr "Dépôts" -#: models.py:63 +#: models.py:66 msgid "Can view all Warehouses" msgstr "Peut voir tous les Dépôts" -#: models.py:64 +#: models.py:67 msgid "Can view own Warehouse" msgstr "Peut voir son propre Dépôt" -#: models.py:65 +#: models.py:68 msgid "Can add own Warehouse" msgstr "Peut ajouter son propre Dépôt" -#: models.py:66 +#: models.py:69 msgid "Can change own Warehouse" msgstr "Peut modifier son propre Dépôt" -#: models.py:67 +#: models.py:70 msgid "Can delete own Warehouse" msgstr "Peut supprimer son propre Dépôt" -#: models.py:87 +#: models.py:102 msgid "Description" msgstr "Description" -#: models.py:92 models.py:93 +#: models.py:107 models.py:108 msgid "Collection" msgstr "Collection" -#: models.py:102 +#: models.py:117 msgid "Warehouse division" msgstr "Division de dépôt" -#: models.py:103 +#: models.py:118 msgid "Warehouse divisions" msgstr "Divisions de dépôt" -#: models.py:123 +#: models.py:138 msgid "Length (mm)" msgstr "Longueur (mm)" -#: models.py:124 +#: models.py:139 msgid "Width (mm)" msgstr "Largeur (mm)" -#: models.py:125 +#: models.py:140 msgid "Height (mm)" msgstr "Hauteur (mm)" -#: models.py:126 +#: models.py:141 msgid "Volume (l)" msgstr "Volume (l)" -#: models.py:131 +#: models.py:146 msgid "Container types" msgstr "Types de contenant" -#: models.py:149 +#: models.py:164 msgid "Location - index" msgstr "Lieu - index" -#: models.py:150 +#: models.py:165 msgid "Precise localisation" msgstr "Localisation précise" -#: models.py:151 +#: models.py:166 msgid "Type" msgstr "Type" -#: models.py:157 +#: models.py:172 msgid "Location (warehouse)" msgstr "Lieu (dépôt)" -#: models.py:164 +#: models.py:179 msgid "Container ref." msgstr "Réf. du contenant" -#: models.py:168 +#: models.py:183 msgid "Cached location" msgstr "Lieu - en cache" -#: models.py:240 +#: models.py:281 msgid "Reference" msgstr "Référence" -#: models.py:243 +#: models.py:284 msgid "Container localisation" msgstr "Localisation de contenant" -#: models.py:244 +#: models.py:285 msgid "Container localisations" msgstr "Localisations de contenant" -#: views.py:106 +#: views.py:110 msgid "Warehouse creation" msgstr "Ajouter un dépôt" -#: views.py:115 +#: views.py:119 msgid "Warehouse modification" msgstr "Modifier un dépôt" -#: views.py:122 +#: views.py:126 msgid "Warehouse deletion" msgstr "Supprimer un dépôt" -#: views.py:138 +#: views.py:142 msgid "Container creation" msgstr "Ajouter un contenant" -#: views.py:147 +#: views.py:151 msgid "Container modification" msgstr "Modifier un contenant" -#: views.py:154 +#: views.py:158 msgid "Container deletion" msgstr "Supprimer un contenant" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index c1bdcb0c2..6661c51d6 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -6,14 +6,13 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata # Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata -# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-01-12 04:03-0500\n" -"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" +"PO-Revision-Date: 2017-02-02 10:16-0500\n" +"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=n>1;\n" @@ -114,31 +113,31 @@ msgstr "L'expression régulière ne fonctionne pas." msgid "Not imported" msgstr "Non importé" -#: data_importer.py:1441 +#: data_importer.py:1444 msgid "line" msgstr "ligne" -#: data_importer.py:1441 +#: data_importer.py:1444 msgid "col" msgstr "colonne" -#: data_importer.py:1441 +#: data_importer.py:1444 msgid "error" msgstr "erreur" -#: data_importer.py:1447 +#: data_importer.py:1450 msgid "field" msgstr "champ" -#: data_importer.py:1447 +#: data_importer.py:1450 msgid "source" msgstr "source" -#: data_importer.py:1447 +#: data_importer.py:1450 msgid "result" msgstr "résultat" -#: data_importer.py:1463 +#: data_importer.py:1466 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "\"%(value)s\" n'est pas dans %(values)s" @@ -171,12 +170,12 @@ msgstr "Vous devez sélectionner un élément." msgid "Add a new item" msgstr "Ajouter un nouvel élément" -#: forms.py:262 models.py:1368 +#: forms.py:262 models.py:1473 msgid "Template" msgstr "Patron" #: forms_common.py:41 forms_common.py:59 forms_common.py:182 -#: forms_common.py:406 models.py:1434 models.py:2826 +#: forms_common.py:406 models.py:1539 models.py:2940 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -199,8 +198,8 @@ msgstr "" "<p class='example'>Par exemple tapez « saint denis 93 » pour obtenir la " "commune Saint-Denis dans le département français de Seine-Saint-Denis.</p>" -#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1607 -#: models.py:2453 models.py:2635 models.py:2696 +#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1712 +#: models.py:2567 models.py:2749 models.py:2810 #: templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "Personne" @@ -214,63 +213,63 @@ msgstr "" "pas possible." #: forms_common.py:170 forms_common.py:327 forms_common.py:451 -#: ishtar_menu.py:75 models.py:1608 models.py:2339 +#: ishtar_menu.py:75 models.py:1713 models.py:2450 models.py:2541 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "Organisation" #: forms_common.py:173 forms_common.py:210 forms_common.py:322 -#: forms_common.py:376 forms_common.py:446 models.py:1034 models.py:1367 -#: models.py:1653 models.py:1872 models.py:2333 models.py:2439 models.py:2812 +#: forms_common.py:376 forms_common.py:446 models.py:1094 models.py:1472 +#: models.py:1758 models.py:1977 models.py:2444 models.py:2553 models.py:2926 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "Nom" -#: forms_common.py:174 models.py:1589 models.py:2003 +#: forms_common.py:174 models.py:1694 models.py:2108 msgid "Organization type" msgstr "Type d'organisation" -#: forms_common.py:176 forms_common.py:400 models.py:1429 +#: forms_common.py:176 forms_common.py:400 models.py:1534 #: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "Adresse" -#: forms_common.py:178 forms_common.py:403 models.py:1430 +#: forms_common.py:178 forms_common.py:403 models.py:1535 #: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "Complément d'adresse" -#: forms_common.py:180 forms_common.py:404 models.py:1432 +#: forms_common.py:180 forms_common.py:404 models.py:1537 #: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "Code postal" -#: forms_common.py:183 forms_common.py:407 models.py:1435 +#: forms_common.py:183 forms_common.py:407 models.py:1540 msgid "Country" msgstr "Pays" #: forms_common.py:185 forms_common.py:324 forms_common.py:380 -#: forms_common.py:448 forms_common.py:572 models.py:1462 +#: forms_common.py:448 forms_common.py:572 models.py:1567 msgid "Email" msgstr "Courriel" -#: forms_common.py:186 forms_common.py:383 models.py:1447 +#: forms_common.py:186 forms_common.py:383 models.py:1552 #: templates/ishtar/sheet_organization.html:14 #: templates/ishtar/sheet_person.html:19 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "Téléphone" -#: forms_common.py:187 forms_common.py:392 models.py:1459 +#: forms_common.py:187 forms_common.py:392 models.py:1564 #: templates/ishtar/sheet_organization.html:15 #: templates/ishtar/sheet_person.html:37 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "Téléphone portable" -#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2033 -#: models.py:2335 models.py:2747 templates/sheet_ope.html:85 +#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2144 +#: models.py:2446 models.py:2861 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:23 @@ -278,7 +277,7 @@ msgstr "Téléphone portable" msgid "Type" msgstr "Type" -#: forms_common.py:220 views.py:142 +#: forms_common.py:220 views.py:146 msgid "Organization search" msgstr "Rechercher une organisation" @@ -294,12 +293,12 @@ msgstr "Fusionner tous les éléments dans" msgid "Organization to merge" msgstr "Organisation à fusionner" -#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2437 +#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2551 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "Prénom" -#: forms_common.py:339 forms_common.py:434 views.py:107 +#: forms_common.py:339 forms_common.py:434 views.py:111 msgid "Person search" msgstr "Rechercher une personne" @@ -312,25 +311,25 @@ msgstr "Personne à fusionner" msgid "Identity" msgstr "Identité" -#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2004 -#: models.py:2431 models.py:2433 models.py:2744 templates/sheet_ope.html:104 +#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2109 +#: models.py:2545 models.py:2547 models.py:2858 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "Titre" -#: forms_common.py:372 models.py:2435 +#: forms_common.py:372 models.py:2549 msgid "Salutation" msgstr "Formule d'appel" -#: forms_common.py:378 models.py:2441 +#: forms_common.py:378 models.py:2555 msgid "Raw name" msgstr "Nom brut" -#: forms_common.py:381 models.py:1448 +#: forms_common.py:381 models.py:1553 msgid "Phone description" msgstr "Type de téléphone" -#: forms_common.py:384 models.py:1450 models.py:1452 +#: forms_common.py:384 models.py:1555 models.py:1557 msgid "Phone description 2" msgstr "Type de téléphone 2" @@ -338,11 +337,11 @@ msgstr "Type de téléphone 2" msgid "Phone 2" msgstr "Téléphone 2" -#: forms_common.py:388 models.py:1456 +#: forms_common.py:388 models.py:1561 msgid "Phone description 3" msgstr "Type de téléphone 3" -#: forms_common.py:390 models.py:1454 +#: forms_common.py:390 models.py:1559 msgid "Phone 3" msgstr "Téléphone 3" @@ -350,23 +349,23 @@ msgstr "Téléphone 3" msgid "Current organization" msgstr "Organisation actuelle" -#: forms_common.py:409 models.py:1437 +#: forms_common.py:409 models.py:1542 msgid "Other address: address" msgstr "Autre adresse : adresse" -#: forms_common.py:412 models.py:1440 +#: forms_common.py:412 models.py:1545 msgid "Other address: address complement" msgstr "Autre adresse : complément d'adresse" -#: forms_common.py:414 models.py:1441 +#: forms_common.py:414 models.py:1546 msgid "Other address: postal code" msgstr "Autre adresse : code postal" -#: forms_common.py:416 models.py:1443 +#: forms_common.py:416 models.py:1548 msgid "Other address: town" msgstr "Autre adresse : ville" -#: forms_common.py:418 models.py:1445 +#: forms_common.py:418 models.py:1550 msgid "Other address: country" msgstr "Autre adresse : pays" @@ -382,7 +381,7 @@ msgstr "Nom d'utilisateur" msgid "Account search" msgstr "Rechercher un compte" -#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2387 +#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2498 msgid "Person type" msgstr "Type de personne" @@ -390,7 +389,7 @@ msgstr "Type de personne" msgid "Account" msgstr "Compte" -#: forms_common.py:575 wizards.py:1256 +#: forms_common.py:575 wizards.py:1281 msgid "New password" msgstr "Nouveau mot de passe" @@ -414,7 +413,7 @@ msgstr "Ce nom d'utilisateur existe déjà." msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" -#: forms_common.py:628 forms_common.py:641 models.py:2827 +#: forms_common.py:628 forms_common.py:641 models.py:2941 msgid "Towns" msgstr "Communes" @@ -430,7 +429,7 @@ msgstr "Seul un choix peut être coché." msgid "Documentation informations" msgstr "Information sur le document" -#: forms_common.py:775 forms_common.py:823 models.py:2005 models.py:2721 +#: forms_common.py:775 forms_common.py:823 models.py:2110 models.py:2835 msgid "Source type" msgstr "Type de document" @@ -442,37 +441,37 @@ msgstr "Référence" msgid "Internal reference" msgstr "Référence interne" -#: forms_common.py:783 models.py:2758 +#: forms_common.py:783 models.py:2872 msgid "Numerical ressource (web address)" msgstr "Ressource numérique (adresse web)" -#: forms_common.py:784 models.py:2760 +#: forms_common.py:784 models.py:2874 msgid "Receipt date" msgstr "Date de réception" -#: forms_common.py:786 models.py:2162 models.py:2762 +#: forms_common.py:786 models.py:2273 models.py:2876 msgid "Creation date" msgstr "Date de création" -#: forms_common.py:789 models.py:2765 +#: forms_common.py:789 models.py:2879 msgid "Receipt date in documentation" msgstr "Date de réception en documentation" -#: forms_common.py:791 forms_common.py:827 models.py:323 models.py:634 -#: models.py:1899 models.py:2445 models.py:2772 +#: forms_common.py:791 forms_common.py:827 models.py:376 models.py:687 +#: models.py:2004 models.py:2559 models.py:2886 msgid "Comment" msgstr "Commentaire" -#: forms_common.py:793 forms_common.py:826 models.py:1036 models.py:1657 -#: models.py:1831 models.py:1873 models.py:2771 templates/sheet_ope.html:128 +#: forms_common.py:793 forms_common.py:826 models.py:1096 models.py:1762 +#: models.py:1936 models.py:1978 models.py:2885 templates/sheet_ope.html:128 msgid "Description" msgstr "Description" -#: forms_common.py:796 models.py:2773 +#: forms_common.py:796 models.py:2887 msgid "Additional information" msgstr "Informations supplémentaires" -#: forms_common.py:798 forms_common.py:830 models.py:2775 +#: forms_common.py:798 forms_common.py:830 models.py:2889 msgid "Has a duplicate" msgstr "Existe en doublon" @@ -489,7 +488,7 @@ msgstr "" "<p>Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).</p>" -#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2701 +#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2815 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "Auteur" @@ -502,7 +501,7 @@ msgstr "Informations complémentaires" msgid "Would you like to delete this documentation?" msgstr "Voulez-vous supprimer ce document ?" -#: forms_common.py:856 models.py:2006 models.py:2689 models.py:2698 +#: forms_common.py:856 models.py:2111 models.py:2803 models.py:2812 msgid "Author type" msgstr "Type d'auteur" @@ -514,7 +513,7 @@ msgstr "Sélection d'auteur" msgid "There are identical authors." msgstr "Il y a des auteurs identiques." -#: forms_common.py:893 models.py:2702 models.py:2754 +#: forms_common.py:893 models.py:2816 models.py:2868 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -532,7 +531,7 @@ msgstr "Ajout/modification" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:39 models.py:1163 views.py:1530 +#: ishtar_menu.py:39 models.py:1268 views.py:1548 msgid "Global variables" msgstr "Variables globales" @@ -560,19 +559,19 @@ msgstr "Fusion automatique" msgid "Manual merge" msgstr "Fusion manuelle" -#: ishtar_menu.py:109 models.py:2173 +#: ishtar_menu.py:109 models.py:2284 msgid "Imports" msgstr "Imports" -#: ishtar_menu.py:112 views.py:1538 +#: ishtar_menu.py:112 views.py:1556 msgid "New import" msgstr "Nouvel import" -#: ishtar_menu.py:116 views.py:1552 +#: ishtar_menu.py:116 views.py:1570 msgid "Current imports" msgstr "Imports en cours" -#: ishtar_menu.py:120 views.py:1588 +#: ishtar_menu.py:120 views.py:1606 msgid "Old imports" msgstr "Anciens imports" @@ -588,95 +587,119 @@ msgstr "Un élément sélectionné n'est pas valide." msgid "This item already exists." msgstr "Cet élément existe déjà." -#: models.py:319 models.py:633 models.py:1402 models.py:1414 models.py:1828 +#: models.py:372 models.py:686 models.py:1507 models.py:1519 models.py:1933 msgid "Label" msgstr "Libellé" -#: models.py:321 +#: models.py:374 msgid "Textual ID" msgstr "Identifiant textuel" -#: models.py:324 models.py:636 models.py:1371 +#: models.py:377 models.py:689 models.py:1476 msgid "Available" msgstr "Disponible" -#: models.py:655 models.py:1945 +#: models.py:713 models.py:2050 msgid "Key" msgstr "Clé" -#: models.py:661 +#: models.py:719 msgid "Specific key to an import" msgstr "Clé spécifique à un import" -#: models.py:753 +#: models.py:811 msgid "Last editor" msgstr "Dernier éditeur" -#: models.py:756 +#: models.py:814 msgid "Creator" msgstr "Créateur" -#: models.py:898 models.py:2838 models.py:2894 +#: models.py:956 models.py:2952 models.py:3008 msgid "Order" msgstr "Ordre" -#: models.py:899 +#: models.py:957 msgid "Symmetrical" msgstr "Symétrique" -#: models.py:900 +#: models.py:958 msgid "Tiny label" msgstr "Libellé court" -#: models.py:914 +#: models.py:972 msgid "Cannot have symmetrical and an inverse_relation" msgstr "Ne peut pas être symétrique et avoir une relation inverse" -#: models.py:1028 +#: models.py:1088 msgid "Euro" msgstr "Euro" -#: models.py:1029 +#: models.py:1089 msgid "US dollar" msgstr "Dollars US" -#: models.py:1035 models.py:1655 +#: models.py:1095 models.py:1760 msgid "Slug" msgstr "Identifiant texte" -#: models.py:1037 +#: models.py:1098 +msgid "CSS color code for base module" +msgstr "Code couleur CSS pour le tronc commun" + +#: models.py:1100 msgid "Files module" msgstr "Module Dossiers" -#: models.py:1038 +#: models.py:1102 +msgid "CSS color code for files module" +msgstr "Code couleur CSS pour le module Dossier" + +#: models.py:1104 msgid "Context records module" msgstr "Module Unités d'Enregistrement" -#: models.py:1040 +#: models.py:1107 +msgid "CSS color code for context record module" +msgstr "Code couleur CSS pour le module Unité d'Enregistrement" + +#: models.py:1109 msgid "Finds module" msgstr "Module Mobilier" -#: models.py:1041 +#: models.py:1110 msgid "Need context records module" msgstr "Nécessite le module Unités d'Enregistrement" -#: models.py:1043 +#: models.py:1112 +msgid "CSS color code for find module" +msgstr "Code couleur CSS pour le module Mobilier" + +#: models.py:1115 msgid "Warehouses module" msgstr "Module Dépôts" -#: models.py:1044 +#: models.py:1116 msgid "Need finds module" msgstr "Nécessite le module mobilier" -#: models.py:1045 +#: models.py:1118 +msgid "CSS code for warehouse module" +msgstr "Code couleur CSS pour le module Dépôt" + +#: models.py:1120 msgid "Mapping module" msgstr "Module cartographique" -#: models.py:1047 +#: models.py:1122 +msgid "CSS code for mapping module" +msgstr "Code couleur CSS pour le module cartographique" + +#: models.py:1125 msgid "Home page" msgstr "Page d'accueil" -#: models.py:1048 +#: models.py:1126 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " @@ -686,11 +709,11 @@ msgstr "" "défaut apparaît. Utiliser la syntaxe Markdown. {random_image} peut être " "utilisé pour afficher une image au hasard." -#: models.py:1052 +#: models.py:1130 msgid "File external id" msgstr "Identifiant externe de fichier" -#: models.py:1054 +#: models.py:1132 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -700,11 +723,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1059 +#: models.py:1137 msgid "Parcel external id" msgstr "Identifiant externe de parcelle" -#: models.py:1062 +#: models.py:1140 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -714,11 +737,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1067 +#: models.py:1145 msgid "Context record external id" msgstr "Identifiant externe d'unité d'enregistrement" -#: models.py:1069 +#: models.py:1147 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -728,11 +751,11 @@ msgstr "" "manipuler avec précaution. Une formule incorrecte peut rendre l'application " "inutilisable et l'import de données externes peut alors être destructif." -#: models.py:1074 +#: models.py:1152 msgid "Base find external id" msgstr "Identifiant externe de mobilier de base" -#: models.py:1076 +#: models.py:1154 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -742,11 +765,11 @@ msgstr "" "manipuler avec précaution. Une formule incorrecte peut rendre l'application " "inutilisable et l'import de données externes peut alors être destructif." -#: models.py:1081 +#: models.py:1159 msgid "Find external id" msgstr "Identifiant externe de mobilier" -#: models.py:1083 +#: models.py:1161 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -756,11 +779,39 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1088 +#: models.py:1166 +msgid "Container external id" +msgstr "ID externe du contenant" + +#: models.py:1168 +msgid "" +"Formula to manage container external ID. Change this with care. With " +"incorrect formula, the application might be unusable and import of external " +"data can be destructive." +msgstr "" +"Formule pour gérer l'ID externe du contenant. À modifier avec précaution. " +"Avec une formule incorrecte, le logiciel pourrait devenir inutilisable et " +"l'import de données externes pourrait être destructif." + +#: models.py:1173 +msgid "Warehouse external id" +msgstr "ID externe du dépôt" + +#: models.py:1175 +msgid "" +"Formula to manage warehouse external ID. Change this with care. With " +"incorrect formula, the application might be unusable and import of external " +"data can be destructive." +msgstr "" +"Formule pour gérer l'ID externe du dépôt. À modifier avec précaution. Avec " +"une formule incorrecte, le logiciel pourrait devenir inutilisable et " +"l'import de données externes pourrait être destructif." + +#: models.py:1180 msgid "Raw name for person" msgstr "Nom brut pour une personne" -#: models.py:1090 +#: models.py:1182 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -770,43 +821,43 @@ msgstr "" "Une formule incorrecte peut rendre l'application inutilisable et l'import de " "données externes peut alors être destructif." -#: models.py:1094 +#: models.py:1186 msgid "Current active" msgstr "Actuellement utilisé" -#: models.py:1095 +#: models.py:1187 msgid "Currency" msgstr "Devise" -#: models.py:1099 +#: models.py:1191 msgid "Ishtar site profile" msgstr "Profil d'instance Ishtar" -#: models.py:1100 +#: models.py:1192 msgid "Ishtar site profiles" msgstr "Profils d'instance Ishtar" -#: models.py:1156 +#: models.py:1261 msgid "Variable name" msgstr "Nom de la variable" -#: models.py:1157 +#: models.py:1262 msgid "Description of the variable" msgstr "Description de la variable" -#: models.py:1159 models.py:1946 +#: models.py:1264 models.py:2051 msgid "Value" msgstr "Valeur" -#: models.py:1162 +#: models.py:1267 msgid "Global variable" msgstr "Variable globale" -#: models.py:1272 models.py:1302 +#: models.py:1377 models.py:1407 msgid "Total" msgstr "Total" -#: models.py:1279 models.py:1403 models.py:1415 +#: models.py:1384 models.py:1508 models.py:1520 #: templates/ishtar/sheet_person.html:22 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 @@ -814,728 +865,748 @@ msgstr "Total" msgid "Number" msgstr "Nombre" -#: models.py:1366 +#: models.py:1471 msgid "Administrative Act" msgstr "Acte administratif" -#: models.py:1370 +#: models.py:1475 msgid "Associated object" msgstr "Objet associé" -#: models.py:1374 +#: models.py:1479 msgid "Document template" msgstr "Patron de document" -#: models.py:1375 +#: models.py:1480 msgid "Document templates" msgstr "Patrons de document" -#: models.py:1406 models.py:1416 models.py:2157 +#: models.py:1511 models.py:1521 models.py:2268 msgid "State" msgstr "État" -#: models.py:1420 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1525 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "Département" -#: models.py:1421 +#: models.py:1526 msgid "Departments" msgstr "Départements" -#: models.py:1458 +#: models.py:1563 msgid "Raw phone" msgstr "Téléphone brut" -#: models.py:1464 +#: models.py:1569 msgid "Alternative address is prefered" msgstr "L'adresse alternative est préférée" -#: models.py:1503 +#: models.py:1608 msgid "Tel: " msgstr "Tél :" -#: models.py:1507 +#: models.py:1612 msgid "Mobile: " msgstr "Mobile :" -#: models.py:1511 +#: models.py:1616 msgid "Email: " msgstr "Courriel :" -#: models.py:1516 +#: models.py:1621 msgid "Merge key" msgstr "Clé de fusion" -#: models.py:1590 +#: models.py:1695 msgid "Organization types" msgstr "Types d'organisation" -#: models.py:1609 views.py:237 +#: models.py:1714 views.py:241 msgid "Operation" msgstr "Opération" -#: models.py:1611 +#: models.py:1716 msgid "Archaeological site" msgstr "Entité Archéologique" -#: models.py:1612 +#: models.py:1717 msgid "Parcels" msgstr "Parcelles" -#: models.py:1614 +#: models.py:1719 msgid "Operation source" msgstr "Documentation de l'opération" -#: models.py:1617 views.py:1346 views.py:1396 +#: models.py:1722 views.py:1364 views.py:1414 msgid "Archaeological files" msgstr "Dossiers" -#: models.py:1619 views.py:1349 views.py:1404 +#: models.py:1724 views.py:1367 views.py:1422 msgid "Context records" msgstr "Unités d'Enregistrement" -#: models.py:1621 +#: models.py:1726 msgid "Context record relations" msgstr "Relations entre Unités d'Enregistrement" -#: models.py:1623 +#: models.py:1728 msgid "Base finds" msgstr "Mobilier de base" -#: models.py:1659 templates/ishtar/dashboards/dashboard_main.html:25 +#: models.py:1764 templates/ishtar/dashboards/dashboard_main.html:25 msgid "Users" msgstr "Utilisateurs" -#: models.py:1661 +#: models.py:1766 msgid "Associated model" msgstr "Modèle associé" -#: models.py:1664 +#: models.py:1769 msgid "Is template" msgstr "Est un patron" -#: models.py:1665 +#: models.py:1770 msgid "Unicity keys (separator \";\")" msgstr "Clés d'unicité (séparateur « ; »)" -#: models.py:1669 +#: models.py:1774 msgid "Importer - Type" msgstr "Importeur - Type" -#: models.py:1670 +#: models.py:1775 msgid "Importer - Types" msgstr "Importeur - Types" -#: models.py:1760 +#: models.py:1865 msgid "Importer - Default" msgstr "Importeur - Par défaut" -#: models.py:1761 +#: models.py:1866 msgid "Importer - Defaults" msgstr "Importeur - Par défaut" -#: models.py:1796 +#: models.py:1901 msgid "Importer - Default value" msgstr "Importeur - Valeur par défaut" -#: models.py:1797 +#: models.py:1902 msgid "Importer - Default values" msgstr "Importeur - Valeurs par défaut" -#: models.py:1830 +#: models.py:1935 msgid "Column number" msgstr "Numéro de colonne" -#: models.py:1833 +#: models.py:1938 msgid "Required" msgstr "Requis" -#: models.py:1836 +#: models.py:1941 msgid "Importer - Column" msgstr "Importeur - Colonne" -#: models.py:1837 +#: models.py:1942 msgid "Importer - Columns" msgstr "Importeur - Colonnes" -#: models.py:1857 +#: models.py:1962 msgid "Field name" msgstr "Nom du champ" -#: models.py:1859 models.py:1893 +#: models.py:1964 models.py:1998 msgid "Force creation of new items" msgstr "Forcer la création de nouveaux éléments" -#: models.py:1861 models.py:1895 +#: models.py:1966 models.py:2000 msgid "Concatenate with existing" msgstr "Concaténer avec l'existant" -#: models.py:1863 models.py:1897 +#: models.py:1968 models.py:2002 msgid "Concatenate character" msgstr "Caractère de concaténation" -#: models.py:1867 +#: models.py:1972 msgid "Importer - Duplicate field" msgstr "Importeur - Champ dupliqué" -#: models.py:1868 +#: models.py:1973 msgid "Importer - Duplicate fields" msgstr "Importeur - Champs dupliqués" -#: models.py:1875 +#: models.py:1980 msgid "Regular expression" msgstr "Expression régulière" -#: models.py:1878 +#: models.py:1983 msgid "Importer - Regular expression" msgstr "Importeur - Expression régulière" -#: models.py:1879 +#: models.py:1984 msgid "Importer - Regular expressions" msgstr "Importeur - Expressions régulières" -#: models.py:1902 +#: models.py:2007 msgid "Importer - Target" msgstr "Importeur - Cible" -#: models.py:1903 +#: models.py:2008 msgid "Importer - Targets" msgstr "Importeur - Cibles" -#: models.py:1927 views.py:536 +#: models.py:2032 views.py:545 msgid "True" msgstr "Oui" -#: models.py:1928 views.py:538 +#: models.py:2033 views.py:547 msgid "False" msgstr "Non" -#: models.py:1947 +#: models.py:2052 msgid "Is set" msgstr "Est défini" -#: models.py:1954 +#: models.py:2059 msgid "Importer - Target key" msgstr "Importeur - Clé de rapprochement" -#: models.py:1955 +#: models.py:2060 msgid "Importer - Targets keys" msgstr "Importeur - Clés de rapprochement" -#: models.py:2007 models.py:2737 models.py:2750 +#: models.py:2112 models.py:2851 models.py:2864 msgid "Format" msgstr "Format" -#: models.py:2008 models.py:2842 +#: models.py:2113 models.py:2956 msgid "Operation type" msgstr "Type d'opération" -#: models.py:2009 +#: models.py:2114 msgid "Period" msgstr "Périodes" -#: models.py:2010 +#: models.py:2115 msgid "Report state" msgstr "État de rapport" -#: models.py:2011 +#: models.py:2116 msgid "Remain type" msgstr "Type de vestige" -#: models.py:2012 +#: models.py:2117 msgid "Unit" msgstr "Unité" -#: models.py:2013 +#: models.py:2118 msgid "Activity type" msgstr "Type d'activité" -#: models.py:2014 +#: models.py:2119 msgid "Material" msgstr "Matériau" -#: models.py:2016 +#: models.py:2121 msgid "Conservatory state" msgstr "État de conservation" -#: models.py:2017 +#: models.py:2122 +msgid "Container type" +msgstr "Type de contenant" + +#: models.py:2123 msgid "Preservation type" msgstr "Type de conservation" -#: models.py:2018 +#: models.py:2124 msgid "Object type" msgstr "Type d'objet" -#: models.py:2020 +#: models.py:2125 +msgid "Integrity type" +msgstr "Type d'intégrité" + +#: models.py:2126 +msgid "Remarkability type" +msgstr "Type de remarquabilité" + +#: models.py:2127 +msgid "Batch type" +msgstr "Type de lot" + +#: models.py:2129 msgid "Identification type" msgstr "Type d'identification" -#: models.py:2022 +#: models.py:2131 msgid "Context record relation type" msgstr "Type de relations entre Unités d'Enregistrement" -#: models.py:2023 models.py:2729 +#: models.py:2132 models.py:3014 +msgid "Spatial reference system" +msgstr "Système de référence spatiale" + +#: models.py:2133 models.py:2843 msgid "Support type" msgstr "Type de support" -#: models.py:2029 +#: models.py:2134 models.py:2510 +msgid "Title type" +msgstr "Type de titre" + +#: models.py:2140 msgid "Integer" msgstr "Entier" -#: models.py:2030 +#: models.py:2141 msgid "Float" msgstr "Nombre à virgule" -#: models.py:2031 +#: models.py:2142 msgid "String" msgstr "Chaîne de caractères" -#: models.py:2032 templates/sheet_ope.html:86 +#: models.py:2143 templates/sheet_ope.html:86 msgid "Date" msgstr "Date" -#: models.py:2034 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2145 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "Année" -#: models.py:2035 +#: models.py:2146 msgid "String to boolean" msgstr "Chaîne de caractères vers booléen" -#: models.py:2036 +#: models.py:2147 msgctxt "filesystem" msgid "File" msgstr "Fichier" -#: models.py:2037 +#: models.py:2148 msgid "Unknow type" msgstr "Type inconnu" -#: models.py:2053 +#: models.py:2164 msgid "4 digit year. e.g.: \"2015\"" msgstr "Année sur 4 chiffres. Exemple : « 2015 »" -#: models.py:2054 +#: models.py:2165 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "Année sur 4 chiffres/mois/jour. Exemple : « 2015/02/04 »" -#: models.py:2055 +#: models.py:2166 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "Jour/mois/année sur 4 chiffres. Exemple : « 04/02/2015 »" -#: models.py:2065 +#: models.py:2176 msgid "Options" msgstr "Options" -#: models.py:2067 +#: models.py:2178 msgid "Split character(s)" msgstr "Caractère(s) de séparation" -#: models.py:2071 +#: models.py:2182 msgid "Importer - Formater type" msgstr "Importeur - Type de mise en forme" -#: models.py:2072 +#: models.py:2183 msgid "Importer - Formater types" msgstr "Importeur - Types de mise en forme" -#: models.py:2121 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2232 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "Créé" -#: models.py:2122 +#: models.py:2233 msgid "Analyse in progress" msgstr "Analyse en cours" -#: models.py:2123 +#: models.py:2234 msgid "Analysed" msgstr "Analysé" -#: models.py:2124 +#: models.py:2235 msgid "Import pending" msgstr "Import en attente" -#: models.py:2125 +#: models.py:2236 msgid "Import in progress" msgstr "Import en cours" -#: models.py:2126 +#: models.py:2237 msgid "Finished with errors" msgstr "Terminé avec des erreurs" -#: models.py:2127 +#: models.py:2238 msgid "Finished" msgstr "Terminé" -#: models.py:2128 +#: models.py:2239 msgid "Archived" msgstr "Archivé" -#: models.py:2140 +#: models.py:2252 msgid "Imported file" msgstr "Fichier importé" -#: models.py:2143 +#: models.py:2254 msgid "Associated images (zip file)" msgstr "Images associées (fichier zip)" -#: models.py:2145 +#: models.py:2256 msgid "Encoding" msgstr "Codage" -#: models.py:2147 +#: models.py:2258 msgid "Skip lines" msgstr "Nombre de lignes d'entête" -#: models.py:2148 templates/ishtar/import_list.html:47 +#: models.py:2259 templates/ishtar/import_list.html:47 msgid "Error file" msgstr "Fichier erreur" -#: models.py:2151 +#: models.py:2262 msgid "Result file" msgstr "Fichier résultant" -#: models.py:2154 templates/ishtar/import_list.html:53 +#: models.py:2265 templates/ishtar/import_list.html:53 msgid "Match file" msgstr "Fichier de correspondance" -#: models.py:2160 +#: models.py:2271 msgid "Conservative import" msgstr "Import conservateur" -#: models.py:2165 +#: models.py:2276 msgid "End date" msgstr "Date de fin" -#: models.py:2167 +#: models.py:2278 msgid "Remaining seconds" msgstr "Secondes restantes" -#: models.py:2172 +#: models.py:2283 msgid "Import" msgstr "Import" -#: models.py:2189 +#: models.py:2300 msgid "Analyse" msgstr "Analyser" -#: models.py:2191 models.py:2194 +#: models.py:2302 models.py:2305 msgid "Re-analyse" msgstr "Analyser de nouveau " -#: models.py:2192 +#: models.py:2303 msgid "Launch import" msgstr "Lancer l'import" -#: models.py:2195 +#: models.py:2306 msgid "Re-import" msgstr "Ré-importer" -#: models.py:2196 +#: models.py:2307 msgid "Archive" msgstr "Archiver" -#: models.py:2198 +#: models.py:2309 msgid "Unarchive" msgstr "Désarchiver" -#: models.py:2199 widgets.py:130 templates/ishtar/form_delete.html:11 +#: models.py:2310 widgets.py:130 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "Supprimer" -#: models.py:2340 +#: models.py:2451 msgid "Organizations" msgstr "Organisations" -#: models.py:2342 +#: models.py:2453 msgid "Can view all Organizations" msgstr "Peut voir toutes les Organisations" -#: models.py:2343 +#: models.py:2454 msgid "Can view own Organization" msgstr "Peut voir sa propre Organisation" -#: models.py:2344 +#: models.py:2455 msgid "Can add own Organization" msgstr "Peut ajouter sa propre Organisation" -#: models.py:2346 +#: models.py:2457 msgid "Can change own Organization" msgstr "Peut modifier sa propre Organisation" -#: models.py:2348 +#: models.py:2459 msgid "Can delete own Organization" msgstr "Peut supprimer sa propre Organisation" -#: models.py:2383 +#: models.py:2494 msgid "Groups" msgstr "Groupes" -#: models.py:2388 +#: models.py:2499 msgid "Person types" msgstr "Types de personne" -#: models.py:2399 -msgid "Title type" -msgstr "Type de titre" - -#: models.py:2400 +#: models.py:2511 msgid "Title types" msgstr "Types de titre" -#: models.py:2409 +#: models.py:2520 msgid "Mr" msgstr "M." -#: models.py:2410 +#: models.py:2521 msgid "Miss" msgstr "Mlle" -#: models.py:2411 +#: models.py:2522 msgid "Mr and Mrs" msgstr "M. et Mme" -#: models.py:2412 +#: models.py:2523 msgid "Mrs" msgstr "Mme" -#: models.py:2413 +#: models.py:2524 msgid "Doctor" msgstr "Dr." -#: models.py:2443 +#: models.py:2557 msgid "Contact type" msgstr "Type de contact" -#: models.py:2446 models.py:2510 +#: models.py:2560 models.py:2624 msgid "Types" msgstr "Types" -#: models.py:2449 +#: models.py:2563 msgid "Is attached to" msgstr "Est rattaché à" -#: models.py:2454 +#: models.py:2568 msgid "Persons" msgstr "Personnes" -#: models.py:2456 +#: models.py:2570 msgid "Can view all Persons" msgstr "Peut voir toutes les Personnes" -#: models.py:2457 +#: models.py:2571 msgid "Can view own Person" msgstr "Peut voir sa propre Personne" -#: models.py:2458 +#: models.py:2572 msgid "Can add own Person" msgstr "Peut ajouter sa propre Personne" -#: models.py:2459 +#: models.py:2573 msgid "Can change own Person" msgstr "Peut modifier sa propre Personne" -#: models.py:2460 +#: models.py:2574 msgid "Can delete own Person" msgstr "Peut supprimer sa propre Personne" -#: models.py:2638 +#: models.py:2752 msgid "Advanced shortcut menu" msgstr "Menu de raccourci (avancé)" -#: models.py:2641 +#: models.py:2755 msgid "Ishtar user" msgstr "Utilisateur d'Ishtar" -#: models.py:2642 +#: models.py:2756 msgid "Ishtar users" msgstr "Utilisateurs d'Ishtar" -#: models.py:2684 +#: models.py:2798 msgid "To modify the password use the form in Auth > User" msgstr "" "Pour modifier le mot de passe, utilisez le formulaire dans Authentification " "> Utilisateurs" -#: models.py:2690 +#: models.py:2804 msgid "Author types" msgstr "Types d'auteur" -#: models.py:2722 +#: models.py:2836 msgid "Source types" msgstr "Types de document" -#: models.py:2730 +#: models.py:2844 msgid "Support types" msgstr "Types de support" -#: models.py:2738 +#: models.py:2852 msgid "Formats" msgstr "Formats" -#: models.py:2745 +#: models.py:2859 msgid "External ID" msgstr "Identifiant externe" -#: models.py:2748 +#: models.py:2862 msgid "Support" msgstr "Support" -#: models.py:2752 +#: models.py:2866 msgid "Scale" msgstr "Échelle" -#: models.py:2766 +#: models.py:2880 msgid "Item number" msgstr "Numéro d'élément" -#: models.py:2767 +#: models.py:2881 msgid "Ref." msgstr "Réf." -#: models.py:2770 +#: models.py:2884 msgid "Internal ref." msgstr "Réf. interne" -#: models.py:2813 +#: models.py:2927 msgid "Surface (m2)" msgstr "Surface (m2)" -#: models.py:2814 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2928 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "Localisation" -#: models.py:2839 +#: models.py:2953 msgid "Is preventive" msgstr "Est du préventif" -#: models.py:2843 +#: models.py:2957 msgid "Operation types" msgstr "Types d'opération" -#: models.py:2872 +#: models.py:2986 msgid "Preventive" msgstr "Préventif" -#: models.py:2873 +#: models.py:2987 msgid "Research" msgstr "Programmé" -#: models.py:2895 -msgid "SRID" -msgstr "SRID" +#: models.py:3010 +msgid "Authority name" +msgstr "Registre" -#: models.py:2898 -msgid "Spatial reference system" -msgstr "Système de référence spatiale" +#: models.py:3011 +msgid "Authority SRID" +msgstr "SRID" -#: models.py:2899 +#: models.py:3015 msgid "Spatial reference systems" msgstr "Systèmes de référence spatiale" -#: utils.py:83 +#: utils.py:84 msgid " (...)" msgstr " (...)" -#: utils.py:116 +#: utils.py:130 msgid "Load another random image?" msgstr "Charger une autre image au hasard ?" -#: views.py:114 +#: views.py:118 msgid "New person" msgstr "Ajouter une personne" -#: views.py:122 +#: views.py:126 msgid "Person modification" msgstr "Modifier une personne" -#: views.py:137 +#: views.py:141 msgid "Person deletion" msgstr "Supprimer une personne" -#: views.py:148 +#: views.py:152 msgid "New organization" msgstr "Ajouter une organisation" -#: views.py:155 +#: views.py:159 msgid "Organization modification" msgstr "Modifier une organisation" -#: views.py:171 +#: views.py:175 msgid "Organization deletion" msgstr "Supprimer une organisation" -#: views.py:178 +#: views.py:182 msgid "Account management" msgstr "Gérer les comptes" -#: views.py:184 +#: views.py:188 msgid "Account deletion" msgstr "Supprimer un compte" -#: views.py:236 +#: views.py:240 msgid "Archaeological file" msgstr "Dossier" -#: views.py:239 +#: views.py:243 msgid "Context record" msgstr "Unité d'Enregistrement" -#: views.py:241 +#: views.py:245 msgid "Find" msgstr "Mobilier" -#: views.py:243 +#: views.py:247 msgid "Treatment request" msgstr "Demande de traitement" -#: views.py:244 +#: views.py:248 msgid "Treatment" msgstr "Traitement" -#: views.py:1285 views.py:1328 +#: views.py:1303 views.py:1346 msgid "Operation not permitted." msgstr "Opération non permise." -#: views.py:1287 +#: views.py:1305 #, python-format msgid "New %s" msgstr "Nouveau %s" -#: views.py:1347 views.py:1400 +#: views.py:1365 views.py:1418 msgid "Operations" msgstr "Opérations" -#: views.py:1351 views.py:1407 +#: views.py:1369 views.py:1425 msgid "Finds" msgstr "Mobilier" -#: views.py:1600 templates/ishtar/import_list.html:43 +#: views.py:1618 templates/ishtar/import_list.html:43 msgid "Link unmatched items" msgstr "Associer les éléments non rapprochés" -#: views.py:1615 +#: views.py:1633 msgid "Delete import" msgstr "Supprimer un import" -#: views.py:1654 +#: views.py:1672 msgid "Merge persons" msgstr "Fusionner des personnes" -#: views.py:1678 +#: views.py:1696 msgid "Select the main person" msgstr "Choisir la personne principale" -#: views.py:1687 +#: views.py:1705 msgid "Merge organization" msgstr "Fusionner des organisations" -#: views.py:1697 +#: views.py:1715 msgid "Select the main organization" msgstr "Sélectionner l'organisation principale" -#: views.py:1737 views.py:1753 +#: views.py:1755 views.py:1771 msgid "Corporation manager" msgstr "Représentant de la personne morale" @@ -1555,15 +1626,15 @@ msgstr "Chargement..." msgid "Remove" msgstr "Enlever" -#: wizards.py:342 templates/ishtar/import_delete.html:20 +#: wizards.py:343 templates/ishtar/import_delete.html:20 msgid "Yes" msgstr "Oui" -#: wizards.py:344 +#: wizards.py:345 msgid "No" msgstr "Non" -#: wizards.py:1313 +#: wizards.py:1338 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "[%(app_name)s] Création/modification du compte" @@ -1630,13 +1701,13 @@ msgstr "Changement de mot de passe" msgid "Log in" msgstr "Connexion" -#: templates/base.html:59 -msgid "Lang" -msgstr "Langue" +#: templates/base.html:82 +msgid "Current items" +msgstr "Éléments courants" -#: templates/base.html:59 templates/base.html.py:83 templates/welcome.html:8 -#: templates/welcome.html.py:9 templates/welcome.html:10 -#: templates/welcome.html.py:11 templates/ishtar/manage_basket.html:4 +#: templates/base.html:84 templates/welcome.html:8 templates/welcome.html.py:9 +#: templates/welcome.html:10 templates/welcome.html.py:11 +#: templates/ishtar/manage_basket.html:4 #: templates/ishtar/blocks/window_field.html:1 #: templates/ishtar/blocks/window_field_detail.html:1 #: templates/ishtar/blocks/window_field_multiple.html:1 @@ -1644,23 +1715,19 @@ msgstr "Langue" msgid ":" msgstr " :" -#: templates/base.html:81 -msgid "Current items" -msgstr "Éléments courants" - -#: templates/base.html:115 +#: templates/base.html:120 msgid "Processing..." msgstr "En traitement..." -#: templates/base.html:116 +#: templates/base.html:121 msgid "This can be long." msgstr "Cela peut être long." -#: templates/base.html:117 +#: templates/base.html:122 msgid "Time to take a coffee?" msgstr "Il est peut-être temps de prendre un café ?" -#: templates/base.html:118 +#: templates/base.html:123 msgid "Time to take another coffee?" msgstr "Pourquoi pas un autre café ?" @@ -2276,6 +2343,15 @@ msgstr "Rafraîchir le menu" msgid "Unpin" msgstr "Désépingler" +#: templates/ishtar/blocks/footer.html:2 +#, python-format +msgid "" +"Powered by <a href=\"https://ishtar-archeo.net/\">Ishtar</a> v%(VERSION)s - " +"a free software under AGPL v3 license." +msgstr "" +"Propulsé par <a href=\"https://ishtar-archeo.net/\">Ishtar</a> v%(VERSION)s -" +" logiciel libre sous licence AGPL v3." + #: templates/ishtar/blocks/window_nav.html:6 msgid "Previous version" msgstr "Version précédente" @@ -2429,7 +2505,7 @@ msgstr "Voulez-vous sauvegarder ces informations ?" msgid "Add/Modify" msgstr "Ajouter/Modifier" -#: templates/ishtar/wizard/default_wizard.html:59 +#: templates/ishtar/wizard/default_wizard.html:64 msgid "" "The form has changed. If you don't validate it, all your changes will be " "lost." diff --git a/version.py b/version.py index b8f044176..5ba0bab42 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 99, 7, 2) +VERSION = (0, 99, 8) def get_version(): |