From 775feabac583813e7f21d335d0809fdac7c5dd65 Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Thu, 9 Mar 2017 23:41:10 +0100 Subject: Finds table: add new fields and reorder --- archaeological_finds/models_finds.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 5c28d1a69..eb88371ea 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -481,17 +481,16 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): CHECK_DICT = dict(CHECK_CHOICES) SHOW_URL = 'show-find' SLUG = 'find' - TABLE_COLS = ['label', 'material_types__label', 'datings__period__label', - 'base_finds__context_record__parcel__town', - 'base_finds__context_record__operation__year', - 'base_finds__context_record__operation__operation_code', + TABLE_COLS = ['label', 'base_finds__context_record__parcel__town', + 'base_finds__context_record__operation__common_name', + 'base_finds__context_record__parcel', + 'base_finds__context_record__label', + 'material_types__label', 'object_types', 'datings__period__label', 'container__cached_label', - 'base_finds__batch', - 'base_finds__context_record__parcel__town', - 'base_finds__context_record__parcel', ] + 'base_finds__batch', ] if settings.COUNTRY == 'fr': TABLE_COLS.insert( - 6, 'base_finds__context_record__operation__code_patriarche') + 1, 'base_finds__context_record__operation__code_patriarche') TABLE_COLS_FOR_OPE = [ 'base_finds__cache_short_id', 'base_finds__cache_complete_id', @@ -502,6 +501,7 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): 'base_finds__context_record__parcel__town', 'base_finds__context_record__parcel', ] COL_LABELS = { + 'base_finds__context_record__label': _(u"Context record"), 'datings__period__label': _(u"Periods"), 'container__cached_label': _(u"Container"), 'material_types__label': _(u"Material types"), -- cgit v1.2.3 From f10181c013adb11a3629ccf2905f8bf1d0ec1433 Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Fri, 10 Mar 2017 00:07:23 +0100 Subject: Context records table: add new fields and reorder --- archaeological_context_records/models.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 1ec32ea83..2b43635ac 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -144,9 +144,8 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, ValueGetter, ShortMenuItem): SHOW_URL = 'show-contextrecord' SLUG = 'contextrecord' - TABLE_COLS = ['parcel__town__name', 'operation__year', - 'operation__operation_code', - 'label', 'unit'] + TABLE_COLS = ['label', 'parcel__town__name', 'operation__common_name', + 'parcel__label', 'unit'] if settings.COUNTRY == 'fr': TABLE_COLS.insert(1, 'operation__code_patriarche') TABLE_COLS_FOR_OPE = ['label', 'parcel', 'unit', -- cgit v1.2.3 From e2321b650989bfb79975a6ba5b6758d36d0189d0 Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Fri, 10 Mar 2017 15:45:34 +0100 Subject: Update labels --- archaeological_warehouse/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 81660bf43..91184c907 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -114,8 +114,8 @@ class Collection(LightHistorizedItem): class WarehouseDivision(GeneralType): class Meta: - verbose_name = _(u"Warehouse division") - verbose_name_plural = _(u"Warehouse divisions") + verbose_name = _(u"Warehouse division type") + verbose_name_plural = _(u"Warehouse division types") post_save.connect(post_save_cache, sender=WarehouseDivision) post_delete.connect(post_save_cache, sender=WarehouseDivision) -- cgit v1.2.3 From e3a1f1aa0d0aa05f8f969adb3e40701aaa9ad39f Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Mar 2017 12:16:20 +0100 Subject: Imports: add a name (refs #3452) --- ishtar_common/admin.py | 2 +- ishtar_common/forms_common.py | 2 +- .../migrations/0074_auto__add_field_import_name.py | 494 +++++++++++++++++++++ ishtar_common/models.py | 5 +- ishtar_common/templates/ishtar/import_delete.html | 33 +- ishtar_common/templates/ishtar/import_list.html | 6 +- 6 files changed, 521 insertions(+), 21 deletions(-) create mode 100644 ishtar_common/migrations/0074_auto__add_field_import_name.py diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index 3460c4a75..cdff25439 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -274,7 +274,7 @@ admin.site.register(models.FormaterType, FormaterTypeAdmin) class ImportAdmin(admin.ModelAdmin): - list_display = ('importer_type', 'imported_file', 'user', 'state', + list_display = ('name', 'importer_type', 'imported_file', 'user', 'state', 'creation_date') admin.site.register(models.Import, ImportAdmin) diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 0ce87025c..078ccfb15 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -105,7 +105,7 @@ class NewItemForm(forms.Form): class NewImportForm(forms.ModelForm): class Meta: model = models.Import - fields = ('importer_type', 'imported_file', 'imported_images', + fields = ('name', 'importer_type', 'imported_file', 'imported_images', 'conservative_import', 'encoding', 'skip_lines') def clean(self): diff --git a/ishtar_common/migrations/0074_auto__add_field_import_name.py b/ishtar_common/migrations/0074_auto__add_field_import_name.py new file mode 100644 index 000000000..8374ce83f --- /dev/null +++ b/ishtar_common/migrations/0074_auto__add_field_import_name.py @@ -0,0 +1,494 @@ +# -*- 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 field 'Import.name' + db.add_column('ishtar_common_import', 'name', + self.gf('django.db.models.fields.CharField')(max_length=500, null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Import.name' + db.delete_column('ishtar_common_import', 'name') + + + 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': {'ordering': "['label']", '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': {'ordering': "['label']", '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'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500', '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'}), + 'export_field_name': ('django.db.models.fields.CharField', [], {'max_length': '200', '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.importermodel': { + 'Meta': {'ordering': "('name',)", 'object_name': 'ImporterModel'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'klass': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}) + }, + 'ishtar_common.importertype': { + 'Meta': {'ordering': "('name',)", 'object_name': 'ImporterType'}, + 'associated_models': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.ImporterModel']"}), + 'created_models': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.ImporterModel']"}), + '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': {'ordering': "['label']", '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'] \ No newline at end of file diff --git a/ishtar_common/models.py b/ishtar_common/models.py index a2341abdc..3b3f9d141 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2276,6 +2276,8 @@ ENCODINGS = [(settings.ENCODING, settings.ENCODING), class Import(models.Model): user = models.ForeignKey('IshtarUser') + name = models.CharField(_(u"Name"), max_length=500, + blank=True, null=True) importer_type = models.ForeignKey(ImporterType) imported_file = models.FileField( _(u"Imported file"), upload_to="upload/imports/", max_length=220) @@ -2313,8 +2315,7 @@ class Import(models.Model): verbose_name_plural = _(u"Imports") def __unicode__(self): - return u"%s - %s - %d" % (unicode(self.importer_type), - unicode(self.user), self.pk) + return u"{} | {}".format(self.name or u"-", self.importer_type) def need_matching(self): return bool(TargetKey.objects.filter(associated_import=self, diff --git a/ishtar_common/templates/ishtar/import_delete.html b/ishtar_common/templates/ishtar/import_delete.html index 30217bf8d..4b48ebc8c 100644 --- a/ishtar_common/templates/ishtar/import_delete.html +++ b/ishtar_common/templates/ishtar/import_delete.html @@ -4,21 +4,22 @@ {% block content %}

{{page_name}}

-
{% csrf_token %} -

{% trans "The current items are linked to this import:" %}

-{% for accessor, imported in object.get_all_imported %} -{% ifchanged imported|verbose_model_name %} -{% if forloop.counter %}{% endif %} -

{{imported|verbose_model_name}}

-
    -{%endifchanged%} -
  • {{imported}}
    • -{% endfor %} -
-

{% trans "All these items will be deleted with this import." %}

-{% trans "Are you sure?" %} - -
-

{% trans "Back" %}

+

{{object}}

+
{% csrf_token %} +

{% trans "The current items are linked to this import:" %}

+ {% for accessor, imported in object.get_all_imported %} + {% ifchanged imported|verbose_model_name %} + {% if forloop.counter %}{% endif %} +

{{imported|verbose_model_name}}

+
    + {%endifchanged%} +
  • {{imported}}
    • + {% endfor %} +
+

{% trans "All these items will be deleted with this import." %}

+ {% trans "Are you sure?" %} + +
+

{% trans "Back" %}

{% endblock %} diff --git a/ishtar_common/templates/ishtar/import_list.html b/ishtar_common/templates/ishtar/import_list.html index 55a4ea883..a33786f6b 100644 --- a/ishtar_common/templates/ishtar/import_list.html +++ b/ishtar_common/templates/ishtar/import_list.html @@ -8,8 +8,9 @@

{% trans "No pending imports." %}

{% else %}
{% csrf_token %} - +
+ @@ -18,6 +19,9 @@ {% for import in object_list %} + -- cgit v1.2.3 From ac840acf81be5a2b002948cfd92871112ba40567 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Mar 2017 12:40:11 +0100 Subject: Imports: admin can see all imports (refs #3450) --- ishtar_common/static/media/style.css | 2 ++ ishtar_common/templates/ishtar/import_list.html | 2 +- ishtar_common/views.py | 21 +++++++++++++-------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 06c80c194..2fd56f697 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -1490,6 +1490,7 @@ table.table-form td input{ margin: 10px 0 10px 0; width: 100%; box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2); + border-collapse: collapse; } .clean-table h4{ @@ -1526,6 +1527,7 @@ table.table-form td input{ background: #DA2D2D; text-align: center; padding: 0.2em 0.4em; + border-right: 1px solid #fff; } .clean-table tr th.sub { diff --git a/ishtar_common/templates/ishtar/import_list.html b/ishtar_common/templates/ishtar/import_list.html index a33786f6b..5dba51b6f 100644 --- a/ishtar_common/templates/ishtar/import_list.html +++ b/ishtar_common/templates/ishtar/import_list.html @@ -29,7 +29,7 @@ {% trans "Source file" %}
{% trans "Name" %} {% trans "Type" %} {% trans "File" context "file" %} {% trans "Creation" %}
+ {{import.name|default:"-"}} + {{import.importer_type}} - {{import.creation_date}} + {{import.creation_date}} ({{import.user}}) {{import.status}} diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 18bdc6e36..95b7689ec 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1629,9 +1629,11 @@ class ImportListView(IshtarMixin, LoginRequiredMixin, ListView): current_url = 'current_imports' def get_queryset(self): + q = self.model.objects.exclude(state='AC') + if self.request.user.is_superuser: + return q.order_by('-creation_date') user = models.IshtarUser.objects.get(pk=self.request.user.pk) - return self.model.objects.filter(user=user).exclude( - state='AC').order_by('-creation_date') + return q.filter(user=user).order_by('-creation_date') def post(self, request, *args, **kwargs): for field in request.POST: @@ -1643,10 +1645,11 @@ class ImportListView(IshtarMixin, LoginRequiredMixin, ListView): imprt = models.Import.objects.get(pk=int(field.split('-')[-1])) except (models.Import.DoesNotExist, ValueError): continue - # user can only edit his own imports - user = models.IshtarUser.objects.get(pk=self.request.user.pk) - if imprt.user != user: - continue + if not self.request.user.is_superuser: + # user can only edit his own imports + user = models.IshtarUser.objects.get(pk=self.request.user.pk) + if imprt.user != user: + continue action = request.POST[field] if action == 'D': return HttpResponseRedirect(reverse('import_delete', @@ -1665,9 +1668,11 @@ class ImportOldListView(ImportListView): current_url = 'old_imports' def get_queryset(self): + q = self.model.objects.filter(state='AC') + if self.request.user.is_superuser: + return q.order_by('-creation_date') user = models.IshtarUser.objects.get(pk=self.request.user.pk) - return self.model.objects.filter( - user=user, state='AC').order_by('-creation_date') + return q.filter(user=user).order_by('-creation_date') class ImportLinkView(IshtarMixin, LoginRequiredMixin, ModelFormSetView): -- cgit v1.2.3 From 83a5855c7bb49f0caca9b18d01579688b6490380 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Mar 2017 13:54:25 +0100 Subject: Sheets: add ishtar ID (refs #3517) --- .../templates/ishtar/sheet_contextrecord.html | 18 +++--------- archaeological_files/models.py | 5 ++++ .../templates/ishtar/sheet_file.html | 27 +++++------------- .../templates/ishtar/sheet_find.html | 32 +++++++++------------- archaeological_operations/models.py | 4 +++ .../templates/ishtar/sheet_operation.html | 3 +- .../templates/ishtar/sheet_container.html | 6 ++-- .../templates/ishtar/sheet_warehouse.html | 7 +++-- example_project/settings.py | 1 + ishtar_common/static/media/style.css | 4 +++ .../ishtar/blocks/sheet_creation_section.html | 19 +++++++++++++ .../templates/ishtar/blocks/sheet_external_id.html | 7 +++++ version.py | 2 +- 13 files changed, 76 insertions(+), 59 deletions(-) create mode 100644 ishtar_common/templates/ishtar/blocks/sheet_creation_section.html create mode 100644 ishtar_common/templates/ishtar/blocks/sheet_external_id.html diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 1c024dcfc..7ba34fd13 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -12,23 +12,13 @@

{{ item.parcel.short_label }}

{{ item.label|default:"" }}

+{% include "ishtar/blocks/sheet_external_id.html" %}
  • {{item.full_label}}
    • -
  • - - {{item.history_creator.ishtaruser.person}}
    - {{item.history_creation_date|date:"DATETIME_FORMAT"}} -     -
    • - {% if item.history_creation_date != item.last_edition_date %} -
  • - - {{item.history_modifier.ishtaruser.person}}
    - {% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %} -     -
    • - {% endif %} + + {% include "ishtar/blocks/sheet_creation_section.html" %} + {% field_li "Type" item.unit %} {% field_li_multiple "Chronology" item.datings %} {% field_li "Town" item.parcel.town %} diff --git a/archaeological_files/models.py b/archaeological_files/models.py index c8134f28f..7f37a298f 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -235,6 +235,11 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, def short_class_name(self): return _(u"FILE") + @property + def full_internal_ref(self): + return u"{}{}".format(settings.ISHTAR_FILE_PREFIX or '', + self.external_id or '') + @property def delay_date(self): cache_key, val = get_cache(self.__class__, [self.pk, 'delay_date']) diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 408edde34..bfd92eb6f 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -11,29 +11,16 @@ {% window_nav item window_id 'show-file' 'file_modify' 'show-historized-file' 'revert-file' previous next 1 %} {% endif %} +

    {{item.full_internal_ref|default:''}}

    +

    {{item.internal_reference|default:''}}

    +

    {{item.name|default:''}}

    +{% include "ishtar/blocks/sheet_external_id.html" %} +

    {% trans "General"%}

      -{% field_li "Year" item.year "" "" %} -{% field_li "Numerical reference" item.numeric_reference "" "" %} -{% field_li "Other reference" item.internal_reference %} -{% field_li "Name" item.name %} - {% field_li "Reception date" item.reception_date|date:"DATE_FORMAT" %} - -
    • - - {{item.history_creator.ishtaruser.person}}
      - {{item.history_creation_date|date:"DATETIME_FORMAT"}} -       -
      • - {% if item.history_creation_date != item.last_edition_date %} -
    • - - {{item.history_modifier.ishtaruser.person}}
      - {% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %} -       -
      • - {% endif %} + {% field_li "Reception date" item.reception_date|date:"DATE_FORMAT" %} + {% include "ishtar/blocks/sheet_creation_section.html" %} {% comment %} diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index b088f3161..7889870b9 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -15,26 +15,13 @@

      {% for base_find in item.base_finds.all %}{% if forloop.counter0 %} – {% endif %}{{base_find.short_id}}{% endfor %}

      {{ item.administrative_index|default:"" }}

      {{ item.contextrecord|default:"" }}

      - +{% include "ishtar/blocks/sheet_external_id.html" %}
        -{% field_li "Previous ID" item.previous_id %} - -
      • - - {{item.history_creator.ishtaruser.person}}
        - {{item.history_creation_date|date:"DATETIME_FORMAT"}} -         -
        • - {% if item.history_creation_date != item.last_edition_date %} -
      • - - {{item.history_modifier.ishtaruser.person}}
        - {% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %} -         -
        • - {% endif %} + {% field_li "Previous ID" item.previous_id %} + + {% include "ishtar/blocks/sheet_creation_section.html" %} {% field_li "Administrative index" item.administrative_index %} {% field_li_multiple "Material types" item.material_types %} {% field_li "Dating" item.dating %} @@ -176,9 +163,16 @@

        {% trans "Associated base finds"%}

        {% for base_find in item.base_finds.all %} +

        {{base_find.complete_id }}

        +

        {{base_find.short_id }}

        +{% if base_find.external_id %} +

        + + + {{base_find.external_id|default:''}} + +

        {% endif %}
          -{% field_li "Complete ID" base_find.complete_id %} -{% field_li "Short ID" base_find.short_id %} {% with item.history_creation_date|date:"SHORT_DATETIME_FORMAT" as creation_date %} {% with item.history_creator.ishtaruser.full_label|add:"
          "|add:creation_date|add:"" as creator %} {% field_li "Created by" creator|safe %} diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index bc2169009..ebe9ae551 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -403,6 +403,10 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms, def short_class_name(self): return _(u"OPE") + @property + def external_id(self): + return self.code_patriarche + @property def short_label(self): if settings.COUNTRY == 'fr': diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index d3eb980c4..3e89c3c39 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -20,10 +20,11 @@

          {% if item.year or item.operation_code %}{{item.year|default:''}}-{{item.operation_code|default:''}}{% endif %}{% if item.code_patriarche %} – OA{{item.code_patriarche}}{% endif %}

          {{item.common_name|default:''}}

          +{% include "ishtar/blocks/sheet_external_id.html" %}

          {% trans "General"%}

            -{% field_li "Old code" item.old_code %} + {% field_li "Old code" item.old_code %}
          • {{item.history_creator.ishtaruser.person}}
            diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html index 4a7b2f0b9..94be2fc04 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_container.html +++ b/archaeological_warehouse/templates/ishtar/sheet_container.html @@ -6,9 +6,11 @@ {% block content %} {% window_nav item window_id 'show-container' '' '' '' previous next 1 %} +

            {{ item.reference|default:"" }}

            +

            {{ item.container_type|default:"" }}

            +{% include "ishtar/blocks/sheet_external_id.html" %} +
              - {% field_li "Reference" item.reference %} - {% field_li "Container type" item.container_type %} {% field_li_detail "Responsible warehouse" item.responsible %} {% field_li_detail "Location (warehouse)" item.location %}
            diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html index 9fd022281..410108a52 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html +++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html @@ -6,10 +6,13 @@ {% block content %} {% window_nav item window_id 'show-warehouse' '' '' '' previous next 1 %} +

            {{ item.name|default:"" }}

            +

            {{ item.warehouse_type|default:"" }}

            +{% include "ishtar/blocks/sheet_external_id.html" %} +
              - {% field_li "Name" item.name %} - {% field_li "Warehouse type" item.warehouse_type %} {% field_li "Person in charge" item.person_in_charge %} + {% include "ishtar/blocks/sheet_creation_section.html" %}
            {% field "Comment" item.comment "
            " "
            " %} diff --git a/example_project/settings.py b/example_project/settings.py index b19867662..efbf0297a 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -214,6 +214,7 @@ APP_NAME = "SRA - Pays de la Loire" SURFACE_UNIT = 'square-metre' SURFACE_UNIT_LABEL = u'm²' JOINT = u" | " +ISHTAR_FILE_PREFIX = u"" ISHTAR_OPE_PREFIX = u"OA" ISHTAR_DEF_OPE_PREFIX = u"OP" # string len of find indexes - i.e: find with index 42 will be 00042 diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 2fd56f697..84ef710b2 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -1546,3 +1546,7 @@ table.table-form td input{ display: block; } +.external-id{ + font-family: monospace; + font-size: 0.9em; +} diff --git a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html new file mode 100644 index 000000000..1312cbcd5 --- /dev/null +++ b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html @@ -0,0 +1,19 @@ +{% load i18n link_to_window %} +{% if item.history_creator.ishtaruser.person %} +
          • + + {{item.history_creator.ishtaruser.person}} + {{item.history_creator.ishtaruser.person|link_to_window}}
            + {{item.history_creation_date|date:"DATETIME_FORMAT"}} +             +
            • +{% endif %} +{% if item.history_creation_date != item.last_edition_date %} +
          • + + {{item.history_modifier.ishtaruser.person}} + {{item.history_modifier.ishtaruser.person|link_to_window}}
            + {% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %} +             +
            • +{% endif %} diff --git a/ishtar_common/templates/ishtar/blocks/sheet_external_id.html b/ishtar_common/templates/ishtar/blocks/sheet_external_id.html new file mode 100644 index 000000000..95628ab15 --- /dev/null +++ b/ishtar_common/templates/ishtar/blocks/sheet_external_id.html @@ -0,0 +1,7 @@ +{% load i18n %}{% if item.external_id %} +

            + + + {{item.external_id|default:''}} + +

            {% endif %} diff --git a/version.py b/version.py index faeadf711..4d6a65db2 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 99, 15) +VERSION = (0, 99, 15, 1) def get_version(): -- cgit v1.2.3 From 5317d6b6b585d7bf6a4144871026d354fed85105 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Mar 2017 14:04:12 +0100 Subject: Sheet person: fix layout --- ishtar_common/templates/ishtar/sheet_person.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html index 5339e4f07..0d7f9621b 100644 --- a/ishtar_common/templates/ishtar/sheet_person.html +++ b/ishtar_common/templates/ishtar/sheet_person.html @@ -6,6 +6,7 @@ {% window_nav item window_id 'show-person' 'person_modify' %}

            {% trans "Identity" %}

            +
              {% field_li "Title" item.full_title %} {% field_li "Name" item.name %} {% field_li "Surname" item.surname %} @@ -13,6 +14,7 @@ {% field_li_detail "Created by" item.history_creator.ishtaruser.person %} {% field_li "Email" item.email %} {% field_li "Type(s)" item.person_types_list %} +
            {% if item.phone or item.phone2 or item.phone3 or item.mobile_phone %} -- cgit v1.2.3 From c16ab41306843a0f00dc5980cc2793134ba6d3ef Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Mar 2017 15:03:33 +0100 Subject: Sheets: improve layout --- .../templates/ishtar/sheet_operation.html | 15 +-------- .../templates/ishtar/sheet_container.html | 1 + ishtar_common/templates/ishtar/sheet_person.html | 39 ++++++++++++---------- 3 files changed, 23 insertions(+), 32 deletions(-) diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 3e89c3c39..f35954488 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -25,20 +25,7 @@

            {% trans "General"%}

              {% field_li "Old code" item.old_code %} -
            • - - {{item.history_creator.ishtaruser.person}}
              - {{item.history_creation_date|date:"DATETIME_FORMAT"}} -               -
              • - {% if item.history_creation_date != item.last_edition_date %} -
            • - - {{item.history_modifier.ishtaruser.person}}
              - {% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %} -               -
              • - {% endif %} + {% include "ishtar/blocks/sheet_creation_section.html" %} {% field_li "Begining date" item.start_date %} {% field_li "Excavation end date" item.excavation_end_date|default:"-" %} {% field_li_detail "Head scientist" item.scientist %} diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html index 94be2fc04..cd8a3602b 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_container.html +++ b/archaeological_warehouse/templates/ishtar/sheet_container.html @@ -12,6 +12,7 @@
                {% field_li_detail "Responsible warehouse" item.responsible %} + {% include "ishtar/blocks/sheet_creation_section.html" %} {% field_li_detail "Location (warehouse)" item.location %}
              {% field "Location" item.precise_location %} diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html index 0d7f9621b..8d51846b2 100644 --- a/ishtar_common/templates/ishtar/sheet_person.html +++ b/ishtar_common/templates/ishtar/sheet_person.html @@ -44,30 +44,33 @@ {% if item.address or item.postal_code or item.town %}

              {% trans "Business address" %}

              -{% field_li "Address" item.address %} -{% field_li "Address complement" item.address_complement %} -{% field_li "Postal code" item.postal_code %} -{% field_li "Town" item.town %} -{% endif %} +
                + {% field_li "Address" item.address %} + {% field_li "Address complement" item.address_complement %} + {% field_li "Postal code" item.postal_code %} + {% field_li "Town" item.town %} +
              {% endif %} {% if item.alt_address or item.alt_postal_code or item.alt_town %}

              {% trans "Other address" %}

              -{% field_li "Address" item.alt_address %} -{% field_li "Address complement" item.alt_address_complement %} -{% field_li "Postal code" item.alt_postal_code %} -{% field_li "Town" item.alt_town %} -{% endif %} +
                + {% field_li "Address" item.alt_address %} + {% field_li "Address complement" item.alt_address_complement %} + {% field_li "Postal code" item.alt_postal_code %} + {% field_li "Town" item.alt_town %} +
              {% endif %} {% if item.attached_to %}

              {% trans "Associated organization"%}

              -{% field_li "Name" item.attached_to %} -{% field_li "Address" item.attached_to.address %} -{% field_li "Address complement" item.attached_to.address_complement %} -{% field_li "Postal code" item.attached_to.postal_code %} -{% field_li "Town" item.attached_to.town %} -{% field_li "Phone" item.attached_to.phone %} -{% field_li "Mobile phone" item.attached_to.mobile_phone %} -{% endif %} +
                + {% field_li "Name" item.attached_to %} + {% field_li "Address" item.attached_to.address %} + {% field_li "Address complement" item.attached_to.address_complement %} + {% field_li "Postal code" item.attached_to.postal_code %} + {% field_li "Town" item.attached_to.town %} + {% field_li "Phone" item.attached_to.phone %} + {% field_li "Mobile phone" item.attached_to.mobile_phone %} +
              {% endif %} {% trans "Associated operations as scientist" as ao %} -- cgit v1.2.3 From e90c8378415c5ee394a220890a07615d1f4b011e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Mar 2017 15:05:01 +0100 Subject: Sheet person: link to the attached organization (refs #3469) --- ishtar_common/templates/ishtar/sheet_person.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html index 8d51846b2..aa5192dc4 100644 --- a/ishtar_common/templates/ishtar/sheet_person.html +++ b/ishtar_common/templates/ishtar/sheet_person.html @@ -63,7 +63,7 @@ {% if item.attached_to %}

              {% trans "Associated organization"%}

                - {% field_li "Name" item.attached_to %} + {% field_li_detail "Name" item.attached_to %} {% field_li "Address" item.attached_to.address %} {% field_li "Address complement" item.attached_to.address_complement %} {% field_li "Postal code" item.attached_to.postal_code %} -- cgit v1.2.3 From f24383496f378392a378c99f22695c0f2a73dc2a Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Mar 2017 15:18:13 +0100 Subject: Sheet operation: add INSEE code to towns (refs #3506) --- archaeological_operations/models.py | 4 ++++ archaeological_operations/templates/ishtar/sheet_operation.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index ebe9ae551..57338f81c 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -421,6 +421,10 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms, def show_url(self): return reverse('show-operation', args=[self.pk, '']) + def towns_codes(self): + return [u"{} ({})".format(town.name, town.numero_insee) for town in + self.towns.all()] + def has_finds(self): from archaeological_finds.models import BaseFind return BaseFind.objects.filter(context_record__operation=self).count() diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index f35954488..69e6c3ddf 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -72,7 +72,7 @@ {% if item.towns.count %}

                {% trans "Localisation"%}

                  -{% field_li_multiple "Towns" item.towns %} +{% field_li "Towns" item.towns_codes|join:" ; " %} {% field_li "Main address" item.associated_file.address %} {% field_li "Complement" item.associated_file.address_complement %} {% field_li "Postal code" item.associated_file.postal_code %} -- cgit v1.2.3 From 3f549a53ba20ecd872fc3494351309c56c1c26b5 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Mar 2017 15:25:35 +0100 Subject: Admin: add batch types (refs #3515) --- archaeological_finds/admin.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py index 988897ceb..8fd168316 100644 --- a/archaeological_finds/admin.py +++ b/archaeological_finds/admin.py @@ -104,6 +104,8 @@ admin.site.register(models.TreatmentType, TreatmentTypeAdmin) general_models = [ models.ConservatoryState, models.RemarkabilityType, models.PreservationType, models.IntegrityType, - models.TreatmentFileType, models.TreatmentState] + models.TreatmentFileType, models.TreatmentState, + models.BatchType +] for model in general_models: admin.site.register(model, GeneralTypeAdmin) -- cgit v1.2.3 From 749a5fa0444d66c8a3656edae9f0e6b6f12b9870 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Mar 2017 15:38:34 +0100 Subject: Context record: add type of excavation technics (refs #3487) --- archaeological_context_records/admin.py | 2 +- archaeological_context_records/forms.py | 10 +- ...ctype__add_field_contextrecord_excavation_te.py | 690 +++++++++++++++++++++ archaeological_context_records/models.py | 12 + .../templates/ishtar/sheet_contextrecord.html | 7 +- 5 files changed, 716 insertions(+), 5 deletions(-) create mode 100644 archaeological_context_records/migrations/0030_auto__add_excavationtechnictype__add_field_contextrecord_excavation_te.py diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py index 2f6bb3291..e3d627ca8 100644 --- a/archaeological_context_records/admin.py +++ b/archaeological_context_records/admin.py @@ -78,7 +78,7 @@ admin.site.register(models.IdentificationType, IdentificationTypeAdmin) general_models = [models.DatingType, models.DatingQuality, - models.ActivityType] + models.ActivityType, models.ExcavationTechnicType] for model in general_models: admin.site.register(model, GeneralTypeAdmin) diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 953d33417..2506ae857 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -130,7 +130,8 @@ class RecordFormSelection(forms.Form): class RecordFormGeneral(ManageOldType, forms.Form): form_label = _("General") file_upload = True - associated_models = {'parcel': Parcel, 'unit': models.Unit} + associated_models = {'parcel': Parcel, 'unit': models.Unit, + 'excavation_technic': models.ExcavationTechnicType} pk = forms.IntegerField(required=False, widget=forms.HiddenInput) operation_id = forms.IntegerField(widget=forms.HiddenInput) parcel = forms.ChoiceField(label=_("Parcel"), choices=[]) @@ -140,6 +141,8 @@ class RecordFormGeneral(ManageOldType, forms.Form): widget=forms.Textarea, required=False) comment = forms.CharField(label=_(u"General comment"), widget=forms.Textarea, required=False) + excavation_technic = forms.ChoiceField( + label=_(u"Excavation technic"), choices=[], required=False) length = forms.FloatField(label=_(u"Length (m)"), required=False) width = forms.FloatField(label=_(u"Width (m)"), required=False) thickness = forms.FloatField(label=_(u"Thickness (m)"), required=False) @@ -208,6 +211,11 @@ class RecordFormGeneral(ManageOldType, forms.Form): self.fields['unit'].choices = models.Unit.get_types( initial=self.init_data.get('unit')) self.fields['unit'].help_text = models.Unit.get_help() + self.fields['excavation_technic'].choices = \ + models.ExcavationTechnicType.get_types( + initial=self.init_data.get('excavation_technic')) + self.fields['excavation_technic'].help_text = \ + models.ExcavationTechnicType.get_help() def clean(self): # manage unique context record ID diff --git a/archaeological_context_records/migrations/0030_auto__add_excavationtechnictype__add_field_contextrecord_excavation_te.py b/archaeological_context_records/migrations/0030_auto__add_excavationtechnictype__add_field_contextrecord_excavation_te.py new file mode 100644 index 000000000..3a4097451 --- /dev/null +++ b/archaeological_context_records/migrations/0030_auto__add_excavationtechnictype__add_field_contextrecord_excavation_te.py @@ -0,0 +1,690 @@ +# -*- 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 'ExcavationTechnicType' + db.create_table('archaeological_context_records_excavationtechnictype', ( + ('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)), + )) + db.send_create_signal('archaeological_context_records', ['ExcavationTechnicType']) + + # Adding field 'ContextRecord.excavation_technic' + db.add_column('archaeological_context_records_contextrecord', 'excavation_technic', + self.gf('django.db.models.fields.related.ForeignKey')(to=orm['archaeological_context_records.ExcavationTechnicType'], null=True, blank=True), + keep_default=False) + + # Adding field 'HistoricalContextRecord.excavation_technic_id' + db.add_column('archaeological_context_records_historicalcontextrecord', 'excavation_technic_id', + self.gf('django.db.models.fields.IntegerField')(db_index=True, null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting model 'ExcavationTechnicType' + db.delete_table('archaeological_context_records_excavationtechnictype') + + # Deleting field 'ContextRecord.excavation_technic' + db.delete_column('archaeological_context_records_contextrecord', 'excavation_technic_id') + + # Deleting field 'HistoricalContextRecord.excavation_technic_id' + db.delete_column('archaeological_context_records_historicalcontextrecord', 'excavation_technic_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'}), + 'excavation_technic': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.ExcavationTechnicType']", '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.excavationtechnictype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'ExcavationTechnicType'}, + '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'}), + 'excavation_technic_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', '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', 'label')", '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': {'ordering': "['label']", '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': {'ordering': "['label']", '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'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500', '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.importermodel': { + 'Meta': {'ordering': "('name',)", 'object_name': 'ImporterModel'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'klass': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}) + }, + 'ishtar_common.importertype': { + 'Meta': {'ordering': "('name',)", 'object_name': 'ImporterType'}, + 'associated_models': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.ImporterModel']"}), + 'created_models': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.ImporterModel']"}), + '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': {'ordering': "['label']", '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 2b43635ac..04ca358e3 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -120,6 +120,15 @@ post_save.connect(post_save_cache, sender=IdentificationType) post_delete.connect(post_save_cache, sender=IdentificationType) +class ExcavationTechnicType(GeneralType): + class Meta: + verbose_name = _(u"Excavation technic type") + verbose_name_plural = _(u"Excavation technic types") + ordering = ('label',) +post_save.connect(post_save_cache, sender=ExcavationTechnicType) +post_delete.connect(post_save_cache, sender=ExcavationTechnicType) + + class CRBulkView(object): CREATE_SQL = """ CREATE VIEW context_records_cached_label_bulk_update @@ -240,6 +249,9 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, verbose_name=_(u"Identification"),) activity = models.ForeignKey(ActivityType, blank=True, null=True, verbose_name=_(u"Activity"),) + excavation_technic = models.ForeignKey( + ExcavationTechnicType, blank=True, null=True, + verbose_name=_(u"Excavation technic")) related_context_records = models.ManyToManyField( 'ContextRecord', through='RecordRelations', blank=True, null=True) point = models.PointField(_(u"Point"), blank=True, null=True, dim=3) diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 7ba34fd13..3f19289e0 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -19,9 +19,10 @@ {% include "ishtar/blocks/sheet_creation_section.html" %} -{% field_li "Type" item.unit %} -{% field_li_multiple "Chronology" item.datings %} -{% field_li "Town" item.parcel.town %} + {% field_li "Type" item.unit %} + {% field_li "Excavation technic" item.excavation_technic %} + {% field_li_multiple "Chronology" item.datings %} + {% field_li "Town" item.parcel.town %}
                {% field "Comment on datings" item.datings_comment "
                " "
                " %} -- cgit v1.2.3 From f0efbc44b9dfbd648c17b4d82937e725431cdf5b Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Mar 2017 16:25:20 +0100 Subject: Operation: add a location field (refs #3508) --- archaeological_operations/forms.py | 6 +- ...operation_address__add_field_operation_addre.py | 852 +++++++++++++++++++++ archaeological_operations/models.py | 1 + .../templates/ishtar/sheet_operation.html | 3 +- 4 files changed, 860 insertions(+), 2 deletions(-) create mode 100644 archaeological_operations/migrations/0065_auto__add_field_historicaloperation_address__add_field_operation_addre.py diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index f9f1095be..27ab4670a 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -465,6 +465,8 @@ class OperationSelect(TableSelect): label=_(u"Department"), choices=[]) common_name = forms.CharField(label=_(u"Name"), max_length=30) + address = forms.CharField(label=_(u"Address / Locality"), + max_length=100) operation_type = forms.ChoiceField(label=_(u"Operation type"), choices=[]) end_date = forms.NullBooleanField(label=_(u"Is open?")) @@ -746,7 +748,9 @@ class OperationFormGeneral(ManageOldType, forms.Form): widget=OAWidget, required=False) common_name = forms.CharField(label=_(u"Generic name"), required=False, - max_length=120, widget=forms.Textarea) + max_length=500, widget=forms.Textarea) + address = forms.CharField(label=_(u"Address / Locality"), required=False, + max_length=500, widget=forms.Textarea) operation_type = forms.ChoiceField(label=_(u"Operation type"), choices=[]) year = forms.IntegerField(label=_(u"Year"), diff --git a/archaeological_operations/migrations/0065_auto__add_field_historicaloperation_address__add_field_operation_addre.py b/archaeological_operations/migrations/0065_auto__add_field_historicaloperation_address__add_field_operation_addre.py new file mode 100644 index 000000000..8626cfcf4 --- /dev/null +++ b/archaeological_operations/migrations/0065_auto__add_field_historicaloperation_address__add_field_operation_addre.py @@ -0,0 +1,852 @@ +# -*- 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 field 'HistoricalOperation.address' + db.add_column('archaeological_operations_historicaloperation', 'address', + self.gf('django.db.models.fields.TextField')(null=True, blank=True), + keep_default=False) + + # Adding field 'Operation.address' + db.add_column('archaeological_operations_operation', 'address', + self.gf('django.db.models.fields.TextField')(null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'HistoricalOperation.address' + db.delete_column('archaeological_operations_historicaloperation', 'address') + + # Deleting field 'Operation.address' + db.delete_column('archaeological_operations_operation', 'address') + + + models = { + '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.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.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.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.historicaladministrativeact': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalAdministrativeAct'}, + 'act_object': ('django.db.models.fields.TextField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'act_type_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'associated_file_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'departments_label': ('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'}), + 'in_charge_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'operation_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'operator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'ref_sra': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}), + 'scientist_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'signatory_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'signature_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'towns_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'treatment_file_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'treatment_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.historicaloperation': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalOperation'}, + 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'associated_file_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + '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_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'code_patriarche': ('django.db.models.fields.IntegerField', [], {'db_index': '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_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'}), + 'in_charge_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + '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_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'operator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'operator_reference': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), + 'optional_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + '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'}), + 'report_delivery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'report_processing_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', '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_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + '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'}), + '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.operation': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'Operation'}, + 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address': ('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.operationbydepartment': { + 'Meta': {'object_name': 'OperationByDepartment', 'db_table': "'operation_department'", 'managed': 'False'}, + 'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'operation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Operation']"}) + }, + 'archaeological_operations.operationsource': { + 'Meta': {'object_name': 'OperationSource'}, + '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': "'operationsource_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'}), + 'index': ('django.db.models.fields.IntegerField', [], {'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'}), + 'operation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_operations.Operation']"}), + 'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + '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_operations.operationtypeold': { + 'Meta': {'ordering': "['-preventive', 'order', 'label']", 'object_name': 'OperationTypeOld'}, + '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'}) + }, + '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.parcelowner': { + 'Meta': {'object_name': 'ParcelOwner'}, + 'end_date': ('django.db.models.fields.DateField', [], {}), + '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_parcelowner'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parcel_owner'", 'to': "orm['ishtar_common.Person']"}), + 'parcel': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owners'", 'to': "orm['archaeological_operations.Parcel']"}), + 'start_date': ('django.db.models.fields.DateField', [], {}) + }, + '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.recordrelations': { + 'Meta': {'ordering': "('left_record', 'relation_type')", '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_operations.Operation']"}), + 'relation_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.RelationType']"}), + 'right_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'left_relations'", 'to': "orm['archaeological_operations.Operation']"}) + }, + 'archaeological_operations.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_operations.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_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.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': {'ordering': "['label']", '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': {'ordering': "['label']", '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'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500', '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.importermodel': { + 'Meta': {'ordering': "('name',)", 'object_name': 'ImporterModel'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'klass': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}) + }, + 'ishtar_common.importertype': { + 'Meta': {'ordering': "('name',)", 'object_name': 'ImporterType'}, + 'associated_models': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.ImporterModel']"}), + 'created_models': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.ImporterModel']"}), + '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': {'ordering': "['label']", '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_operations'] \ No newline at end of file diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 57338f81c..06a5fc0ff 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -331,6 +331,7 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms, operator_reference = models.CharField( _(u"Operator reference"), max_length=20, null=True, blank=True) common_name = models.TextField(_(u"Generic name"), null=True, blank=True) + address = models.TextField(_(u"Address / Locality"), null=True, blank=True) comment = models.TextField(_(u"General comment"), null=True, blank=True) scientific_documentation_comment = models.TextField( _(u"Comment about scientific documentation"), null=True, blank=True) diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 69e6c3ddf..19fdc930a 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -19,7 +19,8 @@

                {% if item.year or item.operation_code %}{{item.year|default:''}}-{{item.operation_code|default:''}}{% endif %}{% if item.code_patriarche %} – OA{{item.code_patriarche}}{% endif %}

                -

                {{item.common_name|default:''}}

                +

                {{item.common_name|default:''}}

                +

                {{item.address|default:''}}

                {% include "ishtar/blocks/sheet_external_id.html" %}

                {% trans "General"%}

                -- cgit v1.2.3 From 7064eb09e1548633d991b501b13d59469339fb46 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Mar 2017 17:02:11 +0100 Subject: Sources: ordering author by author type (refs #3359) --- .../0075_auto__add_field_authortype_order.py | 495 +++++++++++++++++++++ ishtar_common/models.py | 4 +- ishtar_common/templatetags/link_to_window.py | 2 +- 3 files changed, 499 insertions(+), 2 deletions(-) create mode 100644 ishtar_common/migrations/0075_auto__add_field_authortype_order.py diff --git a/ishtar_common/migrations/0075_auto__add_field_authortype_order.py b/ishtar_common/migrations/0075_auto__add_field_authortype_order.py new file mode 100644 index 000000000..e768e57de --- /dev/null +++ b/ishtar_common/migrations/0075_auto__add_field_authortype_order.py @@ -0,0 +1,495 @@ +# -*- 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 field 'AuthorType.order' + db.add_column('ishtar_common_authortype', 'order', + self.gf('django.db.models.fields.IntegerField')(default=1), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'AuthorType.order' + db.delete_column('ishtar_common_authortype', 'order') + + + 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': {'ordering': "('author_type__order', 'person__name')", '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': {'ordering': "['order', 'label']", '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'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + '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': {'ordering': "['label']", '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'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500', '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'}), + 'export_field_name': ('django.db.models.fields.CharField', [], {'max_length': '200', '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.importermodel': { + 'Meta': {'ordering': "('name',)", 'object_name': 'ImporterModel'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'klass': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}) + }, + 'ishtar_common.importertype': { + 'Meta': {'ordering': "('name',)", 'object_name': 'ImporterType'}, + 'associated_models': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.ImporterModel']"}), + 'created_models': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.ImporterModel']"}), + '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': {'ordering': "['label']", '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'] \ No newline at end of file diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 3b3f9d141..ca6ba36c9 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2843,10 +2843,11 @@ IshtarUser._meta.get_field('password').help_text = _( class AuthorType(GeneralType): + order = models.IntegerField(_(u"Order"), default=1) class Meta: verbose_name = _(u"Author type") verbose_name_plural = _(u"Author types") - ordering = ['label'] + ordering = ['order', 'label'] post_save.connect(post_save_cache, sender=AuthorType) post_delete.connect(post_save_cache, sender=AuthorType) @@ -2859,6 +2860,7 @@ class Author(models.Model): class Meta: verbose_name = _(u"Author") verbose_name_plural = _(u"Authors") + ordering = ('author_type__order', 'person__name') def __unicode__(self): return unicode(self.person) + settings.JOINT + \ diff --git a/ishtar_common/templatetags/link_to_window.py b/ishtar_common/templatetags/link_to_window.py index 0417da53f..14e4bd6c7 100644 --- a/ishtar_common/templatetags/link_to_window.py +++ b/ishtar_common/templatetags/link_to_window.py @@ -53,7 +53,7 @@ def add_links(items, extra_attr=''): else: lbl = unicode(item) html.append(u"{} {}".format(lbl, link_to_window(item_lnk))) - return mark_safe(u"
                ".join(sorted(html))) + return mark_safe(u"
                ".join(html)) @register.inclusion_tag('ishtar/blocks/modify_toolbar.html', -- cgit v1.2.3 From 0507c84856700376e06ae03b93366a7be3063771 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Mar 2017 22:29:24 +0100 Subject: Operation migration: fix regeneration of cache --- .../migrations/0061_regenerate_cached_label.py | 11 +- .../migrations/0066_regenerate_cached_label.py | 847 +++++++++++++++++++++ 2 files changed, 849 insertions(+), 9 deletions(-) create mode 100644 archaeological_operations/migrations/0066_regenerate_cached_label.py diff --git a/archaeological_operations/migrations/0061_regenerate_cached_label.py b/archaeological_operations/migrations/0061_regenerate_cached_label.py index 50a2b43fe..91beb8138 100644 --- a/archaeological_operations/migrations/0061_regenerate_cached_label.py +++ b/archaeological_operations/migrations/0061_regenerate_cached_label.py @@ -4,18 +4,11 @@ from south.db import db from south.v2 import SchemaMigration from django.db import models + class Migration(SchemaMigration): def forwards(self, orm): - from archaeological_operations.models import Operation - q = Operation.objects - nb = q.count() - sys.stdout.write("Force regenerating cache...\n") - for idx, ope in enumerate(q.all()): - sys.stdout.write("\r{}/{}".format(idx + 1, nb)) - sys.stdout.flush() - ope.skip_history_when_saving = True - ope.save() + pass def backwards(self, orm): pass diff --git a/archaeological_operations/migrations/0066_regenerate_cached_label.py b/archaeological_operations/migrations/0066_regenerate_cached_label.py new file mode 100644 index 000000000..0475b0065 --- /dev/null +++ b/archaeological_operations/migrations/0066_regenerate_cached_label.py @@ -0,0 +1,847 @@ +# -*- coding: utf-8 -*- +import sys +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + from archaeological_operations.models import Operation + q = Operation.objects + nb = q.count() + sys.stdout.write("Force regenerating cache...\n") + for idx, ope in enumerate(q.all()): + sys.stdout.write("\r{}/{}".format(idx + 1, nb)) + sys.stdout.flush() + ope.skip_history_when_saving = True + ope.save() + + def backwards(self, orm): + pass + + models = { + '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.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.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.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.historicaladministrativeact': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalAdministrativeAct'}, + 'act_object': ('django.db.models.fields.TextField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'act_type_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'associated_file_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'departments_label': ('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'}), + 'in_charge_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'operation_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'operator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'ref_sra': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}), + 'scientist_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'signatory_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'signature_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'towns_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'treatment_file_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'treatment_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.historicaloperation': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalOperation'}, + 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'associated_file_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + '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_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'code_patriarche': ('django.db.models.fields.IntegerField', [], {'db_index': '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_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'}), + 'in_charge_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + '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_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'operator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'operator_reference': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), + 'optional_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + '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'}), + 'report_delivery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'report_processing_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', '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_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + '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'}), + '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.operation': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'Operation'}, + 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address': ('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.operationbydepartment': { + 'Meta': {'object_name': 'OperationByDepartment', 'db_table': "'operation_department'", 'managed': 'False'}, + 'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'operation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Operation']"}) + }, + 'archaeological_operations.operationsource': { + 'Meta': {'object_name': 'OperationSource'}, + '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': "'operationsource_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'}), + 'index': ('django.db.models.fields.IntegerField', [], {'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'}), + 'operation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_operations.Operation']"}), + 'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + '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_operations.operationtypeold': { + 'Meta': {'ordering': "['-preventive', 'order', 'label']", 'object_name': 'OperationTypeOld'}, + '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'}) + }, + '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.parcelowner': { + 'Meta': {'object_name': 'ParcelOwner'}, + 'end_date': ('django.db.models.fields.DateField', [], {}), + '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_parcelowner'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parcel_owner'", 'to': "orm['ishtar_common.Person']"}), + 'parcel': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owners'", 'to': "orm['archaeological_operations.Parcel']"}), + 'start_date': ('django.db.models.fields.DateField', [], {}) + }, + '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.recordrelations': { + 'Meta': {'ordering': "('left_record', 'relation_type')", '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_operations.Operation']"}), + 'relation_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.RelationType']"}), + 'right_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'left_relations'", 'to': "orm['archaeological_operations.Operation']"}) + }, + 'archaeological_operations.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_operations.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_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.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': {'ordering': "('author_type__order', 'person__name')", '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': {'ordering': "['order', 'label']", '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'}), + 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + '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': {'ordering': "['label']", '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'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '500', '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.importermodel': { + 'Meta': {'ordering': "('name',)", 'object_name': 'ImporterModel'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'klass': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}) + }, + 'ishtar_common.importertype': { + 'Meta': {'ordering': "('name',)", 'object_name': 'ImporterType'}, + 'associated_models': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.ImporterModel']"}), + 'created_models': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.ImporterModel']"}), + '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': {'ordering': "['label']", '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_operations'] \ No newline at end of file -- cgit v1.2.3 From e9e03493f014a9374838d4a57ce8b995c753b6b6 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 14 Mar 2017 17:24:24 +0100 Subject: Operation sources: change headers --- archaeological_operations/models.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 06a5fc0ff..bb1f2a256 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -852,8 +852,8 @@ class OperationByDepartment(models.Model): class OperationSource(Source): SHOW_URL = 'show-operationsource' MODIFY_URL = 'operation_source_modify' - TABLE_COLS = ['operation.year', 'operation.operation_code', 'index'] + \ - Source.TABLE_COLS + TABLE_COLS = ['operation__code_patriarche', 'operation__year', + 'operation__operation_code', 'code'] + Source.TABLE_COLS # search parameters BOOL_FIELDS = ['duplicate'] @@ -868,6 +868,11 @@ class OperationSource(Source): 'operation__code_patriarche': 'operation__code_patriarche', 'operation__operation_type': 'operation__operation_type__pk', 'operation__year': 'operation__year'} + COL_LABELS = { + 'operation__year': _(u"Operation year"), + 'operation__operation_code': _(u"Operation code"), + 'code': _(u"Document code") + } # fields operation = models.ForeignKey(Operation, verbose_name=_(u"Operation"), @@ -895,6 +900,11 @@ class OperationSource(Source): def owner(self): return self.operation + @property + def code(self): + return u"{}-{:04d}".format(self.operation.code_patriarche or '', + self.index) + class ActType(GeneralType): TYPE = (('F', _(u'Archaeological file')), -- cgit v1.2.3 From 037f06b038ac3deb8c5d87c94455241cfa58f05c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 14 Mar 2017 17:49:11 +0100 Subject: Test import of files with exotic encoding (refs #3513) --- archaeological_operations/tests.py | 7 +++++-- .../tests/MCC-operations-example-bad-encoding.csv | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 archaeological_operations/tests/MCC-operations-example-bad-encoding.csv diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index 1b64f581d..52a14ce44 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -57,11 +57,11 @@ class ImportTest(object): tg.is_set = True tg.save() - def init_ope_import(self): + def init_ope_import(self, filename='MCC-operations-example.csv'): mcc_operation = ImporterType.objects.get(name=u"MCC - Opérations") mcc_operation_file = open( settings.ROOT_PATH + - '../archaeological_operations/tests/MCC-operations-example.csv', + '../archaeological_operations/tests/' + filename, 'rb') file_dict = {'imported_file': SimpleUploadedFile( mcc_operation_file.name, mcc_operation_file.read())} @@ -209,6 +209,9 @@ class ImportOperationTest(ImportTest, TestCase): self.assertEqual(last_ope, models.Operation.objects.order_by('-pk').all()[0]) + def test_import_bad_encoding(self): + self.init_ope_import('MCC-operations-example-bad-encoding.csv') + def test_keys_limitation(self): # each key association is associated to the import init_ope_number = models.Operation.objects.count() diff --git a/archaeological_operations/tests/MCC-operations-example-bad-encoding.csv b/archaeological_operations/tests/MCC-operations-example-bad-encoding.csv new file mode 100644 index 000000000..efd222ee2 --- /dev/null +++ b/archaeological_operations/tests/MCC-operations-example-bad-encoding.csv @@ -0,0 +1,3 @@ +code OA,region,type operation,intitule operation,operateur,responsable operation,date debut terrain,date fin terrain,chronologie generale,identifiant document georeferencement,notice scientifique +4201,Bourgogne,Fouille programmée,Oppìdum de Paris 2,L'opérateur,,2000/01/31,2002/12/31,Age du Fer,, +4200,Bourgogne,Fouille programmée,Oppìdum de Paris,L'opérateur,Jean Sui-Resp'on Sablé,2000/01/22,2002/12/31,Age du Fer & Gallo-Romain,, -- cgit v1.2.3 From f149232155219bdb5f9e73c580bb0e0b3d285ae8 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 14 Mar 2017 18:40:51 +0100 Subject: Dashboard: fix area unity and effective operation tables (refs #3217) --- archaeological_operations/models.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index bb1f2a256..3b06bc449 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -1666,7 +1666,7 @@ class OperationDashboard: .annotate(number=Sum('surface')).all() val = 0 if area_res: - val = area_res[0].number + val = (area_res[0].number or 0) / 10000.0 dct_res[res_key].append(val) # TODO... res_keys = [('manday_realised', current_realisation_year_ope)] @@ -1701,7 +1701,11 @@ class OperationDashboard: .annotate(area=Sum('surface'))\ .order_by('scientist__attached_to__name').all() # TODO: man-days, man-days/hectare - dct_res[res_key] = org_res + + dct_res[res_key] = [] + for vals in org_res: + vals['area'] = (vals['area'] or 0) / 10000.0 + dct_res[res_key].append(vals) year_ope = Operation.objects.filter(**operation_type) res_keys = ['org_by_year'] @@ -1736,7 +1740,7 @@ class OperationDashboard: cost=Sum('cost')) years_dct = {} for yr in org_res.all(): - area = yr['area'] if yr['area'] else 0 + area = (yr['area'] if yr['area'] else 0) / 10000.0 cost = yr['cost'] if yr['cost'] else 0 years_dct[yr[key_date]] = (area, cost) r_years = [] @@ -1767,7 +1771,8 @@ class OperationDashboard: self.survey['effective'] = [] for yr in self.years: year_res = Operation.objects\ - .filter(scientist__isnull=False, year=yr)\ + .filter(scientist__isnull=False, year=yr, + operation_type__txt_idx__in=ope_types)\ .annotate(number=Sum('surface'), mean=Avg('surface')) nb = year_res[0].number if year_res.count() else 0 nb = nb if nb else 0 @@ -1839,9 +1844,12 @@ class OperationDashboard: dct_years = {} for v in vals: values = [] - for value in (v['number'], v['area'], v['cost'], - v['fnap']): - values.append(value if value else 0) + for k in ('number', 'area', 'cost', 'fnap'): + value = v[k] or 0 + if k == 'area': + value /= 10000.0 + values.append(value) + dct_years[v['operation__year']] = values years = [] for y in self.years: -- cgit v1.2.3 From cd2854ba9d57d40ae2bd95d8926345c7d63fc2b3 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 15 Mar 2017 10:00:12 +0100 Subject: Refactoring: EXTRA_FULL_FIELDS_LABELS -> COL_LABELS (with merge) (refs #3491) --- archaeological_context_records/models.py | 22 +++++++++++----------- archaeological_finds/models_finds.py | 20 +++++++++----------- archaeological_finds/models_treatments.py | 2 +- archaeological_operations/models.py | 3 ++- ishtar_common/models.py | 2 +- ishtar_common/views.py | 8 ++++---- 6 files changed, 28 insertions(+), 29 deletions(-) diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 04ca358e3..1ffdea2f3 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -159,9 +159,17 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, TABLE_COLS.insert(1, 'operation__code_patriarche') TABLE_COLS_FOR_OPE = ['label', 'parcel', 'unit', 'datings__period__label', 'description'] - COL_LABELS = {'section__parcel_number': _(u"Parcel"), - 'datings__period__label': _(u"Periods"), - 'parcel__town__name': _(u"Town")} + COL_LABELS = { + 'datings__period__label': _(u"Periods"), + 'datings__period': _(u"Datings (period)"), + 'detailled_related_context_records': _(u"Related context records"), + 'operation__code_patriarche': u"Operation (code patriarche)", + 'parcel__external_id': _(u"Parcel (external ID)"), + 'parcel__town__name': _(u"Parcel (town)"), + 'parcel__town': _(u"Parcel (town)"), + 'parcel__year': _(u"Parcel (year)"), + 'section__parcel_number': _(u"Parcel"), + } CONTEXTUAL_TABLE_COLS = { 'full': { 'related_context_records': 'detailled_related_context_records' @@ -188,14 +196,6 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, RELATIVE_SESSION_NAMES = [ ('operation', 'operation__pk'), ('file', 'operation__associated_file__pk')] - EXTRA_FULL_FIELDS_LABELS = { - 'parcel__town': _(u"Parcel (town)"), - 'detailled_related_context_records': _(u"Related context records"), - 'operation__code_patriarche': u"Operation (code patriarche)", - 'parcel__external_id': _(u"Parcel (external ID)"), - 'datings__period': _(u"Datings (period)"), - 'parcel__year': _(u"Parcel (year)"), - } # fields external_id = models.TextField(_(u"External ID"), blank=True, null=True) diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index eb88371ea..9b4860e51 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -502,8 +502,16 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): 'base_finds__context_record__parcel', ] COL_LABELS = { 'base_finds__context_record__label': _(u"Context record"), - 'datings__period__label': _(u"Periods"), + 'base_finds__cache_short_id': _(u"Base find - Short ID"), + 'base_finds__cache_complete_id': _(u"Base find - Complete ID"), + 'base_finds__comment': _(u"Base find - Comment"), + 'base_finds__description': _(u"Base find - Description"), + 'base_finds__topographic_localisation': _(u"Base find - " + u"Topographic localisation"), + 'base_finds__special_interest': _(u"Base find - Special interest"), + 'base_finds__discovery_date': _(u"Base find - Discovery date"), 'container__cached_label': _(u"Container"), + 'datings__period__label': _(u"Periods"), 'material_types__label': _(u"Material types"), } @@ -513,16 +521,6 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): 'base_finds__topographic_localisation', 'base_finds__special_interest', 'base_finds__discovery_date'] - EXTRA_FULL_FIELDS_LABELS = { - 'base_finds__cache_short_id': _(u"Base find - Short ID"), - 'base_finds__cache_complete_id': _(u"Base find - Complete ID"), - 'base_finds__comment': _(u"Base find - Comment"), - 'base_finds__description': _(u"Base find - Description"), - 'base_finds__topographic_localisation': _(u"Base find - " - u"Topographic localisation"), - 'base_finds__special_interest': _(u"Base find - Special interest"), - 'base_finds__discovery_date': _(u"Base find - Discovery date"), - } ATTRS_EQUIV = {'get_first_base_find': 'base_finds'} # search parameters diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index 3e9077a48..dd080835e 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -285,7 +285,7 @@ class AbsFindTreatments(models.Model): treatment_nb = models.IntegerField(_(u"Order")) TABLE_COLS = ["treatment__" + col for col in Treatment.TABLE_COLS] + \ ['treatment_nb'] - EXTRA_FULL_FIELDS_LABELS = { + COL_LABELS = { 'treatment__treatment_type': _(u"Treatment type"), 'treatment__start_date': _(u"Start date"), 'treatment__end_date': _(u"End date"), diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 3b06bc449..727b29cb5 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -227,7 +227,7 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms, 'context_record__base_finds__find__upstream_treatment__id' } - EXTRA_FULL_FIELDS_LABELS = { + COL_LABELS = { 'full_code_patriarche': u"Code patriarche", 'associated_file_short_label': _(u"Associated file (label)"), 'operator__name': _(u"Operator name"), @@ -988,6 +988,7 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter): REVERSED_BOOL_FIELDS = ['index__isnull'] RELATIVE_SESSION_NAMES = [('operation', 'operation__pk'), ('file', 'associated_file__pk')] + COL_LABELS = {'full_ref': _(u"Ref.")} # fields act_type = models.ForeignKey(ActType, verbose_name=_(u"Act type")) diff --git a/ishtar_common/models.py b/ishtar_common/models.py index ca6ba36c9..35608abdf 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -102,7 +102,7 @@ class Imported(models.Model): class ValueGetter(object): _prefix = "" GET_VALUES_EXTRA = [] - EXTRA_FULL_FIELDS_LABELS = {} + COL_LABELS = {} def get_values(self, prefix=''): if not prefix: diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 95b7689ec..cbf27c8e7 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1115,9 +1115,9 @@ def get_item(model, func_name, default_name, extra_request_keys=[], for field_name in table_cols: if type(field_name) in (list, tuple): field_name = u" & ".join(field_name) - if hasattr(model, 'EXTRA_FULL_FIELDS_LABELS') and\ - field_name in model.EXTRA_FULL_FIELDS_LABELS: - field = model.EXTRA_FULL_FIELDS_LABELS[field_name] + if hasattr(model, 'COL_LABELS') and\ + field_name in model.COL_LABELS: + field = model.COL_LABELS[field_name] col_names.append(unicode(field).encode(ENCODING)) continue else: @@ -1128,7 +1128,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], logger.warning( "**WARN get_item - csv export**: no col name " "for {}\nadd explicit label to " - "EXTRA_FULL_FIELDS_LABELS attribute of " + "COL_LABELS attribute of " "{}".format(field_name, model)) continue col_names.append( -- cgit v1.2.3 From 1d8af2bea7701a1c36ac341cdc7e5b9bca490012 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 15 Mar 2017 10:20:35 +0100 Subject: Tables: add missing headers (refs #3491) --- archaeological_context_records/models.py | 3 ++- archaeological_finds/models_finds.py | 11 ++++++++++- archaeological_finds/models_treatments.py | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 1ffdea2f3..dd0f0b736 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -153,7 +153,7 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, ValueGetter, ShortMenuItem): SHOW_URL = 'show-contextrecord' SLUG = 'contextrecord' - TABLE_COLS = ['label', 'parcel__town__name', 'operation__common_name', + TABLE_COLS = ['label', 'operation__common_name', 'parcel__town__name', 'parcel__label', 'unit'] if settings.COUNTRY == 'fr': TABLE_COLS.insert(1, 'operation__code_patriarche') @@ -164,6 +164,7 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, 'datings__period': _(u"Datings (period)"), 'detailled_related_context_records': _(u"Related context records"), 'operation__code_patriarche': u"Operation (code patriarche)", + 'operation__common_name': u"Operation (name)", 'parcel__external_id': _(u"Parcel (external ID)"), 'parcel__town__name': _(u"Parcel (town)"), 'parcel__town': _(u"Parcel (town)"), diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 9b4860e51..5872a241f 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -490,7 +490,7 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): 'base_finds__batch', ] if settings.COUNTRY == 'fr': TABLE_COLS.insert( - 1, 'base_finds__context_record__operation__code_patriarche') + 2, 'base_finds__context_record__operation__code_patriarche') TABLE_COLS_FOR_OPE = [ 'base_finds__cache_short_id', 'base_finds__cache_complete_id', @@ -504,6 +504,15 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): 'base_finds__context_record__label': _(u"Context record"), 'base_finds__cache_short_id': _(u"Base find - Short ID"), 'base_finds__cache_complete_id': _(u"Base find - Complete ID"), + 'base_finds__context_record__operation__code_patriarche': _( + u"Operation (code)" + ), + 'base_finds__context_record__parcel__town': _(u"Town"), + 'base_finds__context_record__operation__common_name': _( + u"Operation (name)" + ), + 'base_finds__context_record__parcel': _(u"Parcel"), + 'base_finds__batch':_(u"Batch"), 'base_finds__comment': _(u"Base find - Comment"), 'base_finds__description': _(u"Base find - Description"), 'base_finds__topographic_localisation': _(u"Base find - " diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index dd080835e..2efedbc22 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -88,6 +88,8 @@ class Treatment(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): COL_LABELS = { "downstream_cached_label": _(u"Downstream find"), "upstream_cached_label": _(u"Upstream find"), + "treatment_types__label": _(u"Type"), + "treatment_state__label": _(u"State"), } IMAGE_PREFIX = 'treatment' # extra keys than can be passed to save method -- cgit v1.2.3 From 5123e2e09d801fa9d428d860a170fc561348a339 Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Wed, 15 Mar 2017 11:03:08 +0100 Subject: Update labels --- archaeological_context_records/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index dd0f0b736..14e98e76b 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -122,8 +122,8 @@ post_delete.connect(post_save_cache, sender=IdentificationType) class ExcavationTechnicType(GeneralType): class Meta: - verbose_name = _(u"Excavation technic type") - verbose_name_plural = _(u"Excavation technic types") + verbose_name = _(u"Excavation technique type") + verbose_name_plural = _(u"Excavation technique types") ordering = ('label',) post_save.connect(post_save_cache, sender=ExcavationTechnicType) post_delete.connect(post_save_cache, sender=ExcavationTechnicType) @@ -252,7 +252,7 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, verbose_name=_(u"Activity"),) excavation_technic = models.ForeignKey( ExcavationTechnicType, blank=True, null=True, - verbose_name=_(u"Excavation technic")) + verbose_name=_(u"Excavation technique")) related_context_records = models.ManyToManyField( 'ContextRecord', through='RecordRelations', blank=True, null=True) point = models.PointField(_(u"Point"), blank=True, null=True, dim=3) -- cgit v1.2.3 From 5dd2be142e031d21108296b601c261665d32fb7e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 15 Mar 2017 11:54:54 +0100 Subject: Sheets: mark explicitly some fields as translated fields (refs #3459) --- .../templates/ishtar/sheet_contextrecord.html | 3 ++- .../templates/ishtar/sheet_contextrecordsource.html | 3 ++- archaeological_finds/models_finds.py | 3 ++- archaeological_finds/templates/ishtar/sheet_find.html | 3 ++- archaeological_finds/templates/ishtar/sheet_findsource.html | 3 ++- .../templates/ishtar/sheet_treatmentfilesource.html | 3 ++- archaeological_finds/templates/ishtar/sheet_treatmentsource.html | 3 ++- archaeological_operations/templates/ishtar/sheet_operation.html | 3 ++- .../templates/ishtar/sheet_operationsource.html | 3 ++- ishtar_common/templates/ishtar/sheet_source.html | 6 ++++-- 10 files changed, 22 insertions(+), 11 deletions(-) diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 3f19289e0..8398a0523 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -73,7 +73,8 @@ {% endif %}
                  {% field_li "Year" item.operation.year %} -{% field_li "Numerical reference" item.operation.operation_code %} + {% trans "Numerical reference" as num_ref_label %} + {% field_li num_ref_label item.operation.operation_code %} {% field_li "Patriarche OA code" item.operation.code_patriarche %} {% field_li_detail "Head scientist" item.operation.scientist %}
                • {% if item.operation.is_active %}{% trans "Active file" %}{% else %}{%trans "Closed operation" %}{% endif %}
                  • diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecordsource.html b/archaeological_context_records/templates/ishtar/sheet_contextrecordsource.html index 253d5f047..bd6cdcdba 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecordsource.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecordsource.html @@ -8,5 +8,6 @@ {% endblock %} {% block related %} -{% field "Related context record" item.owner '' item.owner|link_to_window %} +{% trans "Related context record" as related_item_label %} +{% field related_item_label item.owner '' item.owner|link_to_window %} {% endblock %} diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 5872a241f..4ece0b286 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -485,7 +485,8 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): 'base_finds__context_record__operation__common_name', 'base_finds__context_record__parcel', 'base_finds__context_record__label', - 'material_types__label', 'object_types', 'datings__period__label', + 'material_types__label', 'object_types', + 'datings__period__label', 'container__cached_label', 'base_finds__batch', ] if settings.COUNTRY == 'fr': diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 7889870b9..df9fedb10 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -22,7 +22,8 @@ {% field_li "Previous ID" item.previous_id %} {% include "ishtar/blocks/sheet_creation_section.html" %} -{% field_li "Administrative index" item.administrative_index %} + {% trans "Administrative index" as admin_index_label %} + {% field_li admin_index_label item.administrative_index %} {% field_li_multiple "Material types" item.material_types %} {% field_li "Dating" item.dating %} {% field_li "Length (cm)" item.length %} diff --git a/archaeological_finds/templates/ishtar/sheet_findsource.html b/archaeological_finds/templates/ishtar/sheet_findsource.html index 69d14d161..fedb20911 100644 --- a/archaeological_finds/templates/ishtar/sheet_findsource.html +++ b/archaeological_finds/templates/ishtar/sheet_findsource.html @@ -8,5 +8,6 @@ {% endblock %} {% block related %} -{% field "Related find" item.owner '' item.owner|link_to_window %} +{% trans "Related find" as related_item_label %} +{% field related_item_label item.owner '' item.owner|link_to_window %} {% endblock %} diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html b/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html index e558296a8..17cc14b5b 100644 --- a/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html +++ b/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html @@ -8,5 +8,6 @@ {% endblock %} {% block related %} -{% field "Related treatment request" item.owner '' item.owner|link_to_window %} +{% trans "Related treatment request" as related_item_label %} +{% field related_item_label item.owner '' item.owner|link_to_window %} {% endblock %} diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentsource.html b/archaeological_finds/templates/ishtar/sheet_treatmentsource.html index 0825810ad..70e69c704 100644 --- a/archaeological_finds/templates/ishtar/sheet_treatmentsource.html +++ b/archaeological_finds/templates/ishtar/sheet_treatmentsource.html @@ -8,5 +8,6 @@ {% endblock %} {% block related %} -{% field "Related treatment" item.owner '' item.owner|link_to_window %} +{% trans "Related treatment" as related_item_label %} +{% field related_item_label item.owner '' item.owner|link_to_window %} {% endblock %} diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 19fdc930a..e920dd226 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -27,7 +27,8 @@
                    {% field_li "Old code" item.old_code %} {% include "ishtar/blocks/sheet_creation_section.html" %} -{% field_li "Begining date" item.start_date %} + {% trans "Begining date" as begining_date_label %} + {% field_li begining_date_label item.start_date %} {% field_li "Excavation end date" item.excavation_end_date|default:"-" %} {% field_li_detail "Head scientist" item.scientist %} {% field_li_detail "In charge" item.in_charge %} diff --git a/archaeological_operations/templates/ishtar/sheet_operationsource.html b/archaeological_operations/templates/ishtar/sheet_operationsource.html index 9b8cbf509..55c48b319 100644 --- a/archaeological_operations/templates/ishtar/sheet_operationsource.html +++ b/archaeological_operations/templates/ishtar/sheet_operationsource.html @@ -8,5 +8,6 @@ {% endblock %} {% block related %} -{% field "Related operation" item.owner '' item.owner|link_to_window %} +{% trans "Related operation" as related_item_label %} +{% field related_item_label item.owner '' item.owner|link_to_window %} {% endblock %} diff --git a/ishtar_common/templates/ishtar/sheet_source.html b/ishtar_common/templates/ishtar/sheet_source.html index 1c00b684e..244ca1be3 100644 --- a/ishtar_common/templates/ishtar/sheet_source.html +++ b/ishtar_common/templates/ishtar/sheet_source.html @@ -5,7 +5,8 @@ {% block window_nav %}{% endblock %} {% block general %} {% block related %} -{% field "Related item" item.owner %} +{% trans "Related item" as related_item_label %} +{% field related_item_label item.owner %} {% endblock %} {% if item.image %} @@ -18,7 +19,8 @@ {% field_li "Source type" item.source_type %} {% field_li "Format type" item.format_type %} {% field_li "Scale" item.scale %} -{% field_li_url "Web link" item.associated_url %} + {% trans "Web link" as weblink_label %} + {% field_li_url weblink_label item.associated_url %} {% field_li "Item number" item.item_number %} {% field_li "Ref." item.reference %} {% field_li "Internal ref." item.internal_reference %} -- cgit v1.2.3 From ab246c0ba95e5085335642e311dc78d536cdfa49 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 15 Mar 2017 11:57:39 +0100 Subject: Update translation files --- archaeological_context_records/locale/django.pot | 248 +++++----- archaeological_files/locale/django.pot | 96 ++-- archaeological_finds/locale/django.pot | 346 +++++++------- archaeological_operations/locale/django.pot | 503 ++++++++++---------- archaeological_warehouse/locale/django.pot | 10 +- ishtar_common/locale/django.pot | 301 ++++++------ translations/fr/archaeological_context_records.po | 273 ++++++----- translations/fr/archaeological_files.po | 110 ++--- translations/fr/archaeological_files_pdl.po | 8 +- translations/fr/archaeological_finds.po | 380 +++++++++------- translations/fr/archaeological_operations.po | 529 ++++++++++++---------- translations/fr/archaeological_warehouse.po | 20 +- translations/fr/ishtar_common.po | 319 +++++++------ 13 files changed, 1670 insertions(+), 1473 deletions(-) diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index fe47dae4f..75cb3b4a4 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:198 models.py:565 wizards.py:77 +#: forms.py:47 forms.py:51 models.py:207 models.py:577 wizards.py:77 msgid "Operation" msgstr "" -#: forms.py:59 forms.py:137 models.py:200 models.py:533 +#: forms.py:59 forms.py:138 models.py:209 models.py:545 msgid "ID" msgstr "" @@ -35,7 +35,7 @@ msgstr "" msgid "Search within related operations" msgstr "" -#: forms.py:77 forms.py:233 models.py:56 +#: forms.py:77 forms.py:241 models.py:56 msgid "Period" msgstr "" @@ -51,7 +51,7 @@ msgstr "" msgid "Search within relations" msgstr "" -#: forms.py:111 forms.py:336 views.py:92 +#: forms.py:111 forms.py:344 views.py:92 msgid "Context record search" msgstr "" @@ -63,164 +63,168 @@ msgstr "" msgid "General" msgstr "" -#: forms.py:136 models.py:154 models.py:196 models.py:535 +#: forms.py:137 models.py:172 models.py:205 models.py:547 msgid "Parcel" msgstr "" -#: forms.py:139 models.py:201 models.py:536 -#: templates/ishtar/sheet_contextrecord.html:39 +#: forms.py:140 models.py:210 models.py:548 +#: templates/ishtar/sheet_contextrecord.html:30 msgid "Description" msgstr "" -#: forms.py:141 models.py:202 +#: forms.py:142 models.py:211 msgid "General comment" msgstr "" -#: forms.py:143 models.py:206 +#: forms.py:145 +msgid "Excavation technic" +msgstr "" + +#: forms.py:146 models.py:215 msgid "Length (m)" msgstr "" -#: forms.py:144 models.py:207 +#: forms.py:147 models.py:216 msgid "Width (m)" msgstr "" -#: forms.py:145 models.py:208 +#: forms.py:148 models.py:217 msgid "Thickness (m)" msgstr "" -#: forms.py:146 models.py:210 +#: forms.py:149 models.py:219 msgid "Depth (m)" msgstr "" -#: forms.py:147 forms.py:355 models.py:218 models.py:534 +#: forms.py:150 forms.py:363 models.py:227 models.py:546 msgid "Context record type" msgstr "" -#: forms.py:148 models.py:220 +#: forms.py:151 models.py:229 msgid "Has furniture?" msgstr "" -#: forms.py:151 models.py:212 +#: forms.py:154 models.py:221 msgid "Location" msgstr "" -#: forms.py:154 +#: forms.py:157 msgid "Image" msgstr "" -#: forms.py:155 +#: forms.py:158 #, python-format msgid "" "

                    Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" -#: forms.py:222 +#: forms.py:230 msgid "This ID already exists for this operation." msgstr "" -#: forms.py:228 forms.py:255 models.py:67 +#: forms.py:236 forms.py:263 models.py:67 msgid "Dating" msgstr "" -#: forms.py:234 models.py:57 +#: forms.py:242 models.py:57 msgid "Start date" msgstr "" -#: forms.py:235 models.py:58 models.py:205 +#: forms.py:243 models.py:58 models.py:214 msgid "End date" msgstr "" -#: forms.py:236 models.py:61 +#: forms.py:244 models.py:61 msgid "Quality" msgstr "" -#: forms.py:237 models.py:39 models.py:59 +#: forms.py:245 models.py:39 models.py:59 msgid "Dating type" msgstr "" -#: forms.py:264 ishtar_menu.py:29 models.py:595 +#: forms.py:272 ishtar_menu.py:29 models.py:607 msgid "Context record" msgstr "" -#: forms.py:285 +#: forms.py:293 msgid "Relations" msgstr "" -#: forms.py:289 forms.py:297 models.py:223 -#: templates/ishtar/sheet_contextrecord.html:51 +#: forms.py:297 forms.py:305 models.py:232 +#: templates/ishtar/sheet_contextrecord.html:42 msgid "Interpretation" msgstr "" -#: forms.py:293 +#: forms.py:301 msgid "Comments on dating" msgstr "" -#: forms.py:295 models.py:222 +#: forms.py:303 models.py:231 msgid "Filling" msgstr "" -#: forms.py:299 models.py:243 +#: forms.py:307 models.py:252 msgid "Activity" msgstr "" -#: forms.py:301 models.py:241 +#: forms.py:309 models.py:250 msgid "Identification" msgstr "" -#: forms.py:303 models.py:226 +#: forms.py:311 models.py:235 msgid "TAQ" msgstr "" -#: forms.py:304 models.py:230 +#: forms.py:312 models.py:239 msgid "Estimated TAQ" msgstr "" -#: forms.py:306 models.py:233 +#: forms.py:314 models.py:242 msgid "TPQ" msgstr "" -#: forms.py:307 models.py:237 +#: forms.py:315 models.py:246 msgid "Estimated TPQ" msgstr "" -#: forms.py:322 +#: forms.py:330 msgid "Operation search" msgstr "" -#: forms.py:324 +#: forms.py:332 msgid "You should select an operation." msgstr "" -#: forms.py:329 +#: forms.py:337 msgid "Would you like to delete this context record?" msgstr "" -#: forms.py:338 +#: forms.py:346 msgid "You should select a context record." msgstr "" -#: forms.py:343 +#: forms.py:351 msgid "Year of the operation" msgstr "" -#: forms.py:345 +#: forms.py:353 msgid "Numeric reference" msgstr "" -#: forms.py:351 +#: forms.py:359 msgid "Town of the operation" msgstr "" -#: forms.py:353 +#: forms.py:361 msgid "Period of the context record" msgstr "" -#: forms.py:368 +#: forms.py:376 msgid "Documentation search" msgstr "" -#: forms.py:370 +#: forms.py:378 msgid "You should select a document." msgstr "" @@ -296,180 +300,188 @@ msgstr "" msgid "Identification Types" msgstr "" -#: models.py:155 models.py:537 -msgid "Periods" +#: models.py:125 +msgid "Excavation technique type" msgstr "" -#: models.py:156 -msgid "Town" +#: models.py:126 +msgid "Excavation technique types" msgstr "" -#: models.py:184 -msgid "Parcel (town)" +#: models.py:163 models.py:549 +msgid "Periods" msgstr "" -#: models.py:185 +#: models.py:164 +msgid "Datings (period)" +msgstr "" + +#: models.py:165 msgid "Related context records" msgstr "" -#: models.py:187 +#: models.py:168 msgid "Parcel (external ID)" msgstr "" -#: models.py:188 -msgid "Datings (period)" +#: models.py:169 models.py:170 +msgid "Parcel (town)" msgstr "" -#: models.py:189 +#: models.py:171 msgid "Parcel (year)" msgstr "" -#: models.py:193 +#: models.py:202 msgid "External ID" msgstr "" -#: models.py:195 +#: models.py:204 msgid "External ID is set automatically" msgstr "" -#: models.py:203 +#: models.py:212 msgid "Date d'ouverture" msgstr "" -#: models.py:213 +#: models.py:222 msgid "A short description of the location of the context record" msgstr "" -#: models.py:216 +#: models.py:225 msgid "Comment on datings" msgstr "" -#: models.py:227 +#: models.py:236 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: models.py:231 +#: models.py:240 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: models.py:234 +#: models.py:243 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: models.py:238 +#: models.py:247 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: models.py:246 +#: models.py:255 +msgid "Excavation technique" +msgstr "" + +#: models.py:258 msgid "Point" msgstr "" -#: models.py:247 +#: models.py:259 msgid "Polygon" msgstr "" -#: models.py:248 +#: models.py:260 msgid "Cached name" msgstr "" -#: models.py:252 models.py:253 templates/ishtar/sheet_contextrecord.html:4 +#: models.py:264 models.py:265 templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "" -#: models.py:255 +#: models.py:267 msgid "Can view all Context Records" msgstr "" -#: models.py:257 +#: models.py:269 msgid "Can view own Context Record" msgstr "" -#: models.py:259 +#: models.py:271 msgid "Can add own Context Record" msgstr "" -#: models.py:261 +#: models.py:273 msgid "Can change own Context Record" msgstr "" -#: models.py:263 +#: models.py:275 msgid "Can delete own Context Record" msgstr "" -#: models.py:273 +#: models.py:285 msgctxt "short" msgid "Context record" msgstr "" -#: models.py:467 +#: models.py:479 msgid "Inverse relation" msgstr "" -#: models.py:471 models.py:494 models.py:532 +#: models.py:483 models.py:506 models.py:544 msgid "Relation type" msgstr "" -#: models.py:472 +#: models.py:484 msgid "Relation types" msgstr "" -#: models.py:489 +#: models.py:501 msgid "ID (left)" msgstr "" -#: models.py:490 +#: models.py:502 msgid "Context record type (left)" msgstr "" -#: models.py:491 +#: models.py:503 msgid "Parcel (left)" msgstr "" -#: models.py:492 +#: models.py:504 msgid "Description (left)" msgstr "" -#: models.py:493 +#: models.py:505 msgid "Periods (left)" msgstr "" -#: models.py:495 +#: models.py:507 msgid "ID (right)" msgstr "" -#: models.py:496 +#: models.py:508 msgid "Context record type (right)" msgstr "" -#: models.py:497 +#: models.py:509 msgid "Parcel (right)" msgstr "" -#: models.py:498 +#: models.py:510 msgid "Description (right)" msgstr "" -#: models.py:499 +#: models.py:511 msgid "Periods (right)" msgstr "" -#: models.py:508 +#: models.py:520 msgid "Record relation" msgstr "" -#: models.py:509 +#: models.py:521 msgid "Record relations" msgstr "" -#: models.py:592 +#: models.py:604 msgid "Context record documentation" msgstr "" -#: models.py:593 +#: models.py:605 msgid "Context record documentations" msgstr "" @@ -501,86 +513,86 @@ msgstr "" msgid "Context record: source deletion" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:17 +#: templates/ishtar/sheet_contextrecord.html:18 msgid "Complete ID:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:17 -msgid "Temporary ID:" -msgstr "" - #: templates/ishtar/sheet_contextrecord.html:18 -msgid "Creation:" -msgstr "" - -#: templates/ishtar/sheet_contextrecord.html:25 -msgid "Modification:" +msgid "Temporary ID:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:63 +#: templates/ishtar/sheet_contextrecord.html:54 msgid "Datations" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:72 +#: templates/ishtar/sheet_contextrecord.html:63 msgid "Context record relations" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:79 +#: templates/ishtar/sheet_contextrecord.html:70 msgid "Operation summary" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:81 +#: templates/ishtar/sheet_contextrecord.html:72 msgid "Patriarche OA code not yet recorded!" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:88 +#: templates/ishtar/sheet_contextrecord.html:76 +msgid "Numerical reference" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:80 msgid "State:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:88 +#: templates/ishtar/sheet_contextrecord.html:80 msgid "Active file" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:88 +#: templates/ishtar/sheet_contextrecord.html:80 msgid "Closed operation" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:90 +#: templates/ishtar/sheet_contextrecord.html:82 msgid "Closing date:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:90 +#: templates/ishtar/sheet_contextrecord.html:82 msgid "by" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:98 +#: templates/ishtar/sheet_contextrecord.html:90 msgid "Localisation" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:99 +#: templates/ishtar/sheet_contextrecord.html:91 msgid "Towns:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:100 +#: templates/ishtar/sheet_contextrecord.html:92 msgid "Related operation:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:102 +#: templates/ishtar/sheet_contextrecord.html:94 msgid "No operation linked to this context unit!" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:105 +#: templates/ishtar/sheet_contextrecord.html:97 msgid "Document from this context record" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:110 +#: templates/ishtar/sheet_contextrecord.html:102 msgid "Finds" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:115 +#: templates/ishtar/sheet_contextrecord.html:107 msgid "Documents from associated finds" msgstr "" #: templates/ishtar/sheet_contextrecordsource.html:4 msgid "Context record source" msgstr "" + +#: templates/ishtar/sheet_contextrecordsource.html:11 +msgid "Related context record" +msgstr "" diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot index 966c983c8..1e513ae12 100644 --- a/archaeological_files/locale/django.pot +++ b/archaeological_files/locale/django.pot @@ -10,7 +10,7 @@ msgid "" msgstr "" #: forms.py:47 forms.py:210 forms.py:255 forms.py:396 forms.py:423 -#: models.py:108 templates/ishtar/sheet_file.html:157 +#: models.py:108 templates/ishtar/sheet_file.html:144 msgid "Year" msgstr "" @@ -26,7 +26,7 @@ msgstr "" msgid "Parcel (section/number/public domain)" msgstr "" -#: forms.py:55 forms.py:407 forms.py:434 models.py:553 +#: forms.py:55 forms.py:407 forms.py:434 models.py:558 msgid "Department" msgstr "" @@ -55,11 +55,11 @@ msgid "Permit reference" msgstr "" #: forms.py:63 forms.py:227 forms.py:364 models.py:180 -#: templates/ishtar/sheet_file.html:110 +#: templates/ishtar/sheet_file.html:97 msgid "Comment" msgstr "" -#: forms.py:65 templates/ishtar/sheet_file.html:130 +#: forms.py:65 templates/ishtar/sheet_file.html:117 msgid "In charge" msgstr "" @@ -115,7 +115,7 @@ msgstr "" msgid "Date before" msgstr "" -#: forms.py:197 templates/ishtar/sheet_file.html:14 +#: forms.py:197 templates/ishtar/sheet_file.html:19 msgid "General" msgstr "" @@ -164,12 +164,12 @@ msgstr "" msgid "Total developed surface (m2)" msgstr "" -#: forms.py:333 templates/ishtar/sheet_file.html:100 +#: forms.py:333 templates/ishtar/sheet_file.html:87 #: templates/ishtar/dashboards/dashboard_file.html:45 msgid "Research archaeology" msgstr "" -#: forms.py:341 models.py:183 templates/ishtar/sheet_file.html:101 +#: forms.py:341 models.py:183 templates/ishtar/sheet_file.html:88 msgid "Departments" msgstr "" @@ -177,7 +177,7 @@ msgstr "" msgid "Scientist in charge" msgstr "" -#: forms.py:353 models.py:186 templates/ishtar/sheet_file.html:103 +#: forms.py:353 models.py:186 templates/ishtar/sheet_file.html:90 msgid "Requested operation type" msgstr "" @@ -185,11 +185,11 @@ msgstr "" msgid "Lead organization" msgstr "" -#: forms.py:371 models.py:196 templates/ishtar/sheet_file.html:108 +#: forms.py:371 models.py:196 templates/ishtar/sheet_file.html:95 msgid "Classified area" msgstr "" -#: forms.py:373 models.py:198 templates/ishtar/sheet_file.html:109 +#: forms.py:373 models.py:198 templates/ishtar/sheet_file.html:96 msgid "Protected area" msgstr "" @@ -363,7 +363,7 @@ msgstr "" msgid "Main address - postal code" msgstr "" -#: models.py:188 templates/ishtar/sheet_file.html:104 +#: models.py:188 templates/ishtar/sheet_file.html:91 msgid "Organization" msgstr "" @@ -407,15 +407,15 @@ msgstr "" msgid "FILE" msgstr "" -#: models.py:413 +#: models.py:418 msgid "Multi-town" msgstr "" -#: models.py:419 +#: models.py:424 msgid "No town" msgstr "" -#: models.py:552 +#: models.py:557 msgid "File" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "File: administrative act deletion" msgstr "" -#: wizards.py:124 templates/ishtar/sheet_file.html:122 +#: wizards.py:124 templates/ishtar/sheet_file.html:109 msgid "Associated operations" msgstr "" @@ -471,122 +471,114 @@ msgstr "" msgid "Generate" msgstr "" -#: templates/ishtar/sheet_file.html:23 -msgid "Creation:" -msgstr "" - -#: templates/ishtar/sheet_file.html:30 -msgid "Modification:" -msgstr "" - -#: templates/ishtar/sheet_file.html:47 +#: templates/ishtar/sheet_file.html:34 msgid "State:" msgstr "" -#: templates/ishtar/sheet_file.html:47 +#: templates/ishtar/sheet_file.html:34 msgid "Active file" msgstr "" -#: templates/ishtar/sheet_file.html:48 +#: templates/ishtar/sheet_file.html:35 msgid "Closed file" msgstr "" -#: templates/ishtar/sheet_file.html:50 +#: templates/ishtar/sheet_file.html:37 msgid "Closing date:" msgstr "" -#: templates/ishtar/sheet_file.html:50 +#: templates/ishtar/sheet_file.html:37 msgid "by" msgstr "" -#: templates/ishtar/sheet_file.html:55 +#: templates/ishtar/sheet_file.html:42 msgid "Related file:" msgstr "" -#: templates/ishtar/sheet_file.html:60 +#: templates/ishtar/sheet_file.html:47 msgid "Localisation" msgstr "" -#: templates/ishtar/sheet_file.html:61 +#: templates/ishtar/sheet_file.html:48 msgid "Towns:" msgstr "" -#: templates/ishtar/sheet_file.html:62 +#: templates/ishtar/sheet_file.html:49 msgid "Departments:" msgstr "" -#: templates/ishtar/sheet_file.html:64 +#: templates/ishtar/sheet_file.html:51 msgid "Main address:" msgstr "" -#: templates/ishtar/sheet_file.html:65 +#: templates/ishtar/sheet_file.html:52 msgid "Complement:" msgstr "" -#: templates/ishtar/sheet_file.html:66 +#: templates/ishtar/sheet_file.html:53 msgid "Postal code:" msgstr "" -#: templates/ishtar/sheet_file.html:68 +#: templates/ishtar/sheet_file.html:55 msgid "Surface:" msgstr "" -#: templates/ishtar/sheet_file.html:73 +#: templates/ishtar/sheet_file.html:60 msgid "Preventive archaeological file" msgstr "" -#: templates/ishtar/sheet_file.html:75 +#: templates/ishtar/sheet_file.html:62 msgid "Developed surface:" msgstr "" -#: templates/ishtar/sheet_file.html:101 templates/ishtar/sheet_file.html:102 -#: templates/ishtar/sheet_file.html:103 templates/ishtar/sheet_file.html:104 -#: templates/ishtar/sheet_file.html:110 +#: templates/ishtar/sheet_file.html:88 templates/ishtar/sheet_file.html:89 +#: templates/ishtar/sheet_file.html:90 templates/ishtar/sheet_file.html:91 +#: templates/ishtar/sheet_file.html:97 #: templates/ishtar/dashboards/dashboard_file.html:14 msgid ":" msgstr "" -#: templates/ishtar/sheet_file.html:102 +#: templates/ishtar/sheet_file.html:89 msgid "Head scientist" msgstr "" -#: templates/ishtar/sheet_file.html:116 +#: templates/ishtar/sheet_file.html:103 msgid "Associated parcels" msgstr "" -#: templates/ishtar/sheet_file.html:119 +#: templates/ishtar/sheet_file.html:106 msgid "Administrative acts" msgstr "" -#: templates/ishtar/sheet_file.html:127 templates/ishtar/sheet_file.html:158 +#: templates/ishtar/sheet_file.html:114 templates/ishtar/sheet_file.html:145 msgid "Ref." msgstr "" -#: templates/ishtar/sheet_file.html:129 templates/ishtar/sheet_file.html:159 +#: templates/ishtar/sheet_file.html:116 templates/ishtar/sheet_file.html:146 msgid "Type" msgstr "" -#: templates/ishtar/sheet_file.html:131 +#: templates/ishtar/sheet_file.html:118 msgid "Start date" msgstr "" -#: templates/ishtar/sheet_file.html:132 +#: templates/ishtar/sheet_file.html:119 msgid "Excavation end date" msgstr "" -#: templates/ishtar/sheet_file.html:146 +#: templates/ishtar/sheet_file.html:133 msgid "No operation associated to this archaeological file" msgstr "" -#: templates/ishtar/sheet_file.html:152 +#: templates/ishtar/sheet_file.html:139 msgid "Admninistrative acts linked to associated operations" msgstr "" -#: templates/ishtar/sheet_file.html:160 +#: templates/ishtar/sheet_file.html:147 msgid "Date" msgstr "" -#: templates/ishtar/sheet_file.html:170 +#: templates/ishtar/sheet_file.html:157 msgid "No administrative act linked to operations" msgstr "" diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index 002da929e..0fda2ed23 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -7,27 +7,27 @@ msgid "" msgstr "" -#: forms.py:90 forms.py:94 wizards.py:64 +#: forms.py:90 forms.py:94 models_finds.py:505 wizards.py:64 msgid "Context record" msgstr "" -#: forms.py:123 ishtar_menu.py:32 models_finds.py:656 models_finds.py:1059 -#: models_finds.py:1068 models_treatments.py:279 +#: forms.py:123 ishtar_menu.py:32 models_finds.py:664 models_finds.py:1067 +#: models_finds.py:1076 models_treatments.py:281 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "" #: forms.py:137 forms.py:330 forms.py:559 models_finds.py:151 -#: models_finds.py:587 +#: models_finds.py:595 msgid "Free ID" msgstr "" -#: forms.py:139 models_finds.py:639 +#: forms.py:139 models_finds.py:647 msgid "Previous ID" msgstr "" #: forms.py:140 forms.py:362 forms_treatments.py:134 models_finds.py:155 -#: models_finds.py:588 models_treatments.py:125 +#: models_finds.py:596 models_treatments.py:127 msgid "Description" msgstr "" @@ -35,7 +35,7 @@ msgstr "" msgid "Batch/object" msgstr "" -#: forms.py:145 models_finds.py:616 +#: forms.py:145 models_finds.py:624 msgid "Is complete?" msgstr "" @@ -43,15 +43,15 @@ msgstr "" msgid "Material type" msgstr "" -#: forms.py:149 forms.py:356 models_finds.py:63 models_finds.py:592 +#: forms.py:149 forms.py:356 models_finds.py:63 models_finds.py:600 msgid "Conservatory state" msgstr "" -#: forms.py:152 models_finds.py:594 +#: forms.py:152 models_finds.py:602 msgid "Conservatory comment" msgstr "" -#: forms.py:155 models_finds.py:113 models_finds.py:619 +#: forms.py:155 models_finds.py:113 models_finds.py:627 msgid "Object types" msgstr "" @@ -59,11 +59,11 @@ msgstr "" msgid "Preservation type" msgstr "" -#: forms.py:160 forms.py:358 models_finds.py:621 +#: forms.py:160 forms.py:358 models_finds.py:629 msgid "Integrity / interest" msgstr "" -#: forms.py:163 forms.py:360 models_finds.py:624 +#: forms.py:163 forms.py:360 models_finds.py:632 msgid "Remarkability" msgstr "" @@ -99,69 +99,69 @@ msgstr "" msgid "Estimated error for Z" msgstr "" -#: forms.py:181 models_finds.py:628 +#: forms.py:181 models_finds.py:636 msgid "Length (cm)" msgstr "" -#: forms.py:182 models_finds.py:629 +#: forms.py:182 models_finds.py:637 msgid "Width (cm)" msgstr "" -#: forms.py:183 models_finds.py:630 +#: forms.py:183 models_finds.py:638 msgid "Height (cm)" msgstr "" -#: forms.py:184 models_finds.py:631 +#: forms.py:184 models_finds.py:639 msgid "Diameter (cm)" msgstr "" -#: forms.py:185 models_finds.py:632 +#: forms.py:185 models_finds.py:640 msgid "Thickness (cm)" msgstr "" -#: forms.py:186 forms.py:564 models_finds.py:599 +#: forms.py:186 forms.py:564 models_finds.py:607 msgid "Volume (l)" msgstr "" -#: forms.py:187 forms.py:565 models_finds.py:600 +#: forms.py:187 forms.py:565 models_finds.py:608 msgid "Weight (g)" msgstr "" -#: forms.py:189 models_finds.py:633 +#: forms.py:189 models_finds.py:641 msgid "Dimensions comment" msgstr "" -#: forms.py:190 forms.py:566 models_finds.py:603 +#: forms.py:190 forms.py:566 models_finds.py:611 msgid "Find number" msgstr "" -#: forms.py:192 models_finds.py:627 +#: forms.py:192 models_finds.py:635 msgid "Minimum number of individuals (MNI)" msgstr "" -#: forms.py:193 models_finds.py:635 +#: forms.py:193 models_finds.py:643 msgid "Mark" msgstr "" -#: forms.py:194 forms.py:365 models_finds.py:641 +#: forms.py:194 forms.py:365 models_finds.py:649 msgid "Check" msgstr "" -#: forms.py:196 models_finds.py:643 +#: forms.py:196 models_finds.py:651 msgid "Check date" msgstr "" #: forms.py:197 forms_treatments.py:132 forms_treatments.py:434 -#: models_finds.py:156 models_finds.py:636 models_treatments.py:124 -#: models_treatments.py:492 +#: models_finds.py:156 models_finds.py:644 models_treatments.py:126 +#: models_treatments.py:494 msgid "Comment" msgstr "" -#: forms.py:200 models_finds.py:637 +#: forms.py:200 models_finds.py:645 msgid "Comment on dating" msgstr "" -#: forms.py:201 models_finds.py:645 +#: forms.py:201 models_finds.py:653 msgid "Estimated value" msgstr "" @@ -184,7 +184,7 @@ msgstr "" msgid "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" -#: forms.py:293 forms.py:324 models_finds.py:611 +#: forms.py:293 forms.py:324 models_finds.py:619 msgid "Dating" msgstr "" @@ -193,13 +193,13 @@ msgid "Period" msgstr "" #: forms.py:299 forms_treatments.py:138 forms_treatments.py:436 -#: models_finds.py:1073 models_treatments.py:127 models_treatments.py:290 -#: templates/ishtar/sheet_find.html:103 templates/ishtar/sheet_find.html:145 +#: models_finds.py:1081 models_treatments.py:129 models_treatments.py:292 +#: templates/ishtar/sheet_find.html:91 templates/ishtar/sheet_find.html:133 msgid "Start date" msgstr "" -#: forms.py:301 models_finds.py:1074 models_treatments.py:291 -#: templates/ishtar/sheet_find.html:104 templates/ishtar/sheet_find.html:146 +#: forms.py:301 models_finds.py:1082 models_treatments.py:293 +#: templates/ishtar/sheet_find.html:92 templates/ishtar/sheet_find.html:134 msgid "End date" msgstr "" @@ -225,7 +225,7 @@ msgstr "" #: 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:100 models_treatments.py:464 +#: forms_treatments.py:489 models_treatments.py:102 models_treatments.py:466 msgid "Year" msgstr "" @@ -261,7 +261,7 @@ msgstr "" msgid "Upstream finds" msgstr "" -#: forms.py:443 models_finds.py:657 +#: forms.py:443 models_finds.py:665 msgid "Finds" msgstr "" @@ -333,25 +333,25 @@ msgstr "" msgid "Basket" msgstr "" -#: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:96 -#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:139 +#: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:98 +#: templates/ishtar/sheet_find.html:85 templates/ishtar/sheet_find.html:127 msgid "Label" msgstr "" -#: forms_treatments.py:53 forms_treatments.py:95 models_treatments.py:98 +#: forms_treatments.py:53 forms_treatments.py:95 models_treatments.py:100 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:102 -#: models_treatments.py:466 +#: forms_treatments.py:490 forms_treatments.py:557 models_treatments.py:104 +#: models_treatments.py:468 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:107 -#: models_treatments.py:289 +#: forms_treatments.py:578 models_treatments.py:56 models_treatments.py:109 +#: models_treatments.py:291 msgid "Treatment type" msgstr "" @@ -363,8 +363,8 @@ msgstr "" msgid "Base treatment" msgstr "" -#: forms_treatments.py:103 models_treatments.py:109 -#: templates/ishtar/sheet_find.html:99 templates/ishtar/sheet_find.html:141 +#: forms_treatments.py:103 models_treatments.py:92 models_treatments.py:111 +#: templates/ishtar/sheet_find.html:87 templates/ishtar/sheet_find.html:129 msgid "State" msgstr "" @@ -372,15 +372,15 @@ msgstr "" msgid "Target" msgstr "" -#: forms_treatments.py:107 forms_treatments.py:417 models_treatments.py:117 +#: forms_treatments.py:107 forms_treatments.py:417 models_treatments.py:119 msgid "Responsible" msgstr "" -#: forms_treatments.py:113 models_treatments.py:120 +#: forms_treatments.py:113 models_treatments.py:122 msgid "Organization" msgstr "" -#: forms_treatments.py:119 models_treatments.py:112 models_treatments.py:292 +#: forms_treatments.py:119 models_treatments.py:114 models_treatments.py:294 msgid "Location" msgstr "" @@ -392,12 +392,12 @@ msgstr "" msgid "External ref." msgstr "" -#: forms_treatments.py:136 models_treatments.py:126 +#: forms_treatments.py:136 models_treatments.py:128 msgid "Goal" msgstr "" -#: forms_treatments.py:140 forms_treatments.py:442 models_treatments.py:128 -#: models_treatments.py:486 +#: forms_treatments.py:140 forms_treatments.py:442 models_treatments.py:130 +#: models_treatments.py:488 msgid "Closing date" msgstr "" @@ -443,12 +443,12 @@ msgstr "" msgid "Another treatment with this index exists for {}." msgstr "" -#: forms_treatments.py:262 models_treatments.py:105 +#: forms_treatments.py:262 models_treatments.py:107 msgid "Associated request" msgstr "" #: forms_treatments.py:266 forms_treatments.py:397 ishtar_menu.py:108 -#: models_treatments.py:497 models_treatments.py:519 models_treatments.py:581 +#: models_treatments.py:499 models_treatments.py:521 models_treatments.py:583 #: wizards.py:183 templates/ishtar/sheet_treatmentfile.html:5 msgid "Treatment request" msgstr "" @@ -504,7 +504,7 @@ msgstr "" msgid "Modified by" msgstr "" -#: forms_treatments.py:354 forms_treatments.py:404 models_treatments.py:471 +#: forms_treatments.py:354 forms_treatments.py:404 models_treatments.py:473 msgid "Name" msgstr "" @@ -512,9 +512,9 @@ msgstr "" msgid "Internal ref." msgstr "" -#: forms_treatments.py:358 forms_treatments.py:415 -#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:140 -#: templates/ishtar/sheet_find.html:232 +#: forms_treatments.py:358 forms_treatments.py:415 models_treatments.py:91 +#: templates/ishtar/sheet_find.html:86 templates/ishtar/sheet_find.html:128 +#: templates/ishtar/sheet_find.html:227 msgid "Type" msgstr "" @@ -522,12 +522,12 @@ msgstr "" msgid "In charge" msgstr "" -#: forms_treatments.py:366 forms_treatments.py:423 models_treatments.py:480 +#: forms_treatments.py:366 forms_treatments.py:423 models_treatments.py:482 #: templates/ishtar/sheet_treatmentfile.html:31 msgid "Applicant" msgstr "" -#: forms_treatments.py:372 forms_treatments.py:429 models_treatments.py:484 +#: forms_treatments.py:372 forms_treatments.py:429 models_treatments.py:486 #: templates/ishtar/sheet_treatmentfile.html:38 msgid "Applicant organisation" msgstr "" @@ -536,7 +536,7 @@ msgstr "" msgid "Treatment request search" msgstr "" -#: forms_treatments.py:439 models_treatments.py:490 +#: forms_treatments.py:439 models_treatments.py:492 msgid "Reception date" msgstr "" @@ -568,8 +568,8 @@ msgstr "" msgid "Treatment request internal reference" msgstr "" -#: forms_treatments.py:508 forms_treatments.py:604 models_treatments.py:449 -#: models_treatments.py:473 +#: forms_treatments.py:508 forms_treatments.py:604 models_treatments.py:451 +#: models_treatments.py:475 msgid "Treatment request type" msgstr "" @@ -611,12 +611,12 @@ msgstr "" msgid "Documentation" msgstr "" -#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1070 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1078 msgid "Administrative act" msgstr "" -#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:227 -#: templates/ishtar/sheet_find.html:229 +#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:222 +#: templates/ishtar/sheet_find.html:224 msgid "Documents" msgstr "" @@ -624,8 +624,8 @@ msgstr "" msgid "Source" msgstr "" -#: ishtar_menu.py:185 models_treatments.py:145 models_treatments.py:281 -#: models_treatments.py:565 templates/ishtar/sheet_treatment.html:5 +#: ishtar_menu.py:185 models_treatments.py:147 models_treatments.py:283 +#: models_treatments.py:567 templates/ishtar/sheet_treatment.html:5 msgid "Treatment" msgstr "" @@ -645,7 +645,7 @@ msgstr "" msgid "Parent material" msgstr "" -#: models_finds.py:52 models_finds.py:507 models_finds.py:590 +#: models_finds.py:52 models_finds.py:525 models_finds.py:598 msgid "Material types" msgstr "" @@ -677,8 +677,8 @@ msgstr "" msgid "Remarkability types" msgstr "" -#: models_finds.py:98 models_finds.py:586 models_treatments.py:40 -#: models_treatments.py:285 +#: models_finds.py:98 models_finds.py:594 models_treatments.py:40 +#: models_treatments.py:287 msgid "Order" msgstr "" @@ -694,12 +694,12 @@ msgstr "" msgid "Parent" msgstr "" -#: models_finds.py:152 models_finds.py:583 models_treatments.py:122 -#: models_treatments.py:469 +#: models_finds.py:152 models_finds.py:591 models_treatments.py:124 +#: models_treatments.py:471 msgid "External ID" msgstr "" -#: models_finds.py:154 models_finds.py:585 +#: models_finds.py:154 models_finds.py:593 msgid "External ID is set automatically" msgstr "" @@ -739,7 +739,7 @@ msgstr "" msgid "Cached value - do not edit" msgstr "" -#: models_finds.py:197 models_finds.py:581 +#: models_finds.py:197 models_finds.py:589 msgid "Base find" msgstr "" @@ -787,109 +787,129 @@ msgstr "" msgid "Checked and correct" msgstr "" -#: models_finds.py:505 -msgid "Periods" +#: models_finds.py:506 +msgid "Base find - Short ID" msgstr "" -#: models_finds.py:506 models_finds.py:614 models_treatments.py:129 -#: models_treatments.py:293 templates/ishtar/sheet_find.html:102 -#: templates/ishtar/sheet_find.html:144 -msgid "Container" +#: models_finds.py:507 +msgid "Base find - Complete ID" msgstr "" -#: models_finds.py:517 -msgid "Base find - Short ID" +#: models_finds.py:509 +msgid "Operation (code)" msgstr "" -#: models_finds.py:518 -msgid "Base find - Complete ID" +#: models_finds.py:511 +msgid "Town" msgstr "" -#: models_finds.py:519 +#: models_finds.py:513 +msgid "Operation (name)" +msgstr "" + +#: models_finds.py:515 +msgid "Parcel" +msgstr "" + +#: models_finds.py:516 +msgid "Batch" +msgstr "" + +#: models_finds.py:517 msgid "Base find - Comment" msgstr "" -#: models_finds.py:520 +#: models_finds.py:518 msgid "Base find - Description" msgstr "" -#: models_finds.py:521 +#: models_finds.py:519 msgid "Base find - Topographic localisation" msgstr "" -#: models_finds.py:523 +#: models_finds.py:521 msgid "Base find - Special interest" msgstr "" -#: models_finds.py:524 +#: models_finds.py:522 msgid "Base find - Discovery date" msgstr "" -#: models_finds.py:597 +#: models_finds.py:523 models_finds.py:622 models_treatments.py:131 +#: models_treatments.py:295 templates/ishtar/sheet_find.html:90 +#: templates/ishtar/sheet_find.html:132 +msgid "Container" +msgstr "" + +#: models_finds.py:524 +msgid "Periods" +msgstr "" + +#: models_finds.py:605 msgid "Type of preservation to consider" msgstr "" -#: models_finds.py:601 +#: models_finds.py:609 msgid "Weight unit" msgstr "" -#: models_finds.py:607 templates/ishtar/sheet_find.html:90 +#: models_finds.py:615 templates/ishtar/sheet_find.html:78 msgid "Upstream treatment" msgstr "" -#: models_finds.py:610 templates/ishtar/sheet_find.html:132 +#: models_finds.py:618 templates/ishtar/sheet_find.html:120 msgid "Downstream treatment" msgstr "" -#: models_finds.py:648 +#: models_finds.py:656 msgid "Collection" msgstr "" -#: models_finds.py:650 models_treatments.py:141 models_treatments.py:493 +#: models_finds.py:658 models_treatments.py:143 models_treatments.py:495 msgid "Cached name" msgstr "" -#: models_finds.py:659 +#: models_finds.py:667 msgid "Can view all Finds" msgstr "" -#: models_finds.py:660 +#: models_finds.py:668 msgid "Can view own Find" msgstr "" -#: models_finds.py:661 +#: models_finds.py:669 msgid "Can add own Find" msgstr "" -#: models_finds.py:662 +#: models_finds.py:670 msgid "Can change own Find" msgstr "" -#: models_finds.py:663 +#: models_finds.py:671 msgid "Can delete own Find" msgstr "" -#: models_finds.py:669 +#: models_finds.py:677 msgid "FIND" msgstr "" -#: models_finds.py:1057 +#: models_finds.py:1065 msgid "Find documentation" msgstr "" -#: models_finds.py:1058 +#: models_finds.py:1066 msgid "Find documentations" msgstr "" -#: models_finds.py:1071 +#: models_finds.py:1079 msgid "Person" msgstr "" -#: models_finds.py:1077 +#: models_finds.py:1085 msgid "Property" msgstr "" -#: models_finds.py:1078 +#: models_finds.py:1086 msgid "Properties" msgstr "" @@ -933,125 +953,125 @@ msgstr "" msgid "Downstream find" msgstr "" -#: models_treatments.py:114 +#: models_treatments.py:116 msgid "Location where the treatment is done. Target warehouse for a move." msgstr "" -#: models_treatments.py:131 +#: models_treatments.py:133 msgid "Estimated cost" msgstr "" -#: models_treatments.py:133 +#: models_treatments.py:135 msgid "Quoted cost" msgstr "" -#: models_treatments.py:135 +#: models_treatments.py:137 msgid "Realized cost" msgstr "" -#: models_treatments.py:137 +#: models_treatments.py:139 msgid "Insurance cost" msgstr "" -#: models_treatments.py:139 +#: models_treatments.py:141 msgid "Target a basket" msgstr "" -#: models_treatments.py:146 templates/ishtar/sheet_find.html:87 +#: models_treatments.py:148 templates/ishtar/sheet_find.html:75 #: templates/ishtar/sheet_treatmentfile.html:45 msgid "Treatments" msgstr "" -#: models_treatments.py:149 +#: models_treatments.py:151 msgid "Can view all Treatments" msgstr "" -#: models_treatments.py:150 +#: models_treatments.py:152 msgid "Can view own Treatment" msgstr "" -#: models_treatments.py:151 +#: models_treatments.py:153 msgid "Can add own Treatment" msgstr "" -#: models_treatments.py:152 +#: models_treatments.py:154 msgid "Can change own Treatment" msgstr "" -#: models_treatments.py:153 +#: models_treatments.py:155 msgid "Can delete own Treatment" msgstr "" -#: models_treatments.py:165 +#: models_treatments.py:167 msgid "TREATMENT" msgstr "" -#: models_treatments.py:294 templates/ishtar/sheet_find.html:101 -#: templates/ishtar/sheet_find.html:143 +#: models_treatments.py:296 templates/ishtar/sheet_find.html:89 +#: templates/ishtar/sheet_find.html:131 msgid "Doer" msgstr "" -#: models_treatments.py:295 models_treatments.py:296 +#: models_treatments.py:297 models_treatments.py:298 msgid "Related finds" msgstr "" -#: models_treatments.py:438 +#: models_treatments.py:440 msgid "Is upstream" msgstr "" -#: models_treatments.py:450 +#: models_treatments.py:452 msgid "Treatment request types" msgstr "" -#: models_treatments.py:467 +#: models_treatments.py:469 msgid "Internal reference" msgstr "" -#: models_treatments.py:476 +#: models_treatments.py:478 msgid "Person in charge" msgstr "" -#: models_treatments.py:488 +#: models_treatments.py:490 msgid "Creation date" msgstr "" -#: models_treatments.py:498 +#: models_treatments.py:500 msgid "Treatment requests" msgstr "" -#: models_treatments.py:502 +#: models_treatments.py:504 msgid "Can view all Treatment requests" msgstr "" -#: models_treatments.py:504 +#: models_treatments.py:506 msgid "Can view own Treatment request" msgstr "" -#: models_treatments.py:506 +#: models_treatments.py:508 msgid "Can add own Treatment request" msgstr "" -#: models_treatments.py:508 +#: models_treatments.py:510 msgid "Can change own Treatment request" msgstr "" -#: models_treatments.py:510 +#: models_treatments.py:512 msgid "Can delete own Treatment request" msgstr "" -#: models_treatments.py:571 +#: models_treatments.py:573 msgid "Treatment documentation" msgstr "" -#: models_treatments.py:572 +#: models_treatments.py:574 msgid "Treament documentations" msgstr "" -#: models_treatments.py:588 +#: models_treatments.py:590 msgid "Treatment request documentation" msgstr "" -#: models_treatments.py:589 +#: models_treatments.py:591 msgid "Treatment request documentations" msgstr "" @@ -1179,67 +1199,67 @@ msgstr "" msgid "Operation" msgstr "" -#: templates/ishtar/sheet_find.html:24 -msgid "Creation:" +#: templates/ishtar/sheet_find.html:25 +msgid "Administrative index" msgstr "" -#: templates/ishtar/sheet_find.html:31 -msgid "Modification:" -msgstr "" - -#: templates/ishtar/sheet_find.html:79 +#: templates/ishtar/sheet_find.html:67 msgid "Warehouse" msgstr "" -#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:138 +#: templates/ishtar/sheet_find.html:84 templates/ishtar/sheet_find.html:126 msgid "Year - index" msgstr "" -#: templates/ishtar/sheet_find.html:100 templates/ishtar/sheet_find.html:142 +#: templates/ishtar/sheet_find.html:88 templates/ishtar/sheet_find.html:130 msgid "Related finds (max. 15 displayed)" msgstr "" -#: templates/ishtar/sheet_find.html:128 +#: templates/ishtar/sheet_find.html:116 msgid "Export as CSV" msgstr "" -#: templates/ishtar/sheet_find.html:128 templates/ishtar/sheet_find.html:171 +#: templates/ishtar/sheet_find.html:116 templates/ishtar/sheet_find.html:159 msgid "CSV" msgstr "" -#: templates/ishtar/sheet_find.html:176 +#: templates/ishtar/sheet_find.html:164 msgid "Associated base finds" msgstr "" -#: templates/ishtar/sheet_find.html:208 +#: templates/ishtar/sheet_find.html:171 +msgid "Internal ID" +msgstr "" + +#: templates/ishtar/sheet_find.html:203 msgid "Coordinates:" msgstr "" -#: templates/ishtar/sheet_find.html:210 +#: templates/ishtar/sheet_find.html:205 msgid "X:" msgstr "" -#: templates/ishtar/sheet_find.html:211 +#: templates/ishtar/sheet_find.html:206 msgid "Y:" msgstr "" -#: templates/ishtar/sheet_find.html:212 +#: templates/ishtar/sheet_find.html:207 msgid "Z:" msgstr "" -#: templates/ishtar/sheet_find.html:215 +#: templates/ishtar/sheet_find.html:210 msgid "SRID:" msgstr "" -#: templates/ishtar/sheet_find.html:231 +#: templates/ishtar/sheet_find.html:226 msgid "Title" msgstr "" -#: templates/ishtar/sheet_find.html:233 +#: templates/ishtar/sheet_find.html:228 msgid "Authors" msgstr "" -#: templates/ishtar/sheet_find.html:234 +#: templates/ishtar/sheet_find.html:229 msgid "Link" msgstr "" @@ -1251,6 +1271,10 @@ msgstr "" msgid "Find source" msgstr "" +#: templates/ishtar/sheet_findsource.html:11 +msgid "Related find" +msgstr "" + #: templates/ishtar/sheet_treatment.html:20 msgctxt "Treatment" msgid "Closed" @@ -1283,6 +1307,14 @@ msgstr "" msgid "Treatment request source" msgstr "" +#: templates/ishtar/sheet_treatmentfilesource.html:11 +msgid "Related treatment request" +msgstr "" + #: templates/ishtar/sheet_treatmentsource.html:4 msgid "Treatment source" msgstr "" + +#: templates/ishtar/sheet_treatmentsource.html:11 +msgid "Related treatment" +msgstr "" diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index 800f6a31e..35facbbf5 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -9,13 +9,13 @@ msgid "" msgstr "" -#: forms.py:69 forms.py:371 forms.py:1009 forms.py:1031 forms.py:1035 -#: models.py:1221 templates/ishtar/sheet_operation.html:156 +#: forms.py:69 forms.py:371 forms.py:1013 forms.py:1035 forms.py:1039 +#: models.py:1241 templates/ishtar/sheet_operation.html:146 #: templates/ishtar/blocks/window_tables/parcels.html:10 msgid "Parcels" msgstr "" -#: forms.py:72 forms.py:205 forms.py:985 models.py:1207 +#: forms.py:72 forms.py:205 forms.py:989 models.py:1227 #: templates/ishtar/blocks/window_tables/parcels.html:7 #: templates/ishtar/dashboards/dashboard_operation.html:432 #: templates/ishtar/dashboards/dashboard_operation.html:446 @@ -24,22 +24,22 @@ msgstr "" msgid "Town" msgstr "" -#: forms.py:74 forms.py:455 forms.py:752 forms.py:1255 models.py:272 -#: models.py:1013 models.py:1205 +#: forms.py:74 forms.py:455 forms.py:756 forms.py:1259 models.py:272 +#: models.py:1033 models.py:1225 #: templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Year" msgstr "" -#: forms.py:77 models.py:1208 +#: forms.py:77 models.py:1228 #: templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Section" msgstr "" -#: forms.py:80 models.py:1210 +#: forms.py:80 models.py:1230 msgid "Parcel number" msgstr "" -#: forms.py:82 models.py:1212 models.py:1229 models.py:1278 +#: forms.py:82 models.py:1232 models.py:1249 models.py:1298 msgid "Public domain" msgstr "" @@ -75,8 +75,8 @@ msgstr "" msgid "Relation type" msgstr "" -#: forms.py:383 ishtar_menu.py:30 models.py:367 models.py:834 models.py:864 -#: models.py:892 models.py:995 models.py:1204 wizards.py:344 wizards.py:355 +#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:843 models.py:878 +#: models.py:911 models.py:1015 models.py:1224 wizards.py:344 wizards.py:355 #: templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "" @@ -85,7 +85,7 @@ msgstr "" msgid ":" msgstr "" -#: forms.py:411 forms.py:605 forms.py:1220 +#: forms.py:411 forms.py:607 forms.py:1224 msgid "You should select an operation." msgstr "" @@ -101,19 +101,19 @@ msgstr "" msgid "Deleted relations" msgstr "" -#: forms.py:451 templates/ishtar/sheet_operation.html:95 +#: forms.py:451 templates/ishtar/sheet_operation.html:85 msgid "Relations" msgstr "" -#: forms.py:456 forms.py:1226 models.py:273 +#: forms.py:456 forms.py:1230 models.py:273 msgid "Numeric reference" msgstr "" -#: forms.py:462 forms.py:1266 +#: forms.py:462 forms.py:1270 msgid "Parcel (section/number/public domain)" msgstr "" -#: forms.py:465 forms.py:1269 models.py:835 +#: forms.py:465 forms.py:1273 models.py:844 #: templates/ishtar/dashboards/dashboard_operation.html:390 #: templates/ishtar/dashboards/dashboard_operation.html:411 #: templates/ishtar/dashboards/dashboard_operation.html:643 @@ -122,449 +122,454 @@ msgstr "" msgid "Department" msgstr "" -#: forms.py:466 forms.py:1097 models.py:86 +#: forms.py:466 forms.py:1101 models.py:86 +#: templates/ishtar/sheet_operation.html:22 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Name" msgstr "" -#: forms.py:468 forms.py:672 forms.py:750 forms.py:1232 models.py:280 +#: forms.py:468 forms.py:752 models.py:334 +msgid "Address / Locality" +msgstr "" + +#: forms.py:470 forms.py:674 forms.py:754 forms.py:1236 models.py:280 msgid "Operation type" msgstr "" -#: forms.py:470 +#: forms.py:472 msgid "Is open?" msgstr "" -#: forms.py:478 forms.py:782 models.py:269 +#: forms.py:480 forms.py:786 models.py:269 msgid "In charge" msgstr "" -#: forms.py:485 models.py:989 +#: forms.py:487 models.py:1009 msgid "Scientist in charge" msgstr "" -#: forms.py:487 forms.py:674 forms.py:772 models.py:267 +#: forms.py:489 forms.py:676 forms.py:776 models.py:267 msgid "Operator" msgstr "" -#: forms.py:496 forms.py:1102 models.py:90 models.py:282 +#: forms.py:498 forms.py:1106 models.py:90 models.py:282 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10 msgid "Remains" msgstr "" -#: forms.py:497 forms.py:1080 forms.py:1099 models.py:88 models.py:288 +#: forms.py:499 forms.py:1084 forms.py:1103 models.py:88 models.py:288 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Periods" msgstr "" -#: forms.py:498 +#: forms.py:500 msgid "Started before" msgstr "" -#: forms.py:500 +#: forms.py:502 msgid "Started after" msgstr "" -#: forms.py:502 +#: forms.py:504 msgid "Ended before" msgstr "" -#: forms.py:504 +#: forms.py:506 msgid "Ended after" msgstr "" -#: forms.py:507 +#: forms.py:509 msgid "Search within relations" msgstr "" -#: forms.py:509 forms.py:837 +#: forms.py:511 forms.py:841 msgid "Comment" msgstr "" -#: forms.py:510 +#: forms.py:512 msgid "Abstract (full text search)" msgstr "" -#: forms.py:512 forms.py:840 models.py:336 +#: forms.py:514 forms.py:844 models.py:337 msgid "Comment about scientific documentation" msgstr "" -#: forms.py:513 forms.py:842 models.py:348 +#: forms.py:515 forms.py:846 models.py:349 msgid "Record quality" msgstr "" -#: forms.py:514 forms.py:807 models.py:300 +#: forms.py:516 forms.py:811 models.py:300 msgid "Report processing" msgstr "" -#: forms.py:516 forms.py:845 models.py:343 +#: forms.py:518 forms.py:849 models.py:344 msgid "Virtual operation" msgstr "" -#: forms.py:518 forms.py:1142 forms.py:1146 models.py:94 +#: forms.py:520 forms.py:1146 forms.py:1150 models.py:94 msgid "Archaeological site" msgstr "" -#: forms.py:524 forms.py:1273 +#: forms.py:526 forms.py:1277 msgid "Created by" msgstr "" -#: forms.py:530 forms.py:1279 +#: forms.py:532 forms.py:1283 msgid "Modified by" msgstr "" -#: forms.py:537 +#: forms.py:539 msgid "Documentation deadline before" msgstr "" -#: forms.py:539 +#: forms.py:541 msgid "Documentation deadline after" msgstr "" -#: forms.py:541 forms.py:830 models.py:355 +#: forms.py:543 forms.py:834 models.py:356 msgid "Documentation received" msgstr "" -#: forms.py:543 +#: forms.py:545 msgid "Finds deadline before" msgstr "" -#: forms.py:545 +#: forms.py:547 msgid "Finds deadline after" msgstr "" -#: forms.py:547 forms.py:835 models.py:359 +#: forms.py:549 forms.py:839 models.py:360 msgid "Finds received" msgstr "" -#: forms.py:592 forms.py:1218 views.py:168 +#: forms.py:594 forms.py:1222 views.py:168 msgid "Operation search" msgstr "" -#: forms.py:636 +#: forms.py:638 msgid "Associated file" msgstr "" -#: forms.py:640 forms.py:933 models.py:501 models.py:891 models.py:1000 +#: forms.py:642 forms.py:937 models.py:510 models.py:910 models.py:1020 #: wizards.py:80 msgid "Archaeological file" msgstr "" -#: forms.py:647 forms.py:649 models.py:350 +#: forms.py:649 forms.py:651 models.py:351 msgid "Abstract" msgstr "" -#: forms.py:652 +#: forms.py:654 msgid "months" msgstr "" -#: forms.py:652 +#: forms.py:654 msgid "years" msgstr "" -#: forms.py:654 models.py:253 +#: forms.py:656 models.py:253 msgid "Creation date" msgstr "" -#: forms.py:655 +#: forms.py:657 msgid "Start of field work" msgstr "" -#: forms.py:657 +#: forms.py:659 msgid "All" msgstr "" -#: forms.py:658 +#: forms.py:660 msgid "Preventive" msgstr "" -#: forms.py:659 +#: forms.py:661 msgid "Research" msgstr "" -#: forms.py:663 +#: forms.py:665 msgid "Slicing" msgstr "" -#: forms.py:666 +#: forms.py:668 msgid "Department detail" msgstr "" -#: forms.py:668 +#: forms.py:670 msgid "Date get from" msgstr "" -#: forms.py:670 +#: forms.py:672 msgid "Preventive/Research" msgstr "" -#: forms.py:676 +#: forms.py:678 msgid "Date after" msgstr "" -#: forms.py:678 +#: forms.py:680 msgid "Date before" msgstr "" -#: forms.py:680 +#: forms.py:682 msgid "With reports" msgstr "" -#: forms.py:681 +#: forms.py:683 msgid "With finds" msgstr "" -#: forms.py:733 forms.py:1327 templates/ishtar/sheet_administrativeact.html:20 -#: templates/ishtar/sheet_operation.html:24 +#: forms.py:735 forms.py:1331 templates/ishtar/sheet_administrativeact.html:20 +#: templates/ishtar/sheet_operation.html:26 msgid "General" msgstr "" -#: forms.py:748 models.py:333 +#: forms.py:750 models.py:333 msgid "Generic name" msgstr "" -#: forms.py:757 models.py:302 +#: forms.py:761 models.py:302 msgid "Old code" msgstr "" -#: forms.py:760 +#: forms.py:764 msgid "Head scientist" msgstr "" -#: forms.py:779 models.py:332 +#: forms.py:783 models.py:332 msgid "Operator reference" msgstr "" -#: forms.py:793 +#: forms.py:797 msgid "Total surface (m2)" msgstr "" -#: forms.py:800 models.py:54 models.py:256 models.py:1417 +#: forms.py:804 models.py:54 models.py:256 models.py:1437 msgid "Start date" msgstr "" -#: forms.py:802 models.py:258 +#: forms.py:806 models.py:258 msgid "Excavation end date" msgstr "" -#: forms.py:805 models.py:259 +#: forms.py:809 models.py:259 msgid "Report delivery date" msgstr "" -#: forms.py:827 models.py:352 +#: forms.py:831 models.py:353 msgid "Deadline for submission of the documentation" msgstr "" -#: forms.py:832 models.py:357 +#: forms.py:836 models.py:358 msgid "Deadline for submission of the finds" msgstr "" -#: forms.py:847 +#: forms.py:851 msgid "Image" msgstr "" -#: forms.py:848 +#: forms.py:852 #, python-format msgid "" "

                    Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" -#: forms.py:886 +#: forms.py:890 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" -#: forms.py:891 +#: forms.py:895 msgid "The excavation end date cannot be before the start date." msgstr "" -#: forms.py:919 +#: forms.py:923 #, python-format msgid "" "Operation code already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: forms.py:923 +#: forms.py:927 msgid "Bad operation code" msgstr "" -#: forms.py:929 models.py:516 +#: forms.py:933 models.py:525 models.py:873 msgid "Operation code" msgstr "" -#: forms.py:955 +#: forms.py:959 msgid "Preventive informations - excavation" msgstr "" -#: forms.py:956 models.py:286 +#: forms.py:960 models.py:286 #: templates/ishtar/dashboards/dashboard_operation.html:701 msgid "Cost (euros)" msgstr "" -#: forms.py:957 models.py:291 +#: forms.py:961 models.py:291 msgid "Scheduled man-days" msgstr "" -#: forms.py:959 models.py:294 +#: forms.py:963 models.py:294 msgid "Optional man-days" msgstr "" -#: forms.py:961 models.py:297 +#: forms.py:965 models.py:297 msgid "Effective man-days" msgstr "" -#: forms.py:971 +#: forms.py:975 msgid "Preventive informations - diagnostic" msgstr "" -#: forms.py:974 models.py:316 +#: forms.py:978 models.py:316 msgid "Prescription on zoning" msgstr "" -#: forms.py:976 models.py:319 +#: forms.py:980 models.py:319 msgid "Prescription on large area" msgstr "" -#: forms.py:979 models.py:321 +#: forms.py:983 models.py:321 msgid "Prescription on geoarchaeological context" msgstr "" -#: forms.py:983 forms.py:1005 models.py:284 models.py:1023 +#: forms.py:987 forms.py:1009 models.py:284 models.py:1043 msgid "Towns" msgstr "" -#: forms.py:1012 models.py:1220 models.py:1415 +#: forms.py:1016 models.py:1240 models.py:1435 msgid "Parcel" msgstr "" -#: forms.py:1064 models.py:46 +#: forms.py:1068 models.py:46 msgid "Remain types" msgstr "" -#: forms.py:1068 models.py:45 +#: forms.py:1072 models.py:45 msgid "Remain type" msgstr "" -#: forms.py:1084 templates/ishtar/sheet_operation.html:176 -#: templates/ishtar/sheet_operation.html:207 +#: forms.py:1088 templates/ishtar/sheet_operation.html:166 +#: templates/ishtar/sheet_operation.html:197 msgid "Period" msgstr "" -#: forms.py:1096 models.py:85 +#: forms.py:1100 models.py:85 msgid "Reference" msgstr "" -#: forms.py:1125 +#: forms.py:1129 msgid "This reference already exists." msgstr "" -#: forms.py:1157 models.py:95 models.py:340 -#: templates/ishtar/sheet_operation.html:106 +#: forms.py:1161 models.py:95 models.py:341 +#: templates/ishtar/sheet_operation.html:96 msgid "Archaeological sites" msgstr "" -#: forms.py:1161 +#: forms.py:1165 msgid "Associated archaeological sites" msgstr "" -#: forms.py:1167 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93 +#: forms.py:1171 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93 msgid "Search" msgstr "" -#: forms.py:1172 +#: forms.py:1176 msgid "Would you like to close this operation?" msgstr "" -#: forms.py:1177 +#: forms.py:1181 msgid "Would you like to delete this operation?" msgstr "" -#: forms.py:1186 forms.py:1256 forms.py:1392 models.py:866 models.py:980 +#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:880 models.py:1000 msgid "Index" msgstr "" -#: forms.py:1212 +#: forms.py:1216 #, python-format msgid "" "Index already exists for operation: %(operation)s - use a value bigger than " "%(last_val)d" msgstr "" -#: forms.py:1224 +#: forms.py:1228 msgid "Operation's year" msgstr "" -#: forms.py:1231 +#: forms.py:1235 msgid "Operation's town" msgstr "" -#: forms.py:1244 +#: forms.py:1248 msgid "Documentation search" msgstr "" -#: forms.py:1246 +#: forms.py:1250 msgid "You should select a document." msgstr "" -#: forms.py:1263 forms.py:1330 models.py:905 models.py:974 +#: forms.py:1267 forms.py:1334 models.py:924 models.py:994 msgid "Act type" msgstr "" -#: forms.py:1264 forms.py:1462 +#: forms.py:1268 forms.py:1466 msgid "Indexed?" msgstr "" -#: forms.py:1270 forms.py:1335 models.py:1014 +#: forms.py:1274 forms.py:1339 models.py:1034 #: templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" -#: forms.py:1307 views.py:333 +#: forms.py:1311 views.py:333 msgid "Administrative act search" msgstr "" -#: forms.py:1322 forms.py:1420 forms.py:1487 +#: forms.py:1326 forms.py:1424 forms.py:1491 msgid "You should select an administrative act." msgstr "" -#: forms.py:1338 models.py:1011 +#: forms.py:1342 models.py:1031 msgid "Signature date" msgstr "" -#: forms.py:1380 +#: forms.py:1384 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: forms.py:1384 +#: forms.py:1388 msgid "Bad index" msgstr "" -#: forms.py:1397 +#: forms.py:1401 msgid "Would you like to delete this administrative act?" msgstr "" -#: forms.py:1402 +#: forms.py:1406 msgid "Template" msgstr "" -#: forms.py:1426 forms.py:1430 +#: forms.py:1430 forms.py:1434 msgid "This document is not intended for this type of act." msgstr "" -#: forms.py:1448 +#: forms.py:1452 msgid "Doc generation" msgstr "" -#: forms.py:1450 +#: forms.py:1454 msgid "Generate the associated doc?" msgstr "" -#: forms.py:1471 ishtar_menu.py:123 views.py:386 +#: forms.py:1475 ishtar_menu.py:123 views.py:386 msgctxt "admin act register" msgid "Register" msgstr "" @@ -585,7 +590,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:59 models.py:1030 +#: ishtar_menu.py:59 models.py:1050 #: templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -610,16 +615,16 @@ msgstr "" msgid "General informations" msgstr "" -#: ishtar_menu.py:139 models.py:368 +#: ishtar_menu.py:139 models.py:369 #: templates/ishtar/dashboards/dashboard_operation.html:8 msgid "Operations" msgstr "" -#: models.py:53 models.py:71 models.py:1879 +#: models.py:53 models.py:71 models.py:1907 msgid "Order" msgstr "" -#: models.py:55 models.py:1418 +#: models.py:55 models.py:1438 msgid "End date" msgstr "" @@ -735,7 +740,7 @@ msgstr "" msgid "In charge scientist" msgstr "" -#: models.py:277 models.py:1200 +#: models.py:277 models.py:1220 msgid "File" msgstr "" @@ -743,297 +748,305 @@ msgstr "" msgid "Surface (m2)" msgstr "" -#: models.py:334 +#: models.py:335 msgid "General comment" msgstr "" -#: models.py:337 +#: models.py:338 msgid "Cached name" msgstr "" -#: models.py:345 +#: models.py:346 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" -#: models.py:361 +#: models.py:362 msgid "Point" msgstr "" -#: models.py:362 +#: models.py:363 msgid "Multi polygon" msgstr "" -#: models.py:370 +#: models.py:371 msgid "Can view all Operations" msgstr "" -#: models.py:371 +#: models.py:372 msgid "Can view own Operation" msgstr "" -#: models.py:372 +#: models.py:373 msgid "Can add own Operation" msgstr "" -#: models.py:373 +#: models.py:374 msgid "Can change own Operation" msgstr "" -#: models.py:374 +#: models.py:375 msgid "Can delete own Operation" msgstr "" -#: models.py:375 +#: models.py:376 msgid "Can close Operation" msgstr "" -#: models.py:404 +#: models.py:405 msgid "OPE" msgstr "" -#: models.py:470 +#: models.py:479 msgid "Intercommunal" msgstr "" -#: models.py:502 +#: models.py:511 msgid "Code patriarche" msgstr "" -#: models.py:542 +#: models.py:551 msgid "This operation code already exists for this year" msgstr "" -#: models.py:567 +#: models.py:576 msgid "Number of parcels" msgstr "" -#: models.py:585 +#: models.py:594 msgid "Number of administrative acts" msgstr "" -#: models.py:593 +#: models.py:602 msgid "Number of indexed administrative acts" msgstr "" -#: models.py:601 +#: models.py:610 msgid "Number of context records" msgstr "" -#: models.py:637 +#: models.py:646 msgid "Number of finds" msgstr "" -#: models.py:682 +#: models.py:691 msgid "No type" msgstr "" -#: models.py:713 +#: models.py:722 msgid "Number of sources" msgstr "" -#: models.py:755 templates/ishtar/dashboards/dashboard_operation.html:309 +#: models.py:764 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:805 +#: models.py:814 msgid "Inverse relation" msgstr "" -#: models.py:809 +#: models.py:818 msgid "Operation relation type" msgstr "" -#: models.py:810 +#: models.py:819 msgid "Operation relation types" msgstr "" -#: models.py:823 +#: models.py:832 msgid "Operation record relation" msgstr "" -#: models.py:824 +#: models.py:833 msgid "Operation record relations" msgstr "" -#: models.py:870 +#: models.py:872 +msgid "Operation year" +msgstr "" + +#: models.py:874 +msgid "Document code" +msgstr "" + +#: models.py:884 msgid "Operation documentation" msgstr "" -#: models.py:871 +#: models.py:885 msgid "Operation documentations" msgstr "" -#: models.py:874 +#: models.py:888 msgid "Can view all Operation sources" msgstr "" -#: models.py:876 +#: models.py:890 msgid "Can view own Operation source" msgstr "" -#: models.py:878 +#: models.py:892 msgid "Can add own Operation source" msgstr "" -#: models.py:880 +#: models.py:894 msgid "Can change own Operation source" msgstr "" -#: models.py:882 +#: models.py:896 msgid "Can delete own Operation source" msgstr "" -#: models.py:893 models.py:1005 +#: models.py:912 models.py:1025 msgid "Treatment request" msgstr "" -#: models.py:894 models.py:1010 +#: models.py:913 models.py:1030 msgid "Treatment" msgstr "" -#: models.py:896 +#: models.py:915 msgid "Intended to" msgstr "" -#: models.py:898 +#: models.py:917 msgid "Code" msgstr "" -#: models.py:901 +#: models.py:920 msgid "Associated template" msgstr "" -#: models.py:902 +#: models.py:921 msgid "Indexed" msgstr "" -#: models.py:906 +#: models.py:925 msgid "Act types" msgstr "" -#: models.py:978 +#: models.py:991 models.py:1071 +#: templates/ishtar/blocks/window_tables/administrativacts.html:7 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 +msgid "Ref." +msgstr "" + +#: models.py:998 msgid "Person in charge of the operation" msgstr "" -#: models.py:984 +#: models.py:1004 msgid "Archaeological preventive operator" msgstr "" -#: models.py:992 +#: models.py:1012 msgid "Signatory" msgstr "" -#: models.py:1020 +#: models.py:1040 msgid "Departments" msgstr "" -#: models.py:1021 +#: models.py:1041 msgid "Cached values get from associated departments" msgstr "" -#: models.py:1024 +#: models.py:1044 msgid "Cached values get from associated towns" msgstr "" -#: models.py:1031 templates/ishtar/sheet_operation.html:114 -#: templates/ishtar/sheet_operation.html:150 +#: models.py:1051 templates/ishtar/sheet_operation.html:104 +#: templates/ishtar/sheet_operation.html:140 msgid "Administrative acts" msgstr "" -#: models.py:1034 +#: models.py:1054 msgid "Can view all Administrative acts" msgstr "" -#: models.py:1036 +#: models.py:1056 msgid "Can view own Administrative act" msgstr "" -#: models.py:1038 +#: models.py:1058 msgid "Can add own Administrative act" msgstr "" -#: models.py:1040 +#: models.py:1060 msgid "Can change own Administrative act" msgstr "" -#: models.py:1042 +#: models.py:1062 msgid "Can delete own Administrative act" msgstr "" -#: models.py:1051 -#: templates/ishtar/blocks/window_tables/administrativacts.html:7 -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 -msgid "Ref." -msgstr "" - -#: models.py:1145 +#: models.py:1165 msgid "This index already exists for this year" msgstr "" -#: models.py:1213 +#: models.py:1233 msgid "External ID" msgstr "" -#: models.py:1216 +#: models.py:1236 msgid "External ID is set automatically" msgstr "" -#: models.py:1217 +#: models.py:1237 msgid "Address - Locality" msgstr "" -#: models.py:1413 +#: models.py:1433 msgid "Owner" msgstr "" -#: models.py:1421 +#: models.py:1441 msgid "Parcel owner" msgstr "" -#: models.py:1422 +#: models.py:1442 msgid "Parcel owners" msgstr "" -#: models.py:1448 +#: models.py:1468 msgid "Recorded" msgstr "" -#: models.py:1449 +#: models.py:1469 msgid "Effective" msgstr "" -#: models.py:1450 +#: models.py:1470 msgid "Active" msgstr "" -#: models.py:1451 +#: models.py:1471 msgid "Field completed" msgstr "" -#: models.py:1452 +#: models.py:1472 msgid "Associated report" msgstr "" -#: models.py:1453 +#: models.py:1473 msgid "Closed" msgstr "" -#: models.py:1454 +#: models.py:1474 msgid "Documented and closed" msgstr "" -#: models.py:1880 +#: models.py:1908 msgid "Is preventive" msgstr "" -#: models.py:1883 +#: models.py:1911 msgid "Operation type old" msgstr "" -#: models.py:1884 +#: models.py:1912 msgid "Operation types old" msgstr "" @@ -1092,7 +1105,7 @@ msgid "" msgstr "" #: templates/ishtar/sheet_administrativeact.html:36 -#: templates/ishtar/sheet_operation.html:50 +#: templates/ishtar/sheet_operation.html:40 msgid "Surface:" msgstr "" @@ -1104,96 +1117,96 @@ msgstr "" msgid "Patriarche OA code not yet recorded!" msgstr "" -#: templates/ishtar/sheet_operation.html:27 -msgid "Creation:" +#: templates/ishtar/sheet_operation.html:23 +msgid "Address" msgstr "" -#: templates/ishtar/sheet_operation.html:34 -msgid "Modification:" +#: templates/ishtar/sheet_operation.html:30 +msgid "Begining date" msgstr "" -#: templates/ishtar/sheet_operation.html:46 +#: templates/ishtar/sheet_operation.html:36 msgid "State:" msgstr "" -#: templates/ishtar/sheet_operation.html:46 +#: templates/ishtar/sheet_operation.html:36 msgid "Active file" msgstr "" -#: templates/ishtar/sheet_operation.html:47 +#: templates/ishtar/sheet_operation.html:37 msgid "Closed operation" msgstr "" -#: templates/ishtar/sheet_operation.html:48 +#: templates/ishtar/sheet_operation.html:38 msgid "Closing date:" msgstr "" -#: templates/ishtar/sheet_operation.html:48 +#: templates/ishtar/sheet_operation.html:38 msgid "by" msgstr "" -#: templates/ishtar/sheet_operation.html:51 +#: templates/ishtar/sheet_operation.html:41 msgid "Cost:" msgstr "" -#: templates/ishtar/sheet_operation.html:52 +#: templates/ishtar/sheet_operation.html:42 msgid "Duration:" msgstr "" -#: templates/ishtar/sheet_operation.html:52 +#: templates/ishtar/sheet_operation.html:42 msgid "Day" msgstr "" -#: templates/ishtar/sheet_operation.html:85 +#: templates/ishtar/sheet_operation.html:75 msgid "Localisation" msgstr "" -#: templates/ishtar/sheet_operation.html:110 +#: templates/ishtar/sheet_operation.html:100 msgid "Associated parcels" msgstr "" -#: templates/ishtar/sheet_operation.html:118 +#: templates/ishtar/sheet_operation.html:108 msgid "Document from this operation" msgstr "" -#: templates/ishtar/sheet_operation.html:124 -#: templates/ishtar/sheet_operation.html:161 +#: templates/ishtar/sheet_operation.html:114 +#: templates/ishtar/sheet_operation.html:151 msgid "Context records" msgstr "" -#: templates/ishtar/sheet_operation.html:128 +#: templates/ishtar/sheet_operation.html:118 msgid "Context record relations" msgstr "" -#: templates/ishtar/sheet_operation.html:133 +#: templates/ishtar/sheet_operation.html:123 msgid "Documents from associated context records" msgstr "" -#: templates/ishtar/sheet_operation.html:138 -#: templates/ishtar/sheet_operation.html:184 +#: templates/ishtar/sheet_operation.html:128 +#: templates/ishtar/sheet_operation.html:174 msgid "Finds" msgstr "" -#: templates/ishtar/sheet_operation.html:143 +#: templates/ishtar/sheet_operation.html:133 msgid "Documents from associated finds" msgstr "" -#: templates/ishtar/sheet_operation.html:148 +#: templates/ishtar/sheet_operation.html:138 msgid "Statistics" msgstr "" -#: templates/ishtar/sheet_operation.html:168 -#: templates/ishtar/sheet_operation.html:222 +#: templates/ishtar/sheet_operation.html:158 +#: templates/ishtar/sheet_operation.html:212 #: templates/ishtar/blocks/window_tables/administrativacts.html:8 msgid "Type" msgstr "" -#: templates/ishtar/sheet_operation.html:168 -#: templates/ishtar/sheet_operation.html:176 -#: templates/ishtar/sheet_operation.html:191 -#: templates/ishtar/sheet_operation.html:199 -#: templates/ishtar/sheet_operation.html:207 -#: templates/ishtar/sheet_operation.html:222 +#: templates/ishtar/sheet_operation.html:158 +#: templates/ishtar/sheet_operation.html:166 +#: templates/ishtar/sheet_operation.html:181 +#: templates/ishtar/sheet_operation.html:189 +#: templates/ishtar/sheet_operation.html:197 +#: templates/ishtar/sheet_operation.html:212 #: templates/ishtar/dashboards/dashboard_operation.html:18 #: templates/ishtar/dashboards/dashboard_operation.html:164 #: templates/ishtar/dashboards/dashboard_operation.html:432 @@ -1202,19 +1215,19 @@ msgstr "" msgid "Number" msgstr "" -#: templates/ishtar/sheet_operation.html:191 +#: templates/ishtar/sheet_operation.html:181 msgid "Material type" msgstr "" -#: templates/ishtar/sheet_operation.html:199 +#: templates/ishtar/sheet_operation.html:189 msgid "Object type" msgstr "" -#: templates/ishtar/sheet_operation.html:215 +#: templates/ishtar/sheet_operation.html:205 msgid "Sources" msgstr "" -#: templates/ishtar/sheet_operation.html:231 +#: templates/ishtar/sheet_operation.html:221 msgid "Finds by context records" msgstr "" @@ -1222,6 +1235,10 @@ msgstr "" msgid "Operation source" msgstr "" +#: templates/ishtar/sheet_operationsource.html:11 +msgid "Related operation" +msgstr "" + #: templates/ishtar/blocks/window_tables/administrativacts.html:9 msgid "Date" msgstr "" diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot index 5f7ac6fd1..87fedd778 100644 --- a/archaeological_warehouse/locale/django.pot +++ b/archaeological_warehouse/locale/django.pot @@ -161,7 +161,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:57 models.py:192 templates/ishtar/sheet_warehouse.html:17 +#: ishtar_menu.py:57 models.py:192 templates/ishtar/sheet_warehouse.html:20 msgid "Containers" msgstr "" @@ -210,11 +210,11 @@ msgid "Collection" msgstr "" #: models.py:117 -msgid "Warehouse division" +msgid "Warehouse division type" msgstr "" #: models.py:118 -msgid "Warehouse divisions" +msgid "Warehouse division types" msgstr "" #: models.py:138 @@ -297,11 +297,11 @@ msgstr "" msgid "Container deletion" msgstr "" -#: templates/ishtar/sheet_container.html:19 +#: templates/ishtar/sheet_container.html:22 msgid "Content" msgstr "" -#: templates/ishtar/sheet_warehouse.html:22 +#: templates/ishtar/sheet_warehouse.html:25 msgid "Attached containers" msgstr "" diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index c345672b7..d95ccd2f8 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -17,7 +17,7 @@ msgstr "" msgid "email address" msgstr "" -#: __init__.py:10 +#: __init__.py:10 templates/ishtar/sheet_source.html:8 msgid "Related item" msgstr "" @@ -119,31 +119,31 @@ msgstr "" msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: data_importer.py:1555 +#: data_importer.py:1559 msgid "line" msgstr "" -#: data_importer.py:1555 +#: data_importer.py:1559 msgid "col" msgstr "" -#: data_importer.py:1555 +#: data_importer.py:1559 msgid "error" msgstr "" -#: data_importer.py:1561 +#: data_importer.py:1565 msgid "field" msgstr "" -#: data_importer.py:1561 +#: data_importer.py:1565 msgid "source" msgstr "" -#: data_importer.py:1561 +#: data_importer.py:1565 msgid "result" msgstr "" -#: data_importer.py:1577 +#: data_importer.py:1581 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -181,7 +181,7 @@ msgid "Template" msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:184 -#: forms_common.py:408 models.py:1548 models.py:2986 +#: forms_common.py:408 models.py:1548 models.py:2989 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -197,8 +197,8 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.

                    " msgstr "" -#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2609 -#: models.py:2790 models.py:2854 templates/ishtar/sheet_person.html:4 +#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2610 +#: models.py:2791 models.py:2856 templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -209,15 +209,16 @@ msgid "" msgstr "" #: forms_common.py:172 forms_common.py:329 forms_common.py:453 -#: ishtar_menu.py:75 models.py:2492 models.py:2583 +#: ishtar_menu.py:75 models.py:2493 models.py:2584 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" #: forms_common.py:175 forms_common.py:212 forms_common.py:324 #: forms_common.py:378 forms_common.py:448 models.py:1103 models.py:1481 -#: models.py:1750 models.py:1766 models.py:2003 models.py:2486 models.py:2595 -#: models.py:2972 templates/ishtar/sheet_organization.html:8 +#: models.py:1750 models.py:1766 models.py:2003 models.py:2279 models.py:2487 +#: models.py:2596 models.py:2975 templates/ishtar/import_list.html:13 +#: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "" @@ -252,22 +253,22 @@ msgstr "" #: forms_common.py:188 forms_common.py:385 models.py:1561 #: templates/ishtar/sheet_organization.html:14 -#: templates/ishtar/sheet_person.html:19 +#: templates/ishtar/sheet_person.html:21 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "" #: forms_common.py:189 forms_common.py:394 models.py:1573 #: templates/ishtar/sheet_organization.html:15 -#: templates/ishtar/sheet_person.html:37 +#: templates/ishtar/sheet_person.html:39 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "" #: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2170 -#: models.py:2488 models.py:2907 templates/sheet_ope.html:85 +#: models.py:2489 models.py:2910 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 -#: templates/ishtar/import_list.html:13 +#: templates/ishtar/import_list.html:14 #: templates/ishtar/sheet_organization.html:23 #: templates/ishtar/blocks/window_tables/documents.html:8 msgid "Type" @@ -289,7 +290,7 @@ msgstr "" msgid "Organization to merge" msgstr "" -#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2593 +#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2594 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "" @@ -308,16 +309,16 @@ msgid "Identity" msgstr "" #: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2135 -#: models.py:2587 models.py:2589 models.py:2904 templates/sheet_ope.html:104 +#: models.py:2588 models.py:2590 models.py:2907 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" -#: forms_common.py:374 models.py:2591 +#: forms_common.py:374 models.py:2592 msgid "Salutation" msgstr "" -#: forms_common.py:380 models.py:2597 +#: forms_common.py:380 models.py:2598 msgid "Raw name" msgstr "" @@ -377,7 +378,7 @@ msgstr "" msgid "Account search" msgstr "" -#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2540 +#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2541 msgid "Person type" msgstr "" @@ -409,7 +410,7 @@ msgstr "" msgid "Send the new password by email?" msgstr "" -#: forms_common.py:636 forms_common.py:649 models.py:2987 +#: forms_common.py:636 forms_common.py:649 models.py:2990 msgid "Towns" msgstr "" @@ -425,7 +426,7 @@ msgstr "" msgid "Documentation informations" msgstr "" -#: forms_common.py:783 forms_common.py:831 models.py:2136 models.py:2879 +#: forms_common.py:783 forms_common.py:831 models.py:2136 models.py:2882 msgid "Source type" msgstr "" @@ -437,37 +438,37 @@ msgstr "" msgid "Internal reference" msgstr "" -#: forms_common.py:791 models.py:2918 +#: forms_common.py:791 models.py:2921 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:792 models.py:2920 +#: forms_common.py:792 models.py:2923 msgid "Receipt date" msgstr "" -#: forms_common.py:794 models.py:2302 models.py:2922 +#: forms_common.py:794 models.py:2304 models.py:2925 msgid "Creation date" msgstr "" -#: forms_common.py:797 models.py:2925 +#: forms_common.py:797 models.py:2928 msgid "Receipt date in documentation" msgstr "" #: forms_common.py:799 forms_common.py:835 models.py:379 models.py:696 -#: models.py:2030 models.py:2601 models.py:2932 +#: models.py:2030 models.py:2602 models.py:2935 msgid "Comment" msgstr "" #: forms_common.py:801 forms_common.py:834 models.py:1105 models.py:1770 -#: models.py:1957 models.py:2004 models.py:2931 templates/sheet_ope.html:128 +#: models.py:1957 models.py:2004 models.py:2934 templates/sheet_ope.html:128 msgid "Description" msgstr "" -#: forms_common.py:804 models.py:2933 +#: forms_common.py:804 models.py:2936 msgid "Additional information" msgstr "" -#: forms_common.py:806 forms_common.py:838 models.py:2935 +#: forms_common.py:806 forms_common.py:838 models.py:2938 msgid "Has a duplicate" msgstr "" @@ -482,7 +483,7 @@ msgid "" "p>" msgstr "" -#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2859 +#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2861 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" @@ -495,7 +496,7 @@ msgstr "" msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:864 models.py:2137 models.py:2846 models.py:2856 +#: forms_common.py:864 models.py:2137 models.py:2848 models.py:2858 msgid "Author type" msgstr "" @@ -507,7 +508,7 @@ msgstr "" msgid "There are identical authors." msgstr "" -#: forms_common.py:901 models.py:2860 models.py:2914 +#: forms_common.py:901 models.py:2862 models.py:2917 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -537,7 +538,7 @@ msgstr "" msgid "Search" msgstr "" -#: ishtar_menu.py:54 ishtar_menu.py:83 templates/ishtar/import_list.html:15 +#: ishtar_menu.py:54 ishtar_menu.py:83 templates/ishtar/import_list.html:16 msgid "Creation" msgstr "" @@ -553,7 +554,7 @@ msgstr "" msgid "Manual merge" msgstr "" -#: ishtar_menu.py:109 models.py:2313 +#: ishtar_menu.py:109 models.py:2315 msgid "Imports" msgstr "" @@ -565,7 +566,7 @@ msgstr "" msgid "Current imports" msgstr "" -#: ishtar_menu.py:120 views.py:1664 +#: ishtar_menu.py:120 views.py:1667 msgid "Old imports" msgstr "" @@ -609,7 +610,7 @@ msgstr "" msgid "Creator" msgstr "" -#: models.py:965 models.py:2998 models.py:3054 +#: models.py:965 models.py:2846 models.py:3001 models.py:3057 msgid "Order" msgstr "" @@ -825,7 +826,7 @@ msgid "Total" msgstr "" #: models.py:1393 models.py:1517 models.py:1529 -#: templates/ishtar/sheet_person.html:22 +#: templates/ishtar/sheet_person.html:24 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 #: templates/ishtar/wizard/wizard_person.html:20 @@ -848,7 +849,7 @@ msgstr "" msgid "Document templates" msgstr "" -#: models.py:1520 models.py:1530 models.py:2297 +#: models.py:1520 models.py:1530 models.py:2299 msgid "State" msgstr "" @@ -1038,11 +1039,11 @@ msgstr "" msgid "Importer - Targets keys" msgstr "" -#: models.py:2138 models.py:2910 +#: models.py:2138 models.py:2913 msgid "Format" msgstr "" -#: models.py:2139 models.py:3002 +#: models.py:2139 models.py:3005 msgid "Operation type" msgstr "" @@ -1106,15 +1107,15 @@ msgstr "" msgid "Context record relation type" msgstr "" -#: models.py:2158 models.py:3060 +#: models.py:2158 models.py:3063 msgid "Spatial reference system" msgstr "" -#: models.py:2159 models.py:2888 +#: models.py:2159 models.py:2891 msgid "Support type" msgstr "" -#: models.py:2160 models.py:2552 +#: models.py:2160 models.py:2553 msgid "Title type" msgstr "" @@ -1212,263 +1213,263 @@ msgstr "" msgid "Archived" msgstr "" -#: models.py:2281 +#: models.py:2283 msgid "Imported file" msgstr "" -#: models.py:2283 +#: models.py:2285 msgid "Associated images (zip file)" msgstr "" -#: models.py:2285 +#: models.py:2287 msgid "Encoding" msgstr "" -#: models.py:2287 +#: models.py:2289 msgid "Skip lines" msgstr "" -#: models.py:2288 templates/ishtar/import_list.html:47 +#: models.py:2290 templates/ishtar/import_list.html:51 msgid "Error file" msgstr "" -#: models.py:2291 +#: models.py:2293 msgid "Result file" msgstr "" -#: models.py:2294 templates/ishtar/import_list.html:53 +#: models.py:2296 templates/ishtar/import_list.html:57 msgid "Match file" msgstr "" -#: models.py:2300 +#: models.py:2302 msgid "Conservative import" msgstr "" -#: models.py:2305 +#: models.py:2307 msgid "End date" msgstr "" -#: models.py:2307 +#: models.py:2309 msgid "Remaining seconds" msgstr "" -#: models.py:2312 +#: models.py:2314 msgid "Import" msgstr "" -#: models.py:2342 +#: models.py:2343 msgid "Analyse" msgstr "" -#: models.py:2344 models.py:2347 +#: models.py:2345 models.py:2348 msgid "Re-analyse" msgstr "" -#: models.py:2345 +#: models.py:2346 msgid "Launch import" msgstr "" -#: models.py:2348 +#: models.py:2349 msgid "Re-import" msgstr "" -#: models.py:2349 +#: models.py:2350 msgid "Archive" msgstr "" -#: models.py:2351 +#: models.py:2352 msgid "Unarchive" msgstr "" -#: models.py:2352 widgets.py:130 templates/ishtar/form_delete.html:11 +#: models.py:2353 widgets.py:130 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "" -#: models.py:2493 +#: models.py:2494 msgid "Organizations" msgstr "" -#: models.py:2495 +#: models.py:2496 msgid "Can view all Organizations" msgstr "" -#: models.py:2496 +#: models.py:2497 msgid "Can view own Organization" msgstr "" -#: models.py:2497 +#: models.py:2498 msgid "Can add own Organization" msgstr "" -#: models.py:2499 +#: models.py:2500 msgid "Can change own Organization" msgstr "" -#: models.py:2501 +#: models.py:2502 msgid "Can delete own Organization" msgstr "" -#: models.py:2536 +#: models.py:2537 msgid "Groups" msgstr "" -#: models.py:2541 +#: models.py:2542 msgid "Person types" msgstr "" -#: models.py:2553 +#: models.py:2554 msgid "Title types" msgstr "" -#: models.py:2562 +#: models.py:2563 msgid "Mr" msgstr "" -#: models.py:2563 +#: models.py:2564 msgid "Miss" msgstr "" -#: models.py:2564 +#: models.py:2565 msgid "Mr and Mrs" msgstr "" -#: models.py:2565 +#: models.py:2566 msgid "Mrs" msgstr "" -#: models.py:2566 +#: models.py:2567 msgid "Doctor" msgstr "" -#: models.py:2599 +#: models.py:2600 msgid "Contact type" msgstr "" -#: models.py:2602 models.py:2666 +#: models.py:2603 models.py:2667 msgid "Types" msgstr "" -#: models.py:2605 +#: models.py:2606 msgid "Is attached to" msgstr "" -#: models.py:2610 +#: models.py:2611 msgid "Persons" msgstr "" -#: models.py:2612 +#: models.py:2613 msgid "Can view all Persons" msgstr "" -#: models.py:2613 +#: models.py:2614 msgid "Can view own Person" msgstr "" -#: models.py:2614 +#: models.py:2615 msgid "Can add own Person" msgstr "" -#: models.py:2615 +#: models.py:2616 msgid "Can change own Person" msgstr "" -#: models.py:2616 +#: models.py:2617 msgid "Can delete own Person" msgstr "" -#: models.py:2793 +#: models.py:2794 msgid "Advanced shortcut menu" msgstr "" -#: models.py:2796 +#: models.py:2797 msgid "Ishtar user" msgstr "" -#: models.py:2797 +#: models.py:2798 msgid "Ishtar users" msgstr "" -#: models.py:2841 +#: models.py:2842 msgid "To modify the password use the form in Auth > User" msgstr "" -#: models.py:2847 +#: models.py:2849 msgid "Author types" msgstr "" -#: models.py:2880 +#: models.py:2883 msgid "Source types" msgstr "" -#: models.py:2889 +#: models.py:2892 msgid "Support types" msgstr "" -#: models.py:2896 +#: models.py:2899 msgid "Format type" msgstr "" -#: models.py:2897 +#: models.py:2900 msgid "Format types" msgstr "" -#: models.py:2905 +#: models.py:2908 msgid "External ID" msgstr "" -#: models.py:2908 +#: models.py:2911 msgid "Support" msgstr "" -#: models.py:2912 +#: models.py:2915 msgid "Scale" msgstr "" -#: models.py:2926 +#: models.py:2929 msgid "Item number" msgstr "" -#: models.py:2927 +#: models.py:2930 msgid "Ref." msgstr "" -#: models.py:2930 +#: models.py:2933 msgid "Internal ref." msgstr "" -#: models.py:2973 +#: models.py:2976 msgid "Surface (m2)" msgstr "" -#: models.py:2974 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2977 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "" -#: models.py:2999 +#: models.py:3002 msgid "Is preventive" msgstr "" -#: models.py:3003 +#: models.py:3006 msgid "Operation types" msgstr "" -#: models.py:3032 +#: models.py:3035 msgid "Preventive" msgstr "" -#: models.py:3033 +#: models.py:3036 msgid "Research" msgstr "" -#: models.py:3056 +#: models.py:3059 msgid "Authority name" msgstr "" -#: models.py:3057 +#: models.py:3060 msgid "Authority SRID" msgstr "" -#: models.py:3061 +#: models.py:3064 msgid "Spatial reference systems" msgstr "" @@ -1561,31 +1562,31 @@ msgstr "" msgid "Finds" msgstr "" -#: views.py:1676 templates/ishtar/import_list.html:43 +#: views.py:1681 templates/ishtar/import_list.html:47 msgid "Link unmatched items" msgstr "" -#: views.py:1691 +#: views.py:1696 msgid "Delete import" msgstr "" -#: views.py:1730 +#: views.py:1735 msgid "Merge persons" msgstr "" -#: views.py:1754 +#: views.py:1759 msgid "Select the main person" msgstr "" -#: views.py:1763 +#: views.py:1768 msgid "Merge organization" msgstr "" -#: views.py:1773 +#: views.py:1778 msgid "Select the main organization" msgstr "" -#: views.py:1813 views.py:1829 +#: views.py:1818 views.py:1834 msgid "Corporation manager" msgstr "" @@ -1605,7 +1606,7 @@ msgstr "" msgid "Remove" msgstr "" -#: wizards.py:372 templates/ishtar/import_delete.html:20 +#: wizards.py:372 templates/ishtar/import_delete.html:21 msgid "Yes" msgstr "" @@ -2058,7 +2059,7 @@ msgid "remove" msgstr "" #: templates/ishtar/form.html:11 templates/ishtar/formset.html:8 -#: templates/ishtar/import_list.html:58 templates/ishtar/merge.html:31 +#: templates/ishtar/import_list.html:62 templates/ishtar/merge.html:31 #: templates/ishtar/simple_form.html:7 #: templates/ishtar/wizard/default_wizard.html:31 #: templates/ishtar/wizard/search.html:13 @@ -2066,19 +2067,19 @@ msgstr "" msgid "Validate" msgstr "" -#: templates/ishtar/import_delete.html:8 +#: templates/ishtar/import_delete.html:9 msgid "The current items are linked to this import:" msgstr "" -#: templates/ishtar/import_delete.html:18 +#: templates/ishtar/import_delete.html:19 msgid "All these items will be deleted with this import." msgstr "" -#: templates/ishtar/import_delete.html:19 +#: templates/ishtar/import_delete.html:20 msgid "Are you sure?" msgstr "" -#: templates/ishtar/import_delete.html:22 +#: templates/ishtar/import_delete.html:23 msgid "Back" msgstr "" @@ -2086,24 +2087,24 @@ msgstr "" msgid "No pending imports." msgstr "" -#: templates/ishtar/import_list.html:14 +#: templates/ishtar/import_list.html:15 msgctxt "file" msgid "File" msgstr "" -#: templates/ishtar/import_list.html:16 +#: templates/ishtar/import_list.html:17 msgid "Status" msgstr "" -#: templates/ishtar/import_list.html:17 +#: templates/ishtar/import_list.html:18 msgid "Action" msgstr "" -#: templates/ishtar/import_list.html:25 +#: templates/ishtar/import_list.html:29 msgid "Source file" msgstr "" -#: templates/ishtar/import_list.html:50 +#: templates/ishtar/import_list.html:54 msgid "Control file" msgstr "" @@ -2211,60 +2212,64 @@ msgstr "" msgid "Planning service of archaeological files" msgstr "" -#: templates/ishtar/sheet_person.html:21 +#: templates/ishtar/sheet_person.html:23 #: templates/ishtar/wizard/wizard_person.html:19 msgid "Phone type" msgstr "" -#: templates/ishtar/sheet_person.html:44 +#: templates/ishtar/sheet_person.html:46 #: templates/ishtar/wizard/wizard_person.html:42 msgid "Business address" msgstr "" -#: templates/ishtar/sheet_person.html:52 +#: templates/ishtar/sheet_person.html:55 #: templates/ishtar/wizard/wizard_person.html:51 msgid "Other address" msgstr "" -#: templates/ishtar/sheet_person.html:60 +#: templates/ishtar/sheet_person.html:64 msgid "Associated organization" msgstr "" -#: templates/ishtar/sheet_person.html:71 +#: templates/ishtar/sheet_person.html:76 msgid "Associated operations as scientist" msgstr "" -#: templates/ishtar/sheet_person.html:75 +#: templates/ishtar/sheet_person.html:80 msgid "Associated operations as responsible" msgstr "" -#: templates/ishtar/sheet_person.html:80 +#: templates/ishtar/sheet_person.html:85 #: templates/ishtar/wizard/wizard_person_deletion.html:6 msgid "In charge of archaeological files" msgstr "" -#: templates/ishtar/sheet_person.html:85 +#: templates/ishtar/sheet_person.html:90 #: templates/ishtar/wizard/wizard_person_deletion.html:14 msgid "General contractor of archaeological files" msgstr "" -#: templates/ishtar/sheet_person.html:90 +#: templates/ishtar/sheet_person.html:95 #: templates/ishtar/wizard/wizard_person_deletion.html:22 msgid "Responsible for planning service of archaeological files" msgstr "" -#: templates/ishtar/sheet_person.html:96 +#: templates/ishtar/sheet_person.html:101 msgid "Documents associated to operations" msgstr "" -#: templates/ishtar/sheet_person.html:101 +#: templates/ishtar/sheet_person.html:106 msgid "Documents associated to context records" msgstr "" -#: templates/ishtar/sheet_person.html:106 +#: templates/ishtar/sheet_person.html:111 msgid "Documents associated to finds" msgstr "" +#: templates/ishtar/sheet_source.html:22 +msgid "Web link" +msgstr "" + #: templates/ishtar/blocks/advanced_shortcut_menu.html:15 #: templates/ishtar/blocks/shortcut_menu.html:15 msgid "" @@ -2319,6 +2324,18 @@ msgid "" "a free software under AGPL v3 license." msgstr "" +#: templates/ishtar/blocks/sheet_creation_section.html:3 +msgid "Creation:" +msgstr "" + +#: templates/ishtar/blocks/sheet_creation_section.html:12 +msgid "Modification:" +msgstr "" + +#: templates/ishtar/blocks/sheet_external_id.html:3 +msgid "Internal ID" +msgstr "" + #: templates/ishtar/blocks/window_nav.html:6 msgid "Previous version" msgstr "" diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index d30649001..1133c3af6 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -6,21 +6,23 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-03-15 11:56+0100\n" "PO-Revision-Date: 2017-03-09 04:59-0500\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" -#: forms.py:47 forms.py:51 models.py:198 models.py:565 wizards.py:77 +#: forms.py:47 forms.py:51 models.py:207 models.py:577 wizards.py:77 msgid "Operation" msgstr "Opération" -#: forms.py:59 forms.py:137 models.py:200 models.py:533 +#: forms.py:59 forms.py:138 models.py:209 models.py:545 msgid "ID" msgstr "Identifiant" @@ -44,7 +46,7 @@ msgstr "Entité archéologique" msgid "Search within related operations" msgstr "Rechercher parmi les opérations liées" -#: forms.py:77 forms.py:233 models.py:56 +#: forms.py:77 forms.py:241 models.py:56 msgid "Period" msgstr "Période" @@ -60,7 +62,7 @@ msgstr "Parcelle (section/numéro/domaine public)" msgid "Search within relations" msgstr "Rechercher parmi les relations" -#: forms.py:111 forms.py:336 views.py:92 +#: forms.py:111 forms.py:344 views.py:92 msgid "Context record search" msgstr "Rechercher une Unité d'Enregistrement" @@ -72,52 +74,56 @@ msgstr "Vous devez sélectionner au moins une Unité d'Enregistrement." msgid "General" msgstr "Général" -#: forms.py:136 models.py:154 models.py:196 models.py:535 +#: forms.py:137 models.py:172 models.py:205 models.py:547 msgid "Parcel" msgstr "Parcelle" -#: forms.py:139 models.py:201 models.py:536 -#: templates/ishtar/sheet_contextrecord.html:39 +#: forms.py:140 models.py:210 models.py:548 +#: templates/ishtar/sheet_contextrecord.html:30 msgid "Description" msgstr "Description" -#: forms.py:141 models.py:202 +#: forms.py:142 models.py:211 msgid "General comment" msgstr "Commentaire général" -#: forms.py:143 models.py:206 +#: forms.py:145 +msgid "Excavation technic" +msgstr "" + +#: forms.py:146 models.py:215 msgid "Length (m)" msgstr "Taille (m)" -#: forms.py:144 models.py:207 +#: forms.py:147 models.py:216 msgid "Width (m)" msgstr "Largeur (m)" -#: forms.py:145 models.py:208 +#: forms.py:148 models.py:217 msgid "Thickness (m)" msgstr "Épaisseur (m)" -#: forms.py:146 models.py:210 +#: forms.py:149 models.py:219 msgid "Depth (m)" msgstr "Profondeur (m)" -#: forms.py:147 forms.py:355 models.py:218 models.py:534 +#: forms.py:150 forms.py:363 models.py:227 models.py:546 msgid "Context record type" msgstr "Type d'Unité d'Enregistrement" -#: forms.py:148 models.py:220 +#: forms.py:151 models.py:229 msgid "Has furniture?" msgstr "Contient du mobilier ?" -#: forms.py:151 models.py:212 +#: forms.py:154 models.py:221 msgid "Location" msgstr "Lieu" -#: forms.py:154 +#: forms.py:157 msgid "Image" msgstr "Image" -#: forms.py:155 +#: forms.py:158 #, python-format msgid "" "

                    Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).

                    " -#: forms.py:222 +#: forms.py:230 msgid "This ID already exists for this operation." msgstr "Cet identifiant existe déjà pour cette opération." -#: forms.py:228 forms.py:255 models.py:67 +#: forms.py:236 forms.py:263 models.py:67 msgid "Dating" msgstr "Datation" -#: forms.py:234 models.py:57 +#: forms.py:242 models.py:57 msgid "Start date" msgstr "Date de début" -#: forms.py:235 models.py:58 models.py:205 +#: forms.py:243 models.py:58 models.py:214 msgid "End date" msgstr "Date de fin" -#: forms.py:236 models.py:61 +#: forms.py:244 models.py:61 msgid "Quality" msgstr "Qualité" -#: forms.py:237 models.py:39 models.py:59 +#: forms.py:245 models.py:39 models.py:59 msgid "Dating type" msgstr "Type de datation" -#: forms.py:264 ishtar_menu.py:29 models.py:595 +#: forms.py:272 ishtar_menu.py:29 models.py:607 msgid "Context record" msgstr "Unité d'Enregistrement" -#: forms.py:285 +#: forms.py:293 msgid "Relations" msgstr "Relations" -#: forms.py:289 forms.py:297 models.py:223 -#: templates/ishtar/sheet_contextrecord.html:51 +#: forms.py:297 forms.py:305 models.py:232 +#: templates/ishtar/sheet_contextrecord.html:42 msgid "Interpretation" msgstr "Interprétation" -#: forms.py:293 +#: forms.py:301 msgid "Comments on dating" msgstr "Commentaires sur la datation" -#: forms.py:295 models.py:222 +#: forms.py:303 models.py:231 msgid "Filling" msgstr "Remplissage" -#: forms.py:299 models.py:243 +#: forms.py:307 models.py:252 msgid "Activity" msgstr "Activité" -#: forms.py:301 models.py:241 +#: forms.py:309 models.py:250 msgid "Identification" msgstr "Identification" -#: forms.py:303 models.py:226 +#: forms.py:311 models.py:235 msgid "TAQ" msgstr "TAQ" -#: forms.py:304 models.py:230 +#: forms.py:312 models.py:239 msgid "Estimated TAQ" msgstr "TAQ estimé" -#: forms.py:306 models.py:233 +#: forms.py:314 models.py:242 msgid "TPQ" msgstr "TPQ" -#: forms.py:307 models.py:237 +#: forms.py:315 models.py:246 msgid "Estimated TPQ" msgstr "TPQ estimé" -#: forms.py:322 +#: forms.py:330 msgid "Operation search" msgstr "Rechercher une opération" -#: forms.py:324 +#: forms.py:332 msgid "You should select an operation." msgstr "Vous devez sélectionner une Opération." -#: forms.py:329 +#: forms.py:337 msgid "Would you like to delete this context record?" msgstr "Voulez-vous supprimer cette Unité d'Enregistrement ?" -#: forms.py:338 +#: forms.py:346 msgid "You should select a context record." msgstr "Vous devez sélectionner une Unité d'Enregistrement." -#: forms.py:343 +#: forms.py:351 msgid "Year of the operation" msgstr "Année de l'opération" -#: forms.py:345 +#: forms.py:353 msgid "Numeric reference" msgstr "Référence numérique" -#: forms.py:351 +#: forms.py:359 msgid "Town of the operation" msgstr "Commune de l'opération" -#: forms.py:353 +#: forms.py:361 msgid "Period of the context record" msgstr "Période de l'Unité d'Enregistrement" -#: forms.py:368 +#: forms.py:376 msgid "Documentation search" msgstr "Rechercher une documentation" -#: forms.py:370 +#: forms.py:378 msgid "You should select a document." msgstr "Vous devez sélectionner un document." @@ -307,55 +313,59 @@ msgstr "Type d'identification" msgid "Identification Types" msgstr "Types d'identification" -#: models.py:155 models.py:537 +#: models.py:125 +msgid "Excavation technique type" +msgstr "" + +#: models.py:126 +msgid "Excavation technique types" +msgstr "" + +#: models.py:163 models.py:549 msgid "Periods" msgstr "Périodes" -#: models.py:156 -msgid "Town" -msgstr "Ville" - -#: models.py:184 -msgid "Parcel (town)" -msgstr "Parcelle (commune)" +#: models.py:164 +msgid "Datings (period)" +msgstr "Datations (période)" -#: models.py:185 +#: models.py:165 msgid "Related context records" msgstr "Unités d'Enregistrement liées" -#: models.py:187 +#: models.py:168 msgid "Parcel (external ID)" msgstr "Parcelle (identifiant externe)" -#: models.py:188 -msgid "Datings (period)" -msgstr "Datations (période)" +#: models.py:169 models.py:170 +msgid "Parcel (town)" +msgstr "Parcelle (commune)" -#: models.py:189 +#: models.py:171 msgid "Parcel (year)" msgstr "Parcelle (année)" -#: models.py:193 +#: models.py:202 msgid "External ID" msgstr "ID externe" -#: models.py:195 +#: models.py:204 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" -#: models.py:203 +#: models.py:212 msgid "Date d'ouverture" msgstr "Date d'ouverture" -#: models.py:213 +#: models.py:222 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:216 +#: models.py:225 msgid "Comment on datings" msgstr "Commentaire sur les datations" -#: models.py:227 +#: models.py:236 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" @@ -363,11 +373,11 @@ msgstr "" "« Terminus Ante Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "après cette date." -#: models.py:231 +#: models.py:240 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "Estimation d'un « Terminus Ante Quem »." -#: models.py:234 +#: models.py:243 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" @@ -375,116 +385,120 @@ msgstr "" "« Terminus Post Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "avant cette date." -#: models.py:238 +#: models.py:247 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »." -#: models.py:246 +#: models.py:255 +msgid "Excavation technique" +msgstr "" + +#: models.py:258 msgid "Point" msgstr "Point" -#: models.py:247 +#: models.py:259 msgid "Polygon" msgstr "Polygone" -#: models.py:248 +#: models.py:260 msgid "Cached name" msgstr "Nom en cache" -#: models.py:252 models.py:253 templates/ishtar/sheet_contextrecord.html:4 +#: models.py:264 models.py:265 templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: models.py:255 +#: models.py:267 msgid "Can view all Context Records" msgstr "Peut voir toutes les Unités d'Enregistrement" -#: models.py:257 +#: models.py:269 msgid "Can view own Context Record" msgstr "Peut voir sa propre Unité d'Enregistrement" -#: models.py:259 +#: models.py:271 msgid "Can add own Context Record" msgstr "Peut ajouter sa propre Unité d'Enregistrement" -#: models.py:261 +#: models.py:273 msgid "Can change own Context Record" msgstr "Peut modifier sa propre Unité d'Enregistrement" -#: models.py:263 +#: models.py:275 msgid "Can delete own Context Record" msgstr "Peut supprimer sa propre Unité d'Enregistrement" -#: models.py:273 +#: models.py:285 msgctxt "short" msgid "Context record" msgstr "UE" -#: models.py:467 +#: models.py:479 msgid "Inverse relation" msgstr "Relation inverse" -#: models.py:471 models.py:494 models.py:532 +#: models.py:483 models.py:506 models.py:544 msgid "Relation type" msgstr "Type de relation" -#: models.py:472 +#: models.py:484 msgid "Relation types" msgstr "Types de relation" -#: models.py:489 +#: models.py:501 msgid "ID (left)" msgstr "ID (gauche)" -#: models.py:490 +#: models.py:502 msgid "Context record type (left)" msgstr "Type d'UE (gauche)" -#: models.py:491 +#: models.py:503 msgid "Parcel (left)" msgstr "Parcelle (gauche)" -#: models.py:492 +#: models.py:504 msgid "Description (left)" msgstr "Description (gauche)" -#: models.py:493 +#: models.py:505 msgid "Periods (left)" msgstr "Périodes (gauche)" -#: models.py:495 +#: models.py:507 msgid "ID (right)" msgstr "ID (droit)" -#: models.py:496 +#: models.py:508 msgid "Context record type (right)" msgstr "Type d'UE (droite)" -#: models.py:497 +#: models.py:509 msgid "Parcel (right)" msgstr "Parcelle (droite)" -#: models.py:498 +#: models.py:510 msgid "Description (right)" msgstr "Description (droite)" -#: models.py:499 +#: models.py:511 msgid "Periods (right)" msgstr "Périodes (droite)" -#: models.py:508 +#: models.py:520 msgid "Record relation" msgstr "Relation entre Unités d'Enregistrement" -#: models.py:509 +#: models.py:521 msgid "Record relations" msgstr "Relations entre Unités d'Enregistrement" -#: models.py:592 +#: models.py:604 msgid "Context record documentation" msgstr "Documentation d'une Unité d'Enregistrement" -#: models.py:593 +#: models.py:605 msgid "Context record documentations" msgstr "Documentations des Unités d'Enregistrement" @@ -516,86 +530,97 @@ msgstr "Unité d'Enregistrement : modifier une documentation associée" msgid "Context record: source deletion" msgstr "Unité d'Enregistrement : supprimer une documentation associée" -#: templates/ishtar/sheet_contextrecord.html:17 +#: templates/ishtar/sheet_contextrecord.html:18 msgid "Complete ID:" msgstr "ID complet :" -#: templates/ishtar/sheet_contextrecord.html:17 +#: templates/ishtar/sheet_contextrecord.html:18 msgid "Temporary ID:" msgstr "ID temporaire :" -#: templates/ishtar/sheet_contextrecord.html:18 -msgid "Creation:" -msgstr "Création :" - -#: templates/ishtar/sheet_contextrecord.html:25 -msgid "Modification:" -msgstr "Modification :" - -#: templates/ishtar/sheet_contextrecord.html:63 +#: templates/ishtar/sheet_contextrecord.html:54 msgid "Datations" msgstr "Datations" -#: templates/ishtar/sheet_contextrecord.html:72 +#: templates/ishtar/sheet_contextrecord.html:63 msgid "Context record relations" msgstr "Relations entre Unités d'Enregistrement" -#: templates/ishtar/sheet_contextrecord.html:79 +#: templates/ishtar/sheet_contextrecord.html:70 msgid "Operation summary" msgstr "Résumé de l'opération" -#: templates/ishtar/sheet_contextrecord.html:81 +#: templates/ishtar/sheet_contextrecord.html:72 msgid "Patriarche OA code not yet recorded!" msgstr "Code d'opération Patriarche non renseigné !" -#: templates/ishtar/sheet_contextrecord.html:88 +#: templates/ishtar/sheet_contextrecord.html:76 +#, fuzzy +msgid "Numerical reference" +msgstr "Référence numérique" + +#: templates/ishtar/sheet_contextrecord.html:80 msgid "State:" msgstr "État :" -#: templates/ishtar/sheet_contextrecord.html:88 +#: templates/ishtar/sheet_contextrecord.html:80 msgid "Active file" msgstr "Dossier actif" -#: templates/ishtar/sheet_contextrecord.html:88 +#: templates/ishtar/sheet_contextrecord.html:80 msgid "Closed operation" msgstr "Opération close" -#: templates/ishtar/sheet_contextrecord.html:90 +#: templates/ishtar/sheet_contextrecord.html:82 msgid "Closing date:" msgstr "Date de clôture :" -#: templates/ishtar/sheet_contextrecord.html:90 +#: templates/ishtar/sheet_contextrecord.html:82 msgid "by" msgstr "par" -#: templates/ishtar/sheet_contextrecord.html:98 +#: templates/ishtar/sheet_contextrecord.html:90 msgid "Localisation" msgstr "Lieu" -#: templates/ishtar/sheet_contextrecord.html:99 +#: templates/ishtar/sheet_contextrecord.html:91 msgid "Towns:" msgstr "Communes :" -#: templates/ishtar/sheet_contextrecord.html:100 +#: templates/ishtar/sheet_contextrecord.html:92 msgid "Related operation:" msgstr "Opération associée :" -#: templates/ishtar/sheet_contextrecord.html:102 +#: templates/ishtar/sheet_contextrecord.html:94 msgid "No operation linked to this context unit!" msgstr "Pas d'opération rattachée à cette UE !" -#: templates/ishtar/sheet_contextrecord.html:105 +#: templates/ishtar/sheet_contextrecord.html:97 msgid "Document from this context record" msgstr "Document associé à cette Unité d'Enregistrement" -#: templates/ishtar/sheet_contextrecord.html:110 +#: templates/ishtar/sheet_contextrecord.html:102 msgid "Finds" msgstr "Mobilier" -#: templates/ishtar/sheet_contextrecord.html:115 +#: templates/ishtar/sheet_contextrecord.html:107 msgid "Documents from associated finds" msgstr "Documents du mobilier associé" #: templates/ishtar/sheet_contextrecordsource.html:4 msgid "Context record source" msgstr "Documentation associée à l'UE" + +#: templates/ishtar/sheet_contextrecordsource.html:11 +#, fuzzy +msgid "Related context record" +msgstr "Unités d'Enregistrement liées" + +#~ msgid "Town" +#~ msgstr "Ville" + +#~ msgid "Creation:" +#~ msgstr "Création :" + +#~ msgid "Modification:" +#~ msgstr "Modification :" diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po index 4c565b478..e78c79955 100644 --- a/translations/fr/archaeological_files.po +++ b/translations/fr/archaeological_files.po @@ -8,18 +8,20 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-03-15 11:56+0100\n" "PO-Revision-Date: 2017-03-09 05:00-0500\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" #: forms.py:47 forms.py:210 forms.py:255 forms.py:396 forms.py:423 -#: models.py:108 templates/ishtar/sheet_file.html:157 +#: models.py:108 templates/ishtar/sheet_file.html:144 msgid "Year" msgstr "Année" @@ -35,7 +37,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:553 +#: forms.py:55 forms.py:407 forms.py:434 models.py:558 msgid "Department" msgstr "Département" @@ -64,11 +66,11 @@ msgid "Permit reference" msgstr "Référence du permis" #: forms.py:63 forms.py:227 forms.py:364 models.py:180 -#: templates/ishtar/sheet_file.html:110 +#: templates/ishtar/sheet_file.html:97 msgid "Comment" msgstr "Commentaire" -#: forms.py:65 templates/ishtar/sheet_file.html:130 +#: forms.py:65 templates/ishtar/sheet_file.html:117 msgid "In charge" msgstr "Responsable" @@ -124,7 +126,7 @@ msgstr "Date après" msgid "Date before" msgstr "Date avant" -#: forms.py:197 templates/ishtar/sheet_file.html:14 +#: forms.py:197 templates/ishtar/sheet_file.html:19 msgid "General" msgstr "Général" @@ -173,12 +175,12 @@ msgstr "Responsable pour le service instructeur" msgid "Total developed surface (m2)" msgstr "Surface totale aménagée (m2)" -#: forms.py:333 templates/ishtar/sheet_file.html:100 +#: forms.py:333 templates/ishtar/sheet_file.html:87 #: templates/ishtar/dashboards/dashboard_file.html:45 msgid "Research archaeology" msgstr "Archéologie programmée" -#: forms.py:341 models.py:183 templates/ishtar/sheet_file.html:101 +#: forms.py:341 models.py:183 templates/ishtar/sheet_file.html:88 msgid "Departments" msgstr "Départements" @@ -186,7 +188,7 @@ msgstr "Départements" msgid "Scientist in charge" msgstr "Responsable scientifique" -#: forms.py:353 models.py:186 templates/ishtar/sheet_file.html:103 +#: forms.py:353 models.py:186 templates/ishtar/sheet_file.html:90 msgid "Requested operation type" msgstr "Type d'opération demandée" @@ -194,11 +196,11 @@ msgstr "Type d'opération demandée" msgid "Lead organization" msgstr "Organisation porteuse du projet" -#: forms.py:371 models.py:196 templates/ishtar/sheet_file.html:108 +#: forms.py:371 models.py:196 templates/ishtar/sheet_file.html:95 msgid "Classified area" msgstr "Au sein d'un site classé" -#: forms.py:373 models.py:198 templates/ishtar/sheet_file.html:109 +#: forms.py:373 models.py:198 templates/ishtar/sheet_file.html:96 msgid "Protected area" msgstr "Au sein d'un secteur sauvegardé" @@ -372,7 +374,7 @@ msgstr "Lieu-dit" msgid "Main address - postal code" msgstr "Adresse des terrains - code postal" -#: models.py:188 templates/ishtar/sheet_file.html:104 +#: models.py:188 templates/ishtar/sheet_file.html:91 msgid "Organization" msgstr "Organisation" @@ -416,15 +418,15 @@ msgstr "Peut clore un Dossier" msgid "FILE" msgstr "DOSSIER" -#: models.py:413 +#: models.py:418 msgid "Multi-town" msgstr "Intercommunal" -#: models.py:419 +#: models.py:424 msgid "No town" msgstr "Pas de commune" -#: models.py:552 +#: models.py:557 msgid "File" msgstr "Dossier" @@ -464,7 +466,7 @@ msgstr "Dossier : modifier un acte administratif" msgid "File: administrative act deletion" msgstr "Dossier : supprimer un acte administratif" -#: wizards.py:124 templates/ishtar/sheet_file.html:122 +#: wizards.py:124 templates/ishtar/sheet_file.html:109 msgid "Associated operations" msgstr "Opérations associées" @@ -480,122 +482,114 @@ msgstr "Choisir le type de document" msgid "Generate" msgstr "Générer" -#: templates/ishtar/sheet_file.html:23 -msgid "Creation:" -msgstr "Création :" - -#: templates/ishtar/sheet_file.html:30 -msgid "Modification:" -msgstr "Modification :" - -#: templates/ishtar/sheet_file.html:47 +#: templates/ishtar/sheet_file.html:34 msgid "State:" msgstr "État :" -#: templates/ishtar/sheet_file.html:47 +#: templates/ishtar/sheet_file.html:34 msgid "Active file" msgstr "Dossier actif" -#: templates/ishtar/sheet_file.html:48 +#: templates/ishtar/sheet_file.html:35 msgid "Closed file" msgstr "Dossier clos" -#: templates/ishtar/sheet_file.html:50 +#: templates/ishtar/sheet_file.html:37 msgid "Closing date:" msgstr "Date de clôture :" -#: templates/ishtar/sheet_file.html:50 +#: templates/ishtar/sheet_file.html:37 msgid "by" msgstr "par" -#: templates/ishtar/sheet_file.html:55 +#: templates/ishtar/sheet_file.html:42 msgid "Related file:" msgstr "Dossier en relation avec :" -#: templates/ishtar/sheet_file.html:60 +#: templates/ishtar/sheet_file.html:47 msgid "Localisation" msgstr "Localisation" -#: templates/ishtar/sheet_file.html:61 +#: templates/ishtar/sheet_file.html:48 msgid "Towns:" msgstr "Communes :" -#: templates/ishtar/sheet_file.html:62 +#: templates/ishtar/sheet_file.html:49 msgid "Departments:" msgstr "Départements :" -#: templates/ishtar/sheet_file.html:64 +#: templates/ishtar/sheet_file.html:51 msgid "Main address:" msgstr "Adresse principale :" -#: templates/ishtar/sheet_file.html:65 +#: templates/ishtar/sheet_file.html:52 msgid "Complement:" msgstr "Complément :" -#: templates/ishtar/sheet_file.html:66 +#: templates/ishtar/sheet_file.html:53 msgid "Postal code:" msgstr "Code postal :" -#: templates/ishtar/sheet_file.html:68 +#: templates/ishtar/sheet_file.html:55 msgid "Surface:" msgstr "Surface :" -#: templates/ishtar/sheet_file.html:73 +#: templates/ishtar/sheet_file.html:60 msgid "Preventive archaeological file" msgstr "Dossier d'archéologie préventive" -#: templates/ishtar/sheet_file.html:75 +#: templates/ishtar/sheet_file.html:62 msgid "Developed surface:" msgstr "Surface aménagée :" -#: templates/ishtar/sheet_file.html:101 templates/ishtar/sheet_file.html:102 -#: templates/ishtar/sheet_file.html:103 templates/ishtar/sheet_file.html:104 -#: templates/ishtar/sheet_file.html:110 +#: templates/ishtar/sheet_file.html:88 templates/ishtar/sheet_file.html:89 +#: templates/ishtar/sheet_file.html:90 templates/ishtar/sheet_file.html:91 +#: templates/ishtar/sheet_file.html:97 #: templates/ishtar/dashboards/dashboard_file.html:14 msgid ":" msgstr " :" -#: templates/ishtar/sheet_file.html:102 +#: templates/ishtar/sheet_file.html:89 msgid "Head scientist" msgstr "Responsable scientifique" -#: templates/ishtar/sheet_file.html:116 +#: templates/ishtar/sheet_file.html:103 msgid "Associated parcels" msgstr "Parcelles associées" -#: templates/ishtar/sheet_file.html:119 +#: templates/ishtar/sheet_file.html:106 msgid "Administrative acts" msgstr "Actes administratifs" -#: templates/ishtar/sheet_file.html:127 templates/ishtar/sheet_file.html:158 +#: templates/ishtar/sheet_file.html:114 templates/ishtar/sheet_file.html:145 msgid "Ref." msgstr "Réf." -#: templates/ishtar/sheet_file.html:129 templates/ishtar/sheet_file.html:159 +#: templates/ishtar/sheet_file.html:116 templates/ishtar/sheet_file.html:146 msgid "Type" msgstr "Type" -#: templates/ishtar/sheet_file.html:131 +#: templates/ishtar/sheet_file.html:118 msgid "Start date" msgstr "Date de début" -#: templates/ishtar/sheet_file.html:132 +#: templates/ishtar/sheet_file.html:119 msgid "Excavation end date" msgstr "Date de fin de chantier" -#: templates/ishtar/sheet_file.html:146 +#: templates/ishtar/sheet_file.html:133 msgid "No operation associated to this archaeological file" msgstr "Pas d'opération associée à ce dossier archéologique" -#: templates/ishtar/sheet_file.html:152 +#: templates/ishtar/sheet_file.html:139 msgid "Admninistrative acts linked to associated operations" msgstr "Actes administratifs associés à ces opérations" -#: templates/ishtar/sheet_file.html:160 +#: templates/ishtar/sheet_file.html:147 msgid "Date" msgstr "Date" -#: templates/ishtar/sheet_file.html:170 +#: templates/ishtar/sheet_file.html:157 msgid "No administrative act linked to operations" msgstr "Pas d'acte administratif associé à ces opérations" @@ -675,3 +669,9 @@ msgstr "communes principales en nombre" #: templates/ishtar/dashboards/dashboard_file.html:220 msgid "main towns by surface (ha)" msgstr "communes principales en surface (ha)" + +#~ msgid "Creation:" +#~ msgstr "Création :" + +#~ msgid "Modification:" +#~ msgstr "Modification :" diff --git a/translations/fr/archaeological_files_pdl.po b/translations/fr/archaeological_files_pdl.po index 949555adc..0c6641ada 100644 --- a/translations/fr/archaeological_files_pdl.po +++ b/translations/fr/archaeological_files_pdl.po @@ -5,13 +5,15 @@ # Valérie-Emma Leroux , 2016. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-03-15 11:57+0100\n" "PO-Revision-Date: 2016-11-14 05:33-0500\n" "Last-Translator: Copied by Zanata \n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" "X-Generator: Zanata 3.9.6\n" diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po index c32c79b64..d5eed89f2 100644 --- a/translations/fr/archaeological_finds.po +++ b/translations/fr/archaeological_finds.po @@ -6,37 +6,39 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-03-15 11:56+0100\n" "PO-Revision-Date: 2017-03-09 05:01-0500\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" -#: forms.py:90 forms.py:94 wizards.py:64 +#: forms.py:90 forms.py:94 models_finds.py:505 wizards.py:64 msgid "Context record" msgstr "Unité d'Enregistrement" -#: forms.py:123 ishtar_menu.py:32 models_finds.py:656 models_finds.py:1059 -#: models_finds.py:1068 models_treatments.py:279 +#: forms.py:123 ishtar_menu.py:32 models_finds.py:664 models_finds.py:1067 +#: models_finds.py:1076 models_treatments.py:281 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "Mobilier" #: forms.py:137 forms.py:330 forms.py:559 models_finds.py:151 -#: models_finds.py:587 +#: models_finds.py:595 msgid "Free ID" msgstr "ID libre" -#: forms.py:139 models_finds.py:639 +#: forms.py:139 models_finds.py:647 msgid "Previous ID" msgstr "Identifiant précédent" #: forms.py:140 forms.py:362 forms_treatments.py:134 models_finds.py:155 -#: models_finds.py:588 models_treatments.py:125 +#: models_finds.py:596 models_treatments.py:127 msgid "Description" msgstr "Description" @@ -44,7 +46,7 @@ msgstr "Description" msgid "Batch/object" msgstr "Lot/objet" -#: forms.py:145 models_finds.py:616 +#: forms.py:145 models_finds.py:624 msgid "Is complete?" msgstr "Est complet ?" @@ -52,15 +54,15 @@ msgstr "Est complet ?" msgid "Material type" msgstr "Type de matériau" -#: forms.py:149 forms.py:356 models_finds.py:63 models_finds.py:592 +#: forms.py:149 forms.py:356 models_finds.py:63 models_finds.py:600 msgid "Conservatory state" msgstr "État sanitaire" -#: forms.py:152 models_finds.py:594 +#: forms.py:152 models_finds.py:602 msgid "Conservatory comment" msgstr "Commentaire relatif à la conservation" -#: forms.py:155 models_finds.py:113 models_finds.py:619 +#: forms.py:155 models_finds.py:113 models_finds.py:627 msgid "Object types" msgstr "Types d'objet" @@ -68,11 +70,11 @@ msgstr "Types d'objet" msgid "Preservation type" msgstr "Type de conservation" -#: forms.py:160 forms.py:358 models_finds.py:621 +#: forms.py:160 forms.py:358 models_finds.py:629 msgid "Integrity / interest" msgstr "Intégrité / intérêt" -#: forms.py:163 forms.py:360 models_finds.py:624 +#: forms.py:163 forms.py:360 models_finds.py:632 msgid "Remarkability" msgstr "Remarquabilité" @@ -108,69 +110,69 @@ msgstr "Erreur estimée pour Y" msgid "Estimated error for Z" msgstr "Erreur estimée pour Z" -#: forms.py:181 models_finds.py:628 +#: forms.py:181 models_finds.py:636 msgid "Length (cm)" msgstr "Longueur (cm)" -#: forms.py:182 models_finds.py:629 +#: forms.py:182 models_finds.py:637 msgid "Width (cm)" msgstr "Largeur (cm)" -#: forms.py:183 models_finds.py:630 +#: forms.py:183 models_finds.py:638 msgid "Height (cm)" msgstr "Hauteur (cm)" -#: forms.py:184 models_finds.py:631 +#: forms.py:184 models_finds.py:639 msgid "Diameter (cm)" msgstr "Diamètre (cm)" -#: forms.py:185 models_finds.py:632 +#: forms.py:185 models_finds.py:640 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" -#: forms.py:186 forms.py:564 models_finds.py:599 +#: forms.py:186 forms.py:564 models_finds.py:607 msgid "Volume (l)" msgstr "Volume (l)" -#: forms.py:187 forms.py:565 models_finds.py:600 +#: forms.py:187 forms.py:565 models_finds.py:608 msgid "Weight (g)" msgstr "Poids (g)" -#: forms.py:189 models_finds.py:633 +#: forms.py:189 models_finds.py:641 msgid "Dimensions comment" msgstr "Commentaire concernant les dimensions" -#: forms.py:190 forms.py:566 models_finds.py:603 +#: forms.py:190 forms.py:566 models_finds.py:611 msgid "Find number" msgstr "Mobilier (en nombre)" -#: forms.py:192 models_finds.py:627 +#: forms.py:192 models_finds.py:635 msgid "Minimum number of individuals (MNI)" msgstr "Nombre minimum d'individus (NMI)" -#: forms.py:193 models_finds.py:635 +#: forms.py:193 models_finds.py:643 msgid "Mark" msgstr "Marque" -#: forms.py:194 forms.py:365 models_finds.py:641 +#: forms.py:194 forms.py:365 models_finds.py:649 msgid "Check" msgstr "Vérification" -#: forms.py:196 models_finds.py:643 +#: forms.py:196 models_finds.py:651 msgid "Check date" msgstr "Date de vérification" #: forms.py:197 forms_treatments.py:132 forms_treatments.py:434 -#: models_finds.py:156 models_finds.py:636 models_treatments.py:124 -#: models_treatments.py:492 +#: models_finds.py:156 models_finds.py:644 models_treatments.py:126 +#: models_treatments.py:494 msgid "Comment" msgstr "Commentaires" -#: forms.py:200 models_finds.py:637 +#: forms.py:200 models_finds.py:645 msgid "Comment on dating" msgstr "Commentaire général sur les datations" -#: forms.py:201 models_finds.py:645 +#: forms.py:201 models_finds.py:653 msgid "Estimated value" msgstr "Valeur estimée" @@ -188,20 +190,18 @@ msgstr "" "ratio est conservé).

                    " #: forms.py:278 -msgid "" -"You should at least provide X, Y and the spatial reference system used." +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:287 -msgid "" -"Coordinates are not relevant for the spatial reference system used: {}." +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:293 forms.py:324 models_finds.py:611 +#: forms.py:293 forms.py:324 models_finds.py:619 msgid "Dating" msgstr "Datation" @@ -210,13 +210,13 @@ msgid "Period" msgstr "Période" #: forms.py:299 forms_treatments.py:138 forms_treatments.py:436 -#: models_finds.py:1073 models_treatments.py:127 models_treatments.py:290 -#: templates/ishtar/sheet_find.html:103 templates/ishtar/sheet_find.html:145 +#: models_finds.py:1081 models_treatments.py:129 models_treatments.py:292 +#: templates/ishtar/sheet_find.html:91 templates/ishtar/sheet_find.html:133 msgid "Start date" msgstr "Date de début" -#: forms.py:301 models_finds.py:1074 models_treatments.py:291 -#: templates/ishtar/sheet_find.html:104 templates/ishtar/sheet_find.html:146 +#: forms.py:301 models_finds.py:1082 models_treatments.py:293 +#: templates/ishtar/sheet_find.html:92 templates/ishtar/sheet_find.html:134 msgid "End date" msgstr "Date de fin" @@ -242,7 +242,7 @@ msgstr "ID complet" #: 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:100 models_treatments.py:464 +#: forms_treatments.py:489 models_treatments.py:102 models_treatments.py:466 msgid "Year" msgstr "Année" @@ -278,7 +278,7 @@ msgstr "Rechercher un mobilier" msgid "Upstream finds" msgstr "Mobilier amont" -#: forms.py:443 models_finds.py:657 +#: forms.py:443 models_finds.py:665 msgid "Finds" msgstr "Mobilier" @@ -350,25 +350,25 @@ msgstr "Un autre panier existant utilise déjà ce nom." msgid "Basket" msgstr "Panier" -#: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:96 -#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:139 +#: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:98 +#: templates/ishtar/sheet_find.html:85 templates/ishtar/sheet_find.html:127 msgid "Label" msgstr "Intitulé" -#: forms_treatments.py:53 forms_treatments.py:95 models_treatments.py:98 +#: forms_treatments.py:53 forms_treatments.py:95 models_treatments.py:100 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:102 -#: models_treatments.py:466 +#: forms_treatments.py:490 forms_treatments.py:557 models_treatments.py:104 +#: models_treatments.py:468 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:107 -#: models_treatments.py:289 +#: forms_treatments.py:578 models_treatments.py:56 models_treatments.py:109 +#: models_treatments.py:291 msgid "Treatment type" msgstr "Type de traitement" @@ -380,8 +380,8 @@ msgstr "Rechercher un traitement" msgid "Base treatment" msgstr "Traitement de base" -#: forms_treatments.py:103 models_treatments.py:109 -#: templates/ishtar/sheet_find.html:99 templates/ishtar/sheet_find.html:141 +#: forms_treatments.py:103 models_treatments.py:92 models_treatments.py:111 +#: templates/ishtar/sheet_find.html:87 templates/ishtar/sheet_find.html:129 msgid "State" msgstr "État" @@ -389,15 +389,15 @@ msgstr "État" msgid "Target" msgstr "Destination" -#: forms_treatments.py:107 forms_treatments.py:417 models_treatments.py:117 +#: forms_treatments.py:107 forms_treatments.py:417 models_treatments.py:119 msgid "Responsible" msgstr "Responsable" -#: forms_treatments.py:113 models_treatments.py:120 +#: forms_treatments.py:113 models_treatments.py:122 msgid "Organization" msgstr "Organisation" -#: forms_treatments.py:119 models_treatments.py:112 models_treatments.py:292 +#: forms_treatments.py:119 models_treatments.py:114 models_treatments.py:294 msgid "Location" msgstr "Lieu" @@ -409,12 +409,12 @@ msgstr "Contenant (pertinent dans le cadre du conditionnement)" msgid "External ref." msgstr "Réf. externe" -#: forms_treatments.py:136 models_treatments.py:126 +#: forms_treatments.py:136 models_treatments.py:128 msgid "Goal" msgstr "But" -#: forms_treatments.py:140 forms_treatments.py:442 models_treatments.py:128 -#: models_treatments.py:486 +#: forms_treatments.py:140 forms_treatments.py:442 models_treatments.py:130 +#: models_treatments.py:488 msgid "Closing date" msgstr "Date de clôture" @@ -463,12 +463,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:105 +#: forms_treatments.py:262 models_treatments.py:107 msgid "Associated request" msgstr "Demande associée" #: forms_treatments.py:266 forms_treatments.py:397 ishtar_menu.py:108 -#: models_treatments.py:497 models_treatments.py:519 models_treatments.py:581 +#: models_treatments.py:499 models_treatments.py:521 models_treatments.py:583 #: wizards.py:183 templates/ishtar/sheet_treatmentfile.html:5 msgid "Treatment request" msgstr "Demande de traitement" @@ -527,7 +527,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:471 +#: forms_treatments.py:354 forms_treatments.py:404 models_treatments.py:473 msgid "Name" msgstr "Nom" @@ -535,9 +535,9 @@ msgstr "Nom" msgid "Internal ref." msgstr "Réf. interne" -#: forms_treatments.py:358 forms_treatments.py:415 -#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:140 -#: templates/ishtar/sheet_find.html:232 +#: forms_treatments.py:358 forms_treatments.py:415 models_treatments.py:91 +#: templates/ishtar/sheet_find.html:86 templates/ishtar/sheet_find.html:128 +#: templates/ishtar/sheet_find.html:227 msgid "Type" msgstr "Type" @@ -545,12 +545,12 @@ msgstr "Type" msgid "In charge" msgstr "Responsable" -#: forms_treatments.py:366 forms_treatments.py:423 models_treatments.py:480 +#: forms_treatments.py:366 forms_treatments.py:423 models_treatments.py:482 #: templates/ishtar/sheet_treatmentfile.html:31 msgid "Applicant" msgstr "Demandeur" -#: forms_treatments.py:372 forms_treatments.py:429 models_treatments.py:484 +#: forms_treatments.py:372 forms_treatments.py:429 models_treatments.py:486 #: templates/ishtar/sheet_treatmentfile.html:38 msgid "Applicant organisation" msgstr "Organisation du demandeur" @@ -559,7 +559,7 @@ msgstr "Organisation du demandeur" msgid "Treatment request search" msgstr "Rechercher une demande de traitement" -#: forms_treatments.py:439 models_treatments.py:490 +#: forms_treatments.py:439 models_treatments.py:492 msgid "Reception date" msgstr "Date de réception" @@ -591,8 +591,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:449 -#: models_treatments.py:473 +#: forms_treatments.py:508 forms_treatments.py:604 models_treatments.py:451 +#: models_treatments.py:475 msgid "Treatment request type" msgstr "Type de demande de traitement" @@ -634,12 +634,12 @@ msgstr "Gestion des éléments" msgid "Documentation" msgstr "Documentation" -#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1070 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1078 msgid "Administrative act" msgstr "Acte administratif" -#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:227 -#: templates/ishtar/sheet_find.html:229 +#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:222 +#: templates/ishtar/sheet_find.html:224 msgid "Documents" msgstr "Documents" @@ -647,8 +647,8 @@ msgstr "Documents" msgid "Source" msgstr "Documentation" -#: ishtar_menu.py:185 models_treatments.py:145 models_treatments.py:281 -#: models_treatments.py:565 templates/ishtar/sheet_treatment.html:5 +#: ishtar_menu.py:185 models_treatments.py:147 models_treatments.py:283 +#: models_treatments.py:567 templates/ishtar/sheet_treatment.html:5 msgid "Treatment" msgstr "Traitement" @@ -668,7 +668,7 @@ msgstr "Recommandation" msgid "Parent material" msgstr "Matériau parent" -#: models_finds.py:52 models_finds.py:507 models_finds.py:590 +#: models_finds.py:52 models_finds.py:525 models_finds.py:598 msgid "Material types" msgstr "Types de matériau" @@ -700,8 +700,8 @@ msgstr "Type de remarquabilité" msgid "Remarkability types" msgstr "Types de remarquabilité" -#: models_finds.py:98 models_finds.py:586 models_treatments.py:40 -#: models_treatments.py:285 +#: models_finds.py:98 models_finds.py:594 models_treatments.py:40 +#: models_treatments.py:287 msgid "Order" msgstr "Ordre" @@ -717,12 +717,12 @@ msgstr "Types de lot" msgid "Parent" msgstr "Parent" -#: models_finds.py:152 models_finds.py:583 models_treatments.py:122 -#: models_treatments.py:469 +#: models_finds.py:152 models_finds.py:591 models_treatments.py:124 +#: models_treatments.py:471 msgid "External ID" msgstr "ID externe" -#: models_finds.py:154 models_finds.py:585 +#: models_finds.py:154 models_finds.py:593 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" @@ -762,7 +762,7 @@ msgstr "Polygon" msgid "Cached value - do not edit" msgstr "Valeur en cache - ne pas éditer" -#: models_finds.py:197 models_finds.py:581 +#: models_finds.py:197 models_finds.py:589 msgid "Base find" msgstr "Mobilier de base" @@ -810,109 +810,132 @@ msgstr "Vérifié mais incorrect" msgid "Checked and correct" msgstr "Vérifié et correct" -#: models_finds.py:505 -msgid "Periods" -msgstr "Périodes" - -#: models_finds.py:506 models_finds.py:614 models_treatments.py:129 -#: models_treatments.py:293 templates/ishtar/sheet_find.html:102 -#: templates/ishtar/sheet_find.html:144 -msgid "Container" -msgstr "Contenant" - -#: models_finds.py:517 +#: models_finds.py:506 msgid "Base find - Short ID" msgstr "Mobilier de base - ID court" -#: models_finds.py:518 +#: models_finds.py:507 msgid "Base find - Complete ID" msgstr "Mobilier de base - ID complet" -#: models_finds.py:519 +#: models_finds.py:509 +#, fuzzy +msgid "Operation (code)" +msgstr "Opération" + +#: models_finds.py:511 +msgid "Town" +msgstr "" + +#: models_finds.py:513 +#, fuzzy +msgid "Operation (name)" +msgstr "Opération" + +#: models_finds.py:515 +msgid "Parcel" +msgstr "" + +#: models_finds.py:516 +#, fuzzy +msgid "Batch" +msgstr "Type de lot" + +#: models_finds.py:517 msgid "Base find - Comment" msgstr "Mobilier de base - Commentaires" -#: models_finds.py:520 +#: models_finds.py:518 msgid "Base find - Description" msgstr "Mobilier de base - Description" -#: models_finds.py:521 +#: models_finds.py:519 msgid "Base find - Topographic localisation" msgstr "Mobilier de base - Localisation topographique" -#: models_finds.py:523 +#: models_finds.py:521 msgid "Base find - Special interest" msgstr "Mobilier de base - Intérêt spécifique" -#: models_finds.py:524 +#: models_finds.py:522 msgid "Base find - Discovery date" msgstr "Mobilier de base - Date de découverte" -#: models_finds.py:597 +#: models_finds.py:523 models_finds.py:622 models_treatments.py:131 +#: models_treatments.py:295 templates/ishtar/sheet_find.html:90 +#: templates/ishtar/sheet_find.html:132 +msgid "Container" +msgstr "Contenant" + +#: models_finds.py:524 +msgid "Periods" +msgstr "Périodes" + +#: models_finds.py:605 msgid "Type of preservation to consider" msgstr "Mesures de conservation à envisager" -#: models_finds.py:601 +#: models_finds.py:609 msgid "Weight unit" msgstr "Unité de poids" -#: models_finds.py:607 templates/ishtar/sheet_find.html:90 +#: models_finds.py:615 templates/ishtar/sheet_find.html:78 msgid "Upstream treatment" msgstr "Traitement amont" -#: models_finds.py:610 templates/ishtar/sheet_find.html:132 +#: models_finds.py:618 templates/ishtar/sheet_find.html:120 msgid "Downstream treatment" msgstr "Traitement aval" -#: models_finds.py:648 +#: models_finds.py:656 msgid "Collection" msgstr "Collection" -#: models_finds.py:650 models_treatments.py:141 models_treatments.py:493 +#: models_finds.py:658 models_treatments.py:143 models_treatments.py:495 msgid "Cached name" msgstr "Nom en cache" -#: models_finds.py:659 +#: models_finds.py:667 msgid "Can view all Finds" msgstr "Peut voir tout le Mobilier" -#: models_finds.py:660 +#: models_finds.py:668 msgid "Can view own Find" msgstr "Peut voir son propre Mobilier" -#: models_finds.py:661 +#: models_finds.py:669 msgid "Can add own Find" msgstr "Peut ajouter son propre Mobilier" -#: models_finds.py:662 +#: models_finds.py:670 msgid "Can change own Find" msgstr "Peut modifier son propre Mobilier" -#: models_finds.py:663 +#: models_finds.py:671 msgid "Can delete own Find" msgstr "Peut supprimer son propre Mobilier" -#: models_finds.py:669 +#: models_finds.py:677 msgid "FIND" msgstr "MOBILIER" -#: models_finds.py:1057 +#: models_finds.py:1065 msgid "Find documentation" msgstr "Documentation de mobilier" -#: models_finds.py:1058 +#: models_finds.py:1066 msgid "Find documentations" msgstr "Documentations de mobilier" -#: models_finds.py:1071 +#: models_finds.py:1079 msgid "Person" msgstr "Individu" -#: models_finds.py:1077 +#: models_finds.py:1085 msgid "Property" msgstr "Propriété" -#: models_finds.py:1078 +#: models_finds.py:1086 msgid "Properties" msgstr "Propriétés" @@ -960,127 +983,127 @@ msgstr "Types d'état de traitement" msgid "Downstream find" msgstr "Mobilier aval" -#: models_treatments.py:114 +#: models_treatments.py:116 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:131 +#: models_treatments.py:133 msgid "Estimated cost" msgstr "Coût estimé" -#: models_treatments.py:133 +#: models_treatments.py:135 msgid "Quoted cost" msgstr "Coût devisé" -#: models_treatments.py:135 +#: models_treatments.py:137 msgid "Realized cost" msgstr "Coût réalisé" -#: models_treatments.py:137 +#: models_treatments.py:139 msgid "Insurance cost" msgstr "Coût d'assurance" -#: models_treatments.py:139 +#: models_treatments.py:141 msgid "Target a basket" msgstr "Appliquer à un panier" -#: models_treatments.py:146 templates/ishtar/sheet_find.html:87 +#: models_treatments.py:148 templates/ishtar/sheet_find.html:75 #: templates/ishtar/sheet_treatmentfile.html:45 msgid "Treatments" msgstr "Traitements" -#: models_treatments.py:149 +#: models_treatments.py:151 msgid "Can view all Treatments" msgstr "Peut voir tous les Traitements" -#: models_treatments.py:150 +#: models_treatments.py:152 msgid "Can view own Treatment" msgstr "Peut voir son propre Traitement" -#: models_treatments.py:151 +#: models_treatments.py:153 msgid "Can add own Treatment" msgstr "Peut ajouter son propre Traitement" -#: models_treatments.py:152 +#: models_treatments.py:154 msgid "Can change own Treatment" msgstr "Peut modifier son propre Traitement" -#: models_treatments.py:153 +#: models_treatments.py:155 msgid "Can delete own Treatment" msgstr "Peut supprimer son propre Traitement" -#: models_treatments.py:165 +#: models_treatments.py:167 msgid "TREATMENT" msgstr "TRAITEMENT" -#: models_treatments.py:294 templates/ishtar/sheet_find.html:101 -#: templates/ishtar/sheet_find.html:143 +#: models_treatments.py:296 templates/ishtar/sheet_find.html:89 +#: templates/ishtar/sheet_find.html:131 msgid "Doer" msgstr "Opérateur" -#: models_treatments.py:295 models_treatments.py:296 +#: models_treatments.py:297 models_treatments.py:298 msgid "Related finds" msgstr "Mobilier associé" -#: models_treatments.py:438 +#: models_treatments.py:440 msgid "Is upstream" msgstr "Est en amont" -#: models_treatments.py:450 +#: models_treatments.py:452 msgid "Treatment request types" msgstr "Types de demande de traitement" -#: models_treatments.py:467 +#: models_treatments.py:469 msgid "Internal reference" msgstr "Référence interne" -#: models_treatments.py:476 +#: models_treatments.py:478 msgid "Person in charge" msgstr "Personne responsable" -#: models_treatments.py:488 +#: models_treatments.py:490 msgid "Creation date" msgstr "Date de création" -#: models_treatments.py:498 +#: models_treatments.py:500 msgid "Treatment requests" msgstr "Demandes de traitement" -#: models_treatments.py:502 +#: models_treatments.py:504 msgid "Can view all Treatment requests" msgstr "Peut voir toutes les Demandes de traitement" -#: models_treatments.py:504 +#: models_treatments.py:506 msgid "Can view own Treatment request" msgstr "Peut voir sa propre Demande de traitement" -#: models_treatments.py:506 +#: models_treatments.py:508 msgid "Can add own Treatment request" msgstr "Peut ajouter sa propre Demande de traitement" -#: models_treatments.py:508 +#: models_treatments.py:510 msgid "Can change own Treatment request" msgstr "Peut modifier sa propre Demande de traitement" -#: models_treatments.py:510 +#: models_treatments.py:512 msgid "Can delete own Treatment request" msgstr "Peut supprimer sa propre Demande de traitement" -#: models_treatments.py:571 +#: models_treatments.py:573 msgid "Treatment documentation" msgstr "Documentation de traitement" -#: models_treatments.py:572 +#: models_treatments.py:574 msgid "Treament documentations" msgstr "Documentations de traitement" -#: models_treatments.py:588 +#: models_treatments.py:590 msgid "Treatment request documentation" msgstr "Documentation de demande de traitement" -#: models_treatments.py:589 +#: models_treatments.py:591 msgid "Treatment request documentations" msgstr "Documentations de demande de traitement" @@ -1208,67 +1231,69 @@ msgstr "Demande de traitement : supprimer une documentation associée" msgid "Operation" msgstr "Opération" -#: templates/ishtar/sheet_find.html:24 -msgid "Creation:" -msgstr "Création :" - -#: templates/ishtar/sheet_find.html:31 -msgid "Modification:" -msgstr "Modification :" +#: templates/ishtar/sheet_find.html:25 +#, fuzzy +msgid "Administrative index" +msgstr "Acte administratif" -#: templates/ishtar/sheet_find.html:79 +#: templates/ishtar/sheet_find.html:67 msgid "Warehouse" msgstr "Dépôt" -#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:138 +#: templates/ishtar/sheet_find.html:84 templates/ishtar/sheet_find.html:126 msgid "Year - index" msgstr "Année - index" -#: templates/ishtar/sheet_find.html:100 templates/ishtar/sheet_find.html:142 +#: templates/ishtar/sheet_find.html:88 templates/ishtar/sheet_find.html:130 msgid "Related finds (max. 15 displayed)" msgstr "Mobilier associé (max. 15 affichés)" -#: templates/ishtar/sheet_find.html:128 +#: templates/ishtar/sheet_find.html:116 msgid "Export as CSV" msgstr "Export en CSV" -#: templates/ishtar/sheet_find.html:128 templates/ishtar/sheet_find.html:171 +#: templates/ishtar/sheet_find.html:116 templates/ishtar/sheet_find.html:159 msgid "CSV" msgstr "CSV" -#: templates/ishtar/sheet_find.html:176 +#: templates/ishtar/sheet_find.html:164 msgid "Associated base finds" msgstr "Mobilier de base associé" -#: templates/ishtar/sheet_find.html:208 +#: templates/ishtar/sheet_find.html:171 +#, fuzzy +msgid "Internal ID" +msgstr "ID externe" + +#: templates/ishtar/sheet_find.html:203 msgid "Coordinates:" msgstr "Cordonnées :" -#: templates/ishtar/sheet_find.html:210 +#: templates/ishtar/sheet_find.html:205 msgid "X:" msgstr "X :" -#: templates/ishtar/sheet_find.html:211 +#: templates/ishtar/sheet_find.html:206 msgid "Y:" msgstr "Y :" -#: templates/ishtar/sheet_find.html:212 +#: templates/ishtar/sheet_find.html:207 msgid "Z:" msgstr "Z :" -#: templates/ishtar/sheet_find.html:215 +#: templates/ishtar/sheet_find.html:210 msgid "SRID:" msgstr "SRID :" -#: templates/ishtar/sheet_find.html:231 +#: templates/ishtar/sheet_find.html:226 msgid "Title" msgstr "Titre" -#: templates/ishtar/sheet_find.html:233 +#: templates/ishtar/sheet_find.html:228 msgid "Authors" msgstr "Auteurs" -#: templates/ishtar/sheet_find.html:234 +#: templates/ishtar/sheet_find.html:229 msgid "Link" msgstr "Lien" @@ -1280,6 +1305,11 @@ msgstr "Panier de mobilier" msgid "Find source" msgstr "Documentation associée au mobilier" +#: templates/ishtar/sheet_findsource.html:11 +#, fuzzy +msgid "Related find" +msgstr "Mobilier associé" + #: templates/ishtar/sheet_treatment.html:20 msgctxt "Treatment" msgid "Closed" @@ -1312,6 +1342,22 @@ msgstr "Active" msgid "Treatment request source" msgstr "Documentation de demande de traitement" +#: templates/ishtar/sheet_treatmentfilesource.html:11 +#, fuzzy +msgid "Related treatment request" +msgstr "Ajouter une demande de traitement" + #: templates/ishtar/sheet_treatmentsource.html:4 msgid "Treatment source" msgstr "Documentation de traitement" + +#: templates/ishtar/sheet_treatmentsource.html:11 +#, fuzzy +msgid "Related treatment" +msgstr "Traitement de base" + +#~ msgid "Creation:" +#~ msgstr "Création :" + +#~ msgid "Modification:" +#~ msgstr "Modification :" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index 966e83092..5695b1d9f 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -8,23 +8,25 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-03-15 11:56+0100\n" "PO-Revision-Date: 2017-03-09 05:01-0500\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\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:1221 templates/ishtar/sheet_operation.html:156 +#: forms.py:69 forms.py:371 forms.py:1013 forms.py:1035 forms.py:1039 +#: models.py:1241 templates/ishtar/sheet_operation.html:146 #: templates/ishtar/blocks/window_tables/parcels.html:10 msgid "Parcels" msgstr "Parcelles" -#: forms.py:72 forms.py:205 forms.py:985 models.py:1207 +#: forms.py:72 forms.py:205 forms.py:989 models.py:1227 #: templates/ishtar/blocks/window_tables/parcels.html:7 #: templates/ishtar/dashboards/dashboard_operation.html:432 #: templates/ishtar/dashboards/dashboard_operation.html:446 @@ -33,22 +35,22 @@ msgstr "Parcelles" msgid "Town" msgstr "Commune" -#: forms.py:74 forms.py:455 forms.py:752 forms.py:1255 models.py:272 -#: models.py:1013 models.py:1205 +#: forms.py:74 forms.py:455 forms.py:756 forms.py:1259 models.py:272 +#: models.py:1033 models.py:1225 #: templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Year" msgstr "Année" -#: forms.py:77 models.py:1208 +#: forms.py:77 models.py:1228 #: templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Section" msgstr "Section" -#: forms.py:80 models.py:1210 +#: forms.py:80 models.py:1230 msgid "Parcel number" msgstr "Numéro de parcelle" -#: forms.py:82 models.py:1212 models.py:1229 models.py:1278 +#: forms.py:82 models.py:1232 models.py:1249 models.py:1298 msgid "Public domain" msgstr "Domaine public" @@ -84,8 +86,8 @@ msgstr "Il y a des parcelles identiques." msgid "Relation type" msgstr "Type de relation" -#: forms.py:383 ishtar_menu.py:30 models.py:367 models.py:834 models.py:864 -#: models.py:892 models.py:995 models.py:1204 wizards.py:344 wizards.py:355 +#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:843 models.py:878 +#: models.py:911 models.py:1015 models.py:1224 wizards.py:344 wizards.py:355 #: templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "Opération" @@ -94,7 +96,7 @@ msgstr "Opération" msgid ":" msgstr ": " -#: forms.py:411 forms.py:605 forms.py:1220 +#: forms.py:411 forms.py:607 forms.py:1224 msgid "You should select an operation." msgstr "Vous devez sélectionner une opération." @@ -110,19 +112,19 @@ msgstr "Relations actuelles" msgid "Deleted relations" msgstr "Relations supprimées" -#: forms.py:451 templates/ishtar/sheet_operation.html:95 +#: forms.py:451 templates/ishtar/sheet_operation.html:85 msgid "Relations" msgstr "Relations" -#: forms.py:456 forms.py:1226 models.py:273 +#: forms.py:456 forms.py:1230 models.py:273 msgid "Numeric reference" msgstr "Identifiant numérique" -#: forms.py:462 forms.py:1266 +#: forms.py:462 forms.py:1270 msgid "Parcel (section/number/public domain)" msgstr "Parcelle (section/numéro/domaine public)" -#: forms.py:465 forms.py:1269 models.py:835 +#: forms.py:465 forms.py:1273 models.py:844 #: templates/ishtar/dashboards/dashboard_operation.html:390 #: templates/ishtar/dashboards/dashboard_operation.html:411 #: templates/ishtar/dashboards/dashboard_operation.html:643 @@ -131,248 +133,254 @@ msgstr "Parcelle (section/numéro/domaine public)" msgid "Department" msgstr "Département" -#: forms.py:466 forms.py:1097 models.py:86 +#: forms.py:466 forms.py:1101 models.py:86 +#: templates/ishtar/sheet_operation.html:22 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8 msgid "Name" msgstr "Nom" -#: forms.py:468 forms.py:672 forms.py:750 forms.py:1232 models.py:280 +#: forms.py:468 forms.py:752 models.py:334 +#, fuzzy +msgid "Address / Locality" +msgstr "Adresse - Lieu-dit" + +#: forms.py:470 forms.py:674 forms.py:754 forms.py:1236 models.py:280 msgid "Operation type" msgstr "Type d'opération" -#: forms.py:470 +#: forms.py:472 msgid "Is open?" msgstr "Est ouvert ?" -#: forms.py:478 forms.py:782 models.py:269 +#: forms.py:480 forms.py:786 models.py:269 msgid "In charge" msgstr "Responsable du suivi scientifique" -#: forms.py:485 models.py:989 +#: forms.py:487 models.py:1009 msgid "Scientist in charge" msgstr "Responsable scientifique" -#: forms.py:487 forms.py:674 forms.py:772 models.py:267 +#: forms.py:489 forms.py:676 forms.py:776 models.py:267 msgid "Operator" msgstr "Opérateur" -#: forms.py:496 forms.py:1102 models.py:90 models.py:282 +#: forms.py:498 forms.py:1106 models.py:90 models.py:282 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10 msgid "Remains" msgstr "Vestiges" -#: forms.py:497 forms.py:1080 forms.py:1099 models.py:88 models.py:288 +#: forms.py:499 forms.py:1084 forms.py:1103 models.py:88 models.py:288 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Periods" msgstr "Périodes" -#: forms.py:498 +#: forms.py:500 msgid "Started before" msgstr "Commencé avant" -#: forms.py:500 +#: forms.py:502 msgid "Started after" msgstr "Commencé après" -#: forms.py:502 +#: forms.py:504 msgid "Ended before" msgstr "Terminé avant" -#: forms.py:504 +#: forms.py:506 msgid "Ended after" msgstr "Terminé après" -#: forms.py:507 +#: forms.py:509 msgid "Search within relations" msgstr "Rechercher parmi les relations" -#: forms.py:509 forms.py:837 +#: forms.py:511 forms.py:841 msgid "Comment" msgstr "Commentaire" -#: forms.py:510 +#: forms.py:512 msgid "Abstract (full text search)" msgstr "Résumé (recherche texte intégral)" -#: forms.py:512 forms.py:840 models.py:336 +#: forms.py:514 forms.py:844 models.py:337 msgid "Comment about scientific documentation" msgstr "Commentaire concernant la documentation scientifique" -#: forms.py:513 forms.py:842 models.py:348 +#: forms.py:515 forms.py:846 models.py:349 msgid "Record quality" msgstr "Qualité d'enregistrement" -#: forms.py:514 forms.py:807 models.py:300 +#: forms.py:516 forms.py:811 models.py:300 msgid "Report processing" msgstr "Traitement du rapport" -#: forms.py:516 forms.py:845 models.py:343 +#: forms.py:518 forms.py:849 models.py:344 msgid "Virtual operation" msgstr "Opération virtuelle" -#: forms.py:518 forms.py:1142 forms.py:1146 models.py:94 +#: forms.py:520 forms.py:1146 forms.py:1150 models.py:94 msgid "Archaeological site" msgstr "Entité archéologique" -#: forms.py:524 forms.py:1273 +#: forms.py:526 forms.py:1277 msgid "Created by" msgstr "Créé par" -#: forms.py:530 forms.py:1279 +#: forms.py:532 forms.py:1283 msgid "Modified by" msgstr "Modifié par" -#: forms.py:537 +#: forms.py:539 msgid "Documentation deadline before" msgstr "Date limite de rendu de la documentation avant" -#: forms.py:539 +#: forms.py:541 msgid "Documentation deadline after" msgstr "Date limite de rendu de la documentation après" -#: forms.py:541 forms.py:830 models.py:355 +#: forms.py:543 forms.py:834 models.py:356 msgid "Documentation received" msgstr "Documentation reçue" -#: forms.py:543 +#: forms.py:545 msgid "Finds deadline before" msgstr "Date limite de rendu du mobilier avant" -#: forms.py:545 +#: forms.py:547 msgid "Finds deadline after" msgstr "Date limite de rendu du mobilier après" -#: forms.py:547 forms.py:835 models.py:359 +#: forms.py:549 forms.py:839 models.py:360 msgid "Finds received" msgstr "Mobilier reçu" -#: forms.py:592 forms.py:1218 views.py:168 +#: forms.py:594 forms.py:1222 views.py:168 msgid "Operation search" msgstr "Rechercher une opération" -#: forms.py:636 +#: forms.py:638 msgid "Associated file" msgstr "Dossier associé" -#: forms.py:640 forms.py:933 models.py:501 models.py:891 models.py:1000 +#: forms.py:642 forms.py:937 models.py:510 models.py:910 models.py:1020 #: wizards.py:80 msgid "Archaeological file" msgstr "Dossier archéologique" -#: forms.py:647 forms.py:649 models.py:350 +#: forms.py:649 forms.py:651 models.py:351 msgid "Abstract" msgstr "Résumé" -#: forms.py:652 +#: forms.py:654 msgid "months" msgstr "mois" -#: forms.py:652 +#: forms.py:654 msgid "years" msgstr "années" -#: forms.py:654 models.py:253 +#: forms.py:656 models.py:253 msgid "Creation date" msgstr "Date de création" -#: forms.py:655 +#: forms.py:657 msgid "Start of field work" msgstr "Début du travail de terrain" -#: forms.py:657 +#: forms.py:659 msgid "All" msgstr "Tout" -#: forms.py:658 +#: forms.py:660 msgid "Preventive" msgstr "Préventif" -#: forms.py:659 +#: forms.py:661 msgid "Research" msgstr "Programmé" -#: forms.py:663 +#: forms.py:665 msgid "Slicing" msgstr "Découpage" -#: forms.py:666 +#: forms.py:668 msgid "Department detail" msgstr "Détail par département" -#: forms.py:668 +#: forms.py:670 msgid "Date get from" msgstr "Date obtenue depuis" -#: forms.py:670 +#: forms.py:672 msgid "Preventive/Research" msgstr "Préventif/Programmé" -#: forms.py:676 +#: forms.py:678 msgid "Date after" msgstr "Date après" -#: forms.py:678 +#: forms.py:680 msgid "Date before" msgstr "Date avant" -#: forms.py:680 +#: forms.py:682 msgid "With reports" msgstr "Avec un rapport" -#: forms.py:681 +#: forms.py:683 msgid "With finds" msgstr "Avec du mobilier" -#: forms.py:733 forms.py:1327 templates/ishtar/sheet_administrativeact.html:20 -#: templates/ishtar/sheet_operation.html:24 +#: forms.py:735 forms.py:1331 templates/ishtar/sheet_administrativeact.html:20 +#: templates/ishtar/sheet_operation.html:26 msgid "General" msgstr "Général" -#: forms.py:748 models.py:333 +#: forms.py:750 models.py:333 msgid "Generic name" msgstr "Nom générique" -#: forms.py:757 models.py:302 +#: forms.py:761 models.py:302 msgid "Old code" msgstr "Ancien code" -#: forms.py:760 +#: forms.py:764 msgid "Head scientist" msgstr "Responsable scientifique" -#: forms.py:779 models.py:332 +#: forms.py:783 models.py:332 msgid "Operator reference" msgstr "Référence de l'opérateur" -#: forms.py:793 +#: forms.py:797 msgid "Total surface (m2)" msgstr "Surface totale (m2)" -#: forms.py:800 models.py:54 models.py:256 models.py:1417 +#: forms.py:804 models.py:54 models.py:256 models.py:1437 msgid "Start date" msgstr "Date de début" -#: forms.py:802 models.py:258 +#: forms.py:806 models.py:258 msgid "Excavation end date" msgstr "Date de fin de chantier" -#: forms.py:805 models.py:259 +#: forms.py:809 models.py:259 msgid "Report delivery date" msgstr "Date de livraison du rapport" -#: forms.py:827 models.py:352 +#: forms.py:831 models.py:353 msgid "Deadline for submission of the documentation" msgstr "Date limite de rendu de la documentation" -#: forms.py:832 models.py:357 +#: forms.py:836 models.py:358 msgid "Deadline for submission of the finds" msgstr "Date limite de rendu du mobilier" -#: forms.py:847 +#: forms.py:851 msgid "Image" msgstr "Image" -#: forms.py:848 +#: forms.py:852 #, python-format msgid "" "

                    Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).

                    " -#: forms.py:886 +#: forms.py:890 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" "Avant de renseigner la date de fin de chantier, il est nécessaire de " "renseigner une date de début." -#: forms.py:891 +#: forms.py:895 msgid "The excavation end date cannot be before the start date." -msgstr "" -"La date de fin de chantier ne peut être antérieure à la date de début." +msgstr "La date de fin de chantier ne peut être antérieure à la date de début." -#: forms.py:919 +#: forms.py:923 #, python-format msgid "" "Operation code already exists for year: %(year)d - use a value bigger than " @@ -402,106 +409,106 @@ msgstr "" "Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur " "plus grande que %(last_val)d" -#: forms.py:923 +#: forms.py:927 msgid "Bad operation code" msgstr "Mauvais code d'opération" -#: forms.py:929 models.py:516 +#: forms.py:933 models.py:525 models.py:873 msgid "Operation code" msgstr "Code de l'opération" -#: forms.py:955 +#: forms.py:959 msgid "Preventive informations - excavation" msgstr "Information archéologie préventive - fouille" -#: forms.py:956 models.py:286 +#: forms.py:960 models.py:286 #: templates/ishtar/dashboards/dashboard_operation.html:701 msgid "Cost (euros)" msgstr "Coût (euros)" -#: forms.py:957 models.py:291 +#: forms.py:961 models.py:291 msgid "Scheduled man-days" msgstr "Jours-hommes prévus" -#: forms.py:959 models.py:294 +#: forms.py:963 models.py:294 msgid "Optional man-days" msgstr "Jours-hommes optionnels" -#: forms.py:961 models.py:297 +#: forms.py:965 models.py:297 msgid "Effective man-days" msgstr "Jours-hommes effectifs" -#: forms.py:971 +#: forms.py:975 msgid "Preventive informations - diagnostic" msgstr "Information archéologie préventive - diagnostic" -#: forms.py:974 models.py:316 +#: forms.py:978 models.py:316 msgid "Prescription on zoning" msgstr "Prescription sur zonage" -#: forms.py:976 models.py:319 +#: forms.py:980 models.py:319 msgid "Prescription on large area" msgstr "Prescription sur une vaste surface" -#: forms.py:979 models.py:321 +#: forms.py:983 models.py:321 msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" -#: forms.py:983 forms.py:1005 models.py:284 models.py:1023 +#: forms.py:987 forms.py:1009 models.py:284 models.py:1043 msgid "Towns" msgstr "Communes" -#: forms.py:1012 models.py:1220 models.py:1415 +#: forms.py:1016 models.py:1240 models.py:1435 msgid "Parcel" msgstr "Parcelle" -#: forms.py:1064 models.py:46 +#: forms.py:1068 models.py:46 msgid "Remain types" msgstr "Types de vestige" -#: forms.py:1068 models.py:45 +#: forms.py:1072 models.py:45 msgid "Remain type" msgstr "Type de vestige" -#: forms.py:1084 templates/ishtar/sheet_operation.html:176 -#: templates/ishtar/sheet_operation.html:207 +#: forms.py:1088 templates/ishtar/sheet_operation.html:166 +#: templates/ishtar/sheet_operation.html:197 msgid "Period" msgstr "Période" -#: forms.py:1096 models.py:85 +#: forms.py:1100 models.py:85 msgid "Reference" msgstr "Référence" -#: forms.py:1125 +#: forms.py:1129 msgid "This reference already exists." msgstr "Cette référence existe déjà." -#: forms.py:1157 models.py:95 models.py:340 -#: templates/ishtar/sheet_operation.html:106 +#: forms.py:1161 models.py:95 models.py:341 +#: templates/ishtar/sheet_operation.html:96 msgid "Archaeological sites" msgstr "Entités archéologiques" -#: forms.py:1161 +#: forms.py:1165 msgid "Associated archaeological sites" msgstr "Entités archéologiques associées" -#: forms.py:1167 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93 +#: forms.py:1171 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93 msgid "Search" msgstr "Recherche" -#: forms.py:1172 +#: forms.py:1176 msgid "Would you like to close this operation?" msgstr "Voulez-vous clore cette opération ?" -#: forms.py:1177 +#: forms.py:1181 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:866 models.py:980 +#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:880 models.py:1000 msgid "Index" msgstr "Index" -#: forms.py:1212 +#: forms.py:1216 #, python-format msgid "" "Index already exists for operation: %(operation)s - use a value bigger than " @@ -510,48 +517,48 @@ msgstr "" "Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur " "plus grande que %(last_val)d" -#: forms.py:1224 +#: forms.py:1228 msgid "Operation's year" msgstr "Année de l'opération" -#: forms.py:1231 +#: forms.py:1235 msgid "Operation's town" msgstr "Commune de l'opération" -#: forms.py:1244 +#: forms.py:1248 msgid "Documentation search" msgstr "Rechercher une documentation" -#: forms.py:1246 +#: forms.py:1250 msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: forms.py:1263 forms.py:1330 models.py:905 models.py:974 +#: forms.py:1267 forms.py:1334 models.py:924 models.py:994 msgid "Act type" msgstr "Type d'acte" -#: forms.py:1264 forms.py:1462 +#: forms.py:1268 forms.py:1466 msgid "Indexed?" msgstr "Indexé ?" -#: forms.py:1270 forms.py:1335 models.py:1014 +#: forms.py:1274 forms.py:1339 models.py:1034 #: templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "Objet" -#: forms.py:1307 views.py:333 +#: forms.py:1311 views.py:333 msgid "Administrative act search" msgstr "Rechercher un acte administratif" -#: forms.py:1322 forms.py:1420 forms.py:1487 +#: forms.py:1326 forms.py:1424 forms.py:1491 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: forms.py:1338 models.py:1011 +#: forms.py:1342 models.py:1031 msgid "Signature date" msgstr "Date de signature" -#: forms.py:1380 +#: forms.py:1384 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " @@ -560,31 +567,31 @@ msgstr "" "Cet index existe déjà pour l'année : %(year)d, utilisez une valeur plus " "grande que %(last_val)d" -#: forms.py:1384 +#: forms.py:1388 msgid "Bad index" msgstr "Mauvais index" -#: forms.py:1397 +#: forms.py:1401 msgid "Would you like to delete this administrative act?" msgstr "Voulez-vous supprimer cet acte administratif ?" -#: forms.py:1402 +#: forms.py:1406 msgid "Template" msgstr "Patron" -#: forms.py:1426 forms.py:1430 +#: forms.py:1430 forms.py:1434 msgid "This document is not intended for this type of act." msgstr "Ce document n'est pas destiné à ce type d'acte." -#: forms.py:1448 +#: forms.py:1452 msgid "Doc generation" msgstr "Génération de document" -#: forms.py:1450 +#: forms.py:1454 msgid "Generate the associated doc?" msgstr "Générer le document associé ?" -#: forms.py:1471 ishtar_menu.py:123 views.py:386 +#: forms.py:1475 ishtar_menu.py:123 views.py:386 msgctxt "admin act register" msgid "Register" msgstr "Registre" @@ -605,7 +612,7 @@ msgstr "Clôture" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:59 models.py:1030 +#: ishtar_menu.py:59 models.py:1050 #: templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "Acte administratif" @@ -630,16 +637,16 @@ msgstr "Tableau de bord" msgid "General informations" msgstr "Informations générales" -#: ishtar_menu.py:139 models.py:368 +#: ishtar_menu.py:139 models.py:369 #: templates/ishtar/dashboards/dashboard_operation.html:8 msgid "Operations" msgstr "Opérations" -#: models.py:53 models.py:71 models.py:1879 +#: models.py:53 models.py:71 models.py:1907 msgid "Order" msgstr "Ordre" -#: models.py:55 models.py:1418 +#: models.py:55 models.py:1438 msgid "End date" msgstr "Date de fin" @@ -755,7 +762,7 @@ msgstr "Date de clôture" msgid "In charge scientist" msgstr "Responsable du suivi scientifique" -#: models.py:277 models.py:1200 +#: models.py:277 models.py:1220 msgid "File" msgstr "Dossier" @@ -763,299 +770,309 @@ msgstr "Dossier" msgid "Surface (m2)" msgstr "Surface (m2)" -#: models.py:334 +#: models.py:335 msgid "General comment" msgstr "Commentaire général" -#: models.py:337 +#: models.py:338 msgid "Cached name" msgstr "Nom en cache" -#: models.py:345 +#: models.py:346 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" "Si coché, cela signifie que cette opération n'a pas été officiellement " "enregistrée." -#: models.py:361 +#: models.py:362 msgid "Point" msgstr "Point" -#: models.py:362 +#: models.py:363 msgid "Multi polygon" msgstr "Polygones multi-parties" -#: models.py:370 +#: models.py:371 msgid "Can view all Operations" msgstr "Peut voir toutes les Opérations" -#: models.py:371 +#: models.py:372 msgid "Can view own Operation" msgstr "Peut voir sa propre Opération" -#: models.py:372 +#: models.py:373 msgid "Can add own Operation" msgstr "Peut ajouter sa propre Opération" -#: models.py:373 +#: models.py:374 msgid "Can change own Operation" msgstr "Peut modifier sa propre Opération" -#: models.py:374 +#: models.py:375 msgid "Can delete own Operation" msgstr "Peut supprimer sa propre Opération" -#: models.py:375 +#: models.py:376 msgid "Can close Operation" msgstr "Peut clore une Opération" -#: models.py:404 +#: models.py:405 msgid "OPE" msgstr "OPE" -#: models.py:470 +#: models.py:479 msgid "Intercommunal" msgstr "Intercommunal" -#: models.py:502 +#: models.py:511 msgid "Code patriarche" msgstr "Code patriarche" -#: models.py:542 +#: models.py:551 msgid "This operation code already exists for this year" msgstr "Ce code d'opération existe déjà pour cette année." -#: models.py:567 +#: models.py:576 msgid "Number of parcels" msgstr "Nombre de parcelles" -#: models.py:585 +#: models.py:594 msgid "Number of administrative acts" msgstr "Nombre d'actes administratifs" -#: models.py:593 +#: models.py:602 msgid "Number of indexed administrative acts" msgstr "Nombre d'actes administratifs indexés" -#: models.py:601 +#: models.py:610 msgid "Number of context records" msgstr "Nombre d'Unités d'Enregistrement" -#: models.py:637 +#: models.py:646 msgid "Number of finds" msgstr "Nombre d'éléments de mobilier" -#: models.py:682 +#: models.py:691 msgid "No type" msgstr "Pas de type" -#: models.py:713 +#: models.py:722 msgid "Number of sources" msgstr "Nombre de documents" -#: models.py:755 templates/ishtar/dashboards/dashboard_operation.html:309 +#: models.py:764 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:805 +#: models.py:814 msgid "Inverse relation" msgstr "Relation inverse" -#: models.py:809 +#: models.py:818 msgid "Operation relation type" msgstr "Type de relation entre opérations" -#: models.py:810 +#: models.py:819 msgid "Operation relation types" msgstr "Types de relation entre opérations" -#: models.py:823 +#: models.py:832 msgid "Operation record relation" msgstr "Relation entre opérations" -#: models.py:824 +#: models.py:833 msgid "Operation record relations" msgstr "Relations entre opérations" -#: models.py:870 +#: models.py:872 +#, fuzzy +msgid "Operation year" +msgstr "Année de l'opération" + +#: models.py:874 +#, fuzzy +msgid "Document code" +msgstr "Documents" + +#: models.py:884 msgid "Operation documentation" msgstr "Documentation d'une opération" -#: models.py:871 +#: models.py:885 msgid "Operation documentations" msgstr "Documentations des opérations" -#: models.py:874 +#: models.py:888 msgid "Can view all Operation sources" msgstr "Peut voir toutes les Documentations d'opération" -#: models.py:876 +#: models.py:890 msgid "Can view own Operation source" msgstr "Peut voir sa propre Documentation d'opération" -#: models.py:878 +#: models.py:892 msgid "Can add own Operation source" msgstr "Peut ajouter sa propre Documentation d'opération" -#: models.py:880 +#: models.py:894 msgid "Can change own Operation source" msgstr "Peut modifier sa propre Documentation d'opération" -#: models.py:882 +#: models.py:896 msgid "Can delete own Operation source" msgstr "Peut supprimer sa propre Documentation d'opération" -#: models.py:893 models.py:1005 +#: models.py:912 models.py:1025 msgid "Treatment request" msgstr "Demande de traitement" -#: models.py:894 models.py:1010 +#: models.py:913 models.py:1030 msgid "Treatment" msgstr "Traitement" -#: models.py:896 +#: models.py:915 msgid "Intended to" msgstr "Destiné à" -#: models.py:898 +#: models.py:917 msgid "Code" msgstr "Code" -#: models.py:901 +#: models.py:920 msgid "Associated template" msgstr "Patron associé" -#: models.py:902 +#: models.py:921 msgid "Indexed" msgstr "Indexé" -#: models.py:906 +#: models.py:925 msgid "Act types" msgstr "Types d'acte" -#: models.py:978 +#: models.py:991 models.py:1071 +#: templates/ishtar/blocks/window_tables/administrativacts.html:7 +#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 +msgid "Ref." +msgstr "Réf." + +#: models.py:998 msgid "Person in charge of the operation" msgstr "Responsable d'opération" -#: models.py:984 +#: models.py:1004 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: models.py:992 +#: models.py:1012 msgid "Signatory" msgstr "Signataire" -#: models.py:1020 +#: models.py:1040 msgid "Departments" msgstr "Départements" -#: models.py:1021 +#: models.py:1041 msgid "Cached values get from associated departments" msgstr "Valeur en cache des départements associés" -#: models.py:1024 +#: models.py:1044 msgid "Cached values get from associated towns" msgstr "Valeur en cache des communes associées" -#: models.py:1031 templates/ishtar/sheet_operation.html:114 -#: templates/ishtar/sheet_operation.html:150 +#: models.py:1051 templates/ishtar/sheet_operation.html:104 +#: templates/ishtar/sheet_operation.html:140 msgid "Administrative acts" msgstr "Actes administratifs" -#: models.py:1034 +#: models.py:1054 msgid "Can view all Administrative acts" msgstr "Peut voir tous les Actes administratifs" -#: models.py:1036 +#: models.py:1056 msgid "Can view own Administrative act" msgstr "Peut voir son propre Acte administratif" -#: models.py:1038 +#: models.py:1058 msgid "Can add own Administrative act" msgstr "Peut ajouter son propre Acte administratif" -#: models.py:1040 +#: models.py:1060 msgid "Can change own Administrative act" msgstr "Peut modifier son propre Acte administratif" -#: models.py:1042 +#: models.py:1062 msgid "Can delete own Administrative act" msgstr "Peut supprimer son propre Acte administratif" -#: models.py:1051 -#: templates/ishtar/blocks/window_tables/administrativacts.html:7 -#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 -msgid "Ref." -msgstr "Réf." - -#: models.py:1145 +#: models.py:1165 msgid "This index already exists for this year" msgstr "Cet index existe déjà pour cette année." -#: models.py:1213 +#: models.py:1233 msgid "External ID" msgstr "ID externe" -#: models.py:1216 +#: models.py:1236 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" -#: models.py:1217 +#: models.py:1237 msgid "Address - Locality" msgstr "Adresse - Lieu-dit" -#: models.py:1413 +#: models.py:1433 msgid "Owner" msgstr "Propriétaire" -#: models.py:1421 +#: models.py:1441 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: models.py:1422 +#: models.py:1442 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: models.py:1448 +#: models.py:1468 msgid "Recorded" msgstr "Enregistré" -#: models.py:1449 +#: models.py:1469 msgid "Effective" msgstr "Effectif" -#: models.py:1450 +#: models.py:1470 msgid "Active" msgstr "Actif" -#: models.py:1451 +#: models.py:1471 msgid "Field completed" msgstr "Terrain achevé" -#: models.py:1452 +#: models.py:1472 msgid "Associated report" msgstr "Rapport associé" -#: models.py:1453 +#: models.py:1473 msgid "Closed" msgstr "Clos" -#: models.py:1454 +#: models.py:1474 msgid "Documented and closed" msgstr "Documenté et clos" -#: models.py:1880 +#: models.py:1908 msgid "Is preventive" msgstr "Préventif" -#: models.py:1883 +#: models.py:1911 msgid "Operation type old" msgstr "Type d'opération - ancien" -#: models.py:1884 +#: models.py:1912 msgid "Operation types old" msgstr "Types d'opération - ancien" @@ -1116,7 +1133,7 @@ msgstr "" "oubli, définissez-le à la première étape." #: templates/ishtar/sheet_administrativeact.html:36 -#: templates/ishtar/sheet_operation.html:50 +#: templates/ishtar/sheet_operation.html:40 msgid "Surface:" msgstr "Surface :" @@ -1128,96 +1145,97 @@ msgstr "Cette opération est virtuelle." msgid "Patriarche OA code not yet recorded!" msgstr "Code d'opération Patriarche non renseigné !" -#: templates/ishtar/sheet_operation.html:27 -msgid "Creation:" -msgstr "Création :" +#: templates/ishtar/sheet_operation.html:23 +msgid "Address" +msgstr "" -#: templates/ishtar/sheet_operation.html:34 -msgid "Modification:" -msgstr "Modification :" +#: templates/ishtar/sheet_operation.html:30 +#, fuzzy +msgid "Begining date" +msgstr "Date de clôture" -#: templates/ishtar/sheet_operation.html:46 +#: templates/ishtar/sheet_operation.html:36 msgid "State:" msgstr "État :" -#: templates/ishtar/sheet_operation.html:46 +#: templates/ishtar/sheet_operation.html:36 msgid "Active file" msgstr "Dossier actif" -#: templates/ishtar/sheet_operation.html:47 +#: templates/ishtar/sheet_operation.html:37 msgid "Closed operation" msgstr "Opération close" -#: templates/ishtar/sheet_operation.html:48 +#: templates/ishtar/sheet_operation.html:38 msgid "Closing date:" msgstr "Date de clôture :" -#: templates/ishtar/sheet_operation.html:48 +#: templates/ishtar/sheet_operation.html:38 msgid "by" msgstr "par" -#: templates/ishtar/sheet_operation.html:51 +#: templates/ishtar/sheet_operation.html:41 msgid "Cost:" msgstr "Coût :" -#: templates/ishtar/sheet_operation.html:52 +#: templates/ishtar/sheet_operation.html:42 msgid "Duration:" msgstr "Durée :" -#: templates/ishtar/sheet_operation.html:52 +#: templates/ishtar/sheet_operation.html:42 msgid "Day" msgstr "Jour" -#: templates/ishtar/sheet_operation.html:85 +#: templates/ishtar/sheet_operation.html:75 msgid "Localisation" msgstr "Localisation" -#: templates/ishtar/sheet_operation.html:110 +#: templates/ishtar/sheet_operation.html:100 msgid "Associated parcels" msgstr "Parcelles associées" -#: templates/ishtar/sheet_operation.html:118 +#: templates/ishtar/sheet_operation.html:108 msgid "Document from this operation" msgstr "Documents de cette opération" -#: templates/ishtar/sheet_operation.html:124 -#: templates/ishtar/sheet_operation.html:161 +#: templates/ishtar/sheet_operation.html:114 +#: templates/ishtar/sheet_operation.html:151 msgid "Context records" msgstr "Unités d'Enregistrement" -#: templates/ishtar/sheet_operation.html:128 +#: templates/ishtar/sheet_operation.html:118 msgid "Context record relations" msgstr "Relations entre Unités d'Enregistrement" -#: templates/ishtar/sheet_operation.html:133 +#: templates/ishtar/sheet_operation.html:123 msgid "Documents from associated context records" msgstr "Documents des Unités d'Enregistrement associées" -#: templates/ishtar/sheet_operation.html:138 -#: templates/ishtar/sheet_operation.html:184 +#: templates/ishtar/sheet_operation.html:128 +#: templates/ishtar/sheet_operation.html:174 msgid "Finds" msgstr "Mobilier" -#: templates/ishtar/sheet_operation.html:143 +#: templates/ishtar/sheet_operation.html:133 msgid "Documents from associated finds" msgstr "Documents du mobilier associé" -#: templates/ishtar/sheet_operation.html:148 +#: templates/ishtar/sheet_operation.html:138 msgid "Statistics" msgstr "Statistiques" -#: templates/ishtar/sheet_operation.html:168 -#: templates/ishtar/sheet_operation.html:222 +#: templates/ishtar/sheet_operation.html:158 +#: templates/ishtar/sheet_operation.html:212 #: templates/ishtar/blocks/window_tables/administrativacts.html:8 msgid "Type" msgstr "Type" -#: templates/ishtar/sheet_operation.html:168 -#: templates/ishtar/sheet_operation.html:176 -#: templates/ishtar/sheet_operation.html:191 -#: templates/ishtar/sheet_operation.html:199 -#: templates/ishtar/sheet_operation.html:207 -#: templates/ishtar/sheet_operation.html:222 +#: templates/ishtar/sheet_operation.html:158 +#: templates/ishtar/sheet_operation.html:166 +#: templates/ishtar/sheet_operation.html:181 +#: templates/ishtar/sheet_operation.html:189 +#: templates/ishtar/sheet_operation.html:197 +#: templates/ishtar/sheet_operation.html:212 #: templates/ishtar/dashboards/dashboard_operation.html:18 #: templates/ishtar/dashboards/dashboard_operation.html:164 #: templates/ishtar/dashboards/dashboard_operation.html:432 @@ -1226,19 +1244,19 @@ msgstr "Type" msgid "Number" msgstr "Nombre" -#: templates/ishtar/sheet_operation.html:191 +#: templates/ishtar/sheet_operation.html:181 msgid "Material type" msgstr "Type de matériau" -#: templates/ishtar/sheet_operation.html:199 +#: templates/ishtar/sheet_operation.html:189 msgid "Object type" msgstr "Type d'objet" -#: templates/ishtar/sheet_operation.html:215 +#: templates/ishtar/sheet_operation.html:205 msgid "Sources" msgstr "Documents" -#: templates/ishtar/sheet_operation.html:231 +#: templates/ishtar/sheet_operation.html:221 msgid "Finds by context records" msgstr "Mobilier par Unités d'Enregistrement" @@ -1246,6 +1264,11 @@ msgstr "Mobilier par Unités d'Enregistrement" msgid "Operation source" msgstr "Documentation associée à l'opération" +#: templates/ishtar/sheet_operationsource.html:11 +#, fuzzy +msgid "Related operation" +msgstr "Opération close" + #: templates/ishtar/blocks/window_tables/administrativacts.html:9 msgid "Date" msgstr "Date" @@ -1481,3 +1504,9 @@ msgstr "communes principales par coût" #: templates/ishtar/wizard/wizard_adminact_deletion.html:6 msgid "This act is indexed!" msgstr "Cet acte est indexé !" + +#~ msgid "Creation:" +#~ msgstr "Création :" + +#~ msgid "Modification:" +#~ msgstr "Modification :" diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po index 6780d7b3a..0938cf839 100644 --- a/translations/fr/archaeological_warehouse.po +++ b/translations/fr/archaeological_warehouse.po @@ -6,13 +6,15 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-03-15 11:57+0100\n" "PO-Revision-Date: 2017-02-04 08:26-0500\n" "Last-Translator: Copied by Zanata \n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -170,7 +172,7 @@ msgstr "Modification" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:57 models.py:192 templates/ishtar/sheet_warehouse.html:17 +#: ishtar_menu.py:57 models.py:192 templates/ishtar/sheet_warehouse.html:20 msgid "Containers" msgstr "Contenants" @@ -219,11 +221,13 @@ msgid "Collection" msgstr "Collection" #: models.py:117 -msgid "Warehouse division" +#, fuzzy +msgid "Warehouse division type" msgstr "Division de dépôt" #: models.py:118 -msgid "Warehouse divisions" +#, fuzzy +msgid "Warehouse division types" msgstr "Divisions de dépôt" #: models.py:138 @@ -306,11 +310,11 @@ msgstr "Modifier un contenant" msgid "Container deletion" msgstr "Supprimer un contenant" -#: templates/ishtar/sheet_container.html:19 +#: templates/ishtar/sheet_container.html:22 msgid "Content" msgstr "Contenu" -#: templates/ishtar/sheet_warehouse.html:22 +#: templates/ishtar/sheet_warehouse.html:25 msgid "Attached containers" msgstr "Contenants associés" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index 34ff2b5a6..200c1fcc3 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -8,13 +8,15 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-03-15 11:56+0100\n" "PO-Revision-Date: 2017-03-09 05:02-0500\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -26,7 +28,7 @@ msgstr "identifiant" msgid "email address" msgstr "courriel" -#: __init__.py:10 +#: __init__.py:10 templates/ishtar/sheet_source.html:8 msgid "Related item" msgstr "Élément associé" @@ -139,31 +141,31 @@ msgstr "" "Erreur de configuration de l'importeur : le champ \"{}\" n'existe pas pour " "{}." -#: data_importer.py:1555 +#: data_importer.py:1559 msgid "line" msgstr "ligne" -#: data_importer.py:1555 +#: data_importer.py:1559 msgid "col" msgstr "colonne" -#: data_importer.py:1555 +#: data_importer.py:1559 msgid "error" msgstr "erreur" -#: data_importer.py:1561 +#: data_importer.py:1565 msgid "field" msgstr "champ" -#: data_importer.py:1561 +#: data_importer.py:1565 msgid "source" msgstr "source" -#: data_importer.py:1561 +#: data_importer.py:1565 msgid "result" msgstr "résultat" -#: data_importer.py:1577 +#: data_importer.py:1581 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "\"%(value)s\" n'est pas dans %(values)s" @@ -201,7 +203,7 @@ msgid "Template" msgstr "Patron" #: forms_common.py:41 forms_common.py:59 forms_common.py:184 -#: forms_common.py:408 models.py:1548 models.py:2986 +#: forms_common.py:408 models.py:1548 models.py:2989 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -224,8 +226,8 @@ msgstr "" "

                    Par exemple tapez « saint denis 93 » pour obtenir la " "commune Saint-Denis dans le département français de Seine-Saint-Denis.

                    " -#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2609 -#: models.py:2790 models.py:2854 templates/ishtar/sheet_person.html:4 +#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2610 +#: models.py:2791 models.py:2856 templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "Personne" @@ -238,15 +240,16 @@ msgstr "" "pas possible." #: forms_common.py:172 forms_common.py:329 forms_common.py:453 -#: ishtar_menu.py:75 models.py:2492 models.py:2583 +#: ishtar_menu.py:75 models.py:2493 models.py:2584 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "Organisation" #: forms_common.py:175 forms_common.py:212 forms_common.py:324 #: forms_common.py:378 forms_common.py:448 models.py:1103 models.py:1481 -#: models.py:1750 models.py:1766 models.py:2003 models.py:2486 models.py:2595 -#: models.py:2972 templates/ishtar/sheet_organization.html:8 +#: models.py:1750 models.py:1766 models.py:2003 models.py:2279 models.py:2487 +#: models.py:2596 models.py:2975 templates/ishtar/import_list.html:13 +#: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "Nom" @@ -281,22 +284,22 @@ msgstr "Courriel" #: forms_common.py:188 forms_common.py:385 models.py:1561 #: templates/ishtar/sheet_organization.html:14 -#: templates/ishtar/sheet_person.html:19 +#: templates/ishtar/sheet_person.html:21 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "Téléphone" #: forms_common.py:189 forms_common.py:394 models.py:1573 #: templates/ishtar/sheet_organization.html:15 -#: templates/ishtar/sheet_person.html:37 +#: templates/ishtar/sheet_person.html:39 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "Téléphone portable" #: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2170 -#: models.py:2488 models.py:2907 templates/sheet_ope.html:85 +#: models.py:2489 models.py:2910 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 -#: templates/ishtar/import_list.html:13 +#: templates/ishtar/import_list.html:14 #: templates/ishtar/sheet_organization.html:23 #: templates/ishtar/blocks/window_tables/documents.html:8 msgid "Type" @@ -318,7 +321,7 @@ msgstr "Fusionner tous les éléments dans" msgid "Organization to merge" msgstr "Organisation à fusionner" -#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2593 +#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2594 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "Prénom" @@ -337,16 +340,16 @@ msgid "Identity" msgstr "Identité" #: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2135 -#: models.py:2587 models.py:2589 models.py:2904 templates/sheet_ope.html:104 +#: models.py:2588 models.py:2590 models.py:2907 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "Titre" -#: forms_common.py:374 models.py:2591 +#: forms_common.py:374 models.py:2592 msgid "Salutation" msgstr "Formule d'appel" -#: forms_common.py:380 models.py:2597 +#: forms_common.py:380 models.py:2598 msgid "Raw name" msgstr "Nom brut" @@ -406,7 +409,7 @@ msgstr "Nom d'utilisateur" msgid "Account search" msgstr "Rechercher un compte" -#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2540 +#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2541 msgid "Person type" msgstr "Type de personne" @@ -438,7 +441,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:636 forms_common.py:649 models.py:2987 +#: forms_common.py:636 forms_common.py:649 models.py:2990 msgid "Towns" msgstr "Communes" @@ -454,7 +457,7 @@ msgstr "Seul un choix peut être coché." msgid "Documentation informations" msgstr "Information sur le document" -#: forms_common.py:783 forms_common.py:831 models.py:2136 models.py:2879 +#: forms_common.py:783 forms_common.py:831 models.py:2136 models.py:2882 msgid "Source type" msgstr "Type de document" @@ -466,37 +469,37 @@ msgstr "Référence" msgid "Internal reference" msgstr "Référence interne" -#: forms_common.py:791 models.py:2918 +#: forms_common.py:791 models.py:2921 msgid "Numerical ressource (web address)" msgstr "Ressource numérique (adresse web)" -#: forms_common.py:792 models.py:2920 +#: forms_common.py:792 models.py:2923 msgid "Receipt date" msgstr "Date de réception" -#: forms_common.py:794 models.py:2302 models.py:2922 +#: forms_common.py:794 models.py:2304 models.py:2925 msgid "Creation date" msgstr "Date de création" -#: forms_common.py:797 models.py:2925 +#: forms_common.py:797 models.py:2928 msgid "Receipt date in documentation" msgstr "Date de réception en documentation" #: forms_common.py:799 forms_common.py:835 models.py:379 models.py:696 -#: models.py:2030 models.py:2601 models.py:2932 +#: models.py:2030 models.py:2602 models.py:2935 msgid "Comment" msgstr "Commentaire" #: forms_common.py:801 forms_common.py:834 models.py:1105 models.py:1770 -#: models.py:1957 models.py:2004 models.py:2931 templates/sheet_ope.html:128 +#: models.py:1957 models.py:2004 models.py:2934 templates/sheet_ope.html:128 msgid "Description" msgstr "Description" -#: forms_common.py:804 models.py:2933 +#: forms_common.py:804 models.py:2936 msgid "Additional information" msgstr "Information supplémentaire" -#: forms_common.py:806 forms_common.py:838 models.py:2935 +#: forms_common.py:806 forms_common.py:838 models.py:2938 msgid "Has a duplicate" msgstr "Existe en doublon" @@ -513,7 +516,7 @@ msgstr "" "

                    Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).

                    " -#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2859 +#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2861 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "Auteur" @@ -526,7 +529,7 @@ msgstr "Informations supplémentaires" msgid "Would you like to delete this documentation?" msgstr "Voulez-vous supprimer ce document ?" -#: forms_common.py:864 models.py:2137 models.py:2846 models.py:2856 +#: forms_common.py:864 models.py:2137 models.py:2848 models.py:2858 msgid "Author type" msgstr "Type d'auteur" @@ -538,7 +541,7 @@ msgstr "Sélection d'auteur" msgid "There are identical authors." msgstr "Il y a des auteurs identiques." -#: forms_common.py:901 models.py:2860 models.py:2914 +#: forms_common.py:901 models.py:2862 models.py:2917 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -568,7 +571,7 @@ msgstr "Annuaire" msgid "Search" msgstr "Recherche" -#: ishtar_menu.py:54 ishtar_menu.py:83 templates/ishtar/import_list.html:15 +#: ishtar_menu.py:54 ishtar_menu.py:83 templates/ishtar/import_list.html:16 msgid "Creation" msgstr "Ajout" @@ -584,7 +587,7 @@ msgstr "Fusion automatique" msgid "Manual merge" msgstr "Fusion manuelle" -#: ishtar_menu.py:109 models.py:2313 +#: ishtar_menu.py:109 models.py:2315 msgid "Imports" msgstr "Imports" @@ -596,7 +599,7 @@ msgstr "Nouvel import" msgid "Current imports" msgstr "Imports en cours" -#: ishtar_menu.py:120 views.py:1664 +#: ishtar_menu.py:120 views.py:1667 msgid "Old imports" msgstr "Anciens imports" @@ -640,7 +643,7 @@ msgstr "Dernier éditeur" msgid "Creator" msgstr "Créateur" -#: models.py:965 models.py:2998 models.py:3054 +#: models.py:965 models.py:2846 models.py:3001 models.py:3057 msgid "Order" msgstr "Ordre" @@ -883,7 +886,7 @@ msgid "Total" msgstr "Total" #: models.py:1393 models.py:1517 models.py:1529 -#: templates/ishtar/sheet_person.html:22 +#: templates/ishtar/sheet_person.html:24 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 #: templates/ishtar/wizard/wizard_person.html:20 @@ -906,7 +909,7 @@ msgstr "Patron de document" msgid "Document templates" msgstr "Patrons de document" -#: models.py:1520 models.py:1530 models.py:2297 +#: models.py:1520 models.py:1530 models.py:2299 msgid "State" msgstr "État" @@ -1098,11 +1101,11 @@ msgstr "Importeur - Clé de rapprochement" msgid "Importer - Targets keys" msgstr "Importeur - Clés de rapprochement" -#: models.py:2138 models.py:2910 +#: models.py:2138 models.py:2913 msgid "Format" msgstr "Format" -#: models.py:2139 models.py:3002 +#: models.py:2139 models.py:3005 msgid "Operation type" msgstr "Type d'opération" @@ -1166,15 +1169,15 @@ msgstr "Type d'identification" msgid "Context record relation type" msgstr "Type de relations entre Unités d'Enregistrement" -#: models.py:2158 models.py:3060 +#: models.py:2158 models.py:3063 msgid "Spatial reference system" msgstr "Système de référence spatiale" -#: models.py:2159 models.py:2888 +#: models.py:2159 models.py:2891 msgid "Support type" msgstr "Type de support" -#: models.py:2160 models.py:2552 +#: models.py:2160 models.py:2553 msgid "Title type" msgstr "Type de titre" @@ -1272,265 +1275,265 @@ msgstr "Terminé" msgid "Archived" msgstr "Archivé" -#: models.py:2281 +#: models.py:2283 msgid "Imported file" msgstr "Fichier importé" -#: models.py:2283 +#: models.py:2285 msgid "Associated images (zip file)" msgstr "Images associées (fichier zip)" -#: models.py:2285 +#: models.py:2287 msgid "Encoding" msgstr "Codage" -#: models.py:2287 +#: models.py:2289 msgid "Skip lines" msgstr "Nombre de lignes d'entête" -#: models.py:2288 templates/ishtar/import_list.html:47 +#: models.py:2290 templates/ishtar/import_list.html:51 msgid "Error file" msgstr "Fichier erreur" -#: models.py:2291 +#: models.py:2293 msgid "Result file" msgstr "Fichier résultant" -#: models.py:2294 templates/ishtar/import_list.html:53 +#: models.py:2296 templates/ishtar/import_list.html:57 msgid "Match file" msgstr "Fichier de correspondance" -#: models.py:2300 +#: models.py:2302 msgid "Conservative import" msgstr "Import conservateur" -#: models.py:2305 +#: models.py:2307 msgid "End date" msgstr "Date de fin" -#: models.py:2307 +#: models.py:2309 msgid "Remaining seconds" msgstr "Secondes restantes" -#: models.py:2312 +#: models.py:2314 msgid "Import" msgstr "Import" -#: models.py:2342 +#: models.py:2343 msgid "Analyse" msgstr "Analyser" -#: models.py:2344 models.py:2347 +#: models.py:2345 models.py:2348 msgid "Re-analyse" msgstr "Analyser de nouveau " -#: models.py:2345 +#: models.py:2346 msgid "Launch import" msgstr "Lancer l'import" -#: models.py:2348 +#: models.py:2349 msgid "Re-import" msgstr "Ré-importer" -#: models.py:2349 +#: models.py:2350 msgid "Archive" msgstr "Archiver" -#: models.py:2351 +#: models.py:2352 msgid "Unarchive" msgstr "Désarchiver" -#: models.py:2352 widgets.py:130 templates/ishtar/form_delete.html:11 +#: models.py:2353 widgets.py:130 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "Supprimer" -#: models.py:2493 +#: models.py:2494 msgid "Organizations" msgstr "Organisations" -#: models.py:2495 +#: models.py:2496 msgid "Can view all Organizations" msgstr "Peut voir toutes les Organisations" -#: models.py:2496 +#: models.py:2497 msgid "Can view own Organization" msgstr "Peut voir sa propre Organisation" -#: models.py:2497 +#: models.py:2498 msgid "Can add own Organization" msgstr "Peut ajouter sa propre Organisation" -#: models.py:2499 +#: models.py:2500 msgid "Can change own Organization" msgstr "Peut modifier sa propre Organisation" -#: models.py:2501 +#: models.py:2502 msgid "Can delete own Organization" msgstr "Peut supprimer sa propre Organisation" -#: models.py:2536 +#: models.py:2537 msgid "Groups" msgstr "Groupes" -#: models.py:2541 +#: models.py:2542 msgid "Person types" msgstr "Types de personne" -#: models.py:2553 +#: models.py:2554 msgid "Title types" msgstr "Types de titre" -#: models.py:2562 +#: models.py:2563 msgid "Mr" msgstr "M." -#: models.py:2563 +#: models.py:2564 msgid "Miss" msgstr "Mlle" -#: models.py:2564 +#: models.py:2565 msgid "Mr and Mrs" msgstr "M. et Mme" -#: models.py:2565 +#: models.py:2566 msgid "Mrs" msgstr "Mme" -#: models.py:2566 +#: models.py:2567 msgid "Doctor" msgstr "Dr." -#: models.py:2599 +#: models.py:2600 msgid "Contact type" msgstr "Type de contact" -#: models.py:2602 models.py:2666 +#: models.py:2603 models.py:2667 msgid "Types" msgstr "Types" -#: models.py:2605 +#: models.py:2606 msgid "Is attached to" msgstr "Est rattaché à" -#: models.py:2610 +#: models.py:2611 msgid "Persons" msgstr "Personnes" -#: models.py:2612 +#: models.py:2613 msgid "Can view all Persons" msgstr "Peut voir toutes les Personnes" -#: models.py:2613 +#: models.py:2614 msgid "Can view own Person" msgstr "Peut voir sa propre Personne" -#: models.py:2614 +#: models.py:2615 msgid "Can add own Person" msgstr "Peut ajouter sa propre Personne" -#: models.py:2615 +#: models.py:2616 msgid "Can change own Person" msgstr "Peut modifier sa propre Personne" -#: models.py:2616 +#: models.py:2617 msgid "Can delete own Person" msgstr "Peut supprimer sa propre Personne" -#: models.py:2793 +#: models.py:2794 msgid "Advanced shortcut menu" msgstr "Menu de raccourci (avancé)" -#: models.py:2796 +#: models.py:2797 msgid "Ishtar user" msgstr "Utilisateur d'Ishtar" -#: models.py:2797 +#: models.py:2798 msgid "Ishtar users" msgstr "Utilisateurs d'Ishtar" -#: models.py:2841 +#: models.py:2842 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:2847 +#: models.py:2849 msgid "Author types" msgstr "Types d'auteur" -#: models.py:2880 +#: models.py:2883 msgid "Source types" msgstr "Types de document" -#: models.py:2889 +#: models.py:2892 msgid "Support types" msgstr "Types de support" -#: models.py:2896 +#: models.py:2899 msgid "Format type" msgstr "Type de format" -#: models.py:2897 +#: models.py:2900 msgid "Format types" msgstr "Types de format" -#: models.py:2905 +#: models.py:2908 msgid "External ID" msgstr "Identifiant externe" -#: models.py:2908 +#: models.py:2911 msgid "Support" msgstr "Support" -#: models.py:2912 +#: models.py:2915 msgid "Scale" msgstr "Échelle" -#: models.py:2926 +#: models.py:2929 msgid "Item number" msgstr "Numéro d'élément" -#: models.py:2927 +#: models.py:2930 msgid "Ref." msgstr "Réf." -#: models.py:2930 +#: models.py:2933 msgid "Internal ref." msgstr "Réf. interne" -#: models.py:2973 +#: models.py:2976 msgid "Surface (m2)" msgstr "Surface (m2)" -#: models.py:2974 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2977 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "Localisation" -#: models.py:2999 +#: models.py:3002 msgid "Is preventive" msgstr "Est du préventif" -#: models.py:3003 +#: models.py:3006 msgid "Operation types" msgstr "Types d'opération" -#: models.py:3032 +#: models.py:3035 msgid "Preventive" msgstr "Préventif" -#: models.py:3033 +#: models.py:3036 msgid "Research" msgstr "Programmé" -#: models.py:3056 +#: models.py:3059 msgid "Authority name" msgstr "Registre" -#: models.py:3057 +#: models.py:3060 msgid "Authority SRID" msgstr "SRID" -#: models.py:3061 +#: models.py:3064 msgid "Spatial reference systems" msgstr "Systèmes de référence spatiale" @@ -1623,31 +1626,31 @@ msgstr "Unités d'Enregistrement" msgid "Finds" msgstr "Mobilier" -#: views.py:1676 templates/ishtar/import_list.html:43 +#: views.py:1681 templates/ishtar/import_list.html:47 msgid "Link unmatched items" msgstr "Associer les éléments non rapprochés" -#: views.py:1691 +#: views.py:1696 msgid "Delete import" msgstr "Supprimer un import" -#: views.py:1730 +#: views.py:1735 msgid "Merge persons" msgstr "Fusionner des personnes" -#: views.py:1754 +#: views.py:1759 msgid "Select the main person" msgstr "Choisir la personne principale" -#: views.py:1763 +#: views.py:1768 msgid "Merge organization" msgstr "Fusionner des organisations" -#: views.py:1773 +#: views.py:1778 msgid "Select the main organization" msgstr "Sélectionner l'organisation principale" -#: views.py:1813 views.py:1829 +#: views.py:1818 views.py:1834 msgid "Corporation manager" msgstr "Représentant de la personne morale" @@ -1667,7 +1670,7 @@ msgstr "Chargement..." msgid "Remove" msgstr "Enlever" -#: wizards.py:372 templates/ishtar/import_delete.html:20 +#: wizards.py:372 templates/ishtar/import_delete.html:21 msgid "Yes" msgstr "Oui" @@ -1716,8 +1719,7 @@ msgstr "L'équipe %(app_name)s" #: templates/base.html:41 msgid "Searches in the shortcut menu deal with all items." -msgstr "" -"Les recherches dans le menu de raccourci concernent tous les éléments." +msgstr "Les recherches dans le menu de raccourci concernent tous les éléments." #: templates/base.html:42 msgid "Searches in the shortcut menu deal with only your items." @@ -2128,7 +2130,7 @@ msgid "remove" msgstr "supprimer" #: templates/ishtar/form.html:11 templates/ishtar/formset.html:8 -#: templates/ishtar/import_list.html:58 templates/ishtar/merge.html:31 +#: templates/ishtar/import_list.html:62 templates/ishtar/merge.html:31 #: templates/ishtar/simple_form.html:7 #: templates/ishtar/wizard/default_wizard.html:31 #: templates/ishtar/wizard/search.html:13 @@ -2136,19 +2138,19 @@ msgstr "supprimer" msgid "Validate" msgstr "Valider" -#: templates/ishtar/import_delete.html:8 +#: templates/ishtar/import_delete.html:9 msgid "The current items are linked to this import:" msgstr "Les éléments suivants sont associés à cet import :" -#: templates/ishtar/import_delete.html:18 +#: templates/ishtar/import_delete.html:19 msgid "All these items will be deleted with this import." msgstr "Tous ces éléments vont être supprimés avec cet import." -#: templates/ishtar/import_delete.html:19 +#: templates/ishtar/import_delete.html:20 msgid "Are you sure?" msgstr "Êtes-vous sûr ?" -#: templates/ishtar/import_delete.html:22 +#: templates/ishtar/import_delete.html:23 msgid "Back" msgstr "Retour" @@ -2156,24 +2158,24 @@ msgstr "Retour" msgid "No pending imports." msgstr "Pas d'imports en attente." -#: templates/ishtar/import_list.html:14 +#: templates/ishtar/import_list.html:15 msgctxt "file" msgid "File" msgstr "Fichier" -#: templates/ishtar/import_list.html:16 +#: templates/ishtar/import_list.html:17 msgid "Status" msgstr "État" -#: templates/ishtar/import_list.html:17 +#: templates/ishtar/import_list.html:18 msgid "Action" msgstr "Action" -#: templates/ishtar/import_list.html:25 +#: templates/ishtar/import_list.html:29 msgid "Source file" msgstr "Fichier source" -#: templates/ishtar/import_list.html:50 +#: templates/ishtar/import_list.html:54 msgid "Control file" msgstr "Fichier de contrôle" @@ -2281,60 +2283,64 @@ msgstr "Organisation de l'aménageur des dossiers" msgid "Planning service of archaeological files" msgstr "Service instructeur des dossiers" -#: templates/ishtar/sheet_person.html:21 +#: templates/ishtar/sheet_person.html:23 #: templates/ishtar/wizard/wizard_person.html:19 msgid "Phone type" msgstr "Type de téléphone" -#: templates/ishtar/sheet_person.html:44 +#: templates/ishtar/sheet_person.html:46 #: templates/ishtar/wizard/wizard_person.html:42 msgid "Business address" msgstr "Adresse professionnelle" -#: templates/ishtar/sheet_person.html:52 +#: templates/ishtar/sheet_person.html:55 #: templates/ishtar/wizard/wizard_person.html:51 msgid "Other address" msgstr "Autre adresse" -#: templates/ishtar/sheet_person.html:60 +#: templates/ishtar/sheet_person.html:64 msgid "Associated organization" msgstr "Organisation associée" -#: templates/ishtar/sheet_person.html:71 +#: templates/ishtar/sheet_person.html:76 msgid "Associated operations as scientist" msgstr "Opérations associées en tant que responsable scientifique" -#: templates/ishtar/sheet_person.html:75 +#: templates/ishtar/sheet_person.html:80 msgid "Associated operations as responsible" msgstr "Opérations associées en tant que responsable" -#: templates/ishtar/sheet_person.html:80 +#: templates/ishtar/sheet_person.html:85 #: templates/ishtar/wizard/wizard_person_deletion.html:6 msgid "In charge of archaeological files" msgstr "Responsable des dossiers" -#: templates/ishtar/sheet_person.html:85 +#: templates/ishtar/sheet_person.html:90 #: templates/ishtar/wizard/wizard_person_deletion.html:14 msgid "General contractor of archaeological files" msgstr "Aménageur des dossiers" -#: templates/ishtar/sheet_person.html:90 +#: templates/ishtar/sheet_person.html:95 #: templates/ishtar/wizard/wizard_person_deletion.html:22 msgid "Responsible for planning service of archaeological files" msgstr "Responsable pour le service instructeur des dossiers" -#: templates/ishtar/sheet_person.html:96 +#: templates/ishtar/sheet_person.html:101 msgid "Documents associated to operations" msgstr "Documents des opérations associées" -#: templates/ishtar/sheet_person.html:101 +#: templates/ishtar/sheet_person.html:106 msgid "Documents associated to context records" msgstr "Documents des Unités d'Enregistrement associées" -#: templates/ishtar/sheet_person.html:106 +#: templates/ishtar/sheet_person.html:111 msgid "Documents associated to finds" msgstr "Documents du mobilier associé" +#: templates/ishtar/sheet_source.html:22 +msgid "Web link" +msgstr "" + #: templates/ishtar/blocks/advanced_shortcut_menu.html:15 #: templates/ishtar/blocks/shortcut_menu.html:15 msgid "" @@ -2393,8 +2399,23 @@ msgid "" "Powered by Ishtar v%(VERSION)s - " "a free software under AGPL v3 license." msgstr "" -"Propulsé par Ishtar v%(VERSION)s -" -" logiciel libre sous licence AGPL v3." +"Propulsé par Ishtar v%(VERSION)s " +"- logiciel libre sous licence AGPL v3." + +#: templates/ishtar/blocks/sheet_creation_section.html:3 +#, fuzzy +msgid "Creation:" +msgstr "Ajout" + +#: templates/ishtar/blocks/sheet_creation_section.html:12 +#, fuzzy +msgid "Modification:" +msgstr "Modification" + +#: templates/ishtar/blocks/sheet_external_id.html:3 +#, fuzzy +msgid "Internal ID" +msgstr "Identifiant externe" #: templates/ishtar/blocks/window_nav.html:6 msgid "Previous version" -- cgit v1.2.3 From dd0a8c093c34a22ab4ba24a712292927074ec4dc Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 15 Mar 2017 17:08:59 +0100 Subject: Find sheet: link for documents related to finds (refs #3555) --- archaeological_finds/templates/ishtar/sheet_find.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index df9fedb10..381c81a31 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -223,6 +223,7 @@
            + @@ -230,8 +231,11 @@ {% for doc in item.source.all %} + - + -- cgit v1.2.3 From 7e147cafca0f6bc47c43e4ffa781fa64e5b0bcaa Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 15 Mar 2017 17:52:06 +0100 Subject: Operation sheet: add list of containers (refs #3458) --- archaeological_operations/models.py | 6 ++++++ .../templates/ishtar/sheet_operation.html | 17 +++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 727b29cb5..e741f5644 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -507,6 +507,12 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms, return FindSource.objects.filter( find__base_finds__context_record__operation=self) + def containers_q(self): + from archaeological_warehouse.models import Container + return Container.objects.filter( + finds__base_finds__context_record__operation=self + ) + associated_file_short_label_lbl = _(u"Archaeological file") full_code_patriarche_lbl = _(u"Code patriarche") diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index e920dd226..48116433c 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -111,30 +111,35 @@ {% endif %} {% if item.context_record.count %} -

            {% trans "Context records" %}

            -{% dynamic_table_document '' 'context_records_for_ope' 'operation' item.pk 'TABLE_COLS_FOR_OPE' output %} +{% trans "Context records" as cr_lab %} +{% dynamic_table_document cr_lab 'context_records_for_ope' 'operation' item.pk 'TABLE_COLS_FOR_OPE' output %} {% endif %} -{% trans "Context record relations" as cr_rels %} {% if item.context_record_relations_q.count %} +{% trans "Context record relations" as cr_rels %} {% dynamic_table_document cr_rels 'context_records_relations_detail' 'left_record__operation' item.pk '' output %} {% endif %} -{% trans "Documents from associated context records" as cr_docs %} {% if item.context_record_docs_q.count %} +{% trans "Documents from associated context records" as cr_docs %} {% dynamic_table_document cr_docs 'context_records_docs' 'context_record__operation' item.pk '' output %} {% endif %} -{% trans "Finds" as finds %} {% if item.finds %} +{% trans "Finds" as finds %} {% dynamic_table_document finds 'finds_for_ope' 'base_finds__context_record__operation' item.pk 'TABLE_COLS_FOR_OPE' output %} {% endif %} -{% trans "Documents from associated finds" as finds_docs %} {% if item.find_docs_q.count %} +{% trans "Documents from associated finds" as finds_docs %} {% dynamic_table_document finds_docs 'finds_docs' 'find__base_finds__context_record__operation' item.pk '' output %} {% endif %} +{% if item.containers_q.count %} +{% trans "Associated containers" as containers_lbl %} +{% dynamic_table_document containers_lbl 'containers' 'finds__base_finds__context_record__operation' item.pk '' output %} +{% endif %} +

            {% trans "Statistics" %}

            {% trans "Administrative acts" %}

            -- cgit v1.2.3 From be74531db5197863fc7fcc42a6cfa7184ec1a543 Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Thu, 16 Mar 2017 00:08:13 +0100 Subject: Update labels --- archaeological_context_records/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 2506ae857..ef17e561e 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -142,7 +142,7 @@ class RecordFormGeneral(ManageOldType, forms.Form): comment = forms.CharField(label=_(u"General comment"), widget=forms.Textarea, required=False) excavation_technic = forms.ChoiceField( - label=_(u"Excavation technic"), choices=[], required=False) + label=_(u"Excavation technique"), choices=[], required=False) length = forms.FloatField(label=_(u"Length (m)"), required=False) width = forms.FloatField(label=_(u"Width (m)"), required=False) thickness = forms.FloatField(label=_(u"Thickness (m)"), required=False) -- cgit v1.2.3 From 9afb9759dae2933d5c56ab3f4d0375f142c95510 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 16 Mar 2017 09:55:30 +0100 Subject: Warehouse - Container: add a Modify button to sheets (refs #3453, refs #3518) --- .../templates/ishtar/sheet_container.html | 2 +- .../templates/ishtar/sheet_warehouse.html | 2 +- archaeological_warehouse/urls.py | 7 ++++++- archaeological_warehouse/views.py | 19 +++++++++++++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html index cd8a3602b..172719604 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_container.html +++ b/archaeological_warehouse/templates/ishtar/sheet_container.html @@ -4,7 +4,7 @@ {% block head_title %}{% trans "Container" %}{% endblock %} {% block content %} -{% window_nav item window_id 'show-container' '' '' '' previous next 1 %} +{% window_nav item window_id 'show-container' 'container_modify' '' '' previous next 1 %}

            {{ item.reference|default:"" }}

            {{ item.container_type|default:"" }}

            diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html index 410108a52..c31fc93b4 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html +++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html @@ -4,7 +4,7 @@ {% block head_title %}{% trans "Warehouse" %}{% endblock %} {% block content %} -{% window_nav item window_id 'show-warehouse' '' '' '' previous next 1 %} +{% window_nav item window_id 'show-warehouse' 'warehouse_modify' '' '' previous next 1 %}

            {{ item.name|default:"" }}

            {{ item.warehouse_type|default:"" }}

            diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py index 133d4ae79..e5920606a 100644 --- a/archaeological_warehouse/urls.py +++ b/archaeological_warehouse/urls.py @@ -64,6 +64,9 @@ urlpatterns += patterns( check_rights(['change_warehouse'])( views.warehouse_deletion_wizard), name='warehouse_deletion'), + url(r'warehouse-modify/(?P.+)/$', + views.warehouse_modify, name='warehouse_modify'), + url(r'^container_search/(?P.+)?$', check_rights(['change_warehouse'])( views.container_search_wizard), @@ -80,4 +83,6 @@ urlpatterns += patterns( check_rights(['change_warehouse'])( views.container_deletion_wizard), name='container_deletion'), -) + url(r'container-modify/(?P.+)/$', + views.container_modify, name='container_modify'), +) \ No newline at end of file diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py index 06b3c9432..677539a3f 100644 --- a/archaeological_warehouse/views.py +++ b/archaeological_warehouse/views.py @@ -19,9 +19,11 @@ import json +from django.core.urlresolvers import reverse from django.db.models import Q from django.http import HttpResponse from django.utils.translation import ugettext_lazy as _ +from django.shortcuts import redirect import models @@ -120,6 +122,15 @@ warehouse_modification_wizard = WarehouseModificationWizard.as_view([ url_name='warehouse_modification', ) + +def warehouse_modify(request, pk): + WarehouseModificationWizard.session_set_value( + request, 'selec-warehouse_modification', 'pk', pk, reset=True) + return redirect( + reverse('warehouse_modification', + kwargs={'step': 'warehouse-warehouse_modification'})) + + warehouse_deletion_wizard = WarehouseDeletionWizard.as_view([ ('selec-warehouse_deletion', WarehouseFormSelection), ('final-warehouse_deletion', WarehouseDeletionForm)], @@ -152,6 +163,14 @@ container_modification_wizard = ContainerModificationWizard.as_view([ url_name='container_modification', ) + +def container_modify(request, pk): + ContainerModificationWizard.session_set_value( + request, 'selec-container_modification', 'pk', pk, reset=True) + return redirect( + reverse('container_modification', + kwargs={'step': 'container-container_modification'})) + container_deletion_wizard = ContainerDeletionWizard.as_view([ ('selec-container_deletion', MainContainerFormSelection), ('final-container_deletion', ContainerDeletionForm)], -- cgit v1.2.3 From 935c4d3be9d0b73bb353d3b28664595030ecfdcf Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 16 Mar 2017 09:59:39 +0100 Subject: Update french translation --- translations/de/ishtar_common.po | 301 ++++++++++++---------- translations/fr/archaeological_context_records.po | 29 +-- translations/fr/archaeological_files.po | 16 +- translations/fr/archaeological_files_pdl.po | 8 +- translations/fr/archaeological_finds.po | 49 ++-- translations/fr/archaeological_operations.po | 34 +-- translations/fr/archaeological_warehouse.po | 18 +- translations/fr/ishtar_common.po | 28 +- 8 files changed, 222 insertions(+), 261 deletions(-) diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po index d5add0458..d85d9f550 100644 --- a/translations/de/ishtar_common.po +++ b/translations/de/ishtar_common.po @@ -20,7 +20,7 @@ msgstr "Benutzername" msgid "email address" msgstr "E-Mail-Adresse" -#: __init__.py:10 +#: __init__.py:10 templates/ishtar/sheet_source.html:8 msgid "Related item" msgstr "" @@ -122,31 +122,31 @@ msgstr "" msgid "Importer configuration error: field \"{}\" does not exist for {}." msgstr "" -#: data_importer.py:1555 +#: data_importer.py:1559 msgid "line" msgstr "" -#: data_importer.py:1555 +#: data_importer.py:1559 msgid "col" msgstr "" -#: data_importer.py:1555 +#: data_importer.py:1559 msgid "error" msgstr "" -#: data_importer.py:1561 +#: data_importer.py:1565 msgid "field" msgstr "" -#: data_importer.py:1561 +#: data_importer.py:1565 msgid "source" msgstr "" -#: data_importer.py:1561 +#: data_importer.py:1565 msgid "result" msgstr "" -#: data_importer.py:1577 +#: data_importer.py:1581 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -184,7 +184,7 @@ msgid "Template" msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:184 -#: forms_common.py:408 models.py:1548 models.py:2986 +#: forms_common.py:408 models.py:1548 models.py:2989 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -200,8 +200,8 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.

            " msgstr "" -#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2609 -#: models.py:2790 models.py:2854 templates/ishtar/sheet_person.html:4 +#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2610 +#: models.py:2791 models.py:2856 templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -212,15 +212,16 @@ msgid "" msgstr "" #: forms_common.py:172 forms_common.py:329 forms_common.py:453 -#: ishtar_menu.py:75 models.py:2492 models.py:2583 +#: ishtar_menu.py:75 models.py:2493 models.py:2584 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" #: forms_common.py:175 forms_common.py:212 forms_common.py:324 #: forms_common.py:378 forms_common.py:448 models.py:1103 models.py:1481 -#: models.py:1750 models.py:1766 models.py:2003 models.py:2486 models.py:2595 -#: models.py:2972 templates/ishtar/sheet_organization.html:8 +#: models.py:1750 models.py:1766 models.py:2003 models.py:2279 models.py:2487 +#: models.py:2596 models.py:2975 templates/ishtar/import_list.html:13 +#: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "Name" @@ -255,22 +256,22 @@ msgstr "E-Mail-Adresse" #: forms_common.py:188 forms_common.py:385 models.py:1561 #: templates/ishtar/sheet_organization.html:14 -#: templates/ishtar/sheet_person.html:19 +#: templates/ishtar/sheet_person.html:21 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "" #: forms_common.py:189 forms_common.py:394 models.py:1573 #: templates/ishtar/sheet_organization.html:15 -#: templates/ishtar/sheet_person.html:37 +#: templates/ishtar/sheet_person.html:39 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "" #: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2170 -#: models.py:2488 models.py:2907 templates/sheet_ope.html:85 +#: models.py:2489 models.py:2910 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 -#: templates/ishtar/import_list.html:13 +#: templates/ishtar/import_list.html:14 #: templates/ishtar/sheet_organization.html:23 #: templates/ishtar/blocks/window_tables/documents.html:8 msgid "Type" @@ -292,7 +293,7 @@ msgstr "" msgid "Organization to merge" msgstr "" -#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2593 +#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2594 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "" @@ -311,16 +312,16 @@ msgid "Identity" msgstr "" #: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2135 -#: models.py:2587 models.py:2589 models.py:2904 templates/sheet_ope.html:104 +#: models.py:2588 models.py:2590 models.py:2907 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" -#: forms_common.py:374 models.py:2591 +#: forms_common.py:374 models.py:2592 msgid "Salutation" msgstr "" -#: forms_common.py:380 models.py:2597 +#: forms_common.py:380 models.py:2598 msgid "Raw name" msgstr "" @@ -380,7 +381,7 @@ msgstr "Benutzername" msgid "Account search" msgstr "" -#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2540 +#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2541 msgid "Person type" msgstr "" @@ -412,7 +413,7 @@ msgstr "" msgid "Send the new password by email?" msgstr "" -#: forms_common.py:636 forms_common.py:649 models.py:2987 +#: forms_common.py:636 forms_common.py:649 models.py:2990 msgid "Towns" msgstr "" @@ -428,7 +429,7 @@ msgstr "" msgid "Documentation informations" msgstr "" -#: forms_common.py:783 forms_common.py:831 models.py:2136 models.py:2879 +#: forms_common.py:783 forms_common.py:831 models.py:2136 models.py:2882 msgid "Source type" msgstr "" @@ -440,37 +441,37 @@ msgstr "" msgid "Internal reference" msgstr "" -#: forms_common.py:791 models.py:2918 +#: forms_common.py:791 models.py:2921 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:792 models.py:2920 +#: forms_common.py:792 models.py:2923 msgid "Receipt date" msgstr "" -#: forms_common.py:794 models.py:2302 models.py:2922 +#: forms_common.py:794 models.py:2304 models.py:2925 msgid "Creation date" msgstr "Gründungsdatum" -#: forms_common.py:797 models.py:2925 +#: forms_common.py:797 models.py:2928 msgid "Receipt date in documentation" msgstr "" #: forms_common.py:799 forms_common.py:835 models.py:379 models.py:696 -#: models.py:2030 models.py:2601 models.py:2932 +#: models.py:2030 models.py:2602 models.py:2935 msgid "Comment" msgstr "" #: forms_common.py:801 forms_common.py:834 models.py:1105 models.py:1770 -#: models.py:1957 models.py:2004 models.py:2931 templates/sheet_ope.html:128 +#: models.py:1957 models.py:2004 models.py:2934 templates/sheet_ope.html:128 msgid "Description" msgstr "Beschreibung" -#: forms_common.py:804 models.py:2933 +#: forms_common.py:804 models.py:2936 msgid "Additional information" msgstr "" -#: forms_common.py:806 forms_common.py:838 models.py:2935 +#: forms_common.py:806 forms_common.py:838 models.py:2938 msgid "Has a duplicate" msgstr "" @@ -485,7 +486,7 @@ msgid "" "p>" msgstr "" -#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2859 +#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2861 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" @@ -498,7 +499,7 @@ msgstr "" msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:864 models.py:2137 models.py:2846 models.py:2856 +#: forms_common.py:864 models.py:2137 models.py:2848 models.py:2858 msgid "Author type" msgstr "" @@ -510,7 +511,7 @@ msgstr "" msgid "There are identical authors." msgstr "" -#: forms_common.py:901 models.py:2860 models.py:2914 +#: forms_common.py:901 models.py:2862 models.py:2917 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -540,7 +541,7 @@ msgstr "" msgid "Search" msgstr "" -#: ishtar_menu.py:54 ishtar_menu.py:83 templates/ishtar/import_list.html:15 +#: ishtar_menu.py:54 ishtar_menu.py:83 templates/ishtar/import_list.html:16 msgid "Creation" msgstr "Gründung" @@ -556,7 +557,7 @@ msgstr "" msgid "Manual merge" msgstr "" -#: ishtar_menu.py:109 models.py:2313 +#: ishtar_menu.py:109 models.py:2315 msgid "Imports" msgstr "" @@ -568,7 +569,7 @@ msgstr "" msgid "Current imports" msgstr "" -#: ishtar_menu.py:120 views.py:1664 +#: ishtar_menu.py:120 views.py:1667 msgid "Old imports" msgstr "" @@ -612,7 +613,7 @@ msgstr "" msgid "Creator" msgstr "" -#: models.py:965 models.py:2998 models.py:3054 +#: models.py:965 models.py:2846 models.py:3001 models.py:3057 msgid "Order" msgstr "" @@ -828,7 +829,7 @@ msgid "Total" msgstr "" #: models.py:1393 models.py:1517 models.py:1529 -#: templates/ishtar/sheet_person.html:22 +#: templates/ishtar/sheet_person.html:24 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 #: templates/ishtar/wizard/wizard_person.html:20 @@ -851,7 +852,7 @@ msgstr "" msgid "Document templates" msgstr "" -#: models.py:1520 models.py:1530 models.py:2297 +#: models.py:1520 models.py:1530 models.py:2299 msgid "State" msgstr "" @@ -1041,11 +1042,11 @@ msgstr "" msgid "Importer - Targets keys" msgstr "" -#: models.py:2138 models.py:2910 +#: models.py:2138 models.py:2913 msgid "Format" msgstr "" -#: models.py:2139 models.py:3002 +#: models.py:2139 models.py:3005 msgid "Operation type" msgstr "" @@ -1109,15 +1110,15 @@ msgstr "" msgid "Context record relation type" msgstr "" -#: models.py:2158 models.py:3060 +#: models.py:2158 models.py:3063 msgid "Spatial reference system" msgstr "" -#: models.py:2159 models.py:2888 +#: models.py:2159 models.py:2891 msgid "Support type" msgstr "" -#: models.py:2160 models.py:2552 +#: models.py:2160 models.py:2553 msgid "Title type" msgstr "" @@ -1215,263 +1216,263 @@ msgstr "" msgid "Archived" msgstr "" -#: models.py:2281 +#: models.py:2283 msgid "Imported file" msgstr "" -#: models.py:2283 +#: models.py:2285 msgid "Associated images (zip file)" msgstr "" -#: models.py:2285 +#: models.py:2287 msgid "Encoding" msgstr "" -#: models.py:2287 +#: models.py:2289 msgid "Skip lines" msgstr "" -#: models.py:2288 templates/ishtar/import_list.html:47 +#: models.py:2290 templates/ishtar/import_list.html:51 msgid "Error file" msgstr "" -#: models.py:2291 +#: models.py:2293 msgid "Result file" msgstr "" -#: models.py:2294 templates/ishtar/import_list.html:53 +#: models.py:2296 templates/ishtar/import_list.html:57 msgid "Match file" msgstr "" -#: models.py:2300 +#: models.py:2302 msgid "Conservative import" msgstr "" -#: models.py:2305 +#: models.py:2307 msgid "End date" msgstr "" -#: models.py:2307 +#: models.py:2309 msgid "Remaining seconds" msgstr "" -#: models.py:2312 +#: models.py:2314 msgid "Import" msgstr "" -#: models.py:2342 +#: models.py:2343 msgid "Analyse" msgstr "" -#: models.py:2344 models.py:2347 +#: models.py:2345 models.py:2348 msgid "Re-analyse" msgstr "" -#: models.py:2345 +#: models.py:2346 msgid "Launch import" msgstr "" -#: models.py:2348 +#: models.py:2349 msgid "Re-import" msgstr "" -#: models.py:2349 +#: models.py:2350 msgid "Archive" msgstr "" -#: models.py:2351 +#: models.py:2352 msgid "Unarchive" msgstr "" -#: models.py:2352 widgets.py:130 templates/ishtar/form_delete.html:11 +#: models.py:2353 widgets.py:130 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "" -#: models.py:2493 +#: models.py:2494 msgid "Organizations" msgstr "" -#: models.py:2495 +#: models.py:2496 msgid "Can view all Organizations" msgstr "" -#: models.py:2496 +#: models.py:2497 msgid "Can view own Organization" msgstr "" -#: models.py:2497 +#: models.py:2498 msgid "Can add own Organization" msgstr "" -#: models.py:2499 +#: models.py:2500 msgid "Can change own Organization" msgstr "" -#: models.py:2501 +#: models.py:2502 msgid "Can delete own Organization" msgstr "" -#: models.py:2536 +#: models.py:2537 msgid "Groups" msgstr "" -#: models.py:2541 +#: models.py:2542 msgid "Person types" msgstr "" -#: models.py:2553 +#: models.py:2554 msgid "Title types" msgstr "" -#: models.py:2562 +#: models.py:2563 msgid "Mr" msgstr "" -#: models.py:2563 +#: models.py:2564 msgid "Miss" msgstr "" -#: models.py:2564 +#: models.py:2565 msgid "Mr and Mrs" msgstr "" -#: models.py:2565 +#: models.py:2566 msgid "Mrs" msgstr "" -#: models.py:2566 +#: models.py:2567 msgid "Doctor" msgstr "" -#: models.py:2599 +#: models.py:2600 msgid "Contact type" msgstr "" -#: models.py:2602 models.py:2666 +#: models.py:2603 models.py:2667 msgid "Types" msgstr "" -#: models.py:2605 +#: models.py:2606 msgid "Is attached to" msgstr "" -#: models.py:2610 +#: models.py:2611 msgid "Persons" msgstr "" -#: models.py:2612 +#: models.py:2613 msgid "Can view all Persons" msgstr "" -#: models.py:2613 +#: models.py:2614 msgid "Can view own Person" msgstr "" -#: models.py:2614 +#: models.py:2615 msgid "Can add own Person" msgstr "" -#: models.py:2615 +#: models.py:2616 msgid "Can change own Person" msgstr "" -#: models.py:2616 +#: models.py:2617 msgid "Can delete own Person" msgstr "" -#: models.py:2793 +#: models.py:2794 msgid "Advanced shortcut menu" msgstr "" -#: models.py:2796 +#: models.py:2797 msgid "Ishtar user" msgstr "" -#: models.py:2797 +#: models.py:2798 msgid "Ishtar users" msgstr "" -#: models.py:2841 +#: models.py:2842 msgid "To modify the password use the form in Auth > User" msgstr "" -#: models.py:2847 +#: models.py:2849 msgid "Author types" msgstr "" -#: models.py:2880 +#: models.py:2883 msgid "Source types" msgstr "" -#: models.py:2889 +#: models.py:2892 msgid "Support types" msgstr "" -#: models.py:2896 +#: models.py:2899 msgid "Format type" msgstr "" -#: models.py:2897 +#: models.py:2900 msgid "Format types" msgstr "" -#: models.py:2905 +#: models.py:2908 msgid "External ID" msgstr "" -#: models.py:2908 +#: models.py:2911 msgid "Support" msgstr "" -#: models.py:2912 +#: models.py:2915 msgid "Scale" msgstr "" -#: models.py:2926 +#: models.py:2929 msgid "Item number" msgstr "" -#: models.py:2927 +#: models.py:2930 msgid "Ref." msgstr "" -#: models.py:2930 +#: models.py:2933 msgid "Internal ref." msgstr "" -#: models.py:2973 +#: models.py:2976 msgid "Surface (m2)" msgstr "" -#: models.py:2974 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2977 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "Lokalisierung" -#: models.py:2999 +#: models.py:3002 msgid "Is preventive" msgstr "" -#: models.py:3003 +#: models.py:3006 msgid "Operation types" msgstr "" -#: models.py:3032 +#: models.py:3035 msgid "Preventive" msgstr "" -#: models.py:3033 +#: models.py:3036 msgid "Research" msgstr "" -#: models.py:3056 +#: models.py:3059 msgid "Authority name" msgstr "" -#: models.py:3057 +#: models.py:3060 msgid "Authority SRID" msgstr "" -#: models.py:3061 +#: models.py:3064 msgid "Spatial reference systems" msgstr "" @@ -1564,31 +1565,31 @@ msgstr "" msgid "Finds" msgstr "" -#: views.py:1676 templates/ishtar/import_list.html:43 +#: views.py:1681 templates/ishtar/import_list.html:47 msgid "Link unmatched items" msgstr "" -#: views.py:1691 +#: views.py:1696 msgid "Delete import" msgstr "" -#: views.py:1730 +#: views.py:1735 msgid "Merge persons" msgstr "" -#: views.py:1754 +#: views.py:1759 msgid "Select the main person" msgstr "" -#: views.py:1763 +#: views.py:1768 msgid "Merge organization" msgstr "" -#: views.py:1773 +#: views.py:1778 msgid "Select the main organization" msgstr "" -#: views.py:1813 views.py:1829 +#: views.py:1818 views.py:1834 msgid "Corporation manager" msgstr "" @@ -1608,7 +1609,7 @@ msgstr "" msgid "Remove" msgstr "" -#: wizards.py:372 templates/ishtar/import_delete.html:20 +#: wizards.py:372 templates/ishtar/import_delete.html:21 msgid "Yes" msgstr "" @@ -2061,7 +2062,7 @@ msgid "remove" msgstr "" #: templates/ishtar/form.html:11 templates/ishtar/formset.html:8 -#: templates/ishtar/import_list.html:58 templates/ishtar/merge.html:31 +#: templates/ishtar/import_list.html:62 templates/ishtar/merge.html:31 #: templates/ishtar/simple_form.html:7 #: templates/ishtar/wizard/default_wizard.html:31 #: templates/ishtar/wizard/search.html:13 @@ -2069,19 +2070,19 @@ msgstr "" msgid "Validate" msgstr "" -#: templates/ishtar/import_delete.html:8 +#: templates/ishtar/import_delete.html:9 msgid "The current items are linked to this import:" msgstr "" -#: templates/ishtar/import_delete.html:18 +#: templates/ishtar/import_delete.html:19 msgid "All these items will be deleted with this import." msgstr "" -#: templates/ishtar/import_delete.html:19 +#: templates/ishtar/import_delete.html:20 msgid "Are you sure?" msgstr "" -#: templates/ishtar/import_delete.html:22 +#: templates/ishtar/import_delete.html:23 msgid "Back" msgstr "" @@ -2089,24 +2090,24 @@ msgstr "" msgid "No pending imports." msgstr "" -#: templates/ishtar/import_list.html:14 +#: templates/ishtar/import_list.html:15 msgctxt "file" msgid "File" msgstr "" -#: templates/ishtar/import_list.html:16 +#: templates/ishtar/import_list.html:17 msgid "Status" msgstr "" -#: templates/ishtar/import_list.html:17 +#: templates/ishtar/import_list.html:18 msgid "Action" msgstr "" -#: templates/ishtar/import_list.html:25 +#: templates/ishtar/import_list.html:29 msgid "Source file" msgstr "" -#: templates/ishtar/import_list.html:50 +#: templates/ishtar/import_list.html:54 msgid "Control file" msgstr "" @@ -2214,60 +2215,64 @@ msgstr "" msgid "Planning service of archaeological files" msgstr "" -#: templates/ishtar/sheet_person.html:21 +#: templates/ishtar/sheet_person.html:23 #: templates/ishtar/wizard/wizard_person.html:19 msgid "Phone type" msgstr "" -#: templates/ishtar/sheet_person.html:44 +#: templates/ishtar/sheet_person.html:46 #: templates/ishtar/wizard/wizard_person.html:42 msgid "Business address" msgstr "" -#: templates/ishtar/sheet_person.html:52 +#: templates/ishtar/sheet_person.html:55 #: templates/ishtar/wizard/wizard_person.html:51 msgid "Other address" msgstr "" -#: templates/ishtar/sheet_person.html:60 +#: templates/ishtar/sheet_person.html:64 msgid "Associated organization" msgstr "" -#: templates/ishtar/sheet_person.html:71 +#: templates/ishtar/sheet_person.html:76 msgid "Associated operations as scientist" msgstr "" -#: templates/ishtar/sheet_person.html:75 +#: templates/ishtar/sheet_person.html:80 msgid "Associated operations as responsible" msgstr "" -#: templates/ishtar/sheet_person.html:80 +#: templates/ishtar/sheet_person.html:85 #: templates/ishtar/wizard/wizard_person_deletion.html:6 msgid "In charge of archaeological files" msgstr "" -#: templates/ishtar/sheet_person.html:85 +#: templates/ishtar/sheet_person.html:90 #: templates/ishtar/wizard/wizard_person_deletion.html:14 msgid "General contractor of archaeological files" msgstr "" -#: templates/ishtar/sheet_person.html:90 +#: templates/ishtar/sheet_person.html:95 #: templates/ishtar/wizard/wizard_person_deletion.html:22 msgid "Responsible for planning service of archaeological files" msgstr "" -#: templates/ishtar/sheet_person.html:96 +#: templates/ishtar/sheet_person.html:101 msgid "Documents associated to operations" msgstr "" -#: templates/ishtar/sheet_person.html:101 +#: templates/ishtar/sheet_person.html:106 msgid "Documents associated to context records" msgstr "" -#: templates/ishtar/sheet_person.html:106 +#: templates/ishtar/sheet_person.html:111 msgid "Documents associated to finds" msgstr "" +#: templates/ishtar/sheet_source.html:22 +msgid "Web link" +msgstr "" + #: templates/ishtar/blocks/advanced_shortcut_menu.html:15 #: templates/ishtar/blocks/shortcut_menu.html:15 msgid "" @@ -2322,6 +2327,18 @@ msgid "" "a free software under AGPL v3 license." msgstr "" +#: templates/ishtar/blocks/sheet_creation_section.html:3 +msgid "Creation:" +msgstr "" + +#: templates/ishtar/blocks/sheet_creation_section.html:12 +msgid "Modification:" +msgstr "" + +#: templates/ishtar/blocks/sheet_external_id.html:3 +msgid "Internal ID" +msgstr "" + #: templates/ishtar/blocks/window_nav.html:6 msgid "Previous version" msgstr "" diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index 1133c3af6..47a9f5333 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -6,15 +6,13 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-15 11:56+0100\n" -"PO-Revision-Date: 2017-03-09 04:59-0500\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Content-Type: text/plain; charset=UTF-8\n" +"PO-Revision-Date: 2017-03-15 07:09-0400\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: \n" "Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -315,11 +313,11 @@ msgstr "Types d'identification" #: models.py:125 msgid "Excavation technique type" -msgstr "" +msgstr "Type de méthode de fouille" #: models.py:126 msgid "Excavation technique types" -msgstr "" +msgstr "Types de méthode de fouille" #: models.py:163 models.py:549 msgid "Periods" @@ -391,7 +389,7 @@ msgstr "Estimation d'un « Terminus Post Quem »." #: models.py:255 msgid "Excavation technique" -msgstr "" +msgstr "Méthode de fouille" #: models.py:258 msgid "Point" @@ -555,7 +553,6 @@ msgid "Patriarche OA code not yet recorded!" msgstr "Code d'opération Patriarche non renseigné !" #: templates/ishtar/sheet_contextrecord.html:76 -#, fuzzy msgid "Numerical reference" msgstr "Référence numérique" @@ -612,15 +609,5 @@ msgid "Context record source" msgstr "Documentation associée à l'UE" #: templates/ishtar/sheet_contextrecordsource.html:11 -#, fuzzy msgid "Related context record" -msgstr "Unités d'Enregistrement liées" - -#~ msgid "Town" -#~ msgstr "Ville" - -#~ msgid "Creation:" -#~ msgstr "Création :" - -#~ msgid "Modification:" -#~ msgstr "Modification :" +msgstr "Unité d'Enregistrement associée" diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po index e78c79955..23d75e0d0 100644 --- a/translations/fr/archaeological_files.po +++ b/translations/fr/archaeological_files.po @@ -8,15 +8,13 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-15 11:56+0100\n" -"PO-Revision-Date: 2017-03-09 05:00-0500\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Content-Type: text/plain; charset=UTF-8\n" +"PO-Revision-Date: 2017-02-05 05:21-0500\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: \n" "Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -669,9 +667,3 @@ msgstr "communes principales en nombre" #: templates/ishtar/dashboards/dashboard_file.html:220 msgid "main towns by surface (ha)" msgstr "communes principales en surface (ha)" - -#~ msgid "Creation:" -#~ msgstr "Création :" - -#~ msgid "Modification:" -#~ msgstr "Modification :" diff --git a/translations/fr/archaeological_files_pdl.po b/translations/fr/archaeological_files_pdl.po index 0c6641ada..949555adc 100644 --- a/translations/fr/archaeological_files_pdl.po +++ b/translations/fr/archaeological_files_pdl.po @@ -5,15 +5,13 @@ # Valérie-Emma Leroux , 2016. #zanata msgid "" msgstr "" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-15 11:57+0100\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Content-Type: text/plain; charset=UTF-8\n" "PO-Revision-Date: 2016-11-14 05:33-0500\n" "Last-Translator: Copied by Zanata \n" "Language-Team: \n" "Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" "X-Generator: Zanata 3.9.6\n" diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po index d5eed89f2..9bdbbeb57 100644 --- a/translations/fr/archaeological_finds.po +++ b/translations/fr/archaeological_finds.po @@ -3,18 +3,17 @@ # This file is distributed under the same license as the Ishtar package. # Étienne Loks , 2010-2015. # Valérie-Emma Leroux , 2016. #zanata +# Étienne Loks , 2016. #zanata # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-15 11:56+0100\n" -"PO-Revision-Date: 2017-03-09 05:01-0500\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Content-Type: text/plain; charset=UTF-8\n" +"PO-Revision-Date: 2017-03-15 07:11-0400\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: \n" "Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -190,13 +189,15 @@ msgstr "" "ratio est conservé).

            " #: forms.py:278 -msgid "You should at least provide X, Y and the spatial reference system used." +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:287 -msgid "Coordinates are not relevant for the spatial reference system used: {}." +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é : {}." @@ -819,27 +820,24 @@ msgid "Base find - Complete ID" msgstr "Mobilier de base - ID complet" #: models_finds.py:509 -#, fuzzy msgid "Operation (code)" -msgstr "Opération" +msgstr "Opération (code)" #: models_finds.py:511 msgid "Town" -msgstr "" +msgstr "Ville" #: models_finds.py:513 -#, fuzzy msgid "Operation (name)" -msgstr "Opération" +msgstr "Opération (nom)" #: models_finds.py:515 msgid "Parcel" -msgstr "" +msgstr "Parcelle" #: models_finds.py:516 -#, fuzzy msgid "Batch" -msgstr "Type de lot" +msgstr "Lot" #: models_finds.py:517 msgid "Base find - Comment" @@ -1232,9 +1230,8 @@ msgid "Operation" msgstr "Opération" #: templates/ishtar/sheet_find.html:25 -#, fuzzy msgid "Administrative index" -msgstr "Acte administratif" +msgstr "Index administratif" #: templates/ishtar/sheet_find.html:67 msgid "Warehouse" @@ -1261,9 +1258,8 @@ msgid "Associated base finds" msgstr "Mobilier de base associé" #: templates/ishtar/sheet_find.html:171 -#, fuzzy msgid "Internal ID" -msgstr "ID externe" +msgstr "ID interne" #: templates/ishtar/sheet_find.html:203 msgid "Coordinates:" @@ -1306,7 +1302,6 @@ msgid "Find source" msgstr "Documentation associée au mobilier" #: templates/ishtar/sheet_findsource.html:11 -#, fuzzy msgid "Related find" msgstr "Mobilier associé" @@ -1343,21 +1338,13 @@ msgid "Treatment request source" msgstr "Documentation de demande de traitement" #: templates/ishtar/sheet_treatmentfilesource.html:11 -#, fuzzy msgid "Related treatment request" -msgstr "Ajouter une demande de traitement" +msgstr "Demande de traitement associée" #: templates/ishtar/sheet_treatmentsource.html:4 msgid "Treatment source" msgstr "Documentation de traitement" #: templates/ishtar/sheet_treatmentsource.html:11 -#, fuzzy msgid "Related treatment" -msgstr "Traitement de base" - -#~ msgid "Creation:" -#~ msgstr "Création :" - -#~ msgid "Modification:" -#~ msgstr "Modification :" +msgstr "Traitement associé" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index 5695b1d9f..737ebc29e 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -8,15 +8,13 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-15 11:56+0100\n" -"PO-Revision-Date: 2017-03-09 05:01-0500\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Content-Type: text/plain; charset=UTF-8\n" +"PO-Revision-Date: 2017-03-15 07:12-0400\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: \n" "Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -140,9 +138,8 @@ msgid "Name" msgstr "Nom" #: forms.py:468 forms.py:752 models.py:334 -#, fuzzy msgid "Address / Locality" -msgstr "Adresse - Lieu-dit" +msgstr "Adresse / Lieu-dit" #: forms.py:470 forms.py:674 forms.py:754 forms.py:1236 models.py:280 msgid "Operation type" @@ -398,7 +395,8 @@ msgstr "" #: forms.py:895 msgid "The excavation end date cannot be before the start date." -msgstr "La date de fin de chantier ne peut être antérieure à la date de début." +msgstr "" +"La date de fin de chantier ne peut être antérieure à la date de début." #: forms.py:923 #, python-format @@ -888,14 +886,12 @@ msgid "Operation record relations" msgstr "Relations entre opérations" #: models.py:872 -#, fuzzy msgid "Operation year" msgstr "Année de l'opération" #: models.py:874 -#, fuzzy msgid "Document code" -msgstr "Documents" +msgstr "Code du document" #: models.py:884 msgid "Operation documentation" @@ -1147,12 +1143,11 @@ msgstr "Code d'opération Patriarche non renseigné !" #: templates/ishtar/sheet_operation.html:23 msgid "Address" -msgstr "" +msgstr "Adresse" #: templates/ishtar/sheet_operation.html:30 -#, fuzzy msgid "Begining date" -msgstr "Date de clôture" +msgstr "Date de début" #: templates/ishtar/sheet_operation.html:36 msgid "State:" @@ -1265,9 +1260,8 @@ msgid "Operation source" msgstr "Documentation associée à l'opération" #: templates/ishtar/sheet_operationsource.html:11 -#, fuzzy msgid "Related operation" -msgstr "Opération close" +msgstr "Opération associée" #: templates/ishtar/blocks/window_tables/administrativacts.html:9 msgid "Date" @@ -1504,9 +1498,3 @@ msgstr "communes principales par coût" #: templates/ishtar/wizard/wizard_adminact_deletion.html:6 msgid "This act is indexed!" msgstr "Cet acte est indexé !" - -#~ msgid "Creation:" -#~ msgstr "Création :" - -#~ msgid "Modification:" -#~ msgstr "Modification :" diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po index 0938cf839..978153b62 100644 --- a/translations/fr/archaeological_warehouse.po +++ b/translations/fr/archaeological_warehouse.po @@ -6,15 +6,13 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-15 11:57+0100\n" -"PO-Revision-Date: 2017-02-04 08:26-0500\n" -"Last-Translator: Copied by Zanata \n" -"Language-Team: \n" -"Language: fr\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Content-Type: text/plain; charset=UTF-8\n" +"PO-Revision-Date: 2017-03-15 07:06-0400\n" +"Last-Translator: Valérie-Emma Leroux \n" +"Language-Team: \n" +"Language: fr\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -221,14 +219,12 @@ msgid "Collection" msgstr "Collection" #: models.py:117 -#, fuzzy msgid "Warehouse division type" -msgstr "Division de dépôt" +msgstr "Type de division de dépôt" #: models.py:118 -#, fuzzy msgid "Warehouse division types" -msgstr "Divisions de dépôt" +msgstr "Types de division de dépôt" #: models.py:138 msgid "Length (mm)" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index 200c1fcc3..ceea3df26 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -8,15 +8,13 @@ # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-15 11:56+0100\n" -"PO-Revision-Date: 2017-03-09 05:02-0500\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Content-Type: text/plain; charset=UTF-8\n" +"PO-Revision-Date: 2017-03-15 07:13-0400\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: \n" "Language: fr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -1719,7 +1717,8 @@ msgstr "L'équipe %(app_name)s" #: templates/base.html:41 msgid "Searches in the shortcut menu deal with all items." -msgstr "Les recherches dans le menu de raccourci concernent tous les éléments." +msgstr "" +"Les recherches dans le menu de raccourci concernent tous les éléments." #: templates/base.html:42 msgid "Searches in the shortcut menu deal with only your items." @@ -2339,7 +2338,7 @@ msgstr "Documents du mobilier associé" #: templates/ishtar/sheet_source.html:22 msgid "Web link" -msgstr "" +msgstr "Lien Internet" #: templates/ishtar/blocks/advanced_shortcut_menu.html:15 #: templates/ishtar/blocks/shortcut_menu.html:15 @@ -2399,23 +2398,20 @@ msgid "" "Powered by Ishtar v%(VERSION)s - " "a free software under AGPL v3 license." msgstr "" -"Propulsé par Ishtar v%(VERSION)s " -"- logiciel libre sous licence AGPL v3." +"Propulsé par Ishtar v%(VERSION)s -" +" logiciel libre sous licence AGPL v3." #: templates/ishtar/blocks/sheet_creation_section.html:3 -#, fuzzy msgid "Creation:" -msgstr "Ajout" +msgstr "Création :" #: templates/ishtar/blocks/sheet_creation_section.html:12 -#, fuzzy msgid "Modification:" -msgstr "Modification" +msgstr "Modification :" #: templates/ishtar/blocks/sheet_external_id.html:3 -#, fuzzy msgid "Internal ID" -msgstr "Identifiant externe" +msgstr "ID interne" #: templates/ishtar/blocks/window_nav.html:6 msgid "Previous version" -- cgit v1.2.3 From 49a6f8b40a6af038c1a2d4313d8a8c09afa53878 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 16 Mar 2017 10:05:49 +0100 Subject: Update french translation --- Makefile.example | 2 +- archaeological_context_records/locale/django.pot | 8 +- archaeological_finds/locale/django.pot | 9 +- archaeological_operations/locale/django.pot | 216 ++++++++++----------- archaeological_warehouse/locale/django.pot | 18 +- translations/fr/archaeological_context_records.po | 10 +- translations/fr/archaeological_finds.po | 8 +- translations/fr/archaeological_operations.po | 221 +++++++++++----------- translations/fr/archaeological_warehouse.po | 18 +- 9 files changed, 256 insertions(+), 254 deletions(-) diff --git a/Makefile.example b/Makefile.example index f356ce93e..f3ec3f7fd 100644 --- a/Makefile.example +++ b/Makefile.example @@ -248,7 +248,7 @@ fixtures_files: archaeological_files.permittype \ > '../archaeological_files/fixtures/initial_data-'$(default_data)'.json' -translations_push: makemessages +translations_push: translations_pull makemessages zanata-cli push translations_pull: diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index 75cb3b4a4..3320c91a6 100644 --- a/archaeological_context_records/locale/django.pot +++ b/archaeological_context_records/locale/django.pot @@ -76,8 +76,8 @@ msgstr "" msgid "General comment" msgstr "" -#: forms.py:145 -msgid "Excavation technic" +#: forms.py:145 models.py:255 +msgid "Excavation technique" msgstr "" #: forms.py:146 models.py:215 @@ -372,10 +372,6 @@ msgstr "" msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: models.py:255 -msgid "Excavation technique" -msgstr "" - #: models.py:258 msgid "Point" msgstr "" diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index 0fda2ed23..21cfba64a 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -3,6 +3,7 @@ # This file is distributed under the same license as the Ishtar package. # Étienne Loks , 2010-2015. # Valérie-Emma Leroux , 2016. #zanata +# Étienne Loks , 2016. #zanata # Valérie-Emma Leroux , 2017. #zanata msgid "" msgstr "" @@ -514,7 +515,7 @@ msgstr "" #: forms_treatments.py:358 forms_treatments.py:415 models_treatments.py:91 #: templates/ishtar/sheet_find.html:86 templates/ishtar/sheet_find.html:128 -#: templates/ishtar/sheet_find.html:227 +#: templates/ishtar/sheet_find.html:228 msgid "Type" msgstr "" @@ -1251,15 +1252,15 @@ msgstr "" msgid "SRID:" msgstr "" -#: templates/ishtar/sheet_find.html:226 +#: templates/ishtar/sheet_find.html:227 msgid "Title" msgstr "" -#: templates/ishtar/sheet_find.html:228 +#: templates/ishtar/sheet_find.html:229 msgid "Authors" msgstr "" -#: templates/ishtar/sheet_find.html:229 +#: templates/ishtar/sheet_find.html:230 msgid "Link" msgstr "" diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index 35facbbf5..3c8b1c7e5 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:1013 forms.py:1035 forms.py:1039 -#: models.py:1241 templates/ishtar/sheet_operation.html:146 +#: models.py:1247 templates/ishtar/sheet_operation.html:151 #: templates/ishtar/blocks/window_tables/parcels.html:10 msgid "Parcels" msgstr "" -#: forms.py:72 forms.py:205 forms.py:989 models.py:1227 +#: forms.py:72 forms.py:205 forms.py:989 models.py:1233 #: 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:756 forms.py:1259 models.py:272 -#: models.py:1033 models.py:1225 +#: models.py:1039 models.py:1231 #: templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Year" msgstr "" -#: forms.py:77 models.py:1228 +#: forms.py:77 models.py:1234 #: templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Section" msgstr "" -#: forms.py:80 models.py:1230 +#: forms.py:80 models.py:1236 msgid "Parcel number" msgstr "" -#: forms.py:82 models.py:1232 models.py:1249 models.py:1298 +#: forms.py:82 models.py:1238 models.py:1255 models.py:1304 msgid "Public domain" msgstr "" @@ -75,8 +75,8 @@ msgstr "" msgid "Relation type" msgstr "" -#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:843 models.py:878 -#: models.py:911 models.py:1015 models.py:1224 wizards.py:344 wizards.py:355 +#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:849 models.py:884 +#: models.py:917 models.py:1021 models.py:1230 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:1273 models.py:844 +#: forms.py:465 forms.py:1273 models.py:850 #: templates/ishtar/dashboards/dashboard_operation.html:390 #: templates/ishtar/dashboards/dashboard_operation.html:411 #: templates/ishtar/dashboards/dashboard_operation.html:643 @@ -144,7 +144,7 @@ msgstr "" msgid "In charge" msgstr "" -#: forms.py:487 models.py:1009 +#: forms.py:487 models.py:1015 msgid "Scientist in charge" msgstr "" @@ -250,7 +250,7 @@ msgstr "" msgid "Associated file" msgstr "" -#: forms.py:642 forms.py:937 models.py:510 models.py:910 models.py:1020 +#: forms.py:642 forms.py:937 models.py:516 models.py:916 models.py:1026 #: wizards.py:80 msgid "Archaeological file" msgstr "" @@ -344,7 +344,7 @@ msgstr "" msgid "Total surface (m2)" msgstr "" -#: forms.py:804 models.py:54 models.py:256 models.py:1437 +#: forms.py:804 models.py:54 models.py:256 models.py:1443 msgid "Start date" msgstr "" @@ -395,7 +395,7 @@ msgstr "" msgid "Bad operation code" msgstr "" -#: forms.py:933 models.py:525 models.py:873 +#: forms.py:933 models.py:531 models.py:879 msgid "Operation code" msgstr "" @@ -436,11 +436,11 @@ msgstr "" msgid "Prescription on geoarchaeological context" msgstr "" -#: forms.py:987 forms.py:1009 models.py:284 models.py:1043 +#: forms.py:987 forms.py:1009 models.py:284 models.py:1049 msgid "Towns" msgstr "" -#: forms.py:1016 models.py:1240 models.py:1435 +#: forms.py:1016 models.py:1246 models.py:1441 msgid "Parcel" msgstr "" @@ -452,8 +452,8 @@ msgstr "" msgid "Remain type" msgstr "" -#: forms.py:1088 templates/ishtar/sheet_operation.html:166 -#: templates/ishtar/sheet_operation.html:197 +#: forms.py:1088 templates/ishtar/sheet_operation.html:171 +#: templates/ishtar/sheet_operation.html:202 msgid "Period" msgstr "" @@ -486,7 +486,7 @@ msgstr "" msgid "Would you like to delete this operation?" msgstr "" -#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:880 models.py:1000 +#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:886 models.py:1006 msgid "Index" msgstr "" @@ -513,7 +513,7 @@ msgstr "" msgid "You should select a document." msgstr "" -#: forms.py:1267 forms.py:1334 models.py:924 models.py:994 +#: forms.py:1267 forms.py:1334 models.py:930 models.py:1000 msgid "Act type" msgstr "" @@ -521,7 +521,7 @@ msgstr "" msgid "Indexed?" msgstr "" -#: forms.py:1274 forms.py:1339 models.py:1034 +#: forms.py:1274 forms.py:1339 models.py:1040 #: templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" @@ -534,7 +534,7 @@ msgstr "" msgid "You should select an administrative act." msgstr "" -#: forms.py:1342 models.py:1031 +#: forms.py:1342 models.py:1037 msgid "Signature date" msgstr "" @@ -590,7 +590,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:59 models.py:1050 +#: ishtar_menu.py:59 models.py:1056 #: templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -620,11 +620,11 @@ msgstr "" msgid "Operations" msgstr "" -#: models.py:53 models.py:71 models.py:1907 +#: models.py:53 models.py:71 models.py:1913 msgid "Order" msgstr "" -#: models.py:55 models.py:1438 +#: models.py:55 models.py:1444 msgid "End date" msgstr "" @@ -740,7 +740,7 @@ msgstr "" msgid "In charge scientist" msgstr "" -#: models.py:277 models.py:1220 +#: models.py:277 models.py:1226 msgid "File" msgstr "" @@ -801,252 +801,252 @@ msgstr "" msgid "Intercommunal" msgstr "" -#: models.py:511 +#: models.py:517 msgid "Code patriarche" msgstr "" -#: models.py:551 +#: models.py:557 msgid "This operation code already exists for this year" msgstr "" -#: models.py:576 +#: models.py:582 msgid "Number of parcels" msgstr "" -#: models.py:594 +#: models.py:600 msgid "Number of administrative acts" msgstr "" -#: models.py:602 +#: models.py:608 msgid "Number of indexed administrative acts" msgstr "" -#: models.py:610 +#: models.py:616 msgid "Number of context records" msgstr "" -#: models.py:646 +#: models.py:652 msgid "Number of finds" msgstr "" -#: models.py:691 +#: models.py:697 msgid "No type" msgstr "" -#: models.py:722 +#: models.py:728 msgid "Number of sources" msgstr "" -#: models.py:764 templates/ishtar/dashboards/dashboard_operation.html:309 +#: models.py:770 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:814 +#: models.py:820 msgid "Inverse relation" msgstr "" -#: models.py:818 +#: models.py:824 msgid "Operation relation type" msgstr "" -#: models.py:819 +#: models.py:825 msgid "Operation relation types" msgstr "" -#: models.py:832 +#: models.py:838 msgid "Operation record relation" msgstr "" -#: models.py:833 +#: models.py:839 msgid "Operation record relations" msgstr "" -#: models.py:872 +#: models.py:878 msgid "Operation year" msgstr "" -#: models.py:874 +#: models.py:880 msgid "Document code" msgstr "" -#: models.py:884 +#: models.py:890 msgid "Operation documentation" msgstr "" -#: models.py:885 +#: models.py:891 msgid "Operation documentations" msgstr "" -#: models.py:888 +#: models.py:894 msgid "Can view all Operation sources" msgstr "" -#: models.py:890 +#: models.py:896 msgid "Can view own Operation source" msgstr "" -#: models.py:892 +#: models.py:898 msgid "Can add own Operation source" msgstr "" -#: models.py:894 +#: models.py:900 msgid "Can change own Operation source" msgstr "" -#: models.py:896 +#: models.py:902 msgid "Can delete own Operation source" msgstr "" -#: models.py:912 models.py:1025 +#: models.py:918 models.py:1031 msgid "Treatment request" msgstr "" -#: models.py:913 models.py:1030 +#: models.py:919 models.py:1036 msgid "Treatment" msgstr "" -#: models.py:915 +#: models.py:921 msgid "Intended to" msgstr "" -#: models.py:917 +#: models.py:923 msgid "Code" msgstr "" -#: models.py:920 +#: models.py:926 msgid "Associated template" msgstr "" -#: models.py:921 +#: models.py:927 msgid "Indexed" msgstr "" -#: models.py:925 +#: models.py:931 msgid "Act types" msgstr "" -#: models.py:991 models.py:1071 +#: models.py:997 models.py:1077 #: templates/ishtar/blocks/window_tables/administrativacts.html:7 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 msgid "Ref." msgstr "" -#: models.py:998 +#: models.py:1004 msgid "Person in charge of the operation" msgstr "" -#: models.py:1004 +#: models.py:1010 msgid "Archaeological preventive operator" msgstr "" -#: models.py:1012 +#: models.py:1018 msgid "Signatory" msgstr "" -#: models.py:1040 +#: models.py:1046 msgid "Departments" msgstr "" -#: models.py:1041 +#: models.py:1047 msgid "Cached values get from associated departments" msgstr "" -#: models.py:1044 +#: models.py:1050 msgid "Cached values get from associated towns" msgstr "" -#: models.py:1051 templates/ishtar/sheet_operation.html:104 -#: templates/ishtar/sheet_operation.html:140 +#: models.py:1057 templates/ishtar/sheet_operation.html:104 +#: templates/ishtar/sheet_operation.html:145 msgid "Administrative acts" msgstr "" -#: models.py:1054 +#: models.py:1060 msgid "Can view all Administrative acts" msgstr "" -#: models.py:1056 +#: models.py:1062 msgid "Can view own Administrative act" msgstr "" -#: models.py:1058 +#: models.py:1064 msgid "Can add own Administrative act" msgstr "" -#: models.py:1060 +#: models.py:1066 msgid "Can change own Administrative act" msgstr "" -#: models.py:1062 +#: models.py:1068 msgid "Can delete own Administrative act" msgstr "" -#: models.py:1165 +#: models.py:1171 msgid "This index already exists for this year" msgstr "" -#: models.py:1233 +#: models.py:1239 msgid "External ID" msgstr "" -#: models.py:1236 +#: models.py:1242 msgid "External ID is set automatically" msgstr "" -#: models.py:1237 +#: models.py:1243 msgid "Address - Locality" msgstr "" -#: models.py:1433 +#: models.py:1439 msgid "Owner" msgstr "" -#: models.py:1441 +#: models.py:1447 msgid "Parcel owner" msgstr "" -#: models.py:1442 +#: models.py:1448 msgid "Parcel owners" msgstr "" -#: models.py:1468 +#: models.py:1474 msgid "Recorded" msgstr "" -#: models.py:1469 +#: models.py:1475 msgid "Effective" msgstr "" -#: models.py:1470 +#: models.py:1476 msgid "Active" msgstr "" -#: models.py:1471 +#: models.py:1477 msgid "Field completed" msgstr "" -#: models.py:1472 +#: models.py:1478 msgid "Associated report" msgstr "" -#: models.py:1473 +#: models.py:1479 msgid "Closed" msgstr "" -#: models.py:1474 +#: models.py:1480 msgid "Documented and closed" msgstr "" -#: models.py:1908 +#: models.py:1914 msgid "Is preventive" msgstr "" -#: models.py:1911 +#: models.py:1917 msgid "Operation type old" msgstr "" -#: models.py:1912 +#: models.py:1918 msgid "Operation types old" msgstr "" @@ -1170,43 +1170,47 @@ msgid "Document from this operation" msgstr "" #: templates/ishtar/sheet_operation.html:114 -#: templates/ishtar/sheet_operation.html:151 +#: templates/ishtar/sheet_operation.html:156 msgid "Context records" msgstr "" -#: templates/ishtar/sheet_operation.html:118 +#: templates/ishtar/sheet_operation.html:119 msgid "Context record relations" msgstr "" -#: templates/ishtar/sheet_operation.html:123 +#: templates/ishtar/sheet_operation.html:124 msgid "Documents from associated context records" msgstr "" -#: templates/ishtar/sheet_operation.html:128 -#: templates/ishtar/sheet_operation.html:174 +#: templates/ishtar/sheet_operation.html:129 +#: templates/ishtar/sheet_operation.html:179 msgid "Finds" msgstr "" -#: templates/ishtar/sheet_operation.html:133 +#: templates/ishtar/sheet_operation.html:134 msgid "Documents from associated finds" msgstr "" -#: templates/ishtar/sheet_operation.html:138 +#: templates/ishtar/sheet_operation.html:139 +msgid "Associated containers" +msgstr "" + +#: templates/ishtar/sheet_operation.html:143 msgid "Statistics" msgstr "" -#: templates/ishtar/sheet_operation.html:158 -#: templates/ishtar/sheet_operation.html:212 +#: templates/ishtar/sheet_operation.html:163 +#: templates/ishtar/sheet_operation.html:217 #: templates/ishtar/blocks/window_tables/administrativacts.html:8 msgid "Type" msgstr "" -#: templates/ishtar/sheet_operation.html:158 -#: templates/ishtar/sheet_operation.html:166 -#: templates/ishtar/sheet_operation.html:181 -#: templates/ishtar/sheet_operation.html:189 -#: templates/ishtar/sheet_operation.html:197 -#: templates/ishtar/sheet_operation.html:212 +#: templates/ishtar/sheet_operation.html:163 +#: templates/ishtar/sheet_operation.html:171 +#: templates/ishtar/sheet_operation.html:186 +#: templates/ishtar/sheet_operation.html:194 +#: templates/ishtar/sheet_operation.html:202 +#: templates/ishtar/sheet_operation.html:217 #: templates/ishtar/dashboards/dashboard_operation.html:18 #: templates/ishtar/dashboards/dashboard_operation.html:164 #: templates/ishtar/dashboards/dashboard_operation.html:432 @@ -1215,19 +1219,19 @@ msgstr "" msgid "Number" msgstr "" -#: templates/ishtar/sheet_operation.html:181 +#: templates/ishtar/sheet_operation.html:186 msgid "Material type" msgstr "" -#: templates/ishtar/sheet_operation.html:189 +#: templates/ishtar/sheet_operation.html:194 msgid "Object type" msgstr "" -#: templates/ishtar/sheet_operation.html:205 +#: templates/ishtar/sheet_operation.html:210 msgid "Sources" msgstr "" -#: templates/ishtar/sheet_operation.html:221 +#: templates/ishtar/sheet_operation.html:226 msgid "Finds by context records" msgstr "" diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot index 87fedd778..60b35a633 100644 --- a/archaeological_warehouse/locale/django.pot +++ b/archaeological_warehouse/locale/django.pot @@ -36,7 +36,7 @@ msgstr "" msgid "Town" msgstr "" -#: forms.py:79 views.py:98 +#: forms.py:79 views.py:100 msgid "Warehouse search" msgstr "" @@ -105,7 +105,7 @@ msgstr "" msgid "This ID already exists for this warehouse." msgstr "" -#: forms.py:231 forms.py:237 views.py:131 +#: forms.py:231 forms.py:237 views.py:142 msgid "Container search" msgstr "" @@ -117,7 +117,7 @@ msgstr "" msgid "Add a new container" msgstr "" -#: forms.py:244 ishtar_menu.py:36 views.py:93 +#: forms.py:244 ishtar_menu.py:36 views.py:95 msgid "Packaging" msgstr "" @@ -273,27 +273,27 @@ msgstr "" msgid "Container localisations" msgstr "" -#: views.py:110 +#: views.py:112 msgid "Warehouse creation" msgstr "" -#: views.py:119 +#: views.py:121 msgid "Warehouse modification" msgstr "" -#: views.py:126 +#: views.py:137 msgid "Warehouse deletion" msgstr "" -#: views.py:142 +#: views.py:153 msgid "Container creation" msgstr "" -#: views.py:151 +#: views.py:162 msgid "Container modification" msgstr "" -#: views.py:158 +#: views.py:177 msgid "Container deletion" msgstr "" diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index 47a9f5333..9cdf05399 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -85,9 +85,9 @@ msgstr "Description" msgid "General comment" msgstr "Commentaire général" -#: forms.py:145 -msgid "Excavation technic" -msgstr "" +#: forms.py:145 models.py:255 +msgid "Excavation technique" +msgstr "Méthode de fouille" #: forms.py:146 models.py:215 msgid "Length (m)" @@ -387,10 +387,6 @@ msgstr "" msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »." -#: models.py:255 -msgid "Excavation technique" -msgstr "Méthode de fouille" - #: models.py:258 msgid "Point" msgstr "Point" diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po index 9bdbbeb57..8aa993d5d 100644 --- a/translations/fr/archaeological_finds.po +++ b/translations/fr/archaeological_finds.po @@ -538,7 +538,7 @@ msgstr "Réf. interne" #: forms_treatments.py:358 forms_treatments.py:415 models_treatments.py:91 #: templates/ishtar/sheet_find.html:86 templates/ishtar/sheet_find.html:128 -#: templates/ishtar/sheet_find.html:227 +#: templates/ishtar/sheet_find.html:228 msgid "Type" msgstr "Type" @@ -1281,15 +1281,15 @@ msgstr "Z :" msgid "SRID:" msgstr "SRID :" -#: templates/ishtar/sheet_find.html:226 +#: templates/ishtar/sheet_find.html:227 msgid "Title" msgstr "Titre" -#: templates/ishtar/sheet_find.html:228 +#: templates/ishtar/sheet_find.html:229 msgid "Authors" msgstr "Auteurs" -#: templates/ishtar/sheet_find.html:229 +#: templates/ishtar/sheet_find.html:230 msgid "Link" msgstr "Lien" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index 737ebc29e..af55782dc 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -6,25 +6,26 @@ # Valérie-Emma Leroux , 2016. #zanata # Étienne Loks , 2016. #zanata # Valérie-Emma Leroux , 2017. #zanata +# Étienne Loks , 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-03-15 07:12-0400\n" -"Last-Translator: Valérie-Emma Leroux \n" +"PO-Revision-Date: 2017-03-16 05:04-0400\n" +"Last-Translator: Étienne Loks \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:1013 forms.py:1035 forms.py:1039 -#: models.py:1241 templates/ishtar/sheet_operation.html:146 +#: models.py:1247 templates/ishtar/sheet_operation.html:151 #: templates/ishtar/blocks/window_tables/parcels.html:10 msgid "Parcels" msgstr "Parcelles" -#: forms.py:72 forms.py:205 forms.py:989 models.py:1227 +#: forms.py:72 forms.py:205 forms.py:989 models.py:1233 #: templates/ishtar/blocks/window_tables/parcels.html:7 #: templates/ishtar/dashboards/dashboard_operation.html:432 #: templates/ishtar/dashboards/dashboard_operation.html:446 @@ -34,21 +35,21 @@ msgid "Town" msgstr "Commune" #: forms.py:74 forms.py:455 forms.py:756 forms.py:1259 models.py:272 -#: models.py:1033 models.py:1225 +#: models.py:1039 models.py:1231 #: templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Year" msgstr "Année" -#: forms.py:77 models.py:1228 +#: forms.py:77 models.py:1234 #: templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Section" msgstr "Section" -#: forms.py:80 models.py:1230 +#: forms.py:80 models.py:1236 msgid "Parcel number" msgstr "Numéro de parcelle" -#: forms.py:82 models.py:1232 models.py:1249 models.py:1298 +#: forms.py:82 models.py:1238 models.py:1255 models.py:1304 msgid "Public domain" msgstr "Domaine public" @@ -84,8 +85,8 @@ msgstr "Il y a des parcelles identiques." msgid "Relation type" msgstr "Type de relation" -#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:843 models.py:878 -#: models.py:911 models.py:1015 models.py:1224 wizards.py:344 wizards.py:355 +#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:849 models.py:884 +#: models.py:917 models.py:1021 models.py:1230 wizards.py:344 wizards.py:355 #: templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "Opération" @@ -122,7 +123,7 @@ msgstr "Identifiant numérique" msgid "Parcel (section/number/public domain)" msgstr "Parcelle (section/numéro/domaine public)" -#: forms.py:465 forms.py:1273 models.py:844 +#: forms.py:465 forms.py:1273 models.py:850 #: templates/ishtar/dashboards/dashboard_operation.html:390 #: templates/ishtar/dashboards/dashboard_operation.html:411 #: templates/ishtar/dashboards/dashboard_operation.html:643 @@ -153,7 +154,7 @@ msgstr "Est ouvert ?" msgid "In charge" msgstr "Responsable du suivi scientifique" -#: forms.py:487 models.py:1009 +#: forms.py:487 models.py:1015 msgid "Scientist in charge" msgstr "Responsable scientifique" @@ -259,7 +260,7 @@ msgstr "Rechercher une opération" msgid "Associated file" msgstr "Dossier associé" -#: forms.py:642 forms.py:937 models.py:510 models.py:910 models.py:1020 +#: forms.py:642 forms.py:937 models.py:516 models.py:916 models.py:1026 #: wizards.py:80 msgid "Archaeological file" msgstr "Dossier archéologique" @@ -353,7 +354,7 @@ msgstr "Référence de l'opérateur" msgid "Total surface (m2)" msgstr "Surface totale (m2)" -#: forms.py:804 models.py:54 models.py:256 models.py:1437 +#: forms.py:804 models.py:54 models.py:256 models.py:1443 msgid "Start date" msgstr "Date de début" @@ -411,7 +412,7 @@ msgstr "" msgid "Bad operation code" msgstr "Mauvais code d'opération" -#: forms.py:933 models.py:525 models.py:873 +#: forms.py:933 models.py:531 models.py:879 msgid "Operation code" msgstr "Code de l'opération" @@ -452,11 +453,11 @@ msgstr "Prescription sur une vaste surface" msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" -#: forms.py:987 forms.py:1009 models.py:284 models.py:1043 +#: forms.py:987 forms.py:1009 models.py:284 models.py:1049 msgid "Towns" msgstr "Communes" -#: forms.py:1016 models.py:1240 models.py:1435 +#: forms.py:1016 models.py:1246 models.py:1441 msgid "Parcel" msgstr "Parcelle" @@ -468,8 +469,8 @@ msgstr "Types de vestige" msgid "Remain type" msgstr "Type de vestige" -#: forms.py:1088 templates/ishtar/sheet_operation.html:166 -#: templates/ishtar/sheet_operation.html:197 +#: forms.py:1088 templates/ishtar/sheet_operation.html:171 +#: templates/ishtar/sheet_operation.html:202 msgid "Period" msgstr "Période" @@ -502,7 +503,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:1190 forms.py:1260 forms.py:1396 models.py:880 models.py:1000 +#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:886 models.py:1006 msgid "Index" msgstr "Index" @@ -531,7 +532,7 @@ msgstr "Rechercher une documentation" msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: forms.py:1267 forms.py:1334 models.py:924 models.py:994 +#: forms.py:1267 forms.py:1334 models.py:930 models.py:1000 msgid "Act type" msgstr "Type d'acte" @@ -539,7 +540,7 @@ msgstr "Type d'acte" msgid "Indexed?" msgstr "Indexé ?" -#: forms.py:1274 forms.py:1339 models.py:1034 +#: forms.py:1274 forms.py:1339 models.py:1040 #: templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "Objet" @@ -552,7 +553,7 @@ msgstr "Rechercher un acte administratif" msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: forms.py:1342 models.py:1031 +#: forms.py:1342 models.py:1037 msgid "Signature date" msgstr "Date de signature" @@ -610,7 +611,7 @@ msgstr "Clôture" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:59 models.py:1050 +#: ishtar_menu.py:59 models.py:1056 #: templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "Acte administratif" @@ -640,11 +641,11 @@ msgstr "Informations générales" msgid "Operations" msgstr "Opérations" -#: models.py:53 models.py:71 models.py:1907 +#: models.py:53 models.py:71 models.py:1913 msgid "Order" msgstr "Ordre" -#: models.py:55 models.py:1438 +#: models.py:55 models.py:1444 msgid "End date" msgstr "Date de fin" @@ -760,7 +761,7 @@ msgstr "Date de clôture" msgid "In charge scientist" msgstr "Responsable du suivi scientifique" -#: models.py:277 models.py:1220 +#: models.py:277 models.py:1226 msgid "File" msgstr "Dossier" @@ -823,252 +824,252 @@ msgstr "OPE" msgid "Intercommunal" msgstr "Intercommunal" -#: models.py:511 +#: models.py:517 msgid "Code patriarche" msgstr "Code patriarche" -#: models.py:551 +#: models.py:557 msgid "This operation code already exists for this year" msgstr "Ce code d'opération existe déjà pour cette année." -#: models.py:576 +#: models.py:582 msgid "Number of parcels" msgstr "Nombre de parcelles" -#: models.py:594 +#: models.py:600 msgid "Number of administrative acts" msgstr "Nombre d'actes administratifs" -#: models.py:602 +#: models.py:608 msgid "Number of indexed administrative acts" msgstr "Nombre d'actes administratifs indexés" -#: models.py:610 +#: models.py:616 msgid "Number of context records" msgstr "Nombre d'Unités d'Enregistrement" -#: models.py:646 +#: models.py:652 msgid "Number of finds" msgstr "Nombre d'éléments de mobilier" -#: models.py:691 +#: models.py:697 msgid "No type" msgstr "Pas de type" -#: models.py:722 +#: models.py:728 msgid "Number of sources" msgstr "Nombre de documents" -#: models.py:764 templates/ishtar/dashboards/dashboard_operation.html:309 +#: models.py:770 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:814 +#: models.py:820 msgid "Inverse relation" msgstr "Relation inverse" -#: models.py:818 +#: models.py:824 msgid "Operation relation type" msgstr "Type de relation entre opérations" -#: models.py:819 +#: models.py:825 msgid "Operation relation types" msgstr "Types de relation entre opérations" -#: models.py:832 +#: models.py:838 msgid "Operation record relation" msgstr "Relation entre opérations" -#: models.py:833 +#: models.py:839 msgid "Operation record relations" msgstr "Relations entre opérations" -#: models.py:872 +#: models.py:878 msgid "Operation year" msgstr "Année de l'opération" -#: models.py:874 +#: models.py:880 msgid "Document code" msgstr "Code du document" -#: models.py:884 +#: models.py:890 msgid "Operation documentation" msgstr "Documentation d'une opération" -#: models.py:885 +#: models.py:891 msgid "Operation documentations" msgstr "Documentations des opérations" -#: models.py:888 +#: models.py:894 msgid "Can view all Operation sources" msgstr "Peut voir toutes les Documentations d'opération" -#: models.py:890 +#: models.py:896 msgid "Can view own Operation source" msgstr "Peut voir sa propre Documentation d'opération" -#: models.py:892 +#: models.py:898 msgid "Can add own Operation source" msgstr "Peut ajouter sa propre Documentation d'opération" -#: models.py:894 +#: models.py:900 msgid "Can change own Operation source" msgstr "Peut modifier sa propre Documentation d'opération" -#: models.py:896 +#: models.py:902 msgid "Can delete own Operation source" msgstr "Peut supprimer sa propre Documentation d'opération" -#: models.py:912 models.py:1025 +#: models.py:918 models.py:1031 msgid "Treatment request" msgstr "Demande de traitement" -#: models.py:913 models.py:1030 +#: models.py:919 models.py:1036 msgid "Treatment" msgstr "Traitement" -#: models.py:915 +#: models.py:921 msgid "Intended to" msgstr "Destiné à" -#: models.py:917 +#: models.py:923 msgid "Code" msgstr "Code" -#: models.py:920 +#: models.py:926 msgid "Associated template" msgstr "Patron associé" -#: models.py:921 +#: models.py:927 msgid "Indexed" msgstr "Indexé" -#: models.py:925 +#: models.py:931 msgid "Act types" msgstr "Types d'acte" -#: models.py:991 models.py:1071 +#: models.py:997 models.py:1077 #: templates/ishtar/blocks/window_tables/administrativacts.html:7 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 msgid "Ref." msgstr "Réf." -#: models.py:998 +#: models.py:1004 msgid "Person in charge of the operation" msgstr "Responsable d'opération" -#: models.py:1004 +#: models.py:1010 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: models.py:1012 +#: models.py:1018 msgid "Signatory" msgstr "Signataire" -#: models.py:1040 +#: models.py:1046 msgid "Departments" msgstr "Départements" -#: models.py:1041 +#: models.py:1047 msgid "Cached values get from associated departments" msgstr "Valeur en cache des départements associés" -#: models.py:1044 +#: models.py:1050 msgid "Cached values get from associated towns" msgstr "Valeur en cache des communes associées" -#: models.py:1051 templates/ishtar/sheet_operation.html:104 -#: templates/ishtar/sheet_operation.html:140 +#: models.py:1057 templates/ishtar/sheet_operation.html:104 +#: templates/ishtar/sheet_operation.html:145 msgid "Administrative acts" msgstr "Actes administratifs" -#: models.py:1054 +#: models.py:1060 msgid "Can view all Administrative acts" msgstr "Peut voir tous les Actes administratifs" -#: models.py:1056 +#: models.py:1062 msgid "Can view own Administrative act" msgstr "Peut voir son propre Acte administratif" -#: models.py:1058 +#: models.py:1064 msgid "Can add own Administrative act" msgstr "Peut ajouter son propre Acte administratif" -#: models.py:1060 +#: models.py:1066 msgid "Can change own Administrative act" msgstr "Peut modifier son propre Acte administratif" -#: models.py:1062 +#: models.py:1068 msgid "Can delete own Administrative act" msgstr "Peut supprimer son propre Acte administratif" -#: models.py:1165 +#: models.py:1171 msgid "This index already exists for this year" msgstr "Cet index existe déjà pour cette année." -#: models.py:1233 +#: models.py:1239 msgid "External ID" msgstr "ID externe" -#: models.py:1236 +#: models.py:1242 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" -#: models.py:1237 +#: models.py:1243 msgid "Address - Locality" msgstr "Adresse - Lieu-dit" -#: models.py:1433 +#: models.py:1439 msgid "Owner" msgstr "Propriétaire" -#: models.py:1441 +#: models.py:1447 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: models.py:1442 +#: models.py:1448 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: models.py:1468 +#: models.py:1474 msgid "Recorded" msgstr "Enregistré" -#: models.py:1469 +#: models.py:1475 msgid "Effective" msgstr "Effectif" -#: models.py:1470 +#: models.py:1476 msgid "Active" msgstr "Actif" -#: models.py:1471 +#: models.py:1477 msgid "Field completed" msgstr "Terrain achevé" -#: models.py:1472 +#: models.py:1478 msgid "Associated report" msgstr "Rapport associé" -#: models.py:1473 +#: models.py:1479 msgid "Closed" msgstr "Clos" -#: models.py:1474 +#: models.py:1480 msgid "Documented and closed" msgstr "Documenté et clos" -#: models.py:1908 +#: models.py:1914 msgid "Is preventive" msgstr "Préventif" -#: models.py:1911 +#: models.py:1917 msgid "Operation type old" msgstr "Type d'opération - ancien" -#: models.py:1912 +#: models.py:1918 msgid "Operation types old" msgstr "Types d'opération - ancien" @@ -1194,43 +1195,47 @@ msgid "Document from this operation" msgstr "Documents de cette opération" #: templates/ishtar/sheet_operation.html:114 -#: templates/ishtar/sheet_operation.html:151 +#: templates/ishtar/sheet_operation.html:156 msgid "Context records" msgstr "Unités d'Enregistrement" -#: templates/ishtar/sheet_operation.html:118 +#: templates/ishtar/sheet_operation.html:119 msgid "Context record relations" msgstr "Relations entre Unités d'Enregistrement" -#: templates/ishtar/sheet_operation.html:123 +#: templates/ishtar/sheet_operation.html:124 msgid "Documents from associated context records" msgstr "Documents des Unités d'Enregistrement associées" -#: templates/ishtar/sheet_operation.html:128 -#: templates/ishtar/sheet_operation.html:174 +#: templates/ishtar/sheet_operation.html:129 +#: templates/ishtar/sheet_operation.html:179 msgid "Finds" msgstr "Mobilier" -#: templates/ishtar/sheet_operation.html:133 +#: templates/ishtar/sheet_operation.html:134 msgid "Documents from associated finds" msgstr "Documents du mobilier associé" -#: templates/ishtar/sheet_operation.html:138 +#: templates/ishtar/sheet_operation.html:139 +msgid "Associated containers" +msgstr "Contenants associés" + +#: templates/ishtar/sheet_operation.html:143 msgid "Statistics" msgstr "Statistiques" -#: templates/ishtar/sheet_operation.html:158 -#: templates/ishtar/sheet_operation.html:212 +#: templates/ishtar/sheet_operation.html:163 +#: templates/ishtar/sheet_operation.html:217 #: templates/ishtar/blocks/window_tables/administrativacts.html:8 msgid "Type" msgstr "Type" -#: templates/ishtar/sheet_operation.html:158 -#: templates/ishtar/sheet_operation.html:166 -#: templates/ishtar/sheet_operation.html:181 -#: templates/ishtar/sheet_operation.html:189 -#: templates/ishtar/sheet_operation.html:197 -#: templates/ishtar/sheet_operation.html:212 +#: templates/ishtar/sheet_operation.html:163 +#: templates/ishtar/sheet_operation.html:171 +#: templates/ishtar/sheet_operation.html:186 +#: templates/ishtar/sheet_operation.html:194 +#: templates/ishtar/sheet_operation.html:202 +#: templates/ishtar/sheet_operation.html:217 #: templates/ishtar/dashboards/dashboard_operation.html:18 #: templates/ishtar/dashboards/dashboard_operation.html:164 #: templates/ishtar/dashboards/dashboard_operation.html:432 @@ -1239,19 +1244,19 @@ msgstr "Type" msgid "Number" msgstr "Nombre" -#: templates/ishtar/sheet_operation.html:181 +#: templates/ishtar/sheet_operation.html:186 msgid "Material type" msgstr "Type de matériau" -#: templates/ishtar/sheet_operation.html:189 +#: templates/ishtar/sheet_operation.html:194 msgid "Object type" msgstr "Type d'objet" -#: templates/ishtar/sheet_operation.html:205 +#: templates/ishtar/sheet_operation.html:210 msgid "Sources" msgstr "Documents" -#: templates/ishtar/sheet_operation.html:221 +#: templates/ishtar/sheet_operation.html:226 msgid "Finds by context records" msgstr "Mobilier par Unités d'Enregistrement" diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po index 978153b62..689d122df 100644 --- a/translations/fr/archaeological_warehouse.po +++ b/translations/fr/archaeological_warehouse.po @@ -45,7 +45,7 @@ msgstr "Type de dépôt" msgid "Town" msgstr "Commune" -#: forms.py:79 views.py:98 +#: forms.py:79 views.py:100 msgid "Warehouse search" msgstr "Rechercher un dépôt" @@ -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:131 +#: forms.py:231 forms.py:237 views.py:142 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:36 views.py:93 +#: forms.py:244 ishtar_menu.py:36 views.py:95 msgid "Packaging" msgstr "Conditionnement" @@ -282,27 +282,27 @@ msgstr "Localisation de contenant" msgid "Container localisations" msgstr "Localisations de contenant" -#: views.py:110 +#: views.py:112 msgid "Warehouse creation" msgstr "Ajouter un dépôt" -#: views.py:119 +#: views.py:121 msgid "Warehouse modification" msgstr "Modifier un dépôt" -#: views.py:126 +#: views.py:137 msgid "Warehouse deletion" msgstr "Supprimer un dépôt" -#: views.py:142 +#: views.py:153 msgid "Container creation" msgstr "Ajouter un contenant" -#: views.py:151 +#: views.py:162 msgid "Container modification" msgstr "Modifier un contenant" -#: views.py:158 +#: views.py:177 msgid "Container deletion" msgstr "Supprimer un contenant" -- cgit v1.2.3 From e20e666c551e1d4d4630949fcd5000395697a5b2 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 16 Mar 2017 10:31:21 +0100 Subject: Sheet: remove ":" from labels --- ishtar_common/templates/ishtar/blocks/sheet_creation_section.html | 4 ++-- ishtar_common/templates/ishtar/blocks/window_field.html | 2 +- ishtar_common/templates/ishtar/blocks/window_field_detail.html | 2 +- ishtar_common/templates/ishtar/blocks/window_field_multiple.html | 2 +- ishtar_common/templates/ishtar/blocks/window_field_url.html | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html index 1312cbcd5..e6ce31c25 100644 --- a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html +++ b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html @@ -1,6 +1,6 @@ {% load i18n link_to_window %} {% if item.history_creator.ishtaruser.person %} -
          • +
          • {{item.history_creator.ishtaruser.person}} {{item.history_creator.ishtaruser.person|link_to_window}}
            @@ -9,7 +9,7 @@
            • {% endif %} {% if item.history_creation_date != item.last_edition_date %} -
          • +
          • {{item.history_modifier.ishtaruser.person}} {{item.history_modifier.ishtaruser.person|link_to_window}}
            diff --git a/ishtar_common/templates/ishtar/blocks/window_field.html b/ishtar_common/templates/ishtar/blocks/window_field.html index 969f32dbb..b52ed78ee 100644 --- a/ishtar_common/templates/ishtar/blocks/window_field.html +++ b/ishtar_common/templates/ishtar/blocks/window_field.html @@ -1,3 +1,3 @@ -{% load i18n %}{% if data %}{% if li %}
          • {% else %}

            {% endif %} +{% load i18n %}{% if data %}{% if li %}

          • {% else %}

            {% endif %} {{pre_data|safe}}{{data|linebreaksbr}}{{post_data|safe}}{% if li %}

            • {% else %}

            {% endif %} {% endif %} diff --git a/ishtar_common/templates/ishtar/blocks/window_field_detail.html b/ishtar_common/templates/ishtar/blocks/window_field_detail.html index 2be9c5ec4..594c67529 100644 --- a/ishtar_common/templates/ishtar/blocks/window_field_detail.html +++ b/ishtar_common/templates/ishtar/blocks/window_field_detail.html @@ -1,3 +1,3 @@ -{% load i18n %}{% if item %}{% if li %}
          • {% else %}

            {% endif %} +{% load i18n %}{% if item %}{% if li %}

          • {% else %}

            {% endif %} {{item}}{{link}}{% if li %}

            • {% else %}

            {% endif %} {% endif %} diff --git a/ishtar_common/templates/ishtar/blocks/window_field_multiple.html b/ishtar_common/templates/ishtar/blocks/window_field_multiple.html index cc817490c..f07630174 100644 --- a/ishtar_common/templates/ishtar/blocks/window_field_multiple.html +++ b/ishtar_common/templates/ishtar/blocks/window_field_multiple.html @@ -1,4 +1,4 @@ -{% load i18n %}{% if data.count %}{% if li %}
          • {% else %}

            {% endif %} +{% load i18n %}{% if data.count %}{% if li %}

          • {% else %}

            {% endif %} {% for d in data.all %} {% if forloop.counter0 %} ; {% endif %}{{ d }} {% endfor %} diff --git a/ishtar_common/templates/ishtar/blocks/window_field_url.html b/ishtar_common/templates/ishtar/blocks/window_field_url.html index d63ebdca9..cd6365106 100644 --- a/ishtar_common/templates/ishtar/blocks/window_field_url.html +++ b/ishtar_common/templates/ishtar/blocks/window_field_url.html @@ -1,3 +1,3 @@ -{% load i18n %}{% if link %}{% if li %}

          • {% else %}

            {% endif %}

            +{% load i18n %}{% if link %}{% if li %}

          • {% else %}

            {% endif %}

            {% if link_name %}{{link_name}}{% else %}{{link}}{% endif %}{% if li %}

            • {% else %}

            {% endif %} {% endif%} -- cgit v1.2.3 From 9e5be05c239888f4c2fc0c457e0713a15915613d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 16 Mar 2017 12:47:33 +0100 Subject: Basket: add a close button (refs #3407) --- archaeological_finds/templates/ishtar/sheet_find.html | 2 +- archaeological_finds/urls.py | 2 ++ archaeological_finds/views.py | 4 +++- archaeological_warehouse/urls.py | 2 +- ishtar_common/static/media/style.css | 5 +++++ ishtar_common/templates/ishtar/display_item.html | 2 +- ishtar_common/templates/ishtar/manage_basket.html | 11 +++++++++++ ishtar_common/views.py | 8 +++++--- version.py | 2 +- 9 files changed, 30 insertions(+), 8 deletions(-) diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 381c81a31..912bf1b93 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -142,7 +142,7 @@             - + diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py index 4a8dec030..9c554a124 100644 --- a/archaeological_finds/urls.py +++ b/archaeological_finds/urls.py @@ -267,6 +267,8 @@ urlpatterns += patterns( name=models.FindSource.SHOW_URL), url(r'^show-find/basket-(?P.+)/(?P.+)?$', 'show_findbasket', name='show-findbasket'), + url(r'^display-find/basket-(?P.+)/$', 'display_findbasket', + name='display-findbasket'), url(r'^show-find(?:/(?P.+))?/(?P.+)?$', 'show_find', name=models.Find.SHOW_URL), url(r'^display-find/(?P.+)/$', 'display_find', diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 084f15d13..341734ae7 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -108,10 +108,12 @@ show_findsource = show_item(models.FindSource, 'findsource') get_findsource = get_item(models.FindSource, 'get_findsource', 'findsource') show_find = show_item(models.Find, 'find') -display_find = display_item(models.Find, 'find') +display_find = display_item(models.Find) revert_find = revert_item(models.Find) show_findbasket = show_item(models.FindBasket, 'findbasket') +display_findbasket = display_item(models.FindBasket, + show_url='show-find/basket-') find_creation_steps = [ ('selecrecord-find_creation', RecordFormSelectionTable), diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py index e5920606a..5d4427301 100644 --- a/archaeological_warehouse/urls.py +++ b/archaeological_warehouse/urls.py @@ -23,7 +23,7 @@ from ishtar_common.wizards import check_rights import views from archaeological_warehouse import models -# be carreful: each check_rights must be relevant with ishtar_menu +# be careful: each check_rights must be relevant with ishtar_menu # forms urlpatterns = patterns( diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 84ef710b2..adaf94200 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -410,6 +410,11 @@ a.button{ color: white; } +#validate-button{ + background-color: #fff; + display: inline-block; +} + .display_details_inline, .display_details{ display:inline-block; diff --git a/ishtar_common/templates/ishtar/display_item.html b/ishtar_common/templates/ishtar/display_item.html index e00fef05b..e1c63b775 100644 --- a/ishtar_common/templates/ishtar/display_item.html +++ b/ishtar_common/templates/ishtar/display_item.html @@ -4,7 +4,7 @@ {% endblock %} diff --git a/ishtar_common/templates/ishtar/manage_basket.html b/ishtar_common/templates/ishtar/manage_basket.html index de17f3ad7..a6065a7c2 100644 --- a/ishtar_common/templates/ishtar/manage_basket.html +++ b/ishtar_common/templates/ishtar/manage_basket.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load i18n inline_formset %} +{% load url from future %} {% block content %}

            {{page_name}}{% trans ":"%} {{basket}}

            {% csrf_token %} @@ -13,6 +14,16 @@

            {% trans "Basket content" %}

            + {% block "footer" %} + + {% endblock %}
            {%trans "Documents"%}
              {% trans "Title" %} {% trans "Type" %} {% trans "Authors" %}
            + {{ doc.title }}{{doc.source_type}}{{ doc.source_type }} {{ doc.authors.all|join:", " }} {% if doc.associated_url %}{{doc.associated_url}}{% endif %}
            {{ treatment.year }} - {{treatment.index}}{{ treatment.label }}{{ treatment.label|default_if_none:"-" }} {{ treatment.treatment_types_lbl }} {{ treatment.treatment_state|default_if_none:"-" }} {% for item in items %}{{item}} {{ item|link_to_window}}{% endfor %}