From ae9c5eaef99fcd93512ffdf43bbb447057e1acdb Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 21 Mar 2017 23:00:22 +0100 Subject: Context records forms/sheet: add documentation types, diameter and depth of appearance (refs #3561) --- archaeological_context_records/admin.py | 14 +- archaeological_context_records/forms.py | 23 +- ...e__add_field_contextrecord_diameter__add_fie.py | 732 +++++++++++++++++++++ .../0032_has_furniture_to_documentations.py | 686 +++++++++++++++++++ ...ord_has_furniture__del_field_historicalconte.py | 690 +++++++++++++++++++ archaeological_context_records/models.py | 18 +- .../templates/ishtar/sheet_contextrecord.html | 18 +- archaeological_context_records/wizards.py | 2 +- 8 files changed, 2161 insertions(+), 22 deletions(-) create mode 100644 archaeological_context_records/migrations/0031_auto__add_documentationtype__add_field_contextrecord_diameter__add_fie.py create mode 100644 archaeological_context_records/migrations/0032_has_furniture_to_documentations.py create mode 100644 archaeological_context_records/migrations/0033_auto__del_field_contextrecord_has_furniture__del_field_historicalconte.py (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py index e3d627ca8..567f50014 100644 --- a/archaeological_context_records/admin.py +++ b/archaeological_context_records/admin.py @@ -36,8 +36,9 @@ admin.site.register(models.Dating, DatingAdmin) class ContextRecordAdmin(HistorizedObjectAdmin): list_display = ('label', 'length', 'width', 'thickness', 'depth') - list_filter = ('has_furniture',) - search_fields = ('label', 'parcel__operation__common_name', 'datings__period__label') + list_filter = ('documentations',) + search_fields = ('label', 'parcel__operation__common_name', + 'datings__period__label') model = models.ContextRecord admin.site.register(models.ContextRecord, ContextRecordAdmin) @@ -65,8 +66,10 @@ class RelationTypeAdmin(admin.ModelAdmin): admin.site.register(models.RelationType, RelationTypeAdmin) + class UnitAdmin(admin.ModelAdmin): - list_display = ['label', 'txt_idx', 'parent', 'available', 'order', 'comment'] + list_display = ['label', 'txt_idx', 'parent', 'available', 'order', + 'comment'] admin.site.register(models.Unit, UnitAdmin) @@ -77,8 +80,9 @@ class IdentificationTypeAdmin(admin.ModelAdmin): admin.site.register(models.IdentificationType, IdentificationTypeAdmin) -general_models = [models.DatingType, models.DatingQuality, - models.ActivityType, models.ExcavationTechnicType] +general_models = [ + models.DatingType, models.DatingQuality, models.DocumentationType, + 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 ef17e561e..522c69deb 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -130,8 +130,11 @@ class RecordFormSelection(forms.Form): class RecordFormGeneral(ManageOldType, forms.Form): form_label = _("General") file_upload = True - associated_models = {'parcel': Parcel, 'unit': models.Unit, - 'excavation_technic': models.ExcavationTechnicType} + base_models = ["documentation"] + associated_models = { + 'parcel': Parcel, 'unit': models.Unit, + 'documentation': models.DocumentationType, + '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=[]) @@ -146,10 +149,15 @@ class RecordFormGeneral(ManageOldType, forms.Form): 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) + diameter = forms.FloatField(label=_(u"Diameter (m)"), required=False) depth = forms.FloatField(label=_(u"Depth (m)"), required=False) - unit = forms.ChoiceField(label=_("Context record type"), required=False, choices=[]) - has_furniture = forms.NullBooleanField(label=_(u"Has furniture?"), - required=False) + depth_of_appearance = forms.FloatField( + label=_(u"Depth of appearance (m)"), required=False) + unit = forms.ChoiceField(label=_(u"Context record type"), required=False, + choices=[]) + documentation = forms.MultipleChoiceField( + label=_("Documentation"), choices=[], required=False, + widget=forms.CheckboxSelectMultiple) location = forms.CharField( label=_(u"Location"), widget=forms.Textarea, required=False, validators=[validators.MaxLengthValidator(200)]) @@ -216,6 +224,11 @@ class RecordFormGeneral(ManageOldType, forms.Form): initial=self.init_data.get('excavation_technic')) self.fields['excavation_technic'].help_text = \ models.ExcavationTechnicType.get_help() + self.fields['documentation'].choices = \ + models.DocumentationType.get_types(empty_first=False, + initial=self.init_data.get('documentation')) + self.fields['documentation'].help_text = \ + models.DocumentationType.get_help() def clean(self): # manage unique context record ID diff --git a/archaeological_context_records/migrations/0031_auto__add_documentationtype__add_field_contextrecord_diameter__add_fie.py b/archaeological_context_records/migrations/0031_auto__add_documentationtype__add_field_contextrecord_diameter__add_fie.py new file mode 100644 index 000000000..f56f26e9f --- /dev/null +++ b/archaeological_context_records/migrations/0031_auto__add_documentationtype__add_field_contextrecord_diameter__add_fie.py @@ -0,0 +1,732 @@ +# -*- 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 'DocumentationType' + db.create_table('archaeological_context_records_documentationtype', ( + ('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', ['DocumentationType']) + + # Adding field 'ContextRecord.diameter' + db.add_column('archaeological_context_records_contextrecord', 'diameter', + self.gf('django.db.models.fields.FloatField')(null=True, blank=True), + keep_default=False) + + # Adding field 'ContextRecord.depth_of_appearance' + db.add_column('archaeological_context_records_contextrecord', 'depth_of_appearance', + self.gf('django.db.models.fields.FloatField')(null=True, blank=True), + keep_default=False) + + # Adding M2M table for field documentations on 'ContextRecord' + db.create_table('archaeological_context_records_contextrecord_documentations', ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('contextrecord', models.ForeignKey(orm['archaeological_context_records.contextrecord'], null=False)), + ('documentationtype', models.ForeignKey(orm['archaeological_context_records.documentationtype'], null=False)) + )) + db.create_unique('archaeological_context_records_contextrecord_documentations', ['contextrecord_id', 'documentationtype_id']) + + # Adding field 'HistoricalContextRecord.diameter' + db.add_column('archaeological_context_records_historicalcontextrecord', 'diameter', + self.gf('django.db.models.fields.FloatField')(null=True, blank=True), + keep_default=False) + + # Adding field 'HistoricalContextRecord.depth_of_appearance' + db.add_column('archaeological_context_records_historicalcontextrecord', 'depth_of_appearance', + self.gf('django.db.models.fields.FloatField')(null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting model 'DocumentationType' + db.delete_table('archaeological_context_records_documentationtype') + + # Deleting field 'ContextRecord.diameter' + db.delete_column('archaeological_context_records_contextrecord', 'diameter') + + # Deleting field 'ContextRecord.depth_of_appearance' + db.delete_column('archaeological_context_records_contextrecord', 'depth_of_appearance') + + # Removing M2M table for field documentations on 'ContextRecord' + db.delete_table('archaeological_context_records_contextrecord_documentations') + + # Deleting field 'HistoricalContextRecord.diameter' + db.delete_column('archaeological_context_records_historicalcontextrecord', 'diameter') + + # Deleting field 'HistoricalContextRecord.depth_of_appearance' + db.delete_column('archaeological_context_records_historicalcontextrecord', 'depth_of_appearance') + + + 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'}), + 'depth_of_appearance': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'diameter': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'documentations': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_context_records.DocumentationType']", 'symmetrical': 'False'}), + '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.documentationtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'DocumentationType'}, + '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'}), + 'depth_of_appearance': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'diameter': ('django.db.models.fields.FloatField', [], {'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'}), + '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.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': {'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.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/migrations/0032_has_furniture_to_documentations.py b/archaeological_context_records/migrations/0032_has_furniture_to_documentations.py new file mode 100644 index 000000000..0b5de776a --- /dev/null +++ b/archaeological_context_records/migrations/0032_has_furniture_to_documentations.py @@ -0,0 +1,686 @@ +# -*- 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): + has_fur, created = orm[ + 'archaeological_context_records.DocumentationType' + ].objects.get_or_create( + txt_idx='has-furniture', defaults={"label": u"Présence de mobilier"} + ) + for cr in orm['archaeological_context_records.ContextRecord' + ].objects.filter(has_furniture=True).all(): + if has_fur not in cr.documentations.all(): + cr.documentations.add(has_fur) + + def backwards(self, orm): + pass + + models = { + 'archaeological_context_records.activitytype': { + 'Meta': {'ordering': "('order',)", 'object_name': 'ActivityType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'archaeological_context_records.contextrecord': { + 'Meta': {'ordering': "('cached_label',)", 'object_name': 'ContextRecord'}, + 'activity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.ActivityType']", 'null': 'True', 'blank': 'True'}), + 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'closing_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'datings': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_context_records.Dating']", 'symmetrical': 'False'}), + 'datings_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'depth': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'depth_of_appearance': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'diameter': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'documentations': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_context_records.DocumentationType']", '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.documentationtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'DocumentationType'}, + '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'}), + 'depth_of_appearance': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'diameter': ('django.db.models.fields.FloatField', [], {'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'}), + '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.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': {'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.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/migrations/0033_auto__del_field_contextrecord_has_furniture__del_field_historicalconte.py b/archaeological_context_records/migrations/0033_auto__del_field_contextrecord_has_furniture__del_field_historicalconte.py new file mode 100644 index 000000000..65c5d54da --- /dev/null +++ b/archaeological_context_records/migrations/0033_auto__del_field_contextrecord_has_furniture__del_field_historicalconte.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): + # Deleting field 'ContextRecord.has_furniture' + db.delete_column('archaeological_context_records_contextrecord', 'has_furniture') + + # Deleting field 'HistoricalContextRecord.has_furniture' + db.delete_column('archaeological_context_records_historicalcontextrecord', 'has_furniture') + + + def backwards(self, orm): + # Adding field 'ContextRecord.has_furniture' + db.add_column('archaeological_context_records_contextrecord', 'has_furniture', + self.gf('django.db.models.fields.NullBooleanField')(null=True, blank=True), + keep_default=False) + + # Adding field 'HistoricalContextRecord.has_furniture' + db.add_column('archaeological_context_records_historicalcontextrecord', 'has_furniture', + self.gf('django.db.models.fields.NullBooleanField')(null=True, blank=True), + keep_default=False) + + + 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'}), + 'depth_of_appearance': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'diameter': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'documentations': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_context_records.DocumentationType']", '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'}), + '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.documentationtype': { + 'Meta': {'ordering': "('label',)", 'object_name': 'DocumentationType'}, + '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'}), + 'depth_of_appearance': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'diameter': ('django.db.models.fields.FloatField', [], {'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'}), + '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'}), + '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.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': {'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.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 14e98e76b..4df56c49f 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2012-2016 Étienne Loks +# Copyright (C) 2012-2017 Étienne Loks # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -129,6 +129,15 @@ post_save.connect(post_save_cache, sender=ExcavationTechnicType) post_delete.connect(post_save_cache, sender=ExcavationTechnicType) +class DocumentationType(GeneralType): + class Meta: + verbose_name = _(u"Documentation type") + verbose_name_plural = _(u"Documentation types") + ordering = ('label',) +post_save.connect(post_save_cache, sender=DocumentationType) +post_delete.connect(post_save_cache, sender=DocumentationType) + + class CRBulkView(object): CREATE_SQL = """ CREATE VIEW context_records_cached_label_bulk_update @@ -216,18 +225,21 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, width = models.FloatField(_(u"Width (m)"), blank=True, null=True) thickness = models.FloatField(_(u"Thickness (m)"), blank=True, null=True) + diameter = models.FloatField(_(u"Diameter (m)"), blank=True, null=True) depth = models.FloatField(_(u"Depth (m)"), blank=True, null=True) + depth_of_appearance = models.FloatField( + _(u"Depth of appearance (m)"), blank=True, null=True) location = models.TextField( _(u"Location"), blank=True, null=True, help_text=_(u"A short description of the location of the context " u"record")) datings = models.ManyToManyField(Dating) + documentations = models.ManyToManyField(DocumentationType, blank=True, + null=True) datings_comment = models.TextField(_(u"Comment on datings"), blank=True, null=True) unit = models.ForeignKey(Unit, verbose_name=_(u"Context record type"), related_name='+', blank=True, null=True) - has_furniture = models.NullBooleanField(_(u"Has furniture?"), blank=True, - null=True) filling = models.TextField(_(u"Filling"), blank=True, null=True) interpretation = models.TextField(_(u"Interpretation"), blank=True, null=True) diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 8398a0523..272dcb28e 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -26,15 +26,17 @@ {% field "Comment on datings" item.datings_comment "
" "
" %} -{% if item.description or item.lenght or item.width or item.depth or item.thickness or item.comment %} +{% if item.diameter or item.depth_of_appearance or item.documentations.count or item.description or item.lenght or item.width or item.depth or item.thickness or item.comment %}

{% trans "Description"%}

{% field "Description" item.description "
" "
" %} {% field "Comment" item.comment "
" "
" %}
    -{% field_li "Length (m)" item.lenght %} -{% field_li "Width (m)" item.width %} -{% field_li "Depth (m)" item.depth %} -{% field_li "Thickness (m)" item.thickness %} + {% field_li "Length (m)" item.lenght %} + {% field_li "Width (m)" item.width %} + {% field_li "Diameter (m)" item.diameter %} + {% field_li "Depth (m)" item.depth %} + {% field_li "Thickness (m)" item.thickness %} + {% field_li "Depth of appearance (m)" item.depth_of_appearance %}
{% endif %} @@ -42,9 +44,9 @@

{% trans "Interpretation"%}

    -{% field_li "Activity" item.activity %} -{% field_li "Identification" item.identification %} -{% field_li "Has furniture?" item.has_furniture %} + {% field_li_multiple "Documentation" item.documentations %} + {% field_li "Activity" item.activity %} + {% field_li "Identification" item.identification %}
{% field "Filling" item.filling "
" "
" %} {% field "Interpretation" item.interpretation "
" "
" %} diff --git a/archaeological_context_records/wizards.py b/archaeological_context_records/wizards.py index 0d877929f..fd48ef3d9 100644 --- a/archaeological_context_records/wizards.py +++ b/archaeological_context_records/wizards.py @@ -138,7 +138,7 @@ class RecordModifWizard(RecordWizard): class RecordDeletionWizard(DeletionWizard): model = models.ContextRecord fields = ['label', 'parcel', 'description', 'length', 'width', 'thickness', - 'depth', 'location', 'datings', 'units', 'has_furniture', + 'depth', 'location', 'datings', 'units', 'documentations', 'filling', 'interpretation', 'taq', 'taq_estimated', 'tpq', 'tpq_estimated'] filter_owns = {'selec-record_deletion': ['pk']} -- cgit v1.2.3 From 04d2c0c2086c8be9698d4a1ea96e40df96529186 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 21 Mar 2017 23:15:17 +0100 Subject: Update french translation --- archaeological_context_records/locale/django.pot | 230 ++++++++------- archaeological_finds/locale/django.pot | 298 +++++++++---------- archaeological_warehouse/locale/django.pot | 80 +++--- ishtar_common/locale/django.pot | 8 +- translations/de/ishtar_common.po | 72 +++-- translations/fr/archaeological_context_records.po | 245 ++++++++-------- translations/fr/archaeological_files.po | 8 +- translations/fr/archaeological_files_pdl.po | 8 +- translations/fr/archaeological_finds.po | 335 +++++++++++----------- translations/fr/archaeological_operations.po | 11 +- translations/fr/archaeological_warehouse.po | 103 +++---- translations/fr/ishtar_common.po | 35 +-- 12 files changed, 731 insertions(+), 702 deletions(-) (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index 3320c91a6..eedcad733 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:207 models.py:577 wizards.py:77 +#: forms.py:47 forms.py:51 models.py:216 models.py:589 wizards.py:77 msgid "Operation" msgstr "" -#: forms.py:59 forms.py:138 models.py:209 models.py:545 +#: forms.py:59 forms.py:141 models.py:218 models.py:557 msgid "ID" msgstr "" @@ -35,7 +35,7 @@ msgstr "" msgid "Search within related operations" msgstr "" -#: forms.py:77 forms.py:241 models.py:56 +#: forms.py:77 forms.py:254 models.py:56 msgid "Period" msgstr "" @@ -51,7 +51,7 @@ msgstr "" msgid "Search within relations" msgstr "" -#: forms.py:111 forms.py:344 views.py:92 +#: forms.py:111 forms.py:357 views.py:92 msgid "Context record search" msgstr "" @@ -63,168 +63,176 @@ msgstr "" msgid "General" msgstr "" -#: forms.py:137 models.py:172 models.py:205 models.py:547 +#: forms.py:140 models.py:181 models.py:214 models.py:559 msgid "Parcel" msgstr "" -#: forms.py:140 models.py:210 models.py:548 +#: forms.py:143 models.py:219 models.py:560 #: templates/ishtar/sheet_contextrecord.html:30 msgid "Description" msgstr "" -#: forms.py:142 models.py:211 +#: forms.py:145 models.py:220 msgid "General comment" msgstr "" -#: forms.py:145 models.py:255 +#: forms.py:148 models.py:267 msgid "Excavation technique" msgstr "" -#: forms.py:146 models.py:215 +#: forms.py:149 models.py:224 msgid "Length (m)" msgstr "" -#: forms.py:147 models.py:216 +#: forms.py:150 models.py:225 msgid "Width (m)" msgstr "" -#: forms.py:148 models.py:217 +#: forms.py:151 models.py:226 msgid "Thickness (m)" msgstr "" -#: forms.py:149 models.py:219 +#: forms.py:152 models.py:228 +msgid "Diameter (m)" +msgstr "" + +#: forms.py:153 models.py:229 msgid "Depth (m)" msgstr "" -#: forms.py:150 forms.py:363 models.py:227 models.py:546 +#: forms.py:155 models.py:231 +msgid "Depth of appearance (m)" +msgstr "" + +#: forms.py:156 forms.py:376 models.py:241 models.py:558 msgid "Context record type" msgstr "" -#: forms.py:151 models.py:229 -msgid "Has furniture?" +#: forms.py:159 ishtar_menu.py:48 +msgid "Documentation" msgstr "" -#: forms.py:154 models.py:221 +#: forms.py:162 models.py:233 msgid "Location" msgstr "" -#: forms.py:157 +#: forms.py:165 msgid "Image" msgstr "" -#: forms.py:158 +#: forms.py:166 #, python-format msgid "" "

Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" -#: forms.py:230 +#: forms.py:243 msgid "This ID already exists for this operation." msgstr "" -#: forms.py:236 forms.py:263 models.py:67 +#: forms.py:249 forms.py:276 models.py:67 msgid "Dating" msgstr "" -#: forms.py:242 models.py:57 +#: forms.py:255 models.py:57 msgid "Start date" msgstr "" -#: forms.py:243 models.py:58 models.py:214 +#: forms.py:256 models.py:58 models.py:223 msgid "End date" msgstr "" -#: forms.py:244 models.py:61 +#: forms.py:257 models.py:61 msgid "Quality" msgstr "" -#: forms.py:245 models.py:39 models.py:59 +#: forms.py:258 models.py:39 models.py:59 msgid "Dating type" msgstr "" -#: forms.py:272 ishtar_menu.py:29 models.py:607 +#: forms.py:285 ishtar_menu.py:29 models.py:619 msgid "Context record" msgstr "" -#: forms.py:293 +#: forms.py:306 msgid "Relations" msgstr "" -#: forms.py:297 forms.py:305 models.py:232 -#: templates/ishtar/sheet_contextrecord.html:42 +#: forms.py:310 forms.py:318 models.py:244 +#: templates/ishtar/sheet_contextrecord.html:44 msgid "Interpretation" msgstr "" -#: forms.py:301 +#: forms.py:314 msgid "Comments on dating" msgstr "" -#: forms.py:303 models.py:231 +#: forms.py:316 models.py:243 msgid "Filling" msgstr "" -#: forms.py:307 models.py:252 +#: forms.py:320 models.py:264 msgid "Activity" msgstr "" -#: forms.py:309 models.py:250 +#: forms.py:322 models.py:262 msgid "Identification" msgstr "" -#: forms.py:311 models.py:235 +#: forms.py:324 models.py:247 msgid "TAQ" msgstr "" -#: forms.py:312 models.py:239 +#: forms.py:325 models.py:251 msgid "Estimated TAQ" msgstr "" -#: forms.py:314 models.py:242 +#: forms.py:327 models.py:254 msgid "TPQ" msgstr "" -#: forms.py:315 models.py:246 +#: forms.py:328 models.py:258 msgid "Estimated TPQ" msgstr "" -#: forms.py:330 +#: forms.py:343 msgid "Operation search" msgstr "" -#: forms.py:332 +#: forms.py:345 msgid "You should select an operation." msgstr "" -#: forms.py:337 +#: forms.py:350 msgid "Would you like to delete this context record?" msgstr "" -#: forms.py:346 +#: forms.py:359 msgid "You should select a context record." msgstr "" -#: forms.py:351 +#: forms.py:364 msgid "Year of the operation" msgstr "" -#: forms.py:353 +#: forms.py:366 msgid "Numeric reference" msgstr "" -#: forms.py:359 +#: forms.py:372 msgid "Town of the operation" msgstr "" -#: forms.py:361 +#: forms.py:374 msgid "Period of the context record" msgstr "" -#: forms.py:376 +#: forms.py:389 msgid "Documentation search" msgstr "" -#: forms.py:378 +#: forms.py:391 msgid "You should select a document." msgstr "" @@ -244,10 +252,6 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:48 -msgid "Documentation" -msgstr "" - #: models.py:40 msgid "Dating types" msgstr "" @@ -308,176 +312,184 @@ msgstr "" msgid "Excavation technique types" msgstr "" -#: models.py:163 models.py:549 +#: models.py:134 +msgid "Documentation type" +msgstr "" + +#: models.py:135 +msgid "Documentation types" +msgstr "" + +#: models.py:172 models.py:561 msgid "Periods" msgstr "" -#: models.py:164 +#: models.py:173 msgid "Datings (period)" msgstr "" -#: models.py:165 +#: models.py:174 msgid "Related context records" msgstr "" -#: models.py:168 +#: models.py:177 msgid "Parcel (external ID)" msgstr "" -#: models.py:169 models.py:170 +#: models.py:178 models.py:179 msgid "Parcel (town)" msgstr "" -#: models.py:171 +#: models.py:180 msgid "Parcel (year)" msgstr "" -#: models.py:202 +#: models.py:211 msgid "External ID" msgstr "" -#: models.py:204 +#: models.py:213 msgid "External ID is set automatically" msgstr "" -#: models.py:212 +#: models.py:221 msgid "Date d'ouverture" msgstr "" -#: models.py:222 +#: models.py:234 msgid "A short description of the location of the context record" msgstr "" -#: models.py:225 +#: models.py:239 msgid "Comment on datings" msgstr "" -#: models.py:236 +#: models.py:248 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -#: models.py:240 +#: models.py:252 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "" -#: models.py:243 +#: models.py:255 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -#: models.py:247 +#: models.py:259 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "" -#: models.py:258 +#: models.py:270 msgid "Point" msgstr "" -#: models.py:259 +#: models.py:271 msgid "Polygon" msgstr "" -#: models.py:260 +#: models.py:272 msgid "Cached name" msgstr "" -#: models.py:264 models.py:265 templates/ishtar/sheet_contextrecord.html:4 +#: models.py:276 models.py:277 templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "" -#: models.py:267 +#: models.py:279 msgid "Can view all Context Records" msgstr "" -#: models.py:269 +#: models.py:281 msgid "Can view own Context Record" msgstr "" -#: models.py:271 +#: models.py:283 msgid "Can add own Context Record" msgstr "" -#: models.py:273 +#: models.py:285 msgid "Can change own Context Record" msgstr "" -#: models.py:275 +#: models.py:287 msgid "Can delete own Context Record" msgstr "" -#: models.py:285 +#: models.py:297 msgctxt "short" msgid "Context record" msgstr "" -#: models.py:479 +#: models.py:491 msgid "Inverse relation" msgstr "" -#: models.py:483 models.py:506 models.py:544 +#: models.py:495 models.py:518 models.py:556 msgid "Relation type" msgstr "" -#: models.py:484 +#: models.py:496 msgid "Relation types" msgstr "" -#: models.py:501 +#: models.py:513 msgid "ID (left)" msgstr "" -#: models.py:502 +#: models.py:514 msgid "Context record type (left)" msgstr "" -#: models.py:503 +#: models.py:515 msgid "Parcel (left)" msgstr "" -#: models.py:504 +#: models.py:516 msgid "Description (left)" msgstr "" -#: models.py:505 +#: models.py:517 msgid "Periods (left)" msgstr "" -#: models.py:507 +#: models.py:519 msgid "ID (right)" msgstr "" -#: models.py:508 +#: models.py:520 msgid "Context record type (right)" msgstr "" -#: models.py:509 +#: models.py:521 msgid "Parcel (right)" msgstr "" -#: models.py:510 +#: models.py:522 msgid "Description (right)" msgstr "" -#: models.py:511 +#: models.py:523 msgid "Periods (right)" msgstr "" -#: models.py:520 +#: models.py:532 msgid "Record relation" msgstr "" -#: models.py:521 +#: models.py:533 msgid "Record relations" msgstr "" -#: models.py:604 +#: models.py:616 msgid "Context record documentation" msgstr "" -#: models.py:605 +#: models.py:617 msgid "Context record documentations" msgstr "" @@ -517,71 +529,71 @@ msgstr "" msgid "Temporary ID:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:54 +#: templates/ishtar/sheet_contextrecord.html:56 msgid "Datations" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:63 +#: templates/ishtar/sheet_contextrecord.html:65 msgid "Context record relations" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:70 +#: templates/ishtar/sheet_contextrecord.html:72 msgid "Operation summary" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:72 +#: templates/ishtar/sheet_contextrecord.html:74 msgid "Patriarche OA code not yet recorded!" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:76 +#: templates/ishtar/sheet_contextrecord.html:78 msgid "Numerical reference" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:80 +#: templates/ishtar/sheet_contextrecord.html:82 msgid "State:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:80 +#: templates/ishtar/sheet_contextrecord.html:82 msgid "Active file" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:80 +#: templates/ishtar/sheet_contextrecord.html:82 msgid "Closed operation" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:82 +#: templates/ishtar/sheet_contextrecord.html:84 msgid "Closing date:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:82 +#: templates/ishtar/sheet_contextrecord.html:84 msgid "by" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:90 +#: templates/ishtar/sheet_contextrecord.html:92 msgid "Localisation" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:91 +#: templates/ishtar/sheet_contextrecord.html:93 msgid "Towns:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:92 +#: templates/ishtar/sheet_contextrecord.html:94 msgid "Related operation:" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:94 +#: templates/ishtar/sheet_contextrecord.html:96 msgid "No operation linked to this context unit!" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:97 +#: templates/ishtar/sheet_contextrecord.html:99 msgid "Document from this context record" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:102 +#: templates/ishtar/sheet_contextrecord.html:104 msgid "Finds" msgstr "" -#: templates/ishtar/sheet_contextrecord.html:107 +#: templates/ishtar/sheet_contextrecord.html:109 msgid "Documents from associated finds" msgstr "" diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index 8e4a11f9c..d48cbe962 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -8,337 +8,345 @@ msgid "" msgstr "" -#: forms.py:92 forms.py:96 models_finds.py:505 wizards.py:64 +#: forms.py:93 forms.py:97 models_finds.py:505 wizards.py:64 msgid "Context record" msgstr "" -#: forms.py:125 ishtar_menu.py:32 models_finds.py:666 models_finds.py:1069 -#: models_finds.py:1078 models_treatments.py:281 +#: forms.py:126 ishtar_menu.py:32 models_finds.py:668 models_finds.py:1071 +#: models_finds.py:1080 models_treatments.py:281 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "" -#: forms.py:139 forms.py:332 forms.py:573 models_finds.py:151 -#: models_finds.py:597 +#: forms.py:140 forms.py:333 forms.py:601 models_finds.py:151 +#: models_finds.py:599 msgid "Free ID" msgstr "" -#: forms.py:141 models_finds.py:649 +#: forms.py:142 models_finds.py:651 msgid "Previous ID" msgstr "" -#: forms.py:142 forms.py:376 forms_treatments.py:134 models_finds.py:155 -#: models_finds.py:598 models_treatments.py:127 +#: forms.py:143 forms.py:364 forms_treatments.py:134 models_finds.py:155 +#: models_finds.py:600 models_treatments.py:127 msgid "Description" msgstr "" -#: forms.py:145 forms.py:378 models_finds.py:164 +#: forms.py:146 forms.py:366 models_finds.py:164 msgid "Batch/object" msgstr "" -#: forms.py:147 models_finds.py:626 +#: forms.py:148 models_finds.py:628 msgid "Is complete?" msgstr "" -#: forms.py:150 forms.py:366 forms.py:577 models_finds.py:51 +#: forms.py:151 forms.py:354 forms.py:605 models_finds.py:51 msgid "Material type" msgstr "" -#: forms.py:151 forms.py:370 models_finds.py:63 models_finds.py:602 +#: forms.py:152 forms.py:358 models_finds.py:63 models_finds.py:604 msgid "Conservatory state" msgstr "" -#: forms.py:154 models_finds.py:604 +#: forms.py:155 models_finds.py:606 msgid "Conservatory comment" msgstr "" -#: forms.py:157 models_finds.py:113 models_finds.py:629 +#: forms.py:158 models_finds.py:113 models_finds.py:631 msgid "Object types" msgstr "" -#: forms.py:159 forms.py:369 models_finds.py:72 +#: forms.py:160 forms.py:357 models_finds.py:72 msgid "Preservation type" msgstr "" -#: forms.py:162 forms.py:372 models_finds.py:631 +#: forms.py:163 forms.py:360 models_finds.py:633 msgid "Integrity / interest" msgstr "" -#: forms.py:165 forms.py:374 models_finds.py:634 +#: forms.py:166 forms.py:362 models_finds.py:636 msgid "Remarkability" msgstr "" -#: forms.py:168 models_finds.py:169 +#: forms.py:169 models_finds.py:169 msgid "Point of topographic reference" msgstr "" -#: forms.py:171 models_finds.py:171 +#: forms.py:172 models_finds.py:171 msgid "X" msgstr "" -#: forms.py:172 models_finds.py:172 +#: forms.py:173 models_finds.py:172 msgid "Y" msgstr "" -#: forms.py:173 models_finds.py:173 +#: forms.py:174 models_finds.py:173 msgid "Z" msgstr "" -#: forms.py:175 models_finds.py:181 +#: forms.py:176 models_finds.py:181 msgid "Spatial Reference System" msgstr "" -#: forms.py:178 models_finds.py:174 +#: forms.py:179 models_finds.py:174 msgid "Estimated error for X" msgstr "" -#: forms.py:180 models_finds.py:176 +#: forms.py:181 models_finds.py:176 msgid "Estimated error for Y" msgstr "" -#: forms.py:182 models_finds.py:178 +#: forms.py:183 models_finds.py:178 msgid "Estimated error for Z" msgstr "" -#: forms.py:183 models_finds.py:638 +#: forms.py:184 models_finds.py:640 msgid "Length (cm)" msgstr "" -#: forms.py:184 models_finds.py:639 +#: forms.py:185 models_finds.py:641 msgid "Width (cm)" msgstr "" -#: forms.py:185 models_finds.py:640 +#: forms.py:186 models_finds.py:642 msgid "Height (cm)" msgstr "" -#: forms.py:186 models_finds.py:641 +#: forms.py:187 models_finds.py:643 msgid "Diameter (cm)" msgstr "" -#: forms.py:187 models_finds.py:642 +#: forms.py:188 models_finds.py:644 msgid "Thickness (cm)" msgstr "" -#: forms.py:188 forms.py:578 models_finds.py:609 +#: forms.py:189 forms.py:606 models_finds.py:611 msgid "Volume (l)" msgstr "" -#: forms.py:189 forms.py:579 models_finds.py:610 +#: forms.py:190 forms.py:607 models_finds.py:612 msgid "Weight (g)" msgstr "" -#: forms.py:191 models_finds.py:643 +#: forms.py:192 models_finds.py:645 msgid "Dimensions comment" msgstr "" -#: forms.py:192 forms.py:580 models_finds.py:613 +#: forms.py:193 forms.py:608 models_finds.py:615 msgid "Find number" msgstr "" -#: forms.py:194 models_finds.py:637 +#: forms.py:195 models_finds.py:639 msgid "Minimum number of individuals (MNI)" msgstr "" -#: forms.py:195 models_finds.py:645 +#: forms.py:196 models_finds.py:647 msgid "Mark" msgstr "" -#: forms.py:196 forms.py:379 models_finds.py:651 +#: forms.py:197 forms.py:367 models_finds.py:653 msgid "Check" msgstr "" -#: forms.py:198 models_finds.py:653 +#: forms.py:199 models_finds.py:655 msgid "Check date" msgstr "" -#: forms.py:199 forms_treatments.py:132 forms_treatments.py:434 -#: models_finds.py:156 models_finds.py:646 models_treatments.py:126 +#: forms.py:200 forms_treatments.py:132 forms_treatments.py:434 +#: models_finds.py:156 models_finds.py:648 models_treatments.py:126 #: models_treatments.py:494 msgid "Comment" msgstr "" -#: forms.py:202 models_finds.py:647 +#: forms.py:203 models_finds.py:649 msgid "Comment on dating" msgstr "" -#: forms.py:203 models_finds.py:655 +#: forms.py:204 models_finds.py:657 msgid "Estimated value" msgstr "" -#: forms.py:205 forms_treatments.py:151 +#: forms.py:206 forms_treatments.py:151 msgid "Image" msgstr "" -#: forms.py:206 forms_treatments.py:152 +#: forms.py:207 forms_treatments.py:152 #, python-format msgid "" "

Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" -#: forms.py:280 +#: forms.py:281 msgid "You should at least provide X, Y and the spatial reference system used." msgstr "" -#: forms.py:289 +#: forms.py:290 msgid "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" -#: forms.py:295 forms.py:326 models_finds.py:621 +#: forms.py:296 forms.py:327 models_finds.py:623 msgid "Dating" msgstr "" -#: forms.py:300 forms.py:352 +#: forms.py:301 forms.py:353 msgid "Period" msgstr "" -#: forms.py:301 forms_treatments.py:138 forms_treatments.py:436 -#: models_finds.py:1083 models_treatments.py:129 models_treatments.py:292 +#: forms.py:302 forms_treatments.py:138 forms_treatments.py:436 +#: models_finds.py:1085 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:303 models_finds.py:1084 models_treatments.py:293 +#: forms.py:304 models_finds.py:1086 models_treatments.py:293 #: templates/ishtar/sheet_find.html:92 templates/ishtar/sheet_find.html:134 msgid "End date" msgstr "" -#: forms.py:304 +#: forms.py:305 msgid "Quality" msgstr "" -#: forms.py:306 +#: forms.py:307 msgid "Dating type" msgstr "" -#: forms.py:308 +#: forms.py:309 msgid "Precise dating" msgstr "" -#: forms.py:330 models_finds.py:188 +#: forms.py:331 models_finds.py:188 msgid "Short ID" msgstr "" -#: forms.py:331 models_finds.py:191 +#: forms.py:332 models_finds.py:191 msgid "Complete ID" msgstr "" -#: forms.py:335 forms_treatments.py:54 forms_treatments.py:96 +#: forms.py:336 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:102 models_treatments.py:466 msgid "Year" msgstr "" -#: forms.py:337 +#: forms.py:338 msgid "Operation's number (index by year)" msgstr "" -#: forms.py:340 +#: forms.py:341 msgid "Code PATRIARCHE" msgstr "" -#: forms.py:344 +#: forms.py:345 msgid "Archaeological site" msgstr "" -#: forms.py:350 +#: forms.py:351 msgid "Search within related operations" msgstr "" -#: forms.py:355 +#: forms.py:355 models_finds.py:112 +msgid "Object type" +msgstr "" + +#: forms.py:368 forms_treatments.py:57 +msgid "Has an image?" +msgstr "" + +#: forms.py:417 msgid "Warehouse (location)" msgstr "" -#: forms.py:361 +#: forms.py:423 msgid "Warehouse (responsible)" msgstr "" -#: forms.py:367 models_finds.py:112 -msgid "Object type" +#: forms.py:428 +msgid "Container ID" msgstr "" -#: forms.py:380 forms_treatments.py:57 -msgid "Has an image?" +#: forms.py:429 +msgid "Container ref." msgstr "" -#: forms.py:428 forms.py:441 views.py:134 +#: forms.py:433 forms.py:456 views.py:149 msgid "Find search" msgstr "" -#: forms.py:455 templates/ishtar/sheet_treatment.html:46 +#: forms.py:481 templates/ishtar/sheet_treatment.html:46 msgid "Upstream finds" msgstr "" -#: forms.py:457 models_finds.py:667 +#: forms.py:483 models_finds.py:669 msgid "Finds" msgstr "" -#: forms.py:467 +#: forms.py:495 msgid "You should at least select one archaeological find." msgstr "" -#: forms.py:570 +#: forms.py:598 msgid "Resulting find" msgstr "" -#: forms.py:575 +#: forms.py:603 msgid "Precise description" msgstr "" -#: forms.py:590 +#: forms.py:618 msgid "Resulting finds" msgstr "" -#: forms.py:595 +#: forms.py:623 msgid "Would you like to delete this find?" msgstr "" -#: forms.py:599 models_treatments.py:90 +#: forms.py:627 models_treatments.py:90 msgid "Upstream find" msgstr "" -#: forms.py:612 +#: forms.py:640 msgid "Archaeological find search" msgstr "" -#: forms.py:614 +#: forms.py:642 msgid "You should select an archaeological find." msgstr "" -#: forms.py:619 +#: forms.py:647 msgid "Year of the operation" msgstr "" -#: forms.py:621 +#: forms.py:649 msgid "Numeric reference" msgstr "" -#: forms.py:628 +#: forms.py:656 msgid "Period of the archaeological find" msgstr "" -#: forms.py:630 +#: forms.py:658 msgid "Material type of the archaeological find" msgstr "" -#: forms.py:632 +#: forms.py:660 msgid "Description of the archaeological find" msgstr "" -#: forms.py:644 forms_treatments.py:590 forms_treatments.py:616 +#: forms.py:672 forms_treatments.py:590 forms_treatments.py:616 msgid "Documentation search" msgstr "" -#: forms.py:646 forms_treatments.py:592 forms_treatments.py:618 +#: forms.py:674 forms_treatments.py:592 forms_treatments.py:618 msgid "You should select a document." msgstr "" -#: forms.py:663 +#: forms.py:691 msgid "Another basket already exists with this name." msgstr "" -#: forms.py:673 forms.py:677 forms_treatments.py:175 ishtar_menu.py:57 +#: forms.py:701 forms.py:705 forms_treatments.py:175 ishtar_menu.py:57 msgid "Basket" msgstr "" @@ -364,7 +372,7 @@ msgstr "" msgid "Treatment type" msgstr "" -#: forms_treatments.py:68 forms_treatments.py:560 views.py:364 +#: forms_treatments.py:68 forms_treatments.py:560 views.py:398 msgid "Treatment search" msgstr "" @@ -458,7 +466,7 @@ msgstr "" #: forms_treatments.py:266 forms_treatments.py:397 ishtar_menu.py:108 #: models_treatments.py:499 models_treatments.py:521 models_treatments.py:584 -#: wizards.py:183 templates/ishtar/sheet_treatmentfile.html:5 +#: wizards.py:187 templates/ishtar/sheet_treatmentfile.html:5 msgid "Treatment request" msgstr "" @@ -541,7 +549,7 @@ msgstr "" msgid "Applicant organisation" msgstr "" -#: forms_treatments.py:385 forms_treatments.py:565 views.py:468 +#: forms_treatments.py:385 forms_treatments.py:565 views.py:502 msgid "Treatment request search" msgstr "" @@ -620,7 +628,7 @@ msgstr "" msgid "Documentation" msgstr "" -#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1080 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1082 msgid "Administrative act" msgstr "" @@ -655,7 +663,7 @@ msgstr "" msgid "Parent material" msgstr "" -#: models_finds.py:52 models_finds.py:525 models_finds.py:600 +#: models_finds.py:52 models_finds.py:525 models_finds.py:602 msgid "Material types" msgstr "" @@ -687,7 +695,7 @@ msgstr "" msgid "Remarkability types" msgstr "" -#: models_finds.py:98 models_finds.py:596 models_treatments.py:40 +#: models_finds.py:98 models_finds.py:598 models_treatments.py:40 #: models_treatments.py:287 msgid "Order" msgstr "" @@ -704,12 +712,12 @@ msgstr "" msgid "Parent" msgstr "" -#: models_finds.py:152 models_finds.py:593 models_treatments.py:124 +#: models_finds.py:152 models_finds.py:595 models_treatments.py:124 #: models_treatments.py:471 msgid "External ID" msgstr "" -#: models_finds.py:154 models_finds.py:595 +#: models_finds.py:154 models_finds.py:597 msgid "External ID is set automatically" msgstr "" @@ -749,7 +757,7 @@ msgstr "" msgid "Cached value - do not edit" msgstr "" -#: models_finds.py:197 models_finds.py:591 +#: models_finds.py:197 models_finds.py:593 msgid "Base find" msgstr "" @@ -845,7 +853,7 @@ msgstr "" msgid "Base find - Discovery date" msgstr "" -#: models_finds.py:523 models_finds.py:624 models_treatments.py:131 +#: models_finds.py:523 models_finds.py:626 models_treatments.py:131 #: models_treatments.py:295 templates/ishtar/sheet_find.html:90 #: templates/ishtar/sheet_find.html:132 msgid "Container" @@ -855,71 +863,71 @@ msgstr "" msgid "Periods" msgstr "" -#: models_finds.py:607 +#: models_finds.py:609 msgid "Type of preservation to consider" msgstr "" -#: models_finds.py:611 +#: models_finds.py:613 msgid "Weight unit" msgstr "" -#: models_finds.py:617 templates/ishtar/sheet_find.html:78 +#: models_finds.py:619 templates/ishtar/sheet_find.html:78 msgid "Upstream treatment" msgstr "" -#: models_finds.py:620 templates/ishtar/sheet_find.html:120 +#: models_finds.py:622 templates/ishtar/sheet_find.html:120 msgid "Downstream treatment" msgstr "" -#: models_finds.py:658 +#: models_finds.py:660 msgid "Collection" msgstr "" -#: models_finds.py:660 models_treatments.py:143 models_treatments.py:495 +#: models_finds.py:662 models_treatments.py:143 models_treatments.py:495 msgid "Cached name" msgstr "" -#: models_finds.py:669 +#: models_finds.py:671 msgid "Can view all Finds" msgstr "" -#: models_finds.py:670 +#: models_finds.py:672 msgid "Can view own Find" msgstr "" -#: models_finds.py:671 +#: models_finds.py:673 msgid "Can add own Find" msgstr "" -#: models_finds.py:672 +#: models_finds.py:674 msgid "Can change own Find" msgstr "" -#: models_finds.py:673 +#: models_finds.py:675 msgid "Can delete own Find" msgstr "" -#: models_finds.py:679 +#: models_finds.py:681 msgid "FIND" msgstr "" -#: models_finds.py:1067 +#: models_finds.py:1069 msgid "Find documentation" msgstr "" -#: models_finds.py:1068 +#: models_finds.py:1070 msgid "Find documentations" msgstr "" -#: models_finds.py:1081 +#: models_finds.py:1083 msgid "Person" msgstr "" -#: models_finds.py:1087 +#: models_finds.py:1089 msgid "Property" msgstr "" -#: models_finds.py:1088 +#: models_finds.py:1090 msgid "Properties" msgstr "" @@ -1089,127 +1097,127 @@ msgstr "" msgid "Treatment request documentations" msgstr "" -#: views.py:129 +#: views.py:138 msgid "New find" msgstr "" -#: views.py:143 +#: views.py:167 msgid "Find modification" msgstr "" -#: views.py:158 +#: views.py:189 msgid "Find deletion" msgstr "" -#: views.py:163 +#: views.py:194 msgid "Find: source search" msgstr "" -#: views.py:171 +#: views.py:202 msgid "Find: new source" msgstr "" -#: views.py:179 +#: views.py:210 msgid "Find: source modification" msgstr "" -#: views.py:194 +#: views.py:225 msgid "Find: source deletion" msgstr "" -#: views.py:208 +#: views.py:239 msgid "New basket" msgstr "" -#: views.py:227 +#: views.py:258 msgid "Manage items in basket" msgstr "" -#: views.py:247 +#: views.py:278 msgid "Manage basket" msgstr "" -#: views.py:335 +#: views.py:369 msgid "Delete basket" msgstr "" -#: views.py:385 +#: views.py:419 msgid "New treatment" msgstr "" -#: views.py:393 views.py:485 +#: views.py:427 views.py:519 msgid "Modify" msgstr "" -#: views.py:410 +#: views.py:444 msgid "Treatment deletion" msgstr "" -#: views.py:417 +#: views.py:451 msgid "Treatment: search administrative act" msgstr "" -#: views.py:426 +#: views.py:460 msgid "Treatment: new administrative act" msgstr "" -#: views.py:436 +#: views.py:470 msgid "Treatment: administrative act modification" msgstr "" -#: views.py:445 +#: views.py:479 msgid "Treatment: administrative act deletion" msgstr "" -#: views.py:478 +#: views.py:512 msgid "New treatment request" msgstr "" -#: views.py:501 +#: views.py:535 msgid "Treatment request deletion" msgstr "" -#: views.py:508 +#: views.py:542 msgid "Treatment request: search administrative act" msgstr "" -#: views.py:518 +#: views.py:552 msgid "Treatment request: new administrative act" msgstr "" -#: views.py:528 +#: views.py:562 msgid "Treatment request: administrative act modification" msgstr "" -#: views.py:537 +#: views.py:571 msgid "Treatment request: administrative act deletion" msgstr "" -#: views.py:563 +#: views.py:597 msgid "Treatment: source search" msgstr "" -#: views.py:578 +#: views.py:612 msgid "Treatment: source modification" msgstr "" -#: views.py:593 +#: views.py:627 msgid "Treatment: source deletion" msgstr "" -#: views.py:606 +#: views.py:640 msgid "Treatment request: source search" msgstr "" -#: views.py:622 +#: views.py:656 msgid "Treatment request: source modification" msgstr "" -#: views.py:640 +#: views.py:674 msgid "Treatment request: source deletion" msgstr "" -#: wizards.py:63 wizards.py:195 +#: wizards.py:63 wizards.py:199 msgid "Operation" msgstr "" diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot index 65013fd89..d5d6e9b63 100644 --- a/archaeological_warehouse/locale/django.pot +++ b/archaeological_warehouse/locale/django.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" -#: forms.py:36 forms.py:92 ishtar_menu.py:40 models.py:63 models.py:103 +#: forms.py:36 forms.py:99 ishtar_menu.py:40 models.py:63 models.py:103 #: templates/ishtar/sheet_warehouse.html:4 msgid "Warehouse" msgstr "" @@ -20,135 +20,139 @@ msgstr "" msgid "Order" msgstr "" -#: forms.py:63 models.py:53 +#: forms.py:66 +msgid "There are identical divisions." +msgstr "" + +#: forms.py:70 models.py:53 msgid "Divisions" msgstr "" -#: forms.py:67 forms.py:96 models.py:45 models.py:100 +#: forms.py:74 forms.py:103 models.py:45 models.py:100 msgid "Name" msgstr "" -#: forms.py:68 forms.py:98 models.py:36 models.py:47 +#: forms.py:75 forms.py:105 models.py:36 models.py:47 msgid "Warehouse type" msgstr "" -#: forms.py:69 forms.py:115 +#: forms.py:76 forms.py:122 msgid "Town" msgstr "" -#: forms.py:80 views.py:100 +#: forms.py:87 views.py:100 msgid "Warehouse search" msgstr "" -#: forms.py:101 models.py:50 +#: forms.py:108 models.py:50 msgid "Person in charge" msgstr "" -#: forms.py:107 forms.py:177 models.py:51 models.py:181 +#: forms.py:114 forms.py:184 models.py:51 models.py:181 msgid "Comment" msgstr "" -#: forms.py:109 +#: forms.py:116 msgid "Address" msgstr "" -#: forms.py:111 +#: forms.py:118 msgid "Address complement" msgstr "" -#: forms.py:113 +#: forms.py:120 msgid "Postal code" msgstr "" -#: forms.py:116 +#: forms.py:123 msgid "Country" msgstr "" -#: forms.py:118 +#: forms.py:125 msgid "Phone" msgstr "" -#: forms.py:119 +#: forms.py:126 msgid "Mobile phone" msgstr "" -#: forms.py:146 forms.py:147 +#: forms.py:153 forms.py:154 msgid "Would you like to delete this warehouse?" msgstr "" -#: forms.py:151 models.py:192 models.py:279 +#: forms.py:158 models.py:192 models.py:279 #: templates/ishtar/sheet_container.html:4 msgid "Container" msgstr "" -#: forms.py:156 forms.py:230 models.py:142 +#: forms.py:163 forms.py:237 models.py:142 msgid "Ref." msgstr "" -#: forms.py:157 forms.py:229 models.py:145 models.py:179 +#: forms.py:164 forms.py:236 models.py:145 models.py:179 msgid "Container type" msgstr "" -#: forms.py:159 +#: forms.py:166 msgid "Current location (warehouse)" msgstr "" -#: forms.py:165 models.py:176 +#: forms.py:172 models.py:176 msgid "Responsible warehouse" msgstr "" -#: forms.py:171 +#: forms.py:178 msgid "Image" msgstr "" -#: forms.py:172 +#: forms.py:179 #, python-format msgid "" "

Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" -#: forms.py:204 -msgid "Index" +#: forms.py:211 +msgid "ID" msgstr "" -#: forms.py:222 +#: forms.py:229 msgid "This ID already exists for this warehouse." msgstr "" -#: forms.py:240 forms.py:246 views.py:142 +#: forms.py:247 forms.py:253 views.py:142 msgid "Container search" msgstr "" -#: forms.py:242 forms.py:248 +#: forms.py:249 forms.py:255 msgid "You should select a container." msgstr "" -#: forms.py:243 +#: forms.py:250 msgid "Add a new container" msgstr "" -#: forms.py:253 ishtar_menu.py:36 views.py:95 +#: forms.py:260 ishtar_menu.py:36 views.py:95 msgid "Packaging" msgstr "" -#: forms.py:259 +#: forms.py:266 msgid "Packager" msgstr "" -#: forms.py:265 +#: forms.py:272 msgid "Date" msgstr "" -#: forms.py:269 +#: forms.py:276 msgid "Packaged finds" msgstr "" -#: forms.py:273 models.py:182 +#: forms.py:280 models.py:182 msgid "Localisation" msgstr "" -#: forms.py:298 forms.py:299 +#: forms.py:305 forms.py:306 msgid "Would you like to delete this container?" msgstr "" @@ -308,7 +312,7 @@ msgstr "" msgid "Container deletion" msgstr "" -#: templates/ishtar/sheet_container.html:26 +#: templates/ishtar/sheet_container.html:27 msgid "Content" msgstr "" @@ -316,8 +320,8 @@ msgstr "" msgid "Attached containers" msgstr "" -#: templates/ishtar/wizard/wizard_containerlocalisation.html:5 +#: templates/ishtar/wizard/wizard_containerlocalisation.html:6 msgid "" -"No division set for this warehouse. Define it to localise container in this " -"warehouse." +"No division set for this warehouse. Define at least one division to localise " +"containers in this warehouse." msgstr "" diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index e965cb5c6..d56b7cbcd 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -386,7 +386,7 @@ msgstr "" msgid "Account" msgstr "" -#: forms_common.py:577 wizards.py:1333 +#: forms_common.py:577 wizards.py:1339 msgid "New password" msgstr "" @@ -1606,15 +1606,15 @@ msgstr "" msgid "Remove" msgstr "" -#: wizards.py:372 templates/ishtar/import_delete.html:21 +#: wizards.py:374 templates/ishtar/import_delete.html:21 msgid "Yes" msgstr "" -#: wizards.py:374 +#: wizards.py:376 msgid "No" msgstr "" -#: wizards.py:1390 +#: wizards.py:1396 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "" diff --git a/translations/de/ishtar_common.po b/translations/de/ishtar_common.po index d85d9f550..93bce7079 100644 --- a/translations/de/ishtar_common.po +++ b/translations/de/ishtar_common.po @@ -389,7 +389,7 @@ msgstr "" msgid "Account" msgstr "" -#: forms_common.py:577 wizards.py:1333 +#: forms_common.py:577 wizards.py:1339 msgid "New password" msgstr "" @@ -529,7 +529,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:39 models.py:1277 views.py:1606 +#: ishtar_menu.py:39 models.py:1277 views.py:1608 msgid "Global variables" msgstr "" @@ -561,15 +561,15 @@ msgstr "" msgid "Imports" msgstr "" -#: ishtar_menu.py:112 views.py:1614 +#: ishtar_menu.py:112 views.py:1616 msgid "New import" msgstr "" -#: ishtar_menu.py:116 views.py:1628 +#: ishtar_menu.py:116 views.py:1630 msgid "Current imports" msgstr "" -#: ishtar_menu.py:120 views.py:1667 +#: ishtar_menu.py:120 views.py:1669 msgid "Old imports" msgstr "" @@ -1540,56 +1540,56 @@ msgstr "" msgid "Treatment" msgstr "" -#: views.py:1361 views.py:1404 +#: views.py:1363 views.py:1406 msgid "Operation not permitted." msgstr "" -#: views.py:1363 +#: views.py:1365 #, python-format msgid "New %s" msgstr "" -#: views.py:1422 views.py:1472 +#: views.py:1424 views.py:1474 msgid "Archaeological files" msgstr "" -#: views.py:1423 views.py:1476 +#: views.py:1425 views.py:1478 msgid "Operations" msgstr "" -#: views.py:1425 views.py:1480 +#: views.py:1427 views.py:1482 msgid "Context records" msgstr "" -#: views.py:1427 views.py:1483 +#: views.py:1429 views.py:1485 msgid "Finds" msgstr "" -#: views.py:1681 templates/ishtar/import_list.html:47 +#: views.py:1683 templates/ishtar/import_list.html:47 msgid "Link unmatched items" msgstr "" -#: views.py:1696 +#: views.py:1698 msgid "Delete import" msgstr "" -#: views.py:1735 +#: views.py:1737 msgid "Merge persons" msgstr "" -#: views.py:1759 +#: views.py:1761 msgid "Select the main person" msgstr "" -#: views.py:1768 +#: views.py:1770 msgid "Merge organization" msgstr "" -#: views.py:1778 +#: views.py:1780 msgid "Select the main organization" msgstr "" -#: views.py:1818 views.py:1834 +#: views.py:1820 views.py:1836 msgid "Corporation manager" msgstr "" @@ -1597,11 +1597,11 @@ msgstr "" msgid "Search..." msgstr "" -#: widgets.py:670 templatetags/window_tables.py:91 +#: widgets.py:670 templatetags/window_tables.py:96 msgid "No results" msgstr "" -#: widgets.py:671 templatetags/window_tables.py:92 +#: widgets.py:671 templatetags/window_tables.py:97 msgid "Loading..." msgstr "" @@ -1609,15 +1609,15 @@ msgstr "" msgid "Remove" msgstr "" -#: wizards.py:372 templates/ishtar/import_delete.html:21 +#: wizards.py:374 templates/ishtar/import_delete.html:21 msgid "Yes" msgstr "" -#: wizards.py:374 +#: wizards.py:376 msgid "No" msgstr "" -#: wizards.py:1390 +#: wizards.py:1396 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "" @@ -1688,11 +1688,7 @@ msgstr "" #: templates/base.html:84 templates/welcome.html:8 templates/welcome.html.py:9 #: templates/welcome.html:10 templates/welcome.html.py:11 -#: templates/ishtar/manage_basket.html:4 -#: templates/ishtar/blocks/window_field.html:1 -#: templates/ishtar/blocks/window_field_detail.html:1 -#: templates/ishtar/blocks/window_field_multiple.html:1 -#: templates/ishtar/blocks/window_field_url.html:1 +#: templates/ishtar/manage_basket.html:5 msgid ":" msgstr "" @@ -1981,7 +1977,7 @@ msgid "where the magic happens." msgstr "" #: templates/window.html:40 templates/blocks/JQueryJqGrid.html:34 -#: templates/ishtar/manage_basket.html:12 +#: templates/ishtar/manage_basket.html:13 msgid "Add" msgstr "" @@ -2111,14 +2107,18 @@ msgstr "" msgid "Control file" msgstr "" -#: templates/ishtar/manage_basket.html:9 +#: templates/ishtar/manage_basket.html:10 msgid "Checking \"Select all\" only selects the current page." msgstr "" -#: templates/ishtar/manage_basket.html:13 +#: templates/ishtar/manage_basket.html:14 msgid "Basket content" msgstr "" +#: templates/ishtar/manage_basket.html:22 templates/ishtar/sheet.html:28 +msgid "Close" +msgstr "" + #: templates/ishtar/merge.html:5 msgid "Merge" msgstr "" @@ -2187,10 +2187,6 @@ msgstr "" msgid "Contact informations" msgstr "" -#: templates/ishtar/sheet.html:28 -msgid "Close" -msgstr "" - #: templates/ishtar/sheet.html:34 msgid "Close all windows" msgstr "" @@ -2328,11 +2324,13 @@ msgid "" msgstr "" #: templates/ishtar/blocks/sheet_creation_section.html:3 -msgid "Creation:" +msgctxt "Sheet" +msgid "Creation" msgstr "" #: templates/ishtar/blocks/sheet_creation_section.html:12 -msgid "Modification:" +msgctxt "Sheet" +msgid "Modification" msgstr "" #: templates/ishtar/blocks/sheet_external_id.html:3 diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index bbad16706..3b0762092 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -4,25 +4,24 @@ # Étienne Loks , 2010-2015. # Valérie-Emma Leroux , 2016. #zanata # Valérie-Emma Leroux , 2017. #zanata +# Étienne Loks , 2017. #zanata msgid "" msgstr "" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-21 15:34+0100\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" +"Content-Type: text/plain; charset=UTF-8\n" +"PO-Revision-Date: 2017-03-21 06:22-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:47 forms.py:51 models.py:207 models.py:577 wizards.py:77 +#: forms.py:47 forms.py:51 models.py:216 models.py:589 wizards.py:77 msgid "Operation" msgstr "Opération" -#: forms.py:59 forms.py:138 models.py:209 models.py:545 +#: forms.py:59 forms.py:141 models.py:218 models.py:557 msgid "ID" msgstr "Identifiant" @@ -46,7 +45,7 @@ msgstr "Entité archéologique" msgid "Search within related operations" msgstr "Rechercher parmi les opérations liées" -#: forms.py:77 forms.py:241 models.py:56 +#: forms.py:77 forms.py:254 models.py:56 msgid "Period" msgstr "Période" @@ -62,7 +61,7 @@ msgstr "Parcelle (section/numéro/domaine public)" msgid "Search within relations" msgstr "Rechercher parmi les relations" -#: forms.py:111 forms.py:344 views.py:92 +#: forms.py:111 forms.py:357 views.py:92 msgid "Context record search" msgstr "Rechercher une Unité d'Enregistrement" @@ -74,56 +73,64 @@ msgstr "Vous devez sélectionner au moins une Unité d'Enregistrement." msgid "General" msgstr "Général" -#: forms.py:137 models.py:172 models.py:205 models.py:547 +#: forms.py:140 models.py:181 models.py:214 models.py:559 msgid "Parcel" msgstr "Parcelle" -#: forms.py:140 models.py:210 models.py:548 +#: forms.py:143 models.py:219 models.py:560 #: templates/ishtar/sheet_contextrecord.html:30 msgid "Description" msgstr "Description" -#: forms.py:142 models.py:211 +#: forms.py:145 models.py:220 msgid "General comment" msgstr "Commentaire général" -#: forms.py:145 models.py:255 +#: forms.py:148 models.py:267 msgid "Excavation technique" msgstr "Méthode de fouille" -#: forms.py:146 models.py:215 +#: forms.py:149 models.py:224 msgid "Length (m)" msgstr "Taille (m)" -#: forms.py:147 models.py:216 +#: forms.py:150 models.py:225 msgid "Width (m)" msgstr "Largeur (m)" -#: forms.py:148 models.py:217 +#: forms.py:151 models.py:226 msgid "Thickness (m)" msgstr "Épaisseur (m)" -#: forms.py:149 models.py:219 +#: forms.py:152 models.py:228 +msgid "Diameter (m)" +msgstr "Diamètre (m)" + +#: forms.py:153 models.py:229 msgid "Depth (m)" msgstr "Profondeur (m)" -#: forms.py:150 forms.py:363 models.py:227 models.py:546 +#: forms.py:155 models.py:231 +msgid "Depth of appearance (m)" +msgstr "Profondeur d'apparition" + +#: forms.py:156 forms.py:376 models.py:241 models.py:558 msgid "Context record type" msgstr "Type d'Unité d'Enregistrement" -#: forms.py:151 models.py:229 -msgid "Has furniture?" -msgstr "Contient du mobilier ?" +#: forms.py:159 ishtar_menu.py:48 +msgid "Documentation" +msgstr "Documentation" -#: forms.py:154 models.py:221 +#: forms.py:162 models.py:233 msgid "Location" msgstr "Lieu" -#: forms.py:157 +#: forms.py:165 msgid "Image" msgstr "Image" -#: forms.py:158 +#: forms.py:166 #, 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:230 +#: forms.py:243 msgid "This ID already exists for this operation." msgstr "Cet identifiant existe déjà pour cette opération." -#: forms.py:236 forms.py:263 models.py:67 +#: forms.py:249 forms.py:276 models.py:67 msgid "Dating" msgstr "Datation" -#: forms.py:242 models.py:57 +#: forms.py:255 models.py:57 msgid "Start date" msgstr "Date de début" -#: forms.py:243 models.py:58 models.py:214 +#: forms.py:256 models.py:58 models.py:223 msgid "End date" msgstr "Date de fin" -#: forms.py:244 models.py:61 +#: forms.py:257 models.py:61 msgid "Quality" msgstr "Qualité" -#: forms.py:245 models.py:39 models.py:59 +#: forms.py:258 models.py:39 models.py:59 msgid "Dating type" msgstr "Type de datation" -#: forms.py:272 ishtar_menu.py:29 models.py:607 +#: forms.py:285 ishtar_menu.py:29 models.py:619 msgid "Context record" msgstr "Unité d'Enregistrement" -#: forms.py:293 +#: forms.py:306 msgid "Relations" msgstr "Relations" -#: forms.py:297 forms.py:305 models.py:232 -#: templates/ishtar/sheet_contextrecord.html:42 +#: forms.py:310 forms.py:318 models.py:244 +#: templates/ishtar/sheet_contextrecord.html:44 msgid "Interpretation" msgstr "Interprétation" -#: forms.py:301 +#: forms.py:314 msgid "Comments on dating" msgstr "Commentaires sur la datation" -#: forms.py:303 models.py:231 +#: forms.py:316 models.py:243 msgid "Filling" msgstr "Remplissage" -#: forms.py:307 models.py:252 +#: forms.py:320 models.py:264 msgid "Activity" msgstr "Activité" -#: forms.py:309 models.py:250 +#: forms.py:322 models.py:262 msgid "Identification" msgstr "Identification" -#: forms.py:311 models.py:235 +#: forms.py:324 models.py:247 msgid "TAQ" msgstr "TAQ" -#: forms.py:312 models.py:239 +#: forms.py:325 models.py:251 msgid "Estimated TAQ" msgstr "TAQ estimé" -#: forms.py:314 models.py:242 +#: forms.py:327 models.py:254 msgid "TPQ" msgstr "TPQ" -#: forms.py:315 models.py:246 +#: forms.py:328 models.py:258 msgid "Estimated TPQ" msgstr "TPQ estimé" -#: forms.py:330 +#: forms.py:343 msgid "Operation search" msgstr "Rechercher une opération" -#: forms.py:332 +#: forms.py:345 msgid "You should select an operation." msgstr "Vous devez sélectionner une Opération." -#: forms.py:337 +#: forms.py:350 msgid "Would you like to delete this context record?" msgstr "Voulez-vous supprimer cette Unité d'Enregistrement ?" -#: forms.py:346 +#: forms.py:359 msgid "You should select a context record." msgstr "Vous devez sélectionner une Unité d'Enregistrement." -#: forms.py:351 +#: forms.py:364 msgid "Year of the operation" msgstr "Année de l'opération" -#: forms.py:353 +#: forms.py:366 msgid "Numeric reference" msgstr "Référence numérique" -#: forms.py:359 +#: forms.py:372 msgid "Town of the operation" msgstr "Commune de l'opération" -#: forms.py:361 +#: forms.py:374 msgid "Period of the context record" msgstr "Période de l'Unité d'Enregistrement" -#: forms.py:376 +#: forms.py:389 msgid "Documentation search" msgstr "Rechercher une documentation" -#: forms.py:378 +#: forms.py:391 msgid "You should select a document." msgstr "Vous devez sélectionner un document." @@ -257,10 +264,6 @@ msgstr "Modification" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:48 -msgid "Documentation" -msgstr "Documentation" - #: models.py:40 msgid "Dating types" msgstr "Types de datation" @@ -321,51 +324,59 @@ msgstr "Type de méthode de fouille" msgid "Excavation technique types" msgstr "Types de méthode de fouille" -#: models.py:163 models.py:549 +#: models.py:134 +msgid "Documentation type" +msgstr "Type de documentation" + +#: models.py:135 +msgid "Documentation types" +msgstr "Types de documentation" + +#: models.py:172 models.py:561 msgid "Periods" msgstr "Périodes" -#: models.py:164 +#: models.py:173 msgid "Datings (period)" msgstr "Datations (période)" -#: models.py:165 +#: models.py:174 msgid "Related context records" msgstr "Unités d'Enregistrement liées" -#: models.py:168 +#: models.py:177 msgid "Parcel (external ID)" msgstr "Parcelle (identifiant externe)" -#: models.py:169 models.py:170 +#: models.py:178 models.py:179 msgid "Parcel (town)" msgstr "Parcelle (commune)" -#: models.py:171 +#: models.py:180 msgid "Parcel (year)" msgstr "Parcelle (année)" -#: models.py:202 +#: models.py:211 msgid "External ID" msgstr "ID externe" -#: models.py:204 +#: models.py:213 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" -#: models.py:212 +#: models.py:221 msgid "Date d'ouverture" msgstr "Date d'ouverture" -#: models.py:222 +#: models.py:234 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:225 +#: models.py:239 msgid "Comment on datings" msgstr "Commentaire sur les datations" -#: models.py:236 +#: models.py:248 msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" @@ -373,11 +384,11 @@ msgstr "" "« Terminus Ante Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "après cette date." -#: models.py:240 +#: models.py:252 msgid "Estimation of a \"Terminus Ante Quem\"" msgstr "Estimation d'un « Terminus Ante Quem »." -#: models.py:243 +#: models.py:255 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" @@ -385,116 +396,116 @@ msgstr "" "« Terminus Post Quem ». L'Unité d'Enregistrement ne peut avoir été créée " "avant cette date." -#: models.py:247 +#: models.py:259 msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »." -#: models.py:258 +#: models.py:270 msgid "Point" msgstr "Point" -#: models.py:259 +#: models.py:271 msgid "Polygon" msgstr "Polygone" -#: models.py:260 +#: models.py:272 msgid "Cached name" msgstr "Nom en cache" -#: models.py:264 models.py:265 templates/ishtar/sheet_contextrecord.html:4 +#: models.py:276 models.py:277 templates/ishtar/sheet_contextrecord.html:4 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: models.py:267 +#: models.py:279 msgid "Can view all Context Records" msgstr "Peut voir toutes les Unités d'Enregistrement" -#: models.py:269 +#: models.py:281 msgid "Can view own Context Record" msgstr "Peut voir sa propre Unité d'Enregistrement" -#: models.py:271 +#: models.py:283 msgid "Can add own Context Record" msgstr "Peut ajouter sa propre Unité d'Enregistrement" -#: models.py:273 +#: models.py:285 msgid "Can change own Context Record" msgstr "Peut modifier sa propre Unité d'Enregistrement" -#: models.py:275 +#: models.py:287 msgid "Can delete own Context Record" msgstr "Peut supprimer sa propre Unité d'Enregistrement" -#: models.py:285 +#: models.py:297 msgctxt "short" msgid "Context record" msgstr "UE" -#: models.py:479 +#: models.py:491 msgid "Inverse relation" msgstr "Relation inverse" -#: models.py:483 models.py:506 models.py:544 +#: models.py:495 models.py:518 models.py:556 msgid "Relation type" msgstr "Type de relation" -#: models.py:484 +#: models.py:496 msgid "Relation types" msgstr "Types de relation" -#: models.py:501 +#: models.py:513 msgid "ID (left)" msgstr "ID (gauche)" -#: models.py:502 +#: models.py:514 msgid "Context record type (left)" msgstr "Type d'UE (gauche)" -#: models.py:503 +#: models.py:515 msgid "Parcel (left)" msgstr "Parcelle (gauche)" -#: models.py:504 +#: models.py:516 msgid "Description (left)" msgstr "Description (gauche)" -#: models.py:505 +#: models.py:517 msgid "Periods (left)" msgstr "Périodes (gauche)" -#: models.py:507 +#: models.py:519 msgid "ID (right)" msgstr "ID (droit)" -#: models.py:508 +#: models.py:520 msgid "Context record type (right)" msgstr "Type d'UE (droite)" -#: models.py:509 +#: models.py:521 msgid "Parcel (right)" msgstr "Parcelle (droite)" -#: models.py:510 +#: models.py:522 msgid "Description (right)" msgstr "Description (droite)" -#: models.py:511 +#: models.py:523 msgid "Periods (right)" msgstr "Périodes (droite)" -#: models.py:520 +#: models.py:532 msgid "Record relation" msgstr "Relation entre Unités d'Enregistrement" -#: models.py:521 +#: models.py:533 msgid "Record relations" msgstr "Relations entre Unités d'Enregistrement" -#: models.py:604 +#: models.py:616 msgid "Context record documentation" msgstr "Documentation d'une Unité d'Enregistrement" -#: models.py:605 +#: models.py:617 msgid "Context record documentations" msgstr "Documentations des Unités d'Enregistrement" @@ -534,71 +545,71 @@ msgstr "ID complet :" msgid "Temporary ID:" msgstr "ID temporaire :" -#: templates/ishtar/sheet_contextrecord.html:54 +#: templates/ishtar/sheet_contextrecord.html:56 msgid "Datations" msgstr "Datations" -#: templates/ishtar/sheet_contextrecord.html:63 +#: templates/ishtar/sheet_contextrecord.html:65 msgid "Context record relations" msgstr "Relations entre Unités d'Enregistrement" -#: templates/ishtar/sheet_contextrecord.html:70 +#: templates/ishtar/sheet_contextrecord.html:72 msgid "Operation summary" msgstr "Résumé de l'opération" -#: templates/ishtar/sheet_contextrecord.html:72 +#: templates/ishtar/sheet_contextrecord.html:74 msgid "Patriarche OA code not yet recorded!" msgstr "Code d'opération Patriarche non renseigné !" -#: templates/ishtar/sheet_contextrecord.html:76 +#: templates/ishtar/sheet_contextrecord.html:78 msgid "Numerical reference" msgstr "Référence numérique" -#: templates/ishtar/sheet_contextrecord.html:80 +#: templates/ishtar/sheet_contextrecord.html:82 msgid "State:" msgstr "État :" -#: templates/ishtar/sheet_contextrecord.html:80 +#: templates/ishtar/sheet_contextrecord.html:82 msgid "Active file" msgstr "Dossier actif" -#: templates/ishtar/sheet_contextrecord.html:80 +#: templates/ishtar/sheet_contextrecord.html:82 msgid "Closed operation" msgstr "Opération close" -#: templates/ishtar/sheet_contextrecord.html:82 +#: templates/ishtar/sheet_contextrecord.html:84 msgid "Closing date:" msgstr "Date de clôture :" -#: templates/ishtar/sheet_contextrecord.html:82 +#: templates/ishtar/sheet_contextrecord.html:84 msgid "by" msgstr "par" -#: templates/ishtar/sheet_contextrecord.html:90 +#: templates/ishtar/sheet_contextrecord.html:92 msgid "Localisation" msgstr "Lieu" -#: templates/ishtar/sheet_contextrecord.html:91 +#: templates/ishtar/sheet_contextrecord.html:93 msgid "Towns:" msgstr "Communes :" -#: templates/ishtar/sheet_contextrecord.html:92 +#: templates/ishtar/sheet_contextrecord.html:94 msgid "Related operation:" msgstr "Opération associée :" -#: templates/ishtar/sheet_contextrecord.html:94 +#: templates/ishtar/sheet_contextrecord.html:96 msgid "No operation linked to this context unit!" msgstr "Pas d'opération rattachée à cette UE !" -#: templates/ishtar/sheet_contextrecord.html:97 +#: templates/ishtar/sheet_contextrecord.html:99 msgid "Document from this context record" msgstr "Document associé à cette Unité d'Enregistrement" -#: templates/ishtar/sheet_contextrecord.html:102 +#: templates/ishtar/sheet_contextrecord.html:104 msgid "Finds" msgstr "Mobilier" -#: templates/ishtar/sheet_contextrecord.html:107 +#: templates/ishtar/sheet_contextrecord.html:109 msgid "Documents from associated finds" msgstr "Documents du mobilier associé" diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po index 85c783bae..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-21 15:34+0100\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" diff --git a/translations/fr/archaeological_files_pdl.po b/translations/fr/archaeological_files_pdl.po index 4bc3dd910..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-21 15:34+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 dd46244d2..32c8a4861 100644 --- a/translations/fr/archaeological_finds.po +++ b/translations/fr/archaeological_finds.po @@ -5,183 +5,182 @@ # Valérie-Emma Leroux , 2016. #zanata # Étienne Loks , 2016. #zanata # Valérie-Emma Leroux , 2017. #zanata +# Étienne Loks , 2017. #zanata msgid "" msgstr "" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-21 15:34+0100\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" +"Content-Type: text/plain; charset=UTF-8\n" +"PO-Revision-Date: 2017-03-21 06:23-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:92 forms.py:96 models_finds.py:505 wizards.py:64 +#: forms.py:93 forms.py:97 models_finds.py:505 wizards.py:64 msgid "Context record" msgstr "Unité d'Enregistrement" -#: forms.py:125 ishtar_menu.py:32 models_finds.py:666 models_finds.py:1069 -#: models_finds.py:1078 models_treatments.py:281 +#: forms.py:126 ishtar_menu.py:32 models_finds.py:668 models_finds.py:1071 +#: models_finds.py:1080 models_treatments.py:281 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "Mobilier" -#: forms.py:139 forms.py:332 forms.py:573 models_finds.py:151 -#: models_finds.py:597 +#: forms.py:140 forms.py:333 forms.py:601 models_finds.py:151 +#: models_finds.py:599 msgid "Free ID" msgstr "ID libre" -#: forms.py:141 models_finds.py:649 +#: forms.py:142 models_finds.py:651 msgid "Previous ID" msgstr "Identifiant précédent" -#: forms.py:142 forms.py:376 forms_treatments.py:134 models_finds.py:155 -#: models_finds.py:598 models_treatments.py:127 +#: forms.py:143 forms.py:364 forms_treatments.py:134 models_finds.py:155 +#: models_finds.py:600 models_treatments.py:127 msgid "Description" msgstr "Description" -#: forms.py:145 forms.py:378 models_finds.py:164 +#: forms.py:146 forms.py:366 models_finds.py:164 msgid "Batch/object" msgstr "Lot/objet" -#: forms.py:147 models_finds.py:626 +#: forms.py:148 models_finds.py:628 msgid "Is complete?" msgstr "Est complet ?" -#: forms.py:150 forms.py:366 forms.py:577 models_finds.py:51 +#: forms.py:151 forms.py:354 forms.py:605 models_finds.py:51 msgid "Material type" msgstr "Type de matériau" -#: forms.py:151 forms.py:370 models_finds.py:63 models_finds.py:602 +#: forms.py:152 forms.py:358 models_finds.py:63 models_finds.py:604 msgid "Conservatory state" msgstr "État sanitaire" -#: forms.py:154 models_finds.py:604 +#: forms.py:155 models_finds.py:606 msgid "Conservatory comment" msgstr "Commentaire relatif à la conservation" -#: forms.py:157 models_finds.py:113 models_finds.py:629 +#: forms.py:158 models_finds.py:113 models_finds.py:631 msgid "Object types" msgstr "Types d'objet" -#: forms.py:159 forms.py:369 models_finds.py:72 +#: forms.py:160 forms.py:357 models_finds.py:72 msgid "Preservation type" msgstr "Type de conservation" -#: forms.py:162 forms.py:372 models_finds.py:631 +#: forms.py:163 forms.py:360 models_finds.py:633 msgid "Integrity / interest" msgstr "Intégrité / intérêt" -#: forms.py:165 forms.py:374 models_finds.py:634 +#: forms.py:166 forms.py:362 models_finds.py:636 msgid "Remarkability" msgstr "Remarquabilité" -#: forms.py:168 models_finds.py:169 +#: forms.py:169 models_finds.py:169 msgid "Point of topographic reference" msgstr "Point de référence topographique" -#: forms.py:171 models_finds.py:171 +#: forms.py:172 models_finds.py:171 msgid "X" msgstr "X" -#: forms.py:172 models_finds.py:172 +#: forms.py:173 models_finds.py:172 msgid "Y" msgstr "Y" -#: forms.py:173 models_finds.py:173 +#: forms.py:174 models_finds.py:173 msgid "Z" msgstr "Z" -#: forms.py:175 models_finds.py:181 +#: forms.py:176 models_finds.py:181 msgid "Spatial Reference System" msgstr "Système de référence spatiale" -#: forms.py:178 models_finds.py:174 +#: forms.py:179 models_finds.py:174 msgid "Estimated error for X" msgstr "Erreur estimée pour X" -#: forms.py:180 models_finds.py:176 +#: forms.py:181 models_finds.py:176 msgid "Estimated error for Y" msgstr "Erreur estimée pour Y" -#: forms.py:182 models_finds.py:178 +#: forms.py:183 models_finds.py:178 msgid "Estimated error for Z" msgstr "Erreur estimée pour Z" -#: forms.py:183 models_finds.py:638 +#: forms.py:184 models_finds.py:640 msgid "Length (cm)" msgstr "Longueur (cm)" -#: forms.py:184 models_finds.py:639 +#: forms.py:185 models_finds.py:641 msgid "Width (cm)" msgstr "Largeur (cm)" -#: forms.py:185 models_finds.py:640 +#: forms.py:186 models_finds.py:642 msgid "Height (cm)" msgstr "Hauteur (cm)" -#: forms.py:186 models_finds.py:641 +#: forms.py:187 models_finds.py:643 msgid "Diameter (cm)" msgstr "Diamètre (cm)" -#: forms.py:187 models_finds.py:642 +#: forms.py:188 models_finds.py:644 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" -#: forms.py:188 forms.py:578 models_finds.py:609 +#: forms.py:189 forms.py:606 models_finds.py:611 msgid "Volume (l)" msgstr "Volume (l)" -#: forms.py:189 forms.py:579 models_finds.py:610 +#: forms.py:190 forms.py:607 models_finds.py:612 msgid "Weight (g)" msgstr "Poids (g)" -#: forms.py:191 models_finds.py:643 +#: forms.py:192 models_finds.py:645 msgid "Dimensions comment" msgstr "Commentaire concernant les dimensions" -#: forms.py:192 forms.py:580 models_finds.py:613 +#: forms.py:193 forms.py:608 models_finds.py:615 msgid "Find number" msgstr "Mobilier (en nombre)" -#: forms.py:194 models_finds.py:637 +#: forms.py:195 models_finds.py:639 msgid "Minimum number of individuals (MNI)" msgstr "Nombre minimum d'individus (NMI)" -#: forms.py:195 models_finds.py:645 +#: forms.py:196 models_finds.py:647 msgid "Mark" msgstr "Marque" -#: forms.py:196 forms.py:379 models_finds.py:651 +#: forms.py:197 forms.py:367 models_finds.py:653 msgid "Check" msgstr "Vérification" -#: forms.py:198 models_finds.py:653 +#: forms.py:199 models_finds.py:655 msgid "Check date" msgstr "Date de vérification" -#: forms.py:199 forms_treatments.py:132 forms_treatments.py:434 -#: models_finds.py:156 models_finds.py:646 models_treatments.py:126 +#: forms.py:200 forms_treatments.py:132 forms_treatments.py:434 +#: models_finds.py:156 models_finds.py:648 models_treatments.py:126 #: models_treatments.py:494 msgid "Comment" msgstr "Commentaires" -#: forms.py:202 models_finds.py:647 +#: forms.py:203 models_finds.py:649 msgid "Comment on dating" msgstr "Commentaire général sur les datations" -#: forms.py:203 models_finds.py:655 +#: forms.py:204 models_finds.py:657 msgid "Estimated value" msgstr "Valeur estimée" -#: forms.py:205 forms_treatments.py:151 +#: forms.py:206 forms_treatments.py:151 msgid "Image" msgstr "Image" -#: forms.py:206 forms_treatments.py:152 +#: forms.py:207 forms_treatments.py:152 #, 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:280 -msgid "You should at least provide X, Y and the spatial reference system used." +#: forms.py:281 +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:289 -msgid "Coordinates are not relevant for the spatial reference system used: {}." +#: forms.py:290 +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:295 forms.py:326 models_finds.py:621 +#: forms.py:296 forms.py:327 models_finds.py:623 msgid "Dating" msgstr "Datation" -#: forms.py:300 forms.py:352 +#: forms.py:301 forms.py:353 msgid "Period" msgstr "Période" -#: forms.py:301 forms_treatments.py:138 forms_treatments.py:436 -#: models_finds.py:1083 models_treatments.py:129 models_treatments.py:292 +#: forms.py:302 forms_treatments.py:138 forms_treatments.py:436 +#: models_finds.py:1085 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:303 models_finds.py:1084 models_treatments.py:293 +#: forms.py:304 models_finds.py:1086 models_treatments.py:293 #: templates/ishtar/sheet_find.html:92 templates/ishtar/sheet_find.html:134 msgid "End date" msgstr "Date de fin" -#: forms.py:304 +#: forms.py:305 msgid "Quality" msgstr "Qualité" -#: forms.py:306 +#: forms.py:307 msgid "Dating type" msgstr "Type de datation" -#: forms.py:308 +#: forms.py:309 msgid "Precise dating" msgstr "Datation précise" -#: forms.py:330 models_finds.py:188 +#: forms.py:331 models_finds.py:188 msgid "Short ID" msgstr "ID court" -#: forms.py:331 models_finds.py:191 +#: forms.py:332 models_finds.py:191 msgid "Complete ID" msgstr "ID complet" -#: forms.py:335 forms_treatments.py:54 forms_treatments.py:96 +#: forms.py:336 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:102 models_treatments.py:466 msgid "Year" msgstr "Année" -#: forms.py:337 +#: forms.py:338 msgid "Operation's number (index by year)" msgstr "Numéro de l'opération (index par année)" -#: forms.py:340 +#: forms.py:341 msgid "Code PATRIARCHE" msgstr "Code PATRIARCHE" -#: forms.py:344 +#: forms.py:345 msgid "Archaeological site" msgstr "Entité archéologique" -#: forms.py:350 +#: forms.py:351 msgid "Search within related operations" msgstr "Rechercher parmi les opérations liées" -#: forms.py:355 -#, fuzzy -msgid "Warehouse (location)" -msgstr "Dépôt" - -#: forms.py:361 -msgid "Warehouse (responsible)" -msgstr "" - -#: forms.py:367 models_finds.py:112 +#: forms.py:355 models_finds.py:112 msgid "Object type" msgstr "Type d'objet" -#: forms.py:380 forms_treatments.py:57 +#: forms.py:368 forms_treatments.py:57 msgid "Has an image?" msgstr "Dispose d'une image ?" -#: forms.py:428 forms.py:441 views.py:134 +#: forms.py:417 +msgid "Warehouse (location)" +msgstr "Dépôt (lieu)" + +#: forms.py:423 +msgid "Warehouse (responsible)" +msgstr "Dépôt (responsable)" + +#: forms.py:428 +msgid "Container ID" +msgstr "Identifiant du contenant" + +#: forms.py:429 +msgid "Container ref." +msgstr "Réf. contenant" + +#: forms.py:433 forms.py:456 views.py:149 msgid "Find search" msgstr "Rechercher un mobilier" -#: forms.py:455 templates/ishtar/sheet_treatment.html:46 +#: forms.py:481 templates/ishtar/sheet_treatment.html:46 msgid "Upstream finds" msgstr "Mobilier amont" -#: forms.py:457 models_finds.py:667 +#: forms.py:483 models_finds.py:669 msgid "Finds" msgstr "Mobilier" -#: forms.py:467 +#: forms.py:495 msgid "You should at least select one archaeological find." msgstr "Vous devez sélectionner au moins un mobilier archéologique." -#: forms.py:570 +#: forms.py:598 msgid "Resulting find" msgstr "Mobilier résultant" -#: forms.py:575 +#: forms.py:603 msgid "Precise description" msgstr "Description précise" -#: forms.py:590 +#: forms.py:618 msgid "Resulting finds" msgstr "Mobiliers résultants" -#: forms.py:595 +#: forms.py:623 msgid "Would you like to delete this find?" msgstr "Voulez-vous supprimer ce mobilier ?" -#: forms.py:599 models_treatments.py:90 +#: forms.py:627 models_treatments.py:90 msgid "Upstream find" msgstr "Mobilier amont" -#: forms.py:612 +#: forms.py:640 msgid "Archaeological find search" msgstr "Rechercher un mobilier" -#: forms.py:614 +#: forms.py:642 msgid "You should select an archaeological find." msgstr "Vous devez sélectionner du mobilier." -#: forms.py:619 +#: forms.py:647 msgid "Year of the operation" msgstr "Année de l'opération" -#: forms.py:621 +#: forms.py:649 msgid "Numeric reference" msgstr "Référence numérique" -#: forms.py:628 +#: forms.py:656 msgid "Period of the archaeological find" msgstr "Période du mobilier" -#: forms.py:630 +#: forms.py:658 msgid "Material type of the archaeological find" msgstr "Type de matériau du mobilier" -#: forms.py:632 +#: forms.py:660 msgid "Description of the archaeological find" msgstr "Description du mobilier" -#: forms.py:644 forms_treatments.py:590 forms_treatments.py:616 +#: forms.py:672 forms_treatments.py:590 forms_treatments.py:616 msgid "Documentation search" msgstr "Rechercher une documentation" -#: forms.py:646 forms_treatments.py:592 forms_treatments.py:618 +#: forms.py:674 forms_treatments.py:592 forms_treatments.py:618 msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: forms.py:663 +#: forms.py:691 msgid "Another basket already exists with this name." msgstr "Un autre panier existant utilise déjà ce nom." -#: forms.py:673 forms.py:677 forms_treatments.py:175 ishtar_menu.py:57 +#: forms.py:701 forms.py:705 forms_treatments.py:175 ishtar_menu.py:57 msgid "Basket" msgstr "Panier" @@ -382,7 +390,7 @@ msgstr "Index" msgid "Treatment type" msgstr "Type de traitement" -#: forms_treatments.py:68 forms_treatments.py:560 views.py:364 +#: forms_treatments.py:68 forms_treatments.py:560 views.py:398 msgid "Treatment search" msgstr "Rechercher un traitement" @@ -479,7 +487,7 @@ msgstr "Demande associée" #: forms_treatments.py:266 forms_treatments.py:397 ishtar_menu.py:108 #: models_treatments.py:499 models_treatments.py:521 models_treatments.py:584 -#: wizards.py:183 templates/ishtar/sheet_treatmentfile.html:5 +#: wizards.py:187 templates/ishtar/sheet_treatmentfile.html:5 msgid "Treatment request" msgstr "Demande de traitement" @@ -565,7 +573,7 @@ msgstr "Demandeur" msgid "Applicant organisation" msgstr "Organisation du demandeur" -#: forms_treatments.py:385 forms_treatments.py:565 views.py:468 +#: forms_treatments.py:385 forms_treatments.py:565 views.py:502 msgid "Treatment request search" msgstr "Rechercher une demande de traitement" @@ -644,7 +652,7 @@ msgstr "Gestion des éléments" msgid "Documentation" msgstr "Documentation" -#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1080 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1082 msgid "Administrative act" msgstr "Acte administratif" @@ -679,7 +687,7 @@ msgstr "Recommandation" msgid "Parent material" msgstr "Matériau parent" -#: models_finds.py:52 models_finds.py:525 models_finds.py:600 +#: models_finds.py:52 models_finds.py:525 models_finds.py:602 msgid "Material types" msgstr "Types de matériau" @@ -711,7 +719,7 @@ msgstr "Type de remarquabilité" msgid "Remarkability types" msgstr "Types de remarquabilité" -#: models_finds.py:98 models_finds.py:596 models_treatments.py:40 +#: models_finds.py:98 models_finds.py:598 models_treatments.py:40 #: models_treatments.py:287 msgid "Order" msgstr "Ordre" @@ -728,12 +736,12 @@ msgstr "Types de lot" msgid "Parent" msgstr "Parent" -#: models_finds.py:152 models_finds.py:593 models_treatments.py:124 +#: models_finds.py:152 models_finds.py:595 models_treatments.py:124 #: models_treatments.py:471 msgid "External ID" msgstr "ID externe" -#: models_finds.py:154 models_finds.py:595 +#: models_finds.py:154 models_finds.py:597 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" @@ -773,7 +781,7 @@ msgstr "Polygon" msgid "Cached value - do not edit" msgstr "Valeur en cache - ne pas éditer" -#: models_finds.py:197 models_finds.py:591 +#: models_finds.py:197 models_finds.py:593 msgid "Base find" msgstr "Mobilier de base" @@ -869,7 +877,7 @@ msgstr "Mobilier de base - Intérêt spécifique" msgid "Base find - Discovery date" msgstr "Mobilier de base - Date de découverte" -#: models_finds.py:523 models_finds.py:624 models_treatments.py:131 +#: models_finds.py:523 models_finds.py:626 models_treatments.py:131 #: models_treatments.py:295 templates/ishtar/sheet_find.html:90 #: templates/ishtar/sheet_find.html:132 msgid "Container" @@ -879,71 +887,71 @@ msgstr "Contenant" msgid "Periods" msgstr "Périodes" -#: models_finds.py:607 +#: models_finds.py:609 msgid "Type of preservation to consider" msgstr "Mesures de conservation à envisager" -#: models_finds.py:611 +#: models_finds.py:613 msgid "Weight unit" msgstr "Unité de poids" -#: models_finds.py:617 templates/ishtar/sheet_find.html:78 +#: models_finds.py:619 templates/ishtar/sheet_find.html:78 msgid "Upstream treatment" msgstr "Traitement amont" -#: models_finds.py:620 templates/ishtar/sheet_find.html:120 +#: models_finds.py:622 templates/ishtar/sheet_find.html:120 msgid "Downstream treatment" msgstr "Traitement aval" -#: models_finds.py:658 +#: models_finds.py:660 msgid "Collection" msgstr "Collection" -#: models_finds.py:660 models_treatments.py:143 models_treatments.py:495 +#: models_finds.py:662 models_treatments.py:143 models_treatments.py:495 msgid "Cached name" msgstr "Nom en cache" -#: models_finds.py:669 +#: models_finds.py:671 msgid "Can view all Finds" msgstr "Peut voir tout le Mobilier" -#: models_finds.py:670 +#: models_finds.py:672 msgid "Can view own Find" msgstr "Peut voir son propre Mobilier" -#: models_finds.py:671 +#: models_finds.py:673 msgid "Can add own Find" msgstr "Peut ajouter son propre Mobilier" -#: models_finds.py:672 +#: models_finds.py:674 msgid "Can change own Find" msgstr "Peut modifier son propre Mobilier" -#: models_finds.py:673 +#: models_finds.py:675 msgid "Can delete own Find" msgstr "Peut supprimer son propre Mobilier" -#: models_finds.py:679 +#: models_finds.py:681 msgid "FIND" msgstr "MOBILIER" -#: models_finds.py:1067 +#: models_finds.py:1069 msgid "Find documentation" msgstr "Documentation de mobilier" -#: models_finds.py:1068 +#: models_finds.py:1070 msgid "Find documentations" msgstr "Documentations de mobilier" -#: models_finds.py:1081 +#: models_finds.py:1083 msgid "Person" msgstr "Individu" -#: models_finds.py:1087 +#: models_finds.py:1089 msgid "Property" msgstr "Propriété" -#: models_finds.py:1088 +#: models_finds.py:1090 msgid "Properties" msgstr "Propriétés" @@ -1108,9 +1116,8 @@ msgid "Treament documentations" msgstr "Documentations de traitement" #: models_treatments.py:588 -#, fuzzy msgid "Treatment file" -msgstr "Index du traitement" +msgstr "Dossier de traitement" #: models_treatments.py:592 msgid "Treatment request documentation" @@ -1120,127 +1127,127 @@ msgstr "Documentation de demande de traitement" msgid "Treatment request documentations" msgstr "Documentations de demande de traitement" -#: views.py:129 +#: views.py:138 msgid "New find" msgstr "Ajouter un mobilier" -#: views.py:143 +#: views.py:167 msgid "Find modification" msgstr "Modifier un mobilier" -#: views.py:158 +#: views.py:189 msgid "Find deletion" msgstr "Supprimer un mobilier" -#: views.py:163 +#: views.py:194 msgid "Find: source search" msgstr "Mobilier : rechercher une documentation associée" -#: views.py:171 +#: views.py:202 msgid "Find: new source" msgstr "Mobilier : ajouter une documentation associée" -#: views.py:179 +#: views.py:210 msgid "Find: source modification" msgstr "Mobilier : modifier une documentation associée" -#: views.py:194 +#: views.py:225 msgid "Find: source deletion" msgstr "Mobilier : supprimer un mobilier associé" -#: views.py:208 +#: views.py:239 msgid "New basket" msgstr "Ajouter un panier" -#: views.py:227 +#: views.py:258 msgid "Manage items in basket" msgstr "Gérer les éléments dans un panier" -#: views.py:247 +#: views.py:278 msgid "Manage basket" msgstr "Gérer un panier" -#: views.py:335 +#: views.py:369 msgid "Delete basket" msgstr "Supprimer un panier" -#: views.py:385 +#: views.py:419 msgid "New treatment" msgstr "Ajouter un traitement" -#: views.py:393 views.py:485 +#: views.py:427 views.py:519 msgid "Modify" msgstr "Modifier" -#: views.py:410 +#: views.py:444 msgid "Treatment deletion" msgstr "Supprimer un traitement" -#: views.py:417 +#: views.py:451 msgid "Treatment: search administrative act" msgstr "Traitement : rechercher un acte administratif" -#: views.py:426 +#: views.py:460 msgid "Treatment: new administrative act" msgstr "Traitement : ajouter un acte administratif" -#: views.py:436 +#: views.py:470 msgid "Treatment: administrative act modification" msgstr "Traitement : modifier un acte administratif" -#: views.py:445 +#: views.py:479 msgid "Treatment: administrative act deletion" msgstr "Traitement : supprimer un acte administratif" -#: views.py:478 +#: views.py:512 msgid "New treatment request" msgstr "Ajouter une demande de traitement" -#: views.py:501 +#: views.py:535 msgid "Treatment request deletion" msgstr "Supprimer une demande de traitement" -#: views.py:508 +#: views.py:542 msgid "Treatment request: search administrative act" msgstr "Demande de traitement : rechercher un acte administratif" -#: views.py:518 +#: views.py:552 msgid "Treatment request: new administrative act" msgstr "Demande de traitement : ajouter un acte administratif" -#: views.py:528 +#: views.py:562 msgid "Treatment request: administrative act modification" msgstr "Demande de traitement : modifier un acte administratif" -#: views.py:537 +#: views.py:571 msgid "Treatment request: administrative act deletion" msgstr "Demande de traitement : supprimer un acte administratif" -#: views.py:563 +#: views.py:597 msgid "Treatment: source search" msgstr "Traitement : rechercher une documentation associée" -#: views.py:578 +#: views.py:612 msgid "Treatment: source modification" msgstr "Traitement : modifier une documentation associée" -#: views.py:593 +#: views.py:627 msgid "Treatment: source deletion" msgstr "Traitement : supprimer une documentation associée" -#: views.py:606 +#: views.py:640 msgid "Treatment request: source search" msgstr "Demande de traitement : rechercher une documentation associée" -#: views.py:622 +#: views.py:656 msgid "Treatment request: source modification" msgstr "Demande de traitement : modifier une documentation associée" -#: views.py:640 +#: views.py:674 msgid "Treatment request: source deletion" msgstr "Demande de traitement : supprimer une documentation associée" -#: wizards.py:63 wizards.py:195 +#: wizards.py:63 wizards.py:199 msgid "Operation" msgstr "Opération" @@ -1340,15 +1347,13 @@ msgstr "Opérations associées" #: templates/ishtar/sheet_treatment.html:60 #: templates/ishtar/sheet_treatmentfile.html:51 -#, fuzzy msgid "Associated documents" -msgstr "Demande associée" +msgstr "Documents associés" #: templates/ishtar/sheet_treatment.html:65 #: templates/ishtar/sheet_treatmentfile.html:56 -#, fuzzy msgid "Administrative acts" -msgstr "Acte administratif" +msgstr "Actes administratifs" #: templates/ishtar/sheet_treatmentfile.html:16 msgctxt "Treatment request" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index 48d68db58..af55782dc 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -9,15 +9,13 @@ # Étienne Loks , 2017. #zanata msgid "" msgstr "" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-21 15:34+0100\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Content-Type: text/plain; charset=UTF-8\n" "PO-Revision-Date: 2017-03-16 05:04-0400\n" "Last-Translator: Étienne Loks \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" @@ -398,7 +396,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 diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po index 0fcba866b..15d86d645 100644 --- a/translations/fr/archaeological_warehouse.po +++ b/translations/fr/archaeological_warehouse.po @@ -4,21 +4,20 @@ # Étienne Loks , 2010-2011. # Valérie-Emma Leroux , 2016. #zanata # Valérie-Emma Leroux , 2017. #zanata +# Étienne Loks , 2017. #zanata msgid "" msgstr "" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-21 15:34+0100\n" -"PO-Revision-Date: 2017-03-15 07:06-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" +"Content-Type: text/plain; charset=UTF-8\n" +"PO-Revision-Date: 2017-03-21 06:24-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:36 forms.py:92 ishtar_menu.py:40 models.py:63 models.py:103 +#: forms.py:36 forms.py:99 ishtar_menu.py:40 models.py:63 models.py:103 #: templates/ishtar/sheet_warehouse.html:4 msgid "Warehouse" msgstr "Dépôt" @@ -31,135 +30,141 @@ msgstr "Division" msgid "Order" msgstr "Ordre" -#: forms.py:63 models.py:53 +#: forms.py:66 +msgid "There are identical divisions." +msgstr "Il y a des divisions identiques" + +#: forms.py:70 models.py:53 msgid "Divisions" msgstr "Divisions" -#: forms.py:67 forms.py:96 models.py:45 models.py:100 +#: forms.py:74 forms.py:103 models.py:45 models.py:100 msgid "Name" msgstr "Nom" -#: forms.py:68 forms.py:98 models.py:36 models.py:47 +#: forms.py:75 forms.py:105 models.py:36 models.py:47 msgid "Warehouse type" msgstr "Type de dépôt" -#: forms.py:69 forms.py:115 +#: forms.py:76 forms.py:122 msgid "Town" msgstr "Commune" -#: forms.py:80 views.py:100 +#: forms.py:87 views.py:100 msgid "Warehouse search" msgstr "Rechercher un dépôt" -#: forms.py:101 models.py:50 +#: forms.py:108 models.py:50 msgid "Person in charge" msgstr "Responsable" -#: forms.py:107 forms.py:177 models.py:51 models.py:181 +#: forms.py:114 forms.py:184 models.py:51 models.py:181 msgid "Comment" msgstr "Commentaires" -#: forms.py:109 +#: forms.py:116 msgid "Address" msgstr "Adresse" -#: forms.py:111 +#: forms.py:118 msgid "Address complement" msgstr "Complément d'adresse" -#: forms.py:113 +#: forms.py:120 msgid "Postal code" msgstr "Code postal" -#: forms.py:116 +#: forms.py:123 msgid "Country" msgstr "Pays" -#: forms.py:118 +#: forms.py:125 msgid "Phone" msgstr "Téléphone" -#: forms.py:119 +#: forms.py:126 msgid "Mobile phone" msgstr "Téléphone mobile" -#: forms.py:146 forms.py:147 +#: forms.py:153 forms.py:154 msgid "Would you like to delete this warehouse?" msgstr "Voulez-vous supprimer ce dépôt ?" -#: forms.py:151 models.py:192 models.py:279 +#: forms.py:158 models.py:192 models.py:279 #: templates/ishtar/sheet_container.html:4 msgid "Container" msgstr "Contenant" -#: forms.py:156 forms.py:230 models.py:142 +#: forms.py:163 forms.py:237 models.py:142 msgid "Ref." msgstr "Réf." -#: forms.py:157 forms.py:229 models.py:145 models.py:179 +#: forms.py:164 forms.py:236 models.py:145 models.py:179 msgid "Container type" msgstr "Type de contenant" -#: forms.py:159 +#: forms.py:166 msgid "Current location (warehouse)" msgstr "Lieu actuel (dépôt)" -#: forms.py:165 models.py:176 +#: forms.py:172 models.py:176 msgid "Responsible warehouse" msgstr "Dépôt responsable" -#: forms.py:171 +#: forms.py:178 msgid "Image" -msgstr "" +msgstr "Image" -#: forms.py:172 +#: forms.py:179 #, python-format msgid "" "

Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" +"

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

" -#: forms.py:204 -msgid "Index" -msgstr "Index" +#: forms.py:211 +msgid "ID" +msgstr "Identifiant" -#: forms.py:222 +#: forms.py:229 msgid "This ID already exists for this warehouse." msgstr "Cet identifiant existe déjà pour ce dépôt." -#: forms.py:240 forms.py:246 views.py:142 +#: forms.py:247 forms.py:253 views.py:142 msgid "Container search" msgstr "Rechercher un contenant" -#: forms.py:242 forms.py:248 +#: forms.py:249 forms.py:255 msgid "You should select a container." msgstr "Vous devez sélectionner un contenant." -#: forms.py:243 +#: forms.py:250 msgid "Add a new container" msgstr "Ajouter un nouveau contenant" -#: forms.py:253 ishtar_menu.py:36 views.py:95 +#: forms.py:260 ishtar_menu.py:36 views.py:95 msgid "Packaging" msgstr "Conditionnement" -#: forms.py:259 +#: forms.py:266 msgid "Packager" msgstr "Personne assurant le conditionnement" -#: forms.py:265 +#: forms.py:272 msgid "Date" msgstr "Date" -#: forms.py:269 +#: forms.py:276 msgid "Packaged finds" msgstr "Mobilier conditionné" -#: forms.py:273 models.py:182 +#: forms.py:280 models.py:182 msgid "Localisation" msgstr "Localisation" -#: forms.py:298 forms.py:299 +#: forms.py:305 forms.py:306 msgid "Would you like to delete this container?" msgstr "Voulez-vous supprimer ce contenant ?" @@ -319,7 +324,7 @@ msgstr "Modifier un contenant" msgid "Container deletion" msgstr "Supprimer un contenant" -#: templates/ishtar/sheet_container.html:26 +#: templates/ishtar/sheet_container.html:27 msgid "Content" msgstr "Contenu" @@ -327,10 +332,10 @@ msgstr "Contenu" msgid "Attached containers" msgstr "Contenants associés" -#: templates/ishtar/wizard/wizard_containerlocalisation.html:5 +#: templates/ishtar/wizard/wizard_containerlocalisation.html:6 msgid "" -"No division set for this warehouse. Define it to localise container in this " -"warehouse." +"No division set for this warehouse. Define at least one division to localise " +"containers in this warehouse." msgstr "" -"Pas de division configurée pour ce dépôt. Définissez une division pour " -"localiser un contenant dans ce dépôt." +"Pas de division configurée pour ce dépôt. Définissez au moins une division " +"pour localiser les contenants dans ce dépôt." diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index d5cdfbbe2..6a9d80265 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-21 15:34+0100\n" -"PO-Revision-Date: 2017-03-15 07:13-0400\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Content-Type: text/plain; charset=UTF-8\n" +"PO-Revision-Date: 2017-03-21 01:54-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" @@ -417,7 +415,7 @@ msgstr "Type de personne" msgid "Account" msgstr "Compte" -#: forms_common.py:577 wizards.py:1333 +#: forms_common.py:577 wizards.py:1339 msgid "New password" msgstr "Nouveau mot de passe" @@ -1670,15 +1668,15 @@ msgstr "Chargement..." msgid "Remove" msgstr "Enlever" -#: wizards.py:372 templates/ishtar/import_delete.html:21 +#: wizards.py:374 templates/ishtar/import_delete.html:21 msgid "Yes" msgstr "Oui" -#: wizards.py:374 +#: wizards.py:376 msgid "No" msgstr "Non" -#: wizards.py:1390 +#: wizards.py:1396 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "[%(app_name)s] Création/modification du compte" @@ -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." @@ -2395,17 +2394,15 @@ 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 msgctxt "Sheet" msgid "Creation" -msgstr "Ajout" +msgstr "Création" #: templates/ishtar/blocks/sheet_creation_section.html:12 -#, fuzzy msgctxt "Sheet" msgid "Modification" msgstr "Modification" @@ -2780,9 +2777,3 @@ msgid "You are now registered. Activation email sent." msgstr "" "Vous êtes maintenant enregistré. Un courriel d'activation de votre compte " "vous a été envoyé." - -#~ msgid "Creation:" -#~ msgstr "Création :" - -#~ msgid "Modification:" -#~ msgstr "Modification :" -- cgit v1.2.3 From 964ce0244baf55cc1af1029b67f991a0865f1f3c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 28 Mar 2017 13:17:29 +0200 Subject: Access control: fix get owns query for UEs, finds, warehouses and containers --- archaeological_context_records/models.py | 7 ++++--- archaeological_files/models.py | 2 +- archaeological_finds/models_finds.py | 11 ++++++----- archaeological_warehouse/models.py | 11 +++++++++++ 4 files changed, 22 insertions(+), 9 deletions(-) (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 4df56c49f..a16b4cae7 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -365,9 +365,10 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, @classmethod def get_query_owns(cls, user): - return Q(operation__scientist=user.ishtaruser.person) |\ - Q(operation__in_charge=user.ishtaruser.person) |\ - Q(history_creator=user) + return (Q(operation__scientist=user.ishtaruser.person) | + Q(operation__in_charge=user.ishtaruser.person) | + Q(history_creator=user)) \ + & Q(operation__end_date__isnull=True) @classmethod def get_owns(cls, user, menu_filtr=None, limit=None, diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 7f37a298f..52f628817 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2012-2016 Étienne Loks +# Copyright (C) 2012-2017 Étienne Loks # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index c54fd1ed9..cbd13e925 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -868,11 +868,12 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): @classmethod def get_query_owns(cls, user): - return Q(base_finds__context_record__operation__scientist=user. - ishtaruser.person) | \ - Q(base_finds__context_record__operation__in_charge=user. - ishtaruser.person) | \ - Q(history_creator=user) + return (Q(base_finds__context_record__operation__scientist=user. + ishtaruser.person) | + Q(base_finds__context_record__operation__in_charge=user. + ishtaruser.person) | + Q(history_creator=user)) \ + & Q(base_finds__context_record__operation__end_date__isnull=True) @classmethod def get_owns(cls, user, menu_filtr=None, limit=None, diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index d1918f46a..fe054a37b 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -21,6 +21,7 @@ import datetime from django.conf import settings from django.contrib.gis.db import models +from django.db.models import Q from django.db.models.signals import post_save, post_delete from django.template.defaultfilters import slugify from django.utils.translation import ugettext_lazy as _, ugettext @@ -78,6 +79,10 @@ class Warehouse(Address, OwnPerms): return datetime.date.today().strftime('%Y-%m-%d') + '-' + \ slugify(unicode(self)) + @classmethod + def get_query_owns(cls, user): + return Q(person_in_charge__ishtaruser=user.ishtaruser) + def save(self, *args, **kwargs): super(Warehouse, self).save(*args, **kwargs) for container in self.containers.all(): @@ -208,6 +213,12 @@ class Container(LightHistorizedItem, ImageModel): cached_label = u" - ".join(items) return cached_label + @classmethod + def get_query_owns(cls, user): + return Q(history_creator=user) | \ + Q(location__person_in_charge__ishtaruser=user.ishtaruser) | \ + Q(responsible__person_in_charge__ishtaruser=user.ishtaruser) + @property def associated_filename(self): filename = datetime.date.today().strftime('%Y-%m-%d') -- cgit v1.2.3 From e1ec2cc7a72a502f9c8cb42b571bdadcad003237 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 29 Mar 2017 19:42:02 +0200 Subject: Access control: collaborators are included in get_own_query for operations, context records and finds (refs #3196) --- archaeological_context_records/models.py | 1 + archaeological_finds/models_finds.py | 2 ++ archaeological_operations/models.py | 6 ++++-- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index a16b4cae7..bba9c643b 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -367,6 +367,7 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, def get_query_owns(cls, user): return (Q(operation__scientist=user.ishtaruser.person) | Q(operation__in_charge=user.ishtaruser.person) | + Q(operation__collaborators__pk=user.ishtaruser.person.pk) | Q(history_creator=user)) \ & Q(operation__end_date__isnull=True) diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index cbd13e925..735bc01a8 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -872,6 +872,8 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): ishtaruser.person) | Q(base_finds__context_record__operation__in_charge=user. ishtaruser.person) | + Q(base_finds__context_record__operation__collaborators__pk=user. + ishtaruser.person.pk) | Q(history_creator=user)) \ & Q(base_finds__context_record__operation__end_date__isnull=True) diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 782f9cf35..13997a632 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -572,8 +572,10 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms, @classmethod def get_query_owns(cls, user): - return (Q(in_charge=user.ishtaruser.person) |\ - Q(scientist=user.ishtaruser.person) |\ + return ( + Q(in_charge=user.ishtaruser.person) | + Q(scientist=user.ishtaruser.person) | + Q(collaborators__pk=user.ishtaruser.person.pk) | Q(history_creator=user)) & Q(end_date__isnull=True) def is_active(self): -- cgit v1.2.3 From dced4b8f3b540cf84f8e75041a680881b6a7e725 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 30 Mar 2017 02:02:12 +0200 Subject: Access control: fix some inconsistent settings for actions --- archaeological_context_records/urls.py | 4 ++-- archaeological_finds/ishtar_menu.py | 32 ++++++++++++++++---------------- archaeological_finds/urls.py | 4 ++-- archaeological_operations/urls.py | 3 ++- 4 files changed, 22 insertions(+), 21 deletions(-) (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/urls.py b/archaeological_context_records/urls.py index 341d321f9..e89a76aef 100644 --- a/archaeological_context_records/urls.py +++ b/archaeological_context_records/urls.py @@ -23,7 +23,7 @@ from archaeological_context_records import models from ishtar_common.wizards import check_rights import views -# 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( @@ -33,7 +33,7 @@ urlpatterns = patterns( check_rights(['view_contextrecord', 'view_own_contextrecord'])( views.record_search_wizard), name='record_search'), url(r'record_creation/(?P.+)?$', - check_rights(['add_contextrecord'])( + check_rights(['add_contextrecord', 'add_own_contextrecord'])( views.record_creation_wizard), name='record_creation'), url(r'record_modification/(?P.+)?$', check_rights(['change_contextrecord', 'change_own_contextrecord'])( diff --git a/archaeological_finds/ishtar_menu.py b/archaeological_finds/ishtar_menu.py index 44a19dc02..4877e442c 100644 --- a/archaeological_finds/ishtar_menu.py +++ b/archaeological_finds/ishtar_menu.py @@ -112,23 +112,23 @@ MENU_SECTIONS = [ MenuItem('treatmentfle_search', _(u"Search"), model=models.TreatmentFile, - access_controls=['view_find', - 'view_own_find']), + access_controls=['view_treatmentfile', + 'view_own_treatmentfile']), MenuItem('treatmentfle_creation', _(u"Creation"), model=models.TreatmentFile, - access_controls=['change_find', - 'change_own_find']), + access_controls=['change_treatmentfile', + 'change_own_treatmentfile']), MenuItem('treatmentfle_modification', _(u"Modification"), model=models.TreatmentFile, - access_controls=['change_find', - 'change_own_find']), + access_controls=['change_treatmentfile', + 'change_own_treatmentfile']), MenuItem('treatmentfle_deletion', _(u"Deletion"), model=models.TreatmentFile, - access_controls=['change_find', - 'change_own_find']), + access_controls=['change_treatmentfile', + 'change_own_treatmentfile']), SectionItem( 'admin_act_fletreatments', _(u"Administrative act"), childs=[ @@ -192,23 +192,23 @@ MENU_SECTIONS = [ MenuItem('treatment_search', _(u"Search"), model=models.Treatment, - access_controls=['view_find', - 'view_own_find']), + access_controls=['view_treatment', + 'view_own_treatment']), MenuItem('treatment_creation', _(u"Creation"), model=models.Treatment, - access_controls=['change_find', - 'change_own_find']), + access_controls=['change_treatment', + 'change_own_treatment']), MenuItem('treatment_modification', _(u"Modification"), model=models.Treatment, - access_controls=['change_find', - 'change_own_find']), + access_controls=['change_treatment', + 'change_own_treatment']), MenuItem('treatment_deletion', _(u"Deletion"), model=models.Treatment, - access_controls=['change_find', - 'change_own_find']), + access_controls=['change_treatment', + 'change_own_treatment']), ]), SectionItem( 'admin_act_treatments', _(u"Administrative act"), diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py index 06d505896..9c331ccc9 100644 --- a/archaeological_finds/urls.py +++ b/archaeological_finds/urls.py @@ -24,7 +24,7 @@ import views from archaeological_finds 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( @@ -33,7 +33,7 @@ urlpatterns = patterns( check_rights(['view_find', 'view_own_find'])( views.find_search_wizard), name='find_search'), url(r'find_creation/(?P.+)?$', - check_rights(['add_find'])( + check_rights(['add_find', 'add_own_find'])( views.find_creation_wizard), name='find_creation'), url(r'find_modification/(?P.+)?$', check_rights(['change_find', 'change_own_find'])( diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py index e98ddc93f..bc6bc4bee 100644 --- a/archaeological_operations/urls.py +++ b/archaeological_operations/urls.py @@ -69,7 +69,8 @@ urlpatterns = patterns( check_rights(['view_operation', 'view_own_operation'])( views.operation_search_wizard), name='operation_search'), url(r'operation_creation/(?P.+)?$', - check_rights(['add_operation'])(views.operation_creation_wizard), + check_rights(['add_operation', 'add_own_operation'])( + views.operation_creation_wizard), name='operation_creation'), url(r'operation_add/(?P\d+)$', views.operation_add, name='operation_add'), -- cgit v1.2.3 From 76b54a02373d58b630b3be4a76d6b6857806e3e2 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 30 Mar 2017 12:31:55 +0200 Subject: Sources: fix query owns requests (refs #3196) --- archaeological_context_records/models.py | 9 +++++++++ archaeological_finds/models_finds.py | 12 ++++++++++++ archaeological_operations/models.py | 7 +++++++ ishtar_common/models.py | 2 +- 4 files changed, 29 insertions(+), 1 deletion(-) (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index bba9c643b..5e6b4622b 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -624,3 +624,12 @@ class ContextRecordSource(Source): @property def owner(self): return self.context_record + + @classmethod + def get_query_owns(cls, user): + return ( + Q(context_record__operation__scientist=user.ishtaruser.person) | + Q(context_record__operation__in_charge=user.ishtaruser.person) | + Q(context_record__operation__collaborators__pk= + user.ishtaruser.person.pk)) \ + & Q(context_record__operation__end_date__isnull=True) diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 735bc01a8..f6be69f93 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1078,6 +1078,18 @@ class FindSource(Source): def owner(self): return self.find + @classmethod + def get_query_owns(cls, user): + return (Q(find__base_finds__context_record__operation__scientist=user. + ishtaruser.person) | + Q(find__base_finds__context_record__operation__in_charge=user. + ishtaruser.person) | + Q( + find__base_finds__context_record__operation__collaborators__pk=user. + ishtaruser.person.pk)) \ + & Q( + find__base_finds__context_record__operation__end_date__isnull=True) + class Property(LightHistorizedItem): find = models.ForeignKey(Find, verbose_name=_(u"Find")) diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 13997a632..d18181722 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -915,6 +915,13 @@ class OperationSource(Source): return u"{}-{:04d}".format(self.operation.code_patriarche or '', self.index) + @classmethod + def get_query_owns(cls, user): + return (Q(operation__in_charge=user.ishtaruser.person) | + Q(operation__scientist=user.ishtaruser.person) | + Q(operation__collaborators__pk=user.ishtaruser.person.pk)) \ + & Q(operation__end_date__isnull=True) + class ActType(GeneralType): TYPE = (('F', _(u'Archaeological file')), diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 35608abdf..6a9f86569 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2903,7 +2903,7 @@ post_save.connect(post_save_cache, sender=Format) post_delete.connect(post_save_cache, sender=Format) -class Source(ImageModel, models.Model): +class Source(OwnPerms, ImageModel, models.Model): title = models.CharField(_(u"Title"), max_length=300) external_id = models.CharField(_(u"External ID"), max_length=12, null=True, blank=True) -- cgit v1.2.3 From d0a34067c983b7dfb4261cd2c6a39eb82e232b6f Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 30 Mar 2017 12:56:45 +0200 Subject: Permissions: add missing permissions for authors and sources (refs #2068) --- archaeological_context_records/models.py | 12 ++++++++++++ archaeological_finds/models_finds.py | 12 ++++++++++++ ishtar_common/models.py | 13 +++++++++++++ 3 files changed, 37 insertions(+) (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 5e6b4622b..490124342 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -617,6 +617,18 @@ class ContextRecordSource(Source): class Meta: verbose_name = _(u"Context record documentation") verbose_name_plural = _(u"Context record documentations") + permissions = ( + ("view_contextrecordsource", + ugettext(u"Can view all Context record sources")), + ("view_own_contextrecordsource", + ugettext(u"Can view own Context record source")), + ("add_own_contextrecordsource", + ugettext(u"Can add own Context record source")), + ("change_own_contextrecordsource", + ugettext(u"Can change own Context record source")), + ("delete_own_contextrecordsource", + ugettext(u"Can delete own Context record source")), + ) context_record = models.ForeignKey( ContextRecord, verbose_name=_(u"Context record"), related_name="source") diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index f6be69f93..19464838b 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1071,6 +1071,18 @@ class FindSource(Source): class Meta: verbose_name = _(u"Find documentation") verbose_name_plural = _(u"Find documentations") + permissions = ( + ("view_findsource", + ugettext(u"Can view all Find sources")), + ("view_own_findsource", + ugettext(u"Can view own Find source")), + ("add_own_findsource", + ugettext(u"Can add own Find source")), + ("change_own_findsource", + ugettext(u"Can change own Find source")), + ("delete_own_findsource", + ugettext(u"Can delete own Find source")), + ) find = models.ForeignKey(Find, verbose_name=_(u"Find"), related_name="source") diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 6a9f86569..048af1294 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2844,6 +2844,7 @@ 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") @@ -2861,6 +2862,18 @@ class Author(models.Model): verbose_name = _(u"Author") verbose_name_plural = _(u"Authors") ordering = ('author_type__order', 'person__name') + permissions = ( + ("view_author", + ugettext(u"Can view all Authors")), + ("view_own_author", + ugettext(u"Can view own Author")), + ("add_own_author", + ugettext(u"Can add own Author")), + ("change_own_author", + ugettext(u"Can change own Author")), + ("delete_own_author", + ugettext(u"Can delete own Author")), + ) def __unicode__(self): return unicode(self.person) + settings.JOINT + \ -- cgit v1.2.3 From 93f1b10ad4c4f398aed75bf62ed3643554876678 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 4 Apr 2017 11:41:04 +0200 Subject: Base finds: fix cache generation on context record change (refs #3484) --- archaeological_context_records/models.py | 7 +++-- archaeological_context_records/tests.py | 48 ++++++++++++++++++++++++++++++-- archaeological_finds/models_finds.py | 7 +++++ archaeological_operations/tests.py | 2 +- 4 files changed, 58 insertions(+), 6 deletions(-) (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 490124342..4084ec05a 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -159,7 +159,7 @@ class CRBulkView(object): class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, - ValueGetter, ShortMenuItem): + ValueGetter, ShortMenuItem): SHOW_URL = 'show-contextrecord' SLUG = 'contextrecord' TABLE_COLS = ['label', 'operation__common_name', 'parcel__town__name', @@ -403,8 +403,9 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, return self.full_label() def _get_associated_cached_labels(self): - from archaeological_finds.models import Find - return list(Find.objects.filter(base_finds__context_record=self).all()) + from archaeological_finds.models import Find, BaseFind + return list(Find.objects.filter(base_finds__context_record=self).all())\ + + list(BaseFind.objects.filter(context_record=self).all()) @property def reference(self): diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index 6bb293e4d..14a5ae8d3 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -235,7 +235,7 @@ class ContextRecordTest(ContextRecordInit, TestCase): models.RecordRelations.objects.create( left_record=cr_1, right_record=cr_2, relation_type=sym_rel_type) - def testExternalID(self): + def test_external_id(self): cr = self.context_records[0] self.assertEqual( cr.external_id, @@ -255,7 +255,7 @@ class ContextRecordTest(ContextRecordInit, TestCase): cr.operation ) - def test_cache_update(self): + def test_upstream_cache_update(self): cr = self.create_context_record()[0] cr_pk = cr.pk # OP2010 - 1 | A | 1 | CR 1 @@ -288,6 +288,50 @@ class ContextRecordTest(ContextRecordInit, TestCase): ope_id, parcel_sec, parcel_nb, cr_label = cr.cached_label.split(' | ') self.assertEqual(ope_id, 'OP2017-1') + def test_downstream_cache_update(self): + cr = self.create_context_record()[0] + + from archaeological_finds.models import Find, BaseFind, MaterialType + + data = { + 'label': "Find me a reason", + 'context_record': cr, + 'history_modifier': self.get_default_user() + } + bf = BaseFind.objects.create(**data) + find = Find.objects.create( + history_modifier=self.get_default_user(), + label='Find me too' + ) + find.base_finds.add(bf) + + mat = MaterialType.objects.create( + label='Adamentium', txt_idx='admentium', code='ADA') + find.material_types.add(mat) + + class TestObj(object): + def __init__(self): + self.find_reached = [] + + def reached(self, sender, **kwargs): + instance = kwargs.get('instance') + if sender == Find: + self.find_reached.append(instance) + + test_obj = TestObj() + cr = models.ContextRecord.objects.get(pk=cr.pk) + cr.test_obj = test_obj + cr.label = "New label!" + cr.save() + + # verify the relevance of the update + bf = BaseFind.objects.get(pk=bf.pk) + self.assertIn("New label!", bf.cache_complete_id) + + # bulk update of find cached label gen don't have to be + # reached + self.assertEqual(len(test_obj.find_reached), 0) + class ContextRecordSearchTest(ContextRecordInit, TestCase): fixtures = ImportContextRecordTest.fixtures diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 1b492148a..68bc5269c 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -192,6 +192,7 @@ class BaseFind(BaseHistorizedItem, OwnPerms): help_text=_(u"Cached value - do not edit")) history = HistoricalRecords() RELATED_POST_PROCESS = ['find'] + CACHED_LABELS = ['cache_short_id', 'cache_complete_id'] class Meta: verbose_name = _(u"Base find") @@ -254,6 +255,9 @@ class BaseFind(BaseHistorizedItem, OwnPerms): ).format(self.index)) return settings.JOINT.join(c_id) + def _generate_cache_complete_id(self): + return self.complete_id() + def short_id(self): # OPE|FIND_index c_id = [self._ope_code()] @@ -261,6 +265,9 @@ class BaseFind(BaseHistorizedItem, OwnPerms): ).format(self.index)) return settings.JOINT.join(c_id) + def _generate_cache_short_id(self): + return self.short_id() + def full_label(self): return self._real_label() or self._temp_label() or u"" diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index e1ae68237..67f9454fa 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2012-2016 Étienne Loks +# Copyright (C) 2012-2017 Étienne Loks # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as -- cgit v1.2.3 From 58fa2ccf25fa83e6870c64ae8ccb1c4cc19853d2 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 4 Apr 2017 12:13:04 +0200 Subject: Base finds: bulk update of finds on context record change (refs #3484) --- archaeological_context_records/models.py | 7 +++++++ archaeological_context_records/tests.py | 6 +++++- archaeological_finds/models_finds.py | 20 ++++++++++++++++++-- 3 files changed, 30 insertions(+), 3 deletions(-) (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 4084ec05a..bb3afc899 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -407,6 +407,13 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms, return list(Find.objects.filter(base_finds__context_record=self).all())\ + list(BaseFind.objects.filter(context_record=self).all()) + def _cached_labels_bulk_update(self): + if settings.TESTING and settings.USE_SPATIALITE_FOR_TESTS: + return + self.base_finds.model.cached_label_bulk_update( + context_record_id=self.pk) + return True + @property def reference(self): if not self.operation: diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index 14a5ae8d3..4226b42ea 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -289,6 +289,10 @@ class ContextRecordTest(ContextRecordInit, TestCase): self.assertEqual(ope_id, 'OP2017-1') def test_downstream_cache_update(self): + if settings.USE_SPATIALITE_FOR_TESTS: + # using views - can only be tested with postgresql + return + cr = self.create_context_record()[0] from archaeological_finds.models import Find, BaseFind, MaterialType @@ -315,7 +319,7 @@ class ContextRecordTest(ContextRecordInit, TestCase): def reached(self, sender, **kwargs): instance = kwargs.get('instance') - if sender == Find: + if sender in (Find, BaseFind): self.find_reached.append(instance) test_obj = TestObj() diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 68bc5269c..3e14aa592 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -330,7 +330,8 @@ class BaseFind(BaseHistorizedItem, OwnPerms): return returned @classmethod - def cached_label_bulk_update(cls, operation_id=None, parcel_id=None): + def cached_label_bulk_update(cls, operation_id=None, parcel_id=None, + context_record_id=None): if operation_id: filters = """ INNER JOIN archaeological_context_records_contextrecord acr @@ -345,6 +346,12 @@ class BaseFind(BaseHistorizedItem, OwnPerms): """ args = [int(parcel_id)] kwargs = {'parcel_id': parcel_id} + elif context_record_id: + filters = """ + WHERE mybf.context_record_id = %s + """ + args = [int(context_record_id)] + kwargs = {'context_record_id': context_record_id} else: return @@ -905,7 +912,8 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): return unicode(self) @classmethod - def cached_label_bulk_update(cls, operation_id=None, parcel_id=None): + def cached_label_bulk_update(cls, operation_id=None, parcel_id=None, + context_record_id=None): if operation_id: filters = """ INNER JOIN find_first_base_find myfbf @@ -926,6 +934,14 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem): ON acr.parcel_id = %s AND acr.id = mybf.context_record_id """ args = [int(parcel_id)] + elif context_record_id: + filters = """ + INNER JOIN find_first_base_find myfbf + ON myfbf.find_id = myf.id + INNER JOIN archaeological_finds_basefind mybf + ON myfbf.basefind_id = mybf.id AND mybf.context_record_id = %s + """ + args = [int(parcel_id)] else: return -- cgit v1.2.3 From 58039e9efe573b2ba08c950bf7fe0c490e21fc43 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 5 Apr 2017 12:25:34 +0200 Subject: Update translation files --- archaeological_context_records/locale/django.pot | 69 ++- archaeological_files/locale/django.pot | 58 +- archaeological_finds/locale/django.pot | 405 ++++++++------ archaeological_operations/locale/django.pot | 518 ++++++++--------- archaeological_warehouse/locale/django.pot | 112 ++-- ishtar_common/locale/django.pot | 634 +++++++++++---------- translations/fr/archaeological_context_records.po | 81 ++- translations/fr/archaeological_files.po | 66 +-- translations/fr/archaeological_files_pdl.po | 8 +- translations/fr/archaeological_finds.po | 439 +++++++++------ translations/fr/archaeological_operations.po | 529 ++++++++--------- translations/fr/archaeological_warehouse.po | 121 ++-- translations/fr/ishtar_common.po | 654 +++++++++++----------- 13 files changed, 2033 insertions(+), 1661 deletions(-) (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index eedcad733..82c64ac4c 100644 --- a/archaeological_context_records/locale/django.pot +++ b/archaeological_context_records/locale/django.pot @@ -4,14 +4,15 @@ # Étienne Loks , 2010-2015. # Valérie-Emma Leroux , 2016. #zanata # Valérie-Emma Leroux , 2017. #zanata +# Étienne Loks , 2017. #zanata msgid "" msgstr "" -#: forms.py:47 forms.py:51 models.py:216 models.py:589 wizards.py:77 +#: forms.py:47 forms.py:51 models.py:216 models.py:599 wizards.py:77 msgid "Operation" msgstr "" -#: forms.py:59 forms.py:141 models.py:218 models.py:557 +#: forms.py:59 forms.py:141 models.py:218 models.py:567 msgid "ID" msgstr "" @@ -63,11 +64,11 @@ msgstr "" msgid "General" msgstr "" -#: forms.py:140 models.py:181 models.py:214 models.py:559 +#: forms.py:140 models.py:181 models.py:214 models.py:569 msgid "Parcel" msgstr "" -#: forms.py:143 models.py:219 models.py:560 +#: forms.py:143 models.py:219 models.py:570 #: templates/ishtar/sheet_contextrecord.html:30 msgid "Description" msgstr "" @@ -104,7 +105,7 @@ msgstr "" msgid "Depth of appearance (m)" msgstr "" -#: forms.py:156 forms.py:376 models.py:241 models.py:558 +#: forms.py:156 forms.py:376 models.py:241 models.py:568 msgid "Context record type" msgstr "" @@ -151,7 +152,7 @@ msgstr "" msgid "Dating type" msgstr "" -#: forms.py:285 ishtar_menu.py:29 models.py:619 +#: forms.py:285 ishtar_menu.py:29 models.py:641 msgid "Context record" msgstr "" @@ -320,7 +321,7 @@ msgstr "" msgid "Documentation types" msgstr "" -#: models.py:172 models.py:561 +#: models.py:172 models.py:571 msgid "Periods" msgstr "" @@ -425,74 +426,94 @@ msgctxt "short" msgid "Context record" msgstr "" -#: models.py:491 +#: models.py:501 msgid "Inverse relation" msgstr "" -#: models.py:495 models.py:518 models.py:556 +#: models.py:505 models.py:528 models.py:566 msgid "Relation type" msgstr "" -#: models.py:496 +#: models.py:506 msgid "Relation types" msgstr "" -#: models.py:513 +#: models.py:523 msgid "ID (left)" msgstr "" -#: models.py:514 +#: models.py:524 msgid "Context record type (left)" msgstr "" -#: models.py:515 +#: models.py:525 msgid "Parcel (left)" msgstr "" -#: models.py:516 +#: models.py:526 msgid "Description (left)" msgstr "" -#: models.py:517 +#: models.py:527 msgid "Periods (left)" msgstr "" -#: models.py:519 +#: models.py:529 msgid "ID (right)" msgstr "" -#: models.py:520 +#: models.py:530 msgid "Context record type (right)" msgstr "" -#: models.py:521 +#: models.py:531 msgid "Parcel (right)" msgstr "" -#: models.py:522 +#: models.py:532 msgid "Description (right)" msgstr "" -#: models.py:523 +#: models.py:533 msgid "Periods (right)" msgstr "" -#: models.py:532 +#: models.py:542 msgid "Record relation" msgstr "" -#: models.py:533 +#: models.py:543 msgid "Record relations" msgstr "" -#: models.py:616 +#: models.py:626 msgid "Context record documentation" msgstr "" -#: models.py:617 +#: models.py:627 msgid "Context record documentations" msgstr "" +#: models.py:630 +msgid "Can view all Context record sources" +msgstr "" + +#: models.py:632 +msgid "Can view own Context record source" +msgstr "" + +#: models.py:634 +msgid "Can add own Context record source" +msgstr "" + +#: models.py:636 +msgid "Can change own Context record source" +msgstr "" + +#: models.py:638 +msgid "Can delete own Context record source" +msgstr "" + #: views.py:102 msgid "New context record" msgstr "" diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot index 1e513ae12..62dcf19ae 100644 --- a/archaeological_files/locale/django.pot +++ b/archaeological_files/locale/django.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" -#: forms.py:47 forms.py:210 forms.py:255 forms.py:396 forms.py:423 +#: forms.py:47 forms.py:210 forms.py:255 forms.py:394 forms.py:421 #: models.py:108 templates/ishtar/sheet_file.html:144 msgid "Year" msgstr "" @@ -22,15 +22,15 @@ msgstr "" msgid "Other reference" msgstr "" -#: forms.py:52 forms.py:431 +#: forms.py:52 forms.py:429 msgid "Parcel (section/number/public domain)" msgstr "" -#: forms.py:55 forms.py:407 forms.py:434 models.py:558 +#: forms.py:55 forms.py:405 forms.py:432 models.py:558 msgid "Department" msgstr "" -#: forms.py:56 forms.py:443 +#: forms.py:56 forms.py:441 msgid "File name" msgstr "" @@ -54,7 +54,7 @@ msgstr "" msgid "Permit reference" msgstr "" -#: forms.py:63 forms.py:227 forms.py:364 models.py:180 +#: forms.py:63 forms.py:227 forms.py:362 models.py:180 #: templates/ishtar/sheet_file.html:97 msgid "Comment" msgstr "" @@ -63,19 +63,19 @@ msgstr "" msgid "In charge" msgstr "" -#: forms.py:72 forms.py:281 forms.py:445 models.py:126 +#: forms.py:72 forms.py:281 forms.py:443 models.py:126 msgid "General contractor" msgstr "" -#: forms.py:79 forms.py:453 +#: forms.py:79 forms.py:451 msgid "Organization of general contractor" msgstr "" -#: forms.py:87 forms.py:476 +#: forms.py:87 forms.py:474 msgid "Created by" msgstr "" -#: forms.py:94 forms.py:484 +#: forms.py:94 forms.py:482 msgid "Modified by" msgstr "" @@ -169,83 +169,83 @@ msgstr "" msgid "Research archaeology" msgstr "" -#: forms.py:341 models.py:183 templates/ishtar/sheet_file.html:88 +#: forms.py:340 models.py:183 templates/ishtar/sheet_file.html:88 msgid "Departments" msgstr "" -#: forms.py:351 models.py:192 +#: forms.py:349 models.py:192 msgid "Scientist in charge" msgstr "" -#: forms.py:353 models.py:186 templates/ishtar/sheet_file.html:90 +#: forms.py:351 models.py:186 templates/ishtar/sheet_file.html:90 msgid "Requested operation type" msgstr "" -#: forms.py:355 +#: forms.py:353 msgid "Lead organization" msgstr "" -#: forms.py:371 models.py:196 templates/ishtar/sheet_file.html:95 +#: forms.py:369 models.py:196 templates/ishtar/sheet_file.html:95 msgid "Classified area" msgstr "" -#: forms.py:373 models.py:198 templates/ishtar/sheet_file.html:96 +#: forms.py:371 models.py:198 templates/ishtar/sheet_file.html:96 msgid "Protected area" msgstr "" -#: forms.py:387 +#: forms.py:385 msgid "Would you like to close this archaeological file?" msgstr "" -#: forms.py:392 +#: forms.py:390 msgid "Would you like to delete this archaeological file ?" msgstr "" -#: forms.py:397 forms.py:424 forms.py:547 +#: forms.py:395 forms.py:422 forms.py:545 msgid "Index" msgstr "" -#: forms.py:401 forms.py:428 forms.py:533 +#: forms.py:399 forms.py:426 forms.py:531 msgid "Act type" msgstr "" -#: forms.py:402 +#: forms.py:400 msgid "Object (full text search)" msgstr "" -#: forms.py:429 +#: forms.py:427 msgid "Indexed?" msgstr "" -#: forms.py:435 +#: forms.py:433 msgid "Object" msgstr "" -#: forms.py:439 +#: forms.py:437 msgid "Signature date after" msgstr "" -#: forms.py:441 +#: forms.py:439 msgid "Signature date before" msgstr "" -#: forms.py:461 +#: forms.py:459 msgid "File numeric reference" msgstr "" -#: forms.py:462 +#: forms.py:460 msgid "File year" msgstr "" -#: forms.py:464 +#: forms.py:462 msgid "File other reference" msgstr "" -#: forms.py:466 +#: forms.py:464 msgid "File in charge" msgstr "" -#: forms.py:474 +#: forms.py:472 msgid "File permit reference" msgstr "" diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index d48cbe962..dcbf94fca 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -5,348 +5,349 @@ # Valérie-Emma Leroux , 2016. #zanata # Étienne Loks , 2016. #zanata # Valérie-Emma Leroux , 2017. #zanata +# Étienne Loks , 2017. #zanata msgid "" msgstr "" -#: forms.py:93 forms.py:97 models_finds.py:505 wizards.py:64 +#: forms.py:93 forms.py:97 models_finds.py:518 wizards.py:64 msgid "Context record" msgstr "" -#: forms.py:126 ishtar_menu.py:32 models_finds.py:668 models_finds.py:1071 -#: models_finds.py:1080 models_treatments.py:281 +#: forms.py:126 ishtar_menu.py:32 models_finds.py:682 models_finds.py:1113 +#: models_finds.py:1134 models_treatments.py:281 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "" -#: forms.py:140 forms.py:333 forms.py:601 models_finds.py:151 -#: models_finds.py:599 +#: forms.py:140 forms.py:337 forms.py:605 models_finds.py:150 +#: models_finds.py:612 msgid "Free ID" msgstr "" -#: forms.py:142 models_finds.py:651 +#: forms.py:142 models_finds.py:665 msgid "Previous ID" msgstr "" -#: forms.py:143 forms.py:364 forms_treatments.py:134 models_finds.py:155 -#: models_finds.py:600 models_treatments.py:127 +#: forms.py:143 forms.py:368 forms_treatments.py:134 models_finds.py:154 +#: models_finds.py:613 models_treatments.py:127 msgid "Description" msgstr "" -#: forms.py:146 forms.py:366 models_finds.py:164 +#: forms.py:146 forms.py:370 models_finds.py:163 msgid "Batch/object" msgstr "" -#: forms.py:148 models_finds.py:628 +#: forms.py:148 models_finds.py:642 msgid "Is complete?" msgstr "" -#: forms.py:151 forms.py:354 forms.py:605 models_finds.py:51 +#: forms.py:151 forms.py:358 forms.py:609 models_finds.py:50 msgid "Material type" msgstr "" -#: forms.py:152 forms.py:358 models_finds.py:63 models_finds.py:604 +#: forms.py:154 forms.py:362 models_finds.py:62 models_finds.py:617 msgid "Conservatory state" msgstr "" -#: forms.py:155 models_finds.py:606 +#: forms.py:157 models_finds.py:619 msgid "Conservatory comment" msgstr "" -#: forms.py:158 models_finds.py:113 models_finds.py:631 +#: forms.py:160 models_finds.py:112 models_finds.py:645 msgid "Object types" msgstr "" -#: forms.py:160 forms.py:357 models_finds.py:72 +#: forms.py:164 forms.py:361 models_finds.py:71 msgid "Preservation type" msgstr "" -#: forms.py:163 forms.py:360 models_finds.py:633 +#: forms.py:167 forms.py:364 models_finds.py:647 msgid "Integrity / interest" msgstr "" -#: forms.py:166 forms.py:362 models_finds.py:636 +#: forms.py:170 forms.py:366 models_finds.py:650 msgid "Remarkability" msgstr "" -#: forms.py:169 models_finds.py:169 +#: forms.py:173 models_finds.py:168 msgid "Point of topographic reference" msgstr "" -#: forms.py:172 models_finds.py:171 +#: forms.py:176 models_finds.py:170 msgid "X" msgstr "" -#: forms.py:173 models_finds.py:172 +#: forms.py:177 models_finds.py:171 msgid "Y" msgstr "" -#: forms.py:174 models_finds.py:173 +#: forms.py:178 models_finds.py:172 msgid "Z" msgstr "" -#: forms.py:176 models_finds.py:181 +#: forms.py:180 models_finds.py:180 msgid "Spatial Reference System" msgstr "" -#: forms.py:179 models_finds.py:174 +#: forms.py:183 models_finds.py:173 msgid "Estimated error for X" msgstr "" -#: forms.py:181 models_finds.py:176 +#: forms.py:185 models_finds.py:175 msgid "Estimated error for Y" msgstr "" -#: forms.py:183 models_finds.py:178 +#: forms.py:187 models_finds.py:177 msgid "Estimated error for Z" msgstr "" -#: forms.py:184 models_finds.py:640 +#: forms.py:188 models_finds.py:654 msgid "Length (cm)" msgstr "" -#: forms.py:185 models_finds.py:641 +#: forms.py:189 models_finds.py:655 msgid "Width (cm)" msgstr "" -#: forms.py:186 models_finds.py:642 +#: forms.py:190 models_finds.py:656 msgid "Height (cm)" msgstr "" -#: forms.py:187 models_finds.py:643 +#: forms.py:191 models_finds.py:657 msgid "Diameter (cm)" msgstr "" -#: forms.py:188 models_finds.py:644 +#: forms.py:192 models_finds.py:658 msgid "Thickness (cm)" msgstr "" -#: forms.py:189 forms.py:606 models_finds.py:611 +#: forms.py:193 forms.py:610 models_finds.py:624 msgid "Volume (l)" msgstr "" -#: forms.py:190 forms.py:607 models_finds.py:612 +#: forms.py:194 forms.py:611 models_finds.py:625 msgid "Weight (g)" msgstr "" -#: forms.py:192 models_finds.py:645 +#: forms.py:196 models_finds.py:659 msgid "Dimensions comment" msgstr "" -#: forms.py:193 forms.py:608 models_finds.py:615 +#: forms.py:197 forms.py:612 models_finds.py:628 msgid "Find number" msgstr "" -#: forms.py:195 models_finds.py:639 +#: forms.py:199 models_finds.py:653 msgid "Minimum number of individuals (MNI)" msgstr "" -#: forms.py:196 models_finds.py:647 +#: forms.py:200 models_finds.py:661 msgid "Mark" msgstr "" -#: forms.py:197 forms.py:367 models_finds.py:653 +#: forms.py:201 forms.py:371 models_finds.py:667 msgid "Check" msgstr "" -#: forms.py:199 models_finds.py:655 +#: forms.py:203 models_finds.py:669 msgid "Check date" msgstr "" -#: forms.py:200 forms_treatments.py:132 forms_treatments.py:434 -#: models_finds.py:156 models_finds.py:648 models_treatments.py:126 +#: forms.py:204 forms_treatments.py:132 forms_treatments.py:434 +#: models_finds.py:155 models_finds.py:662 models_treatments.py:126 #: models_treatments.py:494 msgid "Comment" msgstr "" -#: forms.py:203 models_finds.py:649 +#: forms.py:207 models_finds.py:663 msgid "Comment on dating" msgstr "" -#: forms.py:204 models_finds.py:657 +#: forms.py:208 models_finds.py:671 msgid "Estimated value" msgstr "" -#: forms.py:206 forms_treatments.py:151 +#: forms.py:210 forms_treatments.py:151 msgid "Image" msgstr "" -#: forms.py:207 forms_treatments.py:152 +#: forms.py:211 forms_treatments.py:152 #, python-format msgid "" "

Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" -#: forms.py:281 +#: forms.py:285 msgid "You should at least provide X, Y and the spatial reference system used." msgstr "" -#: forms.py:290 +#: forms.py:294 msgid "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" -#: forms.py:296 forms.py:327 models_finds.py:623 +#: forms.py:300 forms.py:331 models_finds.py:636 msgid "Dating" msgstr "" -#: forms.py:301 forms.py:353 +#: forms.py:305 forms.py:357 msgid "Period" msgstr "" -#: forms.py:302 forms_treatments.py:138 forms_treatments.py:436 -#: models_finds.py:1085 models_treatments.py:129 models_treatments.py:292 +#: forms.py:306 forms_treatments.py:138 forms_treatments.py:436 +#: models_finds.py:1139 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:304 models_finds.py:1086 models_treatments.py:293 +#: forms.py:308 models_finds.py:1140 models_treatments.py:293 #: templates/ishtar/sheet_find.html:92 templates/ishtar/sheet_find.html:134 msgid "End date" msgstr "" -#: forms.py:305 +#: forms.py:309 msgid "Quality" msgstr "" -#: forms.py:307 +#: forms.py:311 msgid "Dating type" msgstr "" -#: forms.py:309 +#: forms.py:313 msgid "Precise dating" msgstr "" -#: forms.py:331 models_finds.py:188 +#: forms.py:335 models_finds.py:187 msgid "Short ID" msgstr "" -#: forms.py:332 models_finds.py:191 +#: forms.py:336 models_finds.py:190 msgid "Complete ID" msgstr "" -#: forms.py:336 forms_treatments.py:54 forms_treatments.py:96 +#: forms.py:340 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:102 models_treatments.py:466 msgid "Year" msgstr "" -#: forms.py:338 +#: forms.py:342 msgid "Operation's number (index by year)" msgstr "" -#: forms.py:341 +#: forms.py:345 msgid "Code PATRIARCHE" msgstr "" -#: forms.py:345 +#: forms.py:349 msgid "Archaeological site" msgstr "" -#: forms.py:351 +#: forms.py:355 msgid "Search within related operations" msgstr "" -#: forms.py:355 models_finds.py:112 +#: forms.py:359 models_finds.py:111 msgid "Object type" msgstr "" -#: forms.py:368 forms_treatments.py:57 +#: forms.py:372 forms_treatments.py:57 msgid "Has an image?" msgstr "" -#: forms.py:417 +#: forms.py:421 msgid "Warehouse (location)" msgstr "" -#: forms.py:423 +#: forms.py:427 msgid "Warehouse (responsible)" msgstr "" -#: forms.py:428 +#: forms.py:432 msgid "Container ID" msgstr "" -#: forms.py:429 +#: forms.py:433 msgid "Container ref." msgstr "" -#: forms.py:433 forms.py:456 views.py:149 +#: forms.py:437 forms.py:460 views.py:149 msgid "Find search" msgstr "" -#: forms.py:481 templates/ishtar/sheet_treatment.html:46 +#: forms.py:485 templates/ishtar/sheet_treatment.html:46 msgid "Upstream finds" msgstr "" -#: forms.py:483 models_finds.py:669 +#: forms.py:487 models_finds.py:683 msgid "Finds" msgstr "" -#: forms.py:495 +#: forms.py:499 msgid "You should at least select one archaeological find." msgstr "" -#: forms.py:598 +#: forms.py:602 msgid "Resulting find" msgstr "" -#: forms.py:603 +#: forms.py:607 msgid "Precise description" msgstr "" -#: forms.py:618 +#: forms.py:622 msgid "Resulting finds" msgstr "" -#: forms.py:623 +#: forms.py:627 msgid "Would you like to delete this find?" msgstr "" -#: forms.py:627 models_treatments.py:90 +#: forms.py:631 models_treatments.py:90 msgid "Upstream find" msgstr "" -#: forms.py:640 +#: forms.py:644 msgid "Archaeological find search" msgstr "" -#: forms.py:642 +#: forms.py:646 msgid "You should select an archaeological find." msgstr "" -#: forms.py:647 +#: forms.py:651 msgid "Year of the operation" msgstr "" -#: forms.py:649 +#: forms.py:653 msgid "Numeric reference" msgstr "" -#: forms.py:656 +#: forms.py:660 msgid "Period of the archaeological find" msgstr "" -#: forms.py:658 +#: forms.py:662 msgid "Material type of the archaeological find" msgstr "" -#: forms.py:660 +#: forms.py:664 msgid "Description of the archaeological find" msgstr "" -#: forms.py:672 forms_treatments.py:590 forms_treatments.py:616 +#: forms.py:676 forms_treatments.py:590 forms_treatments.py:616 msgid "Documentation search" msgstr "" -#: forms.py:674 forms_treatments.py:592 forms_treatments.py:618 +#: forms.py:678 forms_treatments.py:592 forms_treatments.py:618 msgid "You should select a document." msgstr "" -#: forms.py:691 +#: forms.py:695 msgid "Another basket already exists with this name." msgstr "" -#: forms.py:701 forms.py:705 forms_treatments.py:175 ishtar_menu.py:57 +#: forms.py:705 forms.py:709 forms_treatments.py:175 ishtar_menu.py:57 msgid "Basket" msgstr "" @@ -465,7 +466,7 @@ msgid "Associated request" msgstr "" #: forms_treatments.py:266 forms_treatments.py:397 ishtar_menu.py:108 -#: models_treatments.py:499 models_treatments.py:521 models_treatments.py:584 +#: models_treatments.py:499 models_treatments.py:527 models_treatments.py:602 #: wizards.py:187 templates/ishtar/sheet_treatmentfile.html:5 msgid "Treatment request" msgstr "" @@ -628,7 +629,7 @@ msgstr "" msgid "Documentation" msgstr "" -#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1082 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1136 msgid "Administrative act" msgstr "" @@ -642,7 +643,7 @@ msgid "Source" msgstr "" #: ishtar_menu.py:185 models_treatments.py:147 models_treatments.py:283 -#: models_treatments.py:567 models_treatments.py:570 +#: models_treatments.py:573 models_treatments.py:576 #: templates/ishtar/sheet_treatment.html:5 msgid "Treatment" msgstr "" @@ -651,113 +652,113 @@ msgstr "" msgid "Simple treatments" msgstr "" -#: models_finds.py:44 +#: models_finds.py:43 msgid "Code" msgstr "" -#: models_finds.py:45 +#: models_finds.py:44 msgid "Recommendation" msgstr "" -#: models_finds.py:48 +#: models_finds.py:47 msgid "Parent material" msgstr "" -#: models_finds.py:52 models_finds.py:525 models_finds.py:602 +#: models_finds.py:51 models_finds.py:538 models_finds.py:615 msgid "Material types" msgstr "" -#: models_finds.py:60 +#: models_finds.py:59 msgid "Parent conservatory state" msgstr "" -#: models_finds.py:64 +#: models_finds.py:63 msgid "Conservatory states" msgstr "" -#: models_finds.py:73 +#: models_finds.py:72 msgid "Preservation types" msgstr "" -#: models_finds.py:81 +#: models_finds.py:80 msgid "Integrity / interest type" msgstr "" -#: models_finds.py:82 +#: models_finds.py:81 msgid "Integrity / interest types" msgstr "" -#: models_finds.py:90 +#: models_finds.py:89 msgid "Remarkability type" msgstr "" -#: models_finds.py:91 +#: models_finds.py:90 msgid "Remarkability types" msgstr "" -#: models_finds.py:98 models_finds.py:598 models_treatments.py:40 +#: models_finds.py:97 models_finds.py:611 models_treatments.py:40 #: models_treatments.py:287 msgid "Order" msgstr "" -#: models_finds.py:100 +#: models_finds.py:99 msgid "Batch type" msgstr "" -#: models_finds.py:101 +#: models_finds.py:100 msgid "Batch types" msgstr "" -#: models_finds.py:109 +#: models_finds.py:108 msgid "Parent" msgstr "" -#: models_finds.py:152 models_finds.py:595 models_treatments.py:124 +#: models_finds.py:151 models_finds.py:608 models_treatments.py:124 #: models_treatments.py:471 msgid "External ID" msgstr "" -#: models_finds.py:154 models_finds.py:597 +#: models_finds.py:153 models_finds.py:610 msgid "External ID is set automatically" msgstr "" -#: models_finds.py:157 +#: models_finds.py:156 msgid "Special interest" msgstr "" -#: models_finds.py:161 +#: models_finds.py:160 msgid "Context Record" msgstr "" -#: models_finds.py:162 +#: models_finds.py:161 msgid "Discovery date" msgstr "" -#: models_finds.py:167 +#: models_finds.py:166 msgid "Material index" msgstr "" -#: models_finds.py:183 +#: models_finds.py:182 msgid "Point (2D)" msgstr "" -#: models_finds.py:184 +#: models_finds.py:183 msgid "Point" msgstr "" -#: models_finds.py:185 +#: models_finds.py:184 msgid "Line" msgstr "" -#: models_finds.py:186 +#: models_finds.py:185 msgid "Polygon" msgstr "" -#: models_finds.py:189 models_finds.py:192 +#: models_finds.py:188 models_finds.py:191 msgid "Cached value - do not edit" msgstr "" -#: models_finds.py:197 models_finds.py:593 +#: models_finds.py:197 models_finds.py:606 msgid "Base find" msgstr "" @@ -785,149 +786,169 @@ msgstr "" msgid "Can delete own Base find" msgstr "" -#: models_finds.py:430 +#: models_finds.py:443 msgid "g" msgstr "" -#: models_finds.py:431 +#: models_finds.py:444 msgid "kg" msgstr "" -#: models_finds.py:433 +#: models_finds.py:446 msgid "Not checked" msgstr "" -#: models_finds.py:434 +#: models_finds.py:447 msgid "Checked but incorrect" msgstr "" -#: models_finds.py:435 +#: models_finds.py:448 msgid "Checked and correct" msgstr "" -#: models_finds.py:506 +#: models_finds.py:519 msgid "Base find - Short ID" msgstr "" -#: models_finds.py:507 +#: models_finds.py:520 msgid "Base find - Complete ID" msgstr "" -#: models_finds.py:509 +#: models_finds.py:522 msgid "Operation (code)" msgstr "" -#: models_finds.py:511 +#: models_finds.py:524 msgid "Town" msgstr "" -#: models_finds.py:513 +#: models_finds.py:526 msgid "Operation (name)" msgstr "" -#: models_finds.py:515 +#: models_finds.py:528 msgid "Parcel" msgstr "" -#: models_finds.py:516 +#: models_finds.py:529 msgid "Batch" msgstr "" -#: models_finds.py:517 +#: models_finds.py:530 msgid "Base find - Comment" msgstr "" -#: models_finds.py:518 +#: models_finds.py:531 msgid "Base find - Description" msgstr "" -#: models_finds.py:519 +#: models_finds.py:532 msgid "Base find - Topographic localisation" msgstr "" -#: models_finds.py:521 +#: models_finds.py:534 msgid "Base find - Special interest" msgstr "" -#: models_finds.py:522 +#: models_finds.py:535 msgid "Base find - Discovery date" msgstr "" -#: models_finds.py:523 models_finds.py:626 models_treatments.py:131 +#: models_finds.py:536 models_finds.py:639 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 +#: models_finds.py:537 msgid "Periods" msgstr "" -#: models_finds.py:609 +#: models_finds.py:622 msgid "Type of preservation to consider" msgstr "" -#: models_finds.py:613 +#: models_finds.py:626 msgid "Weight unit" msgstr "" -#: models_finds.py:619 templates/ishtar/sheet_find.html:78 +#: models_finds.py:632 templates/ishtar/sheet_find.html:78 msgid "Upstream treatment" msgstr "" -#: models_finds.py:622 templates/ishtar/sheet_find.html:120 +#: models_finds.py:635 templates/ishtar/sheet_find.html:120 msgid "Downstream treatment" msgstr "" -#: models_finds.py:660 +#: models_finds.py:674 msgid "Collection" msgstr "" -#: models_finds.py:662 models_treatments.py:143 models_treatments.py:495 +#: models_finds.py:676 models_treatments.py:143 models_treatments.py:495 msgid "Cached name" msgstr "" -#: models_finds.py:671 +#: models_finds.py:685 msgid "Can view all Finds" msgstr "" -#: models_finds.py:672 +#: models_finds.py:686 msgid "Can view own Find" msgstr "" -#: models_finds.py:673 +#: models_finds.py:687 msgid "Can add own Find" msgstr "" -#: models_finds.py:674 +#: models_finds.py:688 msgid "Can change own Find" msgstr "" -#: models_finds.py:675 +#: models_finds.py:689 msgid "Can delete own Find" msgstr "" -#: models_finds.py:681 +#: models_finds.py:695 msgid "FIND" msgstr "" -#: models_finds.py:1069 +#: models_finds.py:1099 msgid "Find documentation" msgstr "" -#: models_finds.py:1070 +#: models_finds.py:1100 msgid "Find documentations" msgstr "" -#: models_finds.py:1083 +#: models_finds.py:1103 +msgid "Can view all Find sources" +msgstr "" + +#: models_finds.py:1105 +msgid "Can view own Find source" +msgstr "" + +#: models_finds.py:1107 +msgid "Can add own Find source" +msgstr "" + +#: models_finds.py:1109 +msgid "Can change own Find source" +msgstr "" + +#: models_finds.py:1111 +msgid "Can delete own Find source" +msgstr "" + +#: models_finds.py:1137 msgid "Person" msgstr "" -#: models_finds.py:1089 +#: models_finds.py:1143 msgid "Property" msgstr "" -#: models_finds.py:1090 +#: models_finds.py:1144 msgid "Properties" msgstr "" @@ -1062,41 +1083,105 @@ msgid "Can view all Treatment requests" msgstr "" #: models_treatments.py:506 -msgid "Can view own Treatment request" +msgid "Can add Treatment request" msgstr "" #: models_treatments.py:508 -msgid "Can add own Treatment request" +msgid "Can change Treatment request" msgstr "" #: models_treatments.py:510 -msgid "Can change own Treatment request" +msgid "Can delete Treatment request" msgstr "" #: models_treatments.py:512 +msgid "Can view own Treatment request" +msgstr "" + +#: models_treatments.py:514 +msgid "Can add own Treatment request" +msgstr "" + +#: models_treatments.py:516 +msgid "Can change own Treatment request" +msgstr "" + +#: models_treatments.py:518 msgid "Can delete own Treatment request" msgstr "" -#: models_treatments.py:574 +#: models_treatments.py:580 msgid "Treatment documentation" msgstr "" -#: models_treatments.py:575 +#: models_treatments.py:581 msgid "Treament documentations" msgstr "" +#: models_treatments.py:584 +msgid "Can view all Treatment source" +msgstr "" + +#: models_treatments.py:586 +msgid "Can view own Treatment source" +msgstr "" + #: models_treatments.py:588 -msgid "Treatment file" +msgid "Can add own Treatment source" +msgstr "" + +#: models_treatments.py:590 +msgid "Can change own Treatment source" msgstr "" #: models_treatments.py:592 +msgid "Can delete own Treatment source" +msgstr "" + +#: models_treatments.py:606 +msgid "Treatment file" +msgstr "" + +#: models_treatments.py:610 msgid "Treatment request documentation" msgstr "" -#: models_treatments.py:593 +#: models_treatments.py:611 msgid "Treatment request documentations" msgstr "" +#: models_treatments.py:614 +msgid "Can view all Treatment request source" +msgstr "" + +#: models_treatments.py:616 +msgid "Can add Treatment request source" +msgstr "" + +#: models_treatments.py:618 +msgid "Can change Treatment request source" +msgstr "" + +#: models_treatments.py:620 +msgid "Can delete Treatment request source" +msgstr "" + +#: models_treatments.py:622 +msgid "Can view own Treatment request source" +msgstr "" + +#: models_treatments.py:624 +msgid "Can add own Treatment request source" +msgstr "" + +#: models_treatments.py:626 +msgid "Can change own Treatment request source" +msgstr "" + +#: models_treatments.py:628 +msgid "Can delete own Treatment request source" +msgstr "" + #: views.py:138 msgid "New find" msgstr "" diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot index 3323d638d..f875f6b9a 100644 --- a/archaeological_operations/locale/django.pot +++ b/archaeological_operations/locale/django.pot @@ -10,13 +10,13 @@ msgid "" msgstr "" -#: forms.py:69 forms.py:371 forms.py:1013 forms.py:1035 forms.py:1039 -#: models.py:1247 templates/ishtar/sheet_operation.html:151 +#: forms.py:69 forms.py:371 forms.py:1047 forms.py:1069 forms.py:1073 +#: models.py:1252 templates/ishtar/sheet_operation.html:153 #: templates/ishtar/blocks/window_tables/parcels.html:10 msgid "Parcels" msgstr "" -#: forms.py:72 forms.py:205 forms.py:989 models.py:1233 +#: forms.py:72 forms.py:205 forms.py:1023 models.py:1238 #: templates/ishtar/blocks/window_tables/parcels.html:7 #: templates/ishtar/dashboards/dashboard_operation.html:432 #: templates/ishtar/dashboards/dashboard_operation.html:446 @@ -25,22 +25,22 @@ msgstr "" msgid "Town" msgstr "" -#: forms.py:74 forms.py:455 forms.py:756 forms.py:1259 models.py:272 -#: models.py:1039 models.py:1231 +#: forms.py:74 forms.py:481 forms.py:783 forms.py:1293 models.py:276 +#: models.py:1044 models.py:1236 #: templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Year" msgstr "" -#: forms.py:77 models.py:1234 +#: forms.py:77 models.py:1239 #: templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Section" msgstr "" -#: forms.py:80 models.py:1236 +#: forms.py:80 models.py:1241 msgid "Parcel number" msgstr "" -#: forms.py:82 models.py:1238 models.py:1255 models.py:1304 +#: forms.py:82 models.py:1243 models.py:1260 models.py:1309 msgid "Public domain" msgstr "" @@ -76,45 +76,49 @@ msgstr "" msgid "Relation type" msgstr "" -#: 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 +#: forms.py:383 ishtar_menu.py:30 models.py:372 models.py:847 models.py:882 +#: models.py:922 models.py:1026 models.py:1235 wizards.py:353 wizards.py:364 #: templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "" -#: forms.py:403 +#: forms.py:406 msgid ":" msgstr "" -#: forms.py:411 forms.py:607 forms.py:1224 +#: forms.py:414 forms.py:633 forms.py:1258 msgid "You should select an operation." msgstr "" -#: forms.py:415 +#: forms.py:418 msgid "You should select a relation type." msgstr "" -#: forms.py:445 +#: forms.py:421 +msgid "An operation cannot be related to herself." +msgstr "" + +#: forms.py:451 msgid "Current relations" msgstr "" -#: forms.py:447 +#: forms.py:453 msgid "Deleted relations" msgstr "" -#: forms.py:451 templates/ishtar/sheet_operation.html:85 +#: forms.py:477 templates/ishtar/sheet_operation.html:86 msgid "Relations" msgstr "" -#: forms.py:456 forms.py:1230 models.py:273 +#: forms.py:482 forms.py:1264 models.py:277 msgid "Numeric reference" msgstr "" -#: forms.py:462 forms.py:1270 +#: forms.py:488 forms.py:1304 msgid "Parcel (section/number/public domain)" msgstr "" -#: forms.py:465 forms.py:1273 models.py:850 +#: forms.py:491 forms.py:1307 models.py:848 #: templates/ishtar/dashboards/dashboard_operation.html:390 #: templates/ishtar/dashboards/dashboard_operation.html:411 #: templates/ishtar/dashboards/dashboard_operation.html:643 @@ -123,454 +127,458 @@ msgstr "" msgid "Department" msgstr "" -#: forms.py:466 forms.py:1101 models.py:86 +#: forms.py:492 forms.py:1135 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:752 models.py:334 +#: forms.py:494 forms.py:779 models.py:338 msgid "Address / Locality" msgstr "" -#: forms.py:470 forms.py:674 forms.py:754 forms.py:1236 models.py:280 +#: forms.py:496 forms.py:700 forms.py:781 forms.py:1270 models.py:284 msgid "Operation type" msgstr "" -#: forms.py:472 +#: forms.py:498 msgid "Is open?" msgstr "" -#: forms.py:480 forms.py:786 models.py:269 +#: forms.py:506 forms.py:813 models.py:269 msgid "In charge" msgstr "" -#: forms.py:487 models.py:1015 +#: forms.py:513 models.py:1020 msgid "Scientist in charge" msgstr "" -#: forms.py:489 forms.py:676 forms.py:776 models.py:267 +#: forms.py:515 forms.py:702 forms.py:803 models.py:267 msgid "Operator" msgstr "" -#: forms.py:498 forms.py:1106 models.py:90 models.py:282 +#: forms.py:524 forms.py:1140 models.py:90 models.py:286 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10 msgid "Remains" msgstr "" -#: forms.py:499 forms.py:1084 forms.py:1103 models.py:88 models.py:288 +#: forms.py:525 forms.py:1118 forms.py:1137 models.py:88 models.py:292 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Periods" msgstr "" -#: forms.py:500 +#: forms.py:526 msgid "Started before" msgstr "" -#: forms.py:502 +#: forms.py:528 msgid "Started after" msgstr "" -#: forms.py:504 +#: forms.py:530 msgid "Ended before" msgstr "" -#: forms.py:506 +#: forms.py:532 msgid "Ended after" msgstr "" -#: forms.py:509 +#: forms.py:535 msgid "Search within relations" msgstr "" -#: forms.py:511 forms.py:841 +#: forms.py:537 forms.py:867 msgid "Comment" msgstr "" -#: forms.py:512 +#: forms.py:538 msgid "Abstract (full text search)" msgstr "" -#: forms.py:514 forms.py:844 models.py:337 +#: forms.py:540 forms.py:870 models.py:341 msgid "Comment about scientific documentation" msgstr "" -#: forms.py:515 forms.py:846 models.py:349 +#: forms.py:541 forms.py:872 models.py:353 msgid "Record quality" msgstr "" -#: forms.py:516 forms.py:811 models.py:300 +#: forms.py:542 forms.py:837 models.py:304 msgid "Report processing" msgstr "" -#: forms.py:518 forms.py:849 models.py:344 +#: forms.py:544 forms.py:875 models.py:348 msgid "Virtual operation" msgstr "" -#: forms.py:520 forms.py:1146 forms.py:1150 models.py:94 +#: forms.py:546 forms.py:1180 forms.py:1184 models.py:94 msgid "Archaeological site" msgstr "" -#: forms.py:526 forms.py:1277 +#: forms.py:552 forms.py:1311 msgid "Created by" msgstr "" -#: forms.py:532 forms.py:1283 +#: forms.py:558 forms.py:1317 msgid "Modified by" msgstr "" -#: forms.py:539 +#: forms.py:565 msgid "Documentation deadline before" msgstr "" -#: forms.py:541 +#: forms.py:567 msgid "Documentation deadline after" msgstr "" -#: forms.py:543 forms.py:834 models.py:356 +#: forms.py:569 forms.py:860 models.py:360 msgid "Documentation received" msgstr "" -#: forms.py:545 +#: forms.py:571 msgid "Finds deadline before" msgstr "" -#: forms.py:547 +#: forms.py:573 msgid "Finds deadline after" msgstr "" -#: forms.py:549 forms.py:839 models.py:360 +#: forms.py:575 forms.py:865 models.py:364 msgid "Finds received" msgstr "" -#: forms.py:594 forms.py:1222 views.py:168 +#: forms.py:620 forms.py:1256 views.py:168 msgid "Operation search" msgstr "" -#: forms.py:638 +#: forms.py:664 msgid "Associated file" msgstr "" -#: forms.py:642 forms.py:937 models.py:516 models.py:916 models.py:1026 +#: forms.py:668 forms.py:971 models.py:520 models.py:921 models.py:1031 #: wizards.py:80 msgid "Archaeological file" msgstr "" -#: forms.py:649 forms.py:651 models.py:351 +#: forms.py:675 forms.py:677 models.py:355 msgid "Abstract" msgstr "" -#: forms.py:654 +#: forms.py:680 msgid "months" msgstr "" -#: forms.py:654 +#: forms.py:680 msgid "years" msgstr "" -#: forms.py:656 models.py:253 +#: forms.py:682 models.py:253 msgid "Creation date" msgstr "" -#: forms.py:657 +#: forms.py:683 msgid "Start of field work" msgstr "" -#: forms.py:659 +#: forms.py:685 msgid "All" msgstr "" -#: forms.py:660 +#: forms.py:686 msgid "Preventive" msgstr "" -#: forms.py:661 +#: forms.py:687 msgid "Research" msgstr "" -#: forms.py:665 +#: forms.py:691 msgid "Slicing" msgstr "" -#: forms.py:668 +#: forms.py:694 msgid "Department detail" msgstr "" -#: forms.py:670 +#: forms.py:696 msgid "Date get from" msgstr "" -#: forms.py:672 +#: forms.py:698 msgid "Preventive/Research" msgstr "" -#: forms.py:678 +#: forms.py:704 msgid "Date after" msgstr "" -#: forms.py:680 +#: forms.py:706 msgid "Date before" msgstr "" -#: forms.py:682 +#: forms.py:708 msgid "With reports" msgstr "" -#: forms.py:683 +#: forms.py:709 msgid "With finds" msgstr "" -#: forms.py:735 forms.py:1331 templates/ishtar/sheet_administrativeact.html:20 +#: forms.py:761 forms.py:1365 templates/ishtar/sheet_administrativeact.html:20 #: templates/ishtar/sheet_operation.html:26 msgid "General" msgstr "" -#: forms.py:750 models.py:333 +#: forms.py:777 models.py:337 msgid "Generic name" msgstr "" -#: forms.py:761 models.py:302 +#: forms.py:788 models.py:306 msgid "Old code" msgstr "" -#: forms.py:764 +#: forms.py:791 msgid "Head scientist" msgstr "" -#: forms.py:783 models.py:332 +#: forms.py:810 models.py:336 msgid "Operator reference" msgstr "" -#: forms.py:797 +#: forms.py:823 models.py:273 +msgid "Collaborators" +msgstr "" + +#: forms.py:826 msgid "Total surface (m2)" msgstr "" -#: forms.py:804 models.py:54 models.py:256 models.py:1443 +#: forms.py:830 models.py:54 models.py:256 models.py:1448 msgid "Start date" msgstr "" -#: forms.py:806 models.py:258 +#: forms.py:832 models.py:258 msgid "Excavation end date" msgstr "" -#: forms.py:809 models.py:259 +#: forms.py:835 models.py:259 msgid "Report delivery date" msgstr "" -#: forms.py:831 models.py:353 +#: forms.py:857 models.py:357 msgid "Deadline for submission of the documentation" msgstr "" -#: forms.py:836 models.py:358 +#: forms.py:862 models.py:362 msgid "Deadline for submission of the finds" msgstr "" -#: forms.py:851 +#: forms.py:877 msgid "Image" msgstr "" -#: forms.py:852 +#: forms.py:878 #, python-format msgid "" "

Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)." msgstr "" -#: forms.py:890 +#: forms.py:924 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" -#: forms.py:895 +#: forms.py:929 msgid "The excavation end date cannot be before the start date." msgstr "" -#: forms.py:923 +#: forms.py:957 #, python-format msgid "" "Operation code already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: forms.py:927 +#: forms.py:961 msgid "Bad operation code" msgstr "" -#: forms.py:933 models.py:531 models.py:879 +#: forms.py:967 models.py:535 models.py:877 msgid "Operation code" msgstr "" -#: forms.py:959 +#: forms.py:993 msgid "Preventive informations - excavation" msgstr "" -#: forms.py:960 models.py:286 +#: forms.py:994 models.py:290 #: templates/ishtar/dashboards/dashboard_operation.html:701 msgid "Cost (euros)" msgstr "" -#: forms.py:961 models.py:291 +#: forms.py:995 models.py:295 msgid "Scheduled man-days" msgstr "" -#: forms.py:963 models.py:294 +#: forms.py:997 models.py:298 msgid "Optional man-days" msgstr "" -#: forms.py:965 models.py:297 +#: forms.py:999 models.py:301 msgid "Effective man-days" msgstr "" -#: forms.py:975 +#: forms.py:1009 msgid "Preventive informations - diagnostic" msgstr "" -#: forms.py:978 models.py:316 +#: forms.py:1012 models.py:320 msgid "Prescription on zoning" msgstr "" -#: forms.py:980 models.py:319 +#: forms.py:1014 models.py:323 msgid "Prescription on large area" msgstr "" -#: forms.py:983 models.py:321 +#: forms.py:1017 models.py:325 msgid "Prescription on geoarchaeological context" msgstr "" -#: forms.py:987 forms.py:1009 models.py:284 models.py:1049 +#: forms.py:1021 forms.py:1043 models.py:288 models.py:1054 msgid "Towns" msgstr "" -#: forms.py:1016 models.py:1246 models.py:1441 +#: forms.py:1050 models.py:1251 models.py:1446 msgid "Parcel" msgstr "" -#: forms.py:1068 models.py:46 +#: forms.py:1102 models.py:46 msgid "Remain types" msgstr "" -#: forms.py:1072 models.py:45 +#: forms.py:1106 models.py:45 msgid "Remain type" msgstr "" -#: forms.py:1088 templates/ishtar/sheet_operation.html:171 -#: templates/ishtar/sheet_operation.html:202 +#: forms.py:1122 templates/ishtar/sheet_operation.html:173 +#: templates/ishtar/sheet_operation.html:204 msgid "Period" msgstr "" -#: forms.py:1100 models.py:85 +#: forms.py:1134 models.py:85 msgid "Reference" msgstr "" -#: forms.py:1129 +#: forms.py:1163 msgid "This reference already exists." msgstr "" -#: forms.py:1161 models.py:95 models.py:341 -#: templates/ishtar/sheet_operation.html:96 +#: forms.py:1195 models.py:95 models.py:345 +#: templates/ishtar/sheet_operation.html:97 msgid "Archaeological sites" msgstr "" -#: forms.py:1165 +#: forms.py:1199 msgid "Associated archaeological sites" msgstr "" -#: forms.py:1171 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93 +#: forms.py:1205 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93 msgid "Search" msgstr "" -#: forms.py:1176 +#: forms.py:1210 msgid "Would you like to close this operation?" msgstr "" -#: forms.py:1181 +#: forms.py:1215 msgid "Would you like to delete this operation?" msgstr "" -#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:886 models.py:1006 +#: forms.py:1224 forms.py:1294 forms.py:1430 models.py:884 models.py:1011 msgid "Index" msgstr "" -#: forms.py:1216 +#: forms.py:1250 #, python-format msgid "" "Index already exists for operation: %(operation)s - use a value bigger than " "%(last_val)d" msgstr "" -#: forms.py:1228 +#: forms.py:1262 msgid "Operation's year" msgstr "" -#: forms.py:1235 +#: forms.py:1269 msgid "Operation's town" msgstr "" -#: forms.py:1248 +#: forms.py:1282 msgid "Documentation search" msgstr "" -#: forms.py:1250 +#: forms.py:1284 msgid "You should select a document." msgstr "" -#: forms.py:1267 forms.py:1334 models.py:930 models.py:1000 +#: forms.py:1301 forms.py:1368 models.py:935 models.py:1005 msgid "Act type" msgstr "" -#: forms.py:1268 forms.py:1466 +#: forms.py:1302 forms.py:1500 msgid "Indexed?" msgstr "" -#: forms.py:1274 forms.py:1339 models.py:1040 +#: forms.py:1308 forms.py:1373 models.py:1045 #: templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "" -#: forms.py:1311 views.py:333 +#: forms.py:1345 views.py:348 msgid "Administrative act search" msgstr "" -#: forms.py:1326 forms.py:1424 forms.py:1491 +#: forms.py:1360 forms.py:1458 forms.py:1525 msgid "You should select an administrative act." msgstr "" -#: forms.py:1342 models.py:1037 +#: forms.py:1376 models.py:1042 msgid "Signature date" msgstr "" -#: forms.py:1384 +#: forms.py:1418 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " "%(last_val)d" msgstr "" -#: forms.py:1388 +#: forms.py:1422 msgid "Bad index" msgstr "" -#: forms.py:1401 +#: forms.py:1435 msgid "Would you like to delete this administrative act?" msgstr "" -#: forms.py:1406 +#: forms.py:1440 msgid "Template" msgstr "" -#: forms.py:1430 forms.py:1434 +#: forms.py:1464 forms.py:1468 msgid "This document is not intended for this type of act." msgstr "" -#: forms.py:1452 +#: forms.py:1486 msgid "Doc generation" msgstr "" -#: forms.py:1454 +#: forms.py:1488 msgid "Generate the associated doc?" msgstr "" -#: forms.py:1475 ishtar_menu.py:123 views.py:386 +#: forms.py:1509 ishtar_menu.py:123 views.py:401 msgctxt "admin act register" msgid "Register" msgstr "" @@ -591,7 +599,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:59 models.py:1056 +#: ishtar_menu.py:59 models.py:1061 #: templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "" @@ -616,16 +624,16 @@ msgstr "" msgid "General informations" msgstr "" -#: ishtar_menu.py:139 models.py:369 +#: ishtar_menu.py:139 models.py:373 #: templates/ishtar/dashboards/dashboard_operation.html:8 msgid "Operations" msgstr "" -#: models.py:53 models.py:71 models.py:1913 +#: models.py:53 models.py:71 models.py:1918 msgid "Order" msgstr "" -#: models.py:55 models.py:1444 +#: models.py:55 models.py:1449 msgid "End date" msgstr "" @@ -741,357 +749,357 @@ msgstr "" msgid "In charge scientist" msgstr "" -#: models.py:277 models.py:1226 +#: models.py:281 models.py:1231 msgid "File" msgstr "" -#: models.py:281 +#: models.py:285 msgid "Surface (m2)" msgstr "" -#: models.py:335 +#: models.py:339 msgid "General comment" msgstr "" -#: models.py:338 +#: models.py:342 msgid "Cached name" msgstr "" -#: models.py:346 +#: models.py:350 msgid "" "If checked, it means that this operation have not been officialy registered." msgstr "" -#: models.py:362 +#: models.py:366 msgid "Point" msgstr "" -#: models.py:363 +#: models.py:367 msgid "Multi polygon" msgstr "" -#: models.py:371 +#: models.py:375 msgid "Can view all Operations" msgstr "" -#: models.py:372 +#: models.py:376 msgid "Can view own Operation" msgstr "" -#: models.py:373 +#: models.py:377 msgid "Can add own Operation" msgstr "" -#: models.py:374 +#: models.py:378 msgid "Can change own Operation" msgstr "" -#: models.py:375 +#: models.py:379 msgid "Can delete own Operation" msgstr "" -#: models.py:376 +#: models.py:380 msgid "Can close Operation" msgstr "" -#: models.py:405 +#: models.py:409 msgid "OPE" msgstr "" -#: models.py:479 +#: models.py:483 msgid "Intercommunal" msgstr "" -#: models.py:517 +#: models.py:521 msgid "Code patriarche" msgstr "" -#: models.py:557 +#: models.py:561 msgid "This operation code already exists for this year" msgstr "" -#: models.py:582 +#: models.py:588 msgid "Number of parcels" msgstr "" -#: models.py:600 +#: models.py:598 msgid "Number of administrative acts" msgstr "" -#: models.py:608 +#: models.py:606 msgid "Number of indexed administrative acts" msgstr "" -#: models.py:616 +#: models.py:614 msgid "Number of context records" msgstr "" -#: models.py:652 +#: models.py:650 msgid "Number of finds" msgstr "" -#: models.py:697 +#: models.py:695 msgid "No type" msgstr "" -#: models.py:728 +#: models.py:726 msgid "Number of sources" msgstr "" -#: models.py:770 templates/ishtar/dashboards/dashboard_operation.html:309 +#: models.py:768 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:820 +#: models.py:818 msgid "Inverse relation" msgstr "" -#: models.py:824 +#: models.py:822 msgid "Operation relation type" msgstr "" -#: models.py:825 +#: models.py:823 msgid "Operation relation types" msgstr "" -#: models.py:838 +#: models.py:836 msgid "Operation record relation" msgstr "" -#: models.py:839 +#: models.py:837 msgid "Operation record relations" msgstr "" -#: models.py:878 +#: models.py:876 msgid "Operation year" msgstr "" -#: models.py:880 +#: models.py:878 msgid "Document code" msgstr "" -#: models.py:890 +#: models.py:888 msgid "Operation documentation" msgstr "" -#: models.py:891 +#: models.py:889 msgid "Operation documentations" msgstr "" -#: models.py:894 +#: models.py:892 msgid "Can view all Operation sources" msgstr "" -#: models.py:896 +#: models.py:894 msgid "Can view own Operation source" msgstr "" -#: models.py:898 +#: models.py:896 msgid "Can add own Operation source" msgstr "" -#: models.py:900 +#: models.py:898 msgid "Can change own Operation source" msgstr "" -#: models.py:902 +#: models.py:900 msgid "Can delete own Operation source" msgstr "" -#: models.py:918 models.py:1031 +#: models.py:923 models.py:1036 msgid "Treatment request" msgstr "" -#: models.py:919 models.py:1036 +#: models.py:924 models.py:1041 msgid "Treatment" msgstr "" -#: models.py:921 +#: models.py:926 msgid "Intended to" msgstr "" -#: models.py:923 +#: models.py:928 msgid "Code" msgstr "" -#: models.py:926 +#: models.py:931 msgid "Associated template" msgstr "" -#: models.py:927 +#: models.py:932 msgid "Indexed" msgstr "" -#: models.py:931 +#: models.py:936 msgid "Act types" msgstr "" -#: models.py:997 models.py:1077 +#: models.py:1002 models.py:1082 #: templates/ishtar/blocks/window_tables/administrativacts.html:7 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 msgid "Ref." msgstr "" -#: models.py:1004 +#: models.py:1009 msgid "Person in charge of the operation" msgstr "" -#: models.py:1010 +#: models.py:1015 msgid "Archaeological preventive operator" msgstr "" -#: models.py:1018 +#: models.py:1023 msgid "Signatory" msgstr "" -#: models.py:1046 +#: models.py:1051 msgid "Departments" msgstr "" -#: models.py:1047 +#: models.py:1052 msgid "Cached values get from associated departments" msgstr "" -#: models.py:1050 +#: models.py:1055 msgid "Cached values get from associated towns" msgstr "" -#: models.py:1057 templates/ishtar/sheet_operation.html:104 -#: templates/ishtar/sheet_operation.html:145 +#: models.py:1062 templates/ishtar/sheet_operation.html:105 +#: templates/ishtar/sheet_operation.html:147 msgid "Administrative acts" msgstr "" -#: models.py:1060 +#: models.py:1065 msgid "Can view all Administrative acts" msgstr "" -#: models.py:1062 +#: models.py:1067 msgid "Can view own Administrative act" msgstr "" -#: models.py:1064 +#: models.py:1069 msgid "Can add own Administrative act" msgstr "" -#: models.py:1066 +#: models.py:1071 msgid "Can change own Administrative act" msgstr "" -#: models.py:1068 +#: models.py:1073 msgid "Can delete own Administrative act" msgstr "" -#: models.py:1171 +#: models.py:1176 msgid "This index already exists for this year" msgstr "" -#: models.py:1239 +#: models.py:1244 msgid "External ID" msgstr "" -#: models.py:1242 +#: models.py:1247 msgid "External ID is set automatically" msgstr "" -#: models.py:1243 +#: models.py:1248 msgid "Address - Locality" msgstr "" -#: models.py:1439 +#: models.py:1444 msgid "Owner" msgstr "" -#: models.py:1447 +#: models.py:1452 msgid "Parcel owner" msgstr "" -#: models.py:1448 +#: models.py:1453 msgid "Parcel owners" msgstr "" -#: models.py:1474 +#: models.py:1479 msgid "Recorded" msgstr "" -#: models.py:1475 +#: models.py:1480 msgid "Effective" msgstr "" -#: models.py:1476 +#: models.py:1481 msgid "Active" msgstr "" -#: models.py:1477 +#: models.py:1482 msgid "Field completed" msgstr "" -#: models.py:1478 +#: models.py:1483 msgid "Associated report" msgstr "" -#: models.py:1479 +#: models.py:1484 msgid "Closed" msgstr "" -#: models.py:1480 +#: models.py:1485 msgid "Documented and closed" msgstr "" -#: models.py:1914 +#: models.py:1919 msgid "Is preventive" msgstr "" -#: models.py:1917 +#: models.py:1922 msgid "Operation type old" msgstr "" -#: models.py:1918 +#: models.py:1923 msgid "Operation types old" msgstr "" -#: views.py:214 +#: views.py:223 msgid "New operation" msgstr "" -#: views.py:237 +#: views.py:267 msgid "Operation modification" msgstr "" -#: views.py:280 +#: views.py:295 msgid "Operation closing" msgstr "" -#: views.py:291 +#: views.py:306 msgid "Operation deletion" msgstr "" -#: views.py:296 +#: views.py:311 msgid "Operation: source search" msgstr "" -#: views.py:304 +#: views.py:319 msgid "Operation: source creation" msgstr "" -#: views.py:312 +#: views.py:327 msgid "Operation: source modification" msgstr "" -#: views.py:327 +#: views.py:342 msgid "Operation: source deletion" msgstr "" -#: views.py:346 +#: views.py:361 msgid "Operation: new administrative act" msgstr "" -#: views.py:356 +#: views.py:371 msgid "Operation: administrative act modification" msgstr "" -#: views.py:380 +#: views.py:395 msgid "Operation: administrative act deletion" msgstr "" @@ -1106,7 +1114,7 @@ msgid "" msgstr "" #: templates/ishtar/sheet_administrativeact.html:36 -#: templates/ishtar/sheet_operation.html:40 +#: templates/ishtar/sheet_operation.html:41 msgid "Surface:" msgstr "" @@ -1126,92 +1134,96 @@ msgstr "" msgid "Begining date" msgstr "" -#: templates/ishtar/sheet_operation.html:36 +#: templates/ishtar/sheet_operation.html:37 msgid "State:" msgstr "" -#: templates/ishtar/sheet_operation.html:36 +#: templates/ishtar/sheet_operation.html:37 msgid "Active file" msgstr "" -#: templates/ishtar/sheet_operation.html:37 +#: templates/ishtar/sheet_operation.html:38 msgid "Closed operation" msgstr "" -#: templates/ishtar/sheet_operation.html:38 +#: templates/ishtar/sheet_operation.html:39 msgid "Closing date:" msgstr "" -#: templates/ishtar/sheet_operation.html:38 +#: templates/ishtar/sheet_operation.html:39 msgid "by" msgstr "" -#: templates/ishtar/sheet_operation.html:41 +#: templates/ishtar/sheet_operation.html:42 msgid "Cost:" msgstr "" -#: templates/ishtar/sheet_operation.html:42 +#: templates/ishtar/sheet_operation.html:43 msgid "Duration:" msgstr "" -#: templates/ishtar/sheet_operation.html:42 +#: templates/ishtar/sheet_operation.html:43 msgid "Day" msgstr "" -#: templates/ishtar/sheet_operation.html:75 +#: templates/ishtar/sheet_operation.html:76 msgid "Localisation" msgstr "" -#: templates/ishtar/sheet_operation.html:100 +#: templates/ishtar/sheet_operation.html:101 msgid "Associated parcels" msgstr "" -#: templates/ishtar/sheet_operation.html:108 +#: templates/ishtar/sheet_operation.html:109 msgid "Document from this operation" msgstr "" -#: templates/ishtar/sheet_operation.html:114 -#: templates/ishtar/sheet_operation.html:156 +#: templates/ishtar/sheet_operation.html:115 +#: templates/ishtar/sheet_operation.html:158 msgid "Context records" msgstr "" -#: templates/ishtar/sheet_operation.html:119 +#: templates/ishtar/sheet_operation.html:120 msgid "Context record relations" msgstr "" -#: templates/ishtar/sheet_operation.html:124 +#: templates/ishtar/sheet_operation.html:125 msgid "Documents from associated context records" msgstr "" -#: templates/ishtar/sheet_operation.html:129 -#: templates/ishtar/sheet_operation.html:179 +#: templates/ishtar/sheet_operation.html:130 +#: templates/ishtar/sheet_operation.html:181 msgid "Finds" msgstr "" -#: templates/ishtar/sheet_operation.html:134 +#: templates/ishtar/sheet_operation.html:135 msgid "Documents from associated finds" msgstr "" -#: templates/ishtar/sheet_operation.html:139 +#: templates/ishtar/sheet_operation.html:140 msgid "Associated containers" msgstr "" -#: templates/ishtar/sheet_operation.html:143 +#: templates/ishtar/sheet_operation.html:144 msgid "Statistics" msgstr "" -#: templates/ishtar/sheet_operation.html:163 -#: templates/ishtar/sheet_operation.html:217 +#: templates/ishtar/sheet_operation.html:145 +msgid "Theses number are updated hourly" +msgstr "" + +#: templates/ishtar/sheet_operation.html:165 +#: templates/ishtar/sheet_operation.html:219 #: templates/ishtar/blocks/window_tables/administrativacts.html:8 msgid "Type" msgstr "" -#: 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/sheet_operation.html:165 +#: templates/ishtar/sheet_operation.html:173 +#: templates/ishtar/sheet_operation.html:188 +#: templates/ishtar/sheet_operation.html:196 +#: templates/ishtar/sheet_operation.html:204 +#: templates/ishtar/sheet_operation.html:219 #: templates/ishtar/dashboards/dashboard_operation.html:18 #: templates/ishtar/dashboards/dashboard_operation.html:164 #: templates/ishtar/dashboards/dashboard_operation.html:432 @@ -1220,19 +1232,19 @@ msgstr "" msgid "Number" msgstr "" -#: templates/ishtar/sheet_operation.html:186 +#: templates/ishtar/sheet_operation.html:188 msgid "Material type" msgstr "" -#: templates/ishtar/sheet_operation.html:194 +#: templates/ishtar/sheet_operation.html:196 msgid "Object type" msgstr "" -#: templates/ishtar/sheet_operation.html:210 +#: templates/ishtar/sheet_operation.html:212 msgid "Sources" msgstr "" -#: templates/ishtar/sheet_operation.html:226 +#: templates/ishtar/sheet_operation.html:228 msgid "Finds by context records" msgstr "" diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot index d5d6e9b63..f5893af41 100644 --- a/archaeological_warehouse/locale/django.pot +++ b/archaeological_warehouse/locale/django.pot @@ -4,19 +4,20 @@ # Étienne Loks , 2010-2011. # Valérie-Emma Leroux , 2016. #zanata # Valérie-Emma Leroux , 2017. #zanata +# Étienne Loks , 2017. #zanata msgid "" msgstr "" -#: forms.py:36 forms.py:99 ishtar_menu.py:40 models.py:63 models.py:103 +#: forms.py:36 forms.py:99 ishtar_menu.py:40 models.py:66 models.py:202 #: templates/ishtar/sheet_warehouse.html:4 msgid "Warehouse" msgstr "" -#: forms.py:45 forms.py:50 models.py:281 +#: forms.py:45 forms.py:50 models.py:387 msgid "Division" msgstr "" -#: forms.py:52 models.py:127 +#: forms.py:52 models.py:226 msgid "Order" msgstr "" @@ -24,15 +25,15 @@ msgstr "" msgid "There are identical divisions." msgstr "" -#: forms.py:70 models.py:53 +#: forms.py:70 models.py:56 msgid "Divisions" msgstr "" -#: forms.py:74 forms.py:103 models.py:45 models.py:100 +#: forms.py:74 forms.py:103 models.py:48 models.py:199 msgid "Name" msgstr "" -#: forms.py:75 forms.py:105 models.py:36 models.py:47 +#: forms.py:75 forms.py:105 models.py:39 models.py:50 msgid "Warehouse type" msgstr "" @@ -44,11 +45,11 @@ msgstr "" msgid "Warehouse search" msgstr "" -#: forms.py:108 models.py:50 +#: forms.py:108 models.py:53 msgid "Person in charge" msgstr "" -#: forms.py:114 forms.py:184 models.py:51 models.py:181 +#: forms.py:114 forms.py:184 models.py:54 models.py:280 msgid "Comment" msgstr "" @@ -80,16 +81,16 @@ msgstr "" msgid "Would you like to delete this warehouse?" msgstr "" -#: forms.py:158 models.py:192 models.py:279 +#: forms.py:158 models.py:291 models.py:384 #: templates/ishtar/sheet_container.html:4 msgid "Container" msgstr "" -#: forms.py:163 forms.py:237 models.py:142 +#: forms.py:163 forms.py:237 models.py:241 msgid "Ref." msgstr "" -#: forms.py:164 forms.py:236 models.py:145 models.py:179 +#: forms.py:164 forms.py:236 models.py:244 models.py:278 msgid "Container type" msgstr "" @@ -97,7 +98,7 @@ msgstr "" msgid "Current location (warehouse)" msgstr "" -#: forms.py:172 models.py:176 +#: forms.py:172 models.py:275 msgid "Responsible warehouse" msgstr "" @@ -148,7 +149,7 @@ msgstr "" msgid "Packaged finds" msgstr "" -#: forms.py:280 models.py:182 +#: forms.py:280 models.py:281 msgid "Localisation" msgstr "" @@ -176,115 +177,116 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:57 models.py:193 templates/ishtar/sheet_warehouse.html:20 +#: ishtar_menu.py:57 models.py:292 templates/ishtar/sheet_warehouse.html:20 +#: templates/ishtar/sheet_warehouse.html:53 msgid "Containers" msgstr "" -#: models.py:37 +#: models.py:40 msgid "Warehouse types" msgstr "" -#: models.py:56 models.py:187 +#: models.py:59 models.py:286 msgid "External ID" msgstr "" -#: models.py:58 models.py:189 +#: models.py:61 models.py:288 msgid "External ID is set automatically" msgstr "" -#: models.py:64 +#: models.py:67 msgid "Warehouses" msgstr "" -#: models.py:66 +#: models.py:69 msgid "Can view all Warehouses" msgstr "" -#: models.py:67 +#: models.py:70 msgid "Can view own Warehouse" msgstr "" -#: models.py:68 +#: models.py:71 msgid "Can add own Warehouse" msgstr "" -#: models.py:69 +#: models.py:72 msgid "Can change own Warehouse" msgstr "" -#: models.py:70 +#: models.py:73 msgid "Can delete own Warehouse" msgstr "" -#: models.py:102 +#: models.py:201 msgid "Description" msgstr "" -#: models.py:107 models.py:108 +#: models.py:206 models.py:207 msgid "Collection" msgstr "" -#: models.py:117 +#: models.py:216 msgid "Warehouse division type" msgstr "" -#: models.py:118 +#: models.py:217 msgid "Warehouse division types" msgstr "" -#: models.py:138 +#: models.py:237 msgid "Length (mm)" msgstr "" -#: models.py:139 +#: models.py:238 msgid "Width (mm)" msgstr "" -#: models.py:140 +#: models.py:239 msgid "Height (mm)" msgstr "" -#: models.py:141 +#: models.py:240 msgid "Volume (l)" msgstr "" -#: models.py:146 +#: models.py:245 msgid "Container types" msgstr "" -#: models.py:165 +#: models.py:264 msgid "Location - index" msgstr "" -#: models.py:166 +#: models.py:265 msgid "Precise localisation" msgstr "" -#: models.py:167 +#: models.py:266 msgid "Type" msgstr "" -#: models.py:173 +#: models.py:272 msgid "Location (warehouse)" msgstr "" -#: models.py:180 +#: models.py:279 msgid "Container ref." msgstr "" -#: models.py:184 +#: models.py:283 msgid "Cached location" msgstr "" -#: models.py:282 +#: models.py:388 msgid "Reference" msgstr "" -#: models.py:285 +#: models.py:391 msgid "Container localisation" msgstr "" -#: models.py:286 +#: models.py:392 msgid "Container localisations" msgstr "" @@ -320,8 +322,34 @@ msgstr "" msgid "Attached containers" msgstr "" -#: templates/ishtar/wizard/wizard_containerlocalisation.html:6 +#: templates/ishtar/sheet_warehouse.html:29 +msgid "Statistics" +msgstr "" + +#: templates/ishtar/sheet_warehouse.html:30 +msgid "Theses number are updated hourly" +msgstr "" + +#: templates/ishtar/sheet_warehouse.html:32 +msgid "Finds" +msgstr "" + +#: templates/ishtar/sheet_warehouse.html:39 +msgid "Finds by location in the warehouse" +msgstr "" + +#: templates/ishtar/sheet_warehouse.html:59 +msgid "Containers by location in the warehouse" +msgstr "" + +#: templates/ishtar/wizard/wizard_containerlocalisation.html:8 msgid "" "No division set for this warehouse. Define at least one division to localise " "containers in this warehouse." msgstr "" + +#: templates/ishtar/wizard/wizard_warehouse_divisions.html:8 +msgid "" +"Containers with localisation are associated to this warehouse. You cannot " +"change divisions." +msgstr "" diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index d56b7cbcd..bf9b6bca0 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -148,40 +148,40 @@ msgstr "" msgid "\"%(value)s\" not in %(values)s" msgstr "" -#: forms.py:73 +#: forms.py:74 msgid "Enter a valid name consisting of letters, spaces and hyphens." msgstr "" -#: forms.py:89 forms_common.py:626 +#: forms.py:90 forms_common.py:626 msgid "Confirm" msgstr "" -#: forms.py:94 +#: forms.py:95 msgid "Are you sure you want to delete?" msgstr "" -#: forms.py:103 +#: forms.py:129 msgid "There are identical items." msgstr "" -#: forms.py:141 forms.py:142 +#: forms.py:176 forms.py:177 msgid "Closing date" msgstr "" -#: forms.py:155 +#: forms.py:190 msgid "You should select an item." msgstr "" -#: forms.py:156 +#: forms.py:191 msgid "Add a new item" msgstr "" -#: forms.py:262 models.py:1482 +#: forms.py:297 models.py:1501 msgid "Template" msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:184 -#: forms_common.py:408 models.py:1548 models.py:2989 +#: forms_common.py:408 models.py:1567 models.py:3033 #: 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:2610 -#: models.py:2791 models.py:2856 templates/ishtar/sheet_person.html:4 +#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2629 +#: models.py:2822 models.py:2888 templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -209,64 +209,64 @@ msgid "" msgstr "" #: forms_common.py:172 forms_common.py:329 forms_common.py:453 -#: ishtar_menu.py:75 models.py:2493 models.py:2584 +#: ishtar_menu.py:75 models.py:2512 models.py:2603 #: 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:2279 models.py:2487 -#: models.py:2596 models.py:2975 templates/ishtar/import_list.html:13 +#: forms_common.py:378 forms_common.py:448 models.py:1109 models.py:1500 +#: models.py:1769 models.py:1785 models.py:2022 models.py:2298 models.py:2506 +#: models.py:2615 models.py:3019 templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "" -#: forms_common.py:176 models.py:1703 models.py:2134 +#: forms_common.py:176 models.py:1722 models.py:2153 msgid "Organization type" msgstr "" -#: forms_common.py:178 forms_common.py:402 models.py:1543 +#: forms_common.py:178 forms_common.py:402 models.py:1562 #: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "" -#: forms_common.py:180 forms_common.py:405 models.py:1544 +#: forms_common.py:180 forms_common.py:405 models.py:1563 #: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "" -#: forms_common.py:182 forms_common.py:406 models.py:1546 +#: forms_common.py:182 forms_common.py:406 models.py:1565 #: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "" -#: forms_common.py:185 forms_common.py:409 models.py:1549 +#: forms_common.py:185 forms_common.py:409 models.py:1568 msgid "Country" msgstr "" #: forms_common.py:187 forms_common.py:326 forms_common.py:382 -#: forms_common.py:450 forms_common.py:574 models.py:1576 +#: forms_common.py:450 forms_common.py:574 models.py:1595 msgid "Email" msgstr "" -#: forms_common.py:188 forms_common.py:385 models.py:1561 +#: forms_common.py:188 forms_common.py:385 models.py:1580 #: templates/ishtar/sheet_organization.html:14 #: 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 +#: forms_common.py:189 forms_common.py:394 models.py:1592 #: templates/ishtar/sheet_organization.html:15 #: 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:2489 models.py:2910 templates/sheet_ope.html:85 +#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2189 +#: models.py:2508 models.py:2954 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:14 #: templates/ishtar/sheet_organization.html:23 @@ -290,7 +290,7 @@ msgstr "" msgid "Organization to merge" msgstr "" -#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2594 +#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2613 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "" @@ -308,25 +308,25 @@ msgstr "" msgid "Identity" msgstr "" -#: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2135 -#: models.py:2588 models.py:2590 models.py:2907 templates/sheet_ope.html:104 +#: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2154 +#: models.py:2607 models.py:2609 models.py:2951 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" -#: forms_common.py:374 models.py:2592 +#: forms_common.py:374 models.py:2611 msgid "Salutation" msgstr "" -#: forms_common.py:380 models.py:2598 +#: forms_common.py:380 models.py:2617 msgid "Raw name" msgstr "" -#: forms_common.py:383 models.py:1562 +#: forms_common.py:383 models.py:1581 msgid "Phone description" msgstr "" -#: forms_common.py:386 models.py:1564 models.py:1566 +#: forms_common.py:386 models.py:1583 models.py:1585 msgid "Phone description 2" msgstr "" @@ -334,11 +334,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: forms_common.py:390 models.py:1570 +#: forms_common.py:390 models.py:1589 msgid "Phone description 3" msgstr "" -#: forms_common.py:392 models.py:1568 +#: forms_common.py:392 models.py:1587 msgid "Phone 3" msgstr "" @@ -346,23 +346,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: forms_common.py:411 models.py:1551 +#: forms_common.py:411 models.py:1570 msgid "Other address: address" msgstr "" -#: forms_common.py:414 models.py:1554 +#: forms_common.py:414 models.py:1573 msgid "Other address: address complement" msgstr "" -#: forms_common.py:416 models.py:1555 +#: forms_common.py:416 models.py:1574 msgid "Other address: postal code" msgstr "" -#: forms_common.py:418 models.py:1557 +#: forms_common.py:418 models.py:1576 msgid "Other address: town" msgstr "" -#: forms_common.py:420 models.py:1559 +#: forms_common.py:420 models.py:1578 msgid "Other address: country" msgstr "" @@ -378,7 +378,7 @@ msgstr "" msgid "Account search" msgstr "" -#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2541 +#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2560 msgid "Person type" msgstr "" @@ -386,7 +386,7 @@ msgstr "" msgid "Account" msgstr "" -#: forms_common.py:577 wizards.py:1339 +#: forms_common.py:577 wizards.py:1347 msgid "New password" msgstr "" @@ -410,7 +410,7 @@ msgstr "" msgid "Send the new password by email?" msgstr "" -#: forms_common.py:636 forms_common.py:649 models.py:2990 +#: forms_common.py:636 forms_common.py:649 models.py:3034 msgid "Towns" msgstr "" @@ -426,7 +426,7 @@ msgstr "" msgid "Documentation informations" msgstr "" -#: forms_common.py:783 forms_common.py:831 models.py:2136 models.py:2882 +#: forms_common.py:783 forms_common.py:831 models.py:2155 models.py:2926 msgid "Source type" msgstr "" @@ -438,37 +438,37 @@ msgstr "" msgid "Internal reference" msgstr "" -#: forms_common.py:791 models.py:2921 +#: forms_common.py:791 models.py:2965 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:792 models.py:2923 +#: forms_common.py:792 models.py:2967 msgid "Receipt date" msgstr "" -#: forms_common.py:794 models.py:2304 models.py:2925 +#: forms_common.py:794 models.py:2323 models.py:2969 msgid "Creation date" msgstr "" -#: forms_common.py:797 models.py:2928 +#: forms_common.py:797 models.py:2972 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:2602 models.py:2935 +#: forms_common.py:799 forms_common.py:835 models.py:381 models.py:698 +#: models.py:2049 models.py:2621 models.py:2979 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:2934 templates/sheet_ope.html:128 +#: forms_common.py:801 forms_common.py:834 models.py:1111 models.py:1789 +#: models.py:1976 models.py:2023 models.py:2978 templates/sheet_ope.html:128 msgid "Description" msgstr "" -#: forms_common.py:804 models.py:2936 +#: forms_common.py:804 models.py:2980 msgid "Additional information" msgstr "" -#: forms_common.py:806 forms_common.py:838 models.py:2938 +#: forms_common.py:806 forms_common.py:838 models.py:2982 msgid "Has a duplicate" msgstr "" @@ -483,7 +483,7 @@ msgid "" "p>" msgstr "" -#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2861 +#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2893 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" @@ -496,7 +496,7 @@ msgstr "" msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:864 models.py:2137 models.py:2848 models.py:2858 +#: forms_common.py:864 models.py:2156 models.py:2880 models.py:2890 msgid "Author type" msgstr "" @@ -508,7 +508,7 @@ msgstr "" msgid "There are identical authors." msgstr "" -#: forms_common.py:901 models.py:2862 models.py:2917 +#: forms_common.py:901 models.py:2894 models.py:2961 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -526,7 +526,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:39 models.py:1277 views.py:1608 +#: ishtar_menu.py:39 models.py:1283 views.py:1632 msgid "Global variables" msgstr "" @@ -554,19 +554,19 @@ msgstr "" msgid "Manual merge" msgstr "" -#: ishtar_menu.py:109 models.py:2315 +#: ishtar_menu.py:109 models.py:2334 msgid "Imports" msgstr "" -#: ishtar_menu.py:112 views.py:1616 +#: ishtar_menu.py:112 views.py:1640 msgid "New import" msgstr "" -#: ishtar_menu.py:116 views.py:1630 +#: ishtar_menu.py:116 views.py:1654 msgid "Current imports" msgstr "" -#: ishtar_menu.py:120 views.py:1669 +#: ishtar_menu.py:120 views.py:1693 msgid "Old imports" msgstr "" @@ -574,258 +574,258 @@ msgstr "" msgid "Not a valid item." msgstr "" -#: models.py:199 +#: models.py:201 msgid "A selected item is not a valid item." msgstr "" -#: models.py:210 +#: models.py:212 msgid "This item already exists." msgstr "" -#: models.py:375 models.py:695 models.py:1516 models.py:1528 models.py:1954 +#: models.py:377 models.py:697 models.py:1535 models.py:1547 models.py:1973 msgid "Label" msgstr "" -#: models.py:377 +#: models.py:379 msgid "Textual ID" msgstr "" -#: models.py:380 models.py:698 models.py:1485 +#: models.py:382 models.py:700 models.py:1504 msgid "Available" msgstr "" -#: models.py:722 models.py:2076 +#: models.py:724 models.py:2095 msgid "Key" msgstr "" -#: models.py:728 +#: models.py:730 msgid "Specific key to an import" msgstr "" -#: models.py:820 +#: models.py:826 msgid "Last editor" msgstr "" -#: models.py:823 +#: models.py:829 msgid "Creator" msgstr "" -#: models.py:965 models.py:2846 models.py:3001 models.py:3057 +#: models.py:971 models.py:2877 models.py:3045 models.py:3101 msgid "Order" msgstr "" -#: models.py:966 +#: models.py:972 msgid "Symmetrical" msgstr "" -#: models.py:967 +#: models.py:973 msgid "Tiny label" msgstr "" -#: models.py:981 +#: models.py:987 msgid "Cannot have symmetrical and an inverse_relation" msgstr "" -#: models.py:1097 +#: models.py:1103 msgid "Euro" msgstr "" -#: models.py:1098 +#: models.py:1104 msgid "US dollar" msgstr "" -#: models.py:1104 models.py:1768 +#: models.py:1110 models.py:1787 msgid "Slug" msgstr "" -#: models.py:1107 +#: models.py:1113 msgid "CSS color code for base module" msgstr "" -#: models.py:1109 +#: models.py:1115 msgid "Files module" msgstr "" -#: models.py:1111 +#: models.py:1117 msgid "CSS color code for files module" msgstr "" -#: models.py:1113 +#: models.py:1119 msgid "Context records module" msgstr "" -#: models.py:1116 +#: models.py:1122 msgid "CSS color code for context record module" msgstr "" -#: models.py:1118 +#: models.py:1124 msgid "Finds module" msgstr "" -#: models.py:1119 +#: models.py:1125 msgid "Need context records module" msgstr "" -#: models.py:1121 +#: models.py:1127 msgid "CSS color code for find module" msgstr "" -#: models.py:1124 +#: models.py:1130 msgid "Warehouses module" msgstr "" -#: models.py:1125 +#: models.py:1131 msgid "Need finds module" msgstr "" -#: models.py:1127 +#: models.py:1133 msgid "CSS code for warehouse module" msgstr "" -#: models.py:1129 +#: models.py:1135 msgid "Mapping module" msgstr "" -#: models.py:1131 +#: models.py:1137 msgid "CSS code for mapping module" msgstr "" -#: models.py:1134 +#: models.py:1140 msgid "Home page" msgstr "" -#: models.py:1135 +#: models.py:1141 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " "markdown syntax. {random_image} can be used to display a random image." msgstr "" -#: models.py:1139 +#: models.py:1145 msgid "File external id" msgstr "" -#: models.py:1141 +#: models.py:1147 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1146 +#: models.py:1152 msgid "Parcel external id" msgstr "" -#: models.py:1149 +#: models.py:1155 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1154 +#: models.py:1160 msgid "Context record external id" msgstr "" -#: models.py:1156 +#: models.py:1162 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1161 +#: models.py:1167 msgid "Base find external id" msgstr "" -#: models.py:1163 +#: models.py:1169 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1168 +#: models.py:1174 msgid "Find external id" msgstr "" -#: models.py:1170 +#: models.py:1176 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1175 +#: models.py:1181 msgid "Container external id" msgstr "" -#: models.py:1177 +#: models.py:1183 msgid "" "Formula to manage container external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1182 +#: models.py:1188 msgid "Warehouse external id" msgstr "" -#: models.py:1184 +#: models.py:1190 msgid "" "Formula to manage warehouse external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1189 +#: models.py:1195 msgid "Raw name for person" msgstr "" -#: models.py:1191 +#: models.py:1197 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1195 +#: models.py:1201 msgid "Current active" msgstr "" -#: models.py:1196 +#: models.py:1202 msgid "Currency" msgstr "" -#: models.py:1200 +#: models.py:1206 msgid "Ishtar site profile" msgstr "" -#: models.py:1201 +#: models.py:1207 msgid "Ishtar site profiles" msgstr "" -#: models.py:1270 +#: models.py:1276 msgid "Variable name" msgstr "" -#: models.py:1271 +#: models.py:1277 msgid "Description of the variable" msgstr "" -#: models.py:1273 models.py:2077 +#: models.py:1279 models.py:2096 msgid "Value" msgstr "" -#: models.py:1276 +#: models.py:1282 msgid "Global variable" msgstr "" -#: models.py:1386 models.py:1416 +#: models.py:1405 models.py:1435 msgid "Total" msgstr "" -#: models.py:1393 models.py:1517 models.py:1529 +#: models.py:1412 models.py:1536 models.py:1548 #: templates/ishtar/sheet_person.html:24 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 @@ -833,643 +833,663 @@ msgstr "" msgid "Number" msgstr "" -#: models.py:1480 +#: models.py:1499 msgid "Administrative Act" msgstr "" -#: models.py:1484 +#: models.py:1503 msgid "Associated object" msgstr "" -#: models.py:1488 +#: models.py:1507 msgid "Document template" msgstr "" -#: models.py:1489 +#: models.py:1508 msgid "Document templates" msgstr "" -#: models.py:1520 models.py:1530 models.py:2299 +#: models.py:1539 models.py:1549 models.py:2318 msgid "State" msgstr "" -#: models.py:1534 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1553 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: models.py:1535 +#: models.py:1554 msgid "Departments" msgstr "" -#: models.py:1572 +#: models.py:1591 msgid "Raw phone" msgstr "" -#: models.py:1578 +#: models.py:1597 msgid "Alternative address is prefered" msgstr "" -#: models.py:1617 +#: models.py:1636 msgid "Tel: " msgstr "" -#: models.py:1621 +#: models.py:1640 msgid "Mobile: " msgstr "" -#: models.py:1625 +#: models.py:1644 msgid "Email: " msgstr "" -#: models.py:1630 +#: models.py:1649 msgid "Merge key" msgstr "" -#: models.py:1704 +#: models.py:1723 msgid "Organization types" msgstr "" -#: models.py:1751 +#: models.py:1770 msgid "Class name" msgstr "" -#: models.py:1754 +#: models.py:1773 msgid "Importer - Model" msgstr "" -#: models.py:1755 +#: models.py:1774 msgid "Importer - Models" msgstr "" -#: models.py:1772 templates/ishtar/dashboards/dashboard_main.html:25 +#: models.py:1791 templates/ishtar/dashboards/dashboard_main.html:25 msgid "Users" msgstr "" -#: models.py:1775 +#: models.py:1794 msgid "Associated model" msgstr "" -#: models.py:1778 +#: models.py:1797 msgid "Models that can accept new items" msgstr "" -#: models.py:1779 +#: models.py:1798 msgid "Leave blank for no restrictions" msgstr "" -#: models.py:1781 +#: models.py:1800 msgid "Is template" msgstr "" -#: models.py:1782 +#: models.py:1801 msgid "Unicity keys (separator \";\")" msgstr "" -#: models.py:1786 +#: models.py:1805 msgid "Importer - Type" msgstr "" -#: models.py:1787 +#: models.py:1806 msgid "Importer - Types" msgstr "" -#: models.py:1886 +#: models.py:1905 msgid "Importer - Default" msgstr "" -#: models.py:1887 +#: models.py:1906 msgid "Importer - Defaults" msgstr "" -#: models.py:1922 +#: models.py:1941 msgid "Importer - Default value" msgstr "" -#: models.py:1923 +#: models.py:1942 msgid "Importer - Default values" msgstr "" -#: models.py:1956 +#: models.py:1975 msgid "Column number" msgstr "" -#: models.py:1959 +#: models.py:1978 msgid "Required" msgstr "" -#: models.py:1961 +#: models.py:1980 msgid "Export field name" msgstr "" -#: models.py:1962 +#: models.py:1981 msgid "" "Fill this field if the field name is ambiguous for export. For instance: " "concatenated fields." msgstr "" -#: models.py:1967 +#: models.py:1986 msgid "Importer - Column" msgstr "" -#: models.py:1968 +#: models.py:1987 msgid "Importer - Columns" msgstr "" -#: models.py:1988 +#: models.py:2007 msgid "Field name" msgstr "" -#: models.py:1990 models.py:2024 +#: models.py:2009 models.py:2043 msgid "Force creation of new items" msgstr "" -#: models.py:1992 models.py:2026 +#: models.py:2011 models.py:2045 msgid "Concatenate with existing" msgstr "" -#: models.py:1994 models.py:2028 +#: models.py:2013 models.py:2047 msgid "Concatenate character" msgstr "" -#: models.py:1998 +#: models.py:2017 msgid "Importer - Duplicate field" msgstr "" -#: models.py:1999 +#: models.py:2018 msgid "Importer - Duplicate fields" msgstr "" -#: models.py:2006 +#: models.py:2025 msgid "Regular expression" msgstr "" -#: models.py:2009 +#: models.py:2028 msgid "Importer - Regular expression" msgstr "" -#: models.py:2010 +#: models.py:2029 msgid "Importer - Regular expressions" msgstr "" -#: models.py:2033 +#: models.py:2052 msgid "Importer - Target" msgstr "" -#: models.py:2034 +#: models.py:2053 msgid "Importer - Targets" msgstr "" -#: models.py:2058 views.py:549 +#: models.py:2077 views.py:568 msgid "True" msgstr "" -#: models.py:2059 views.py:551 +#: models.py:2078 views.py:570 msgid "False" msgstr "" -#: models.py:2078 +#: models.py:2097 msgid "Is set" msgstr "" -#: models.py:2085 +#: models.py:2104 msgid "Importer - Target key" msgstr "" -#: models.py:2086 +#: models.py:2105 msgid "Importer - Targets keys" msgstr "" -#: models.py:2138 models.py:2913 +#: models.py:2157 models.py:2957 msgid "Format" msgstr "" -#: models.py:2139 models.py:3005 +#: models.py:2158 models.py:3049 msgid "Operation type" msgstr "" -#: models.py:2140 +#: models.py:2159 msgid "Period" msgstr "" -#: models.py:2141 +#: models.py:2160 msgid "Report state" msgstr "" -#: models.py:2142 +#: models.py:2161 msgid "Remain type" msgstr "" -#: models.py:2143 +#: models.py:2162 msgid "Unit" msgstr "" -#: models.py:2144 +#: models.py:2163 msgid "Activity type" msgstr "" -#: models.py:2145 +#: models.py:2164 msgid "Material" msgstr "" -#: models.py:2147 +#: models.py:2166 msgid "Conservatory state" msgstr "" -#: models.py:2148 +#: models.py:2167 msgid "Container type" msgstr "" -#: models.py:2149 +#: models.py:2168 msgid "Preservation type" msgstr "" -#: models.py:2150 +#: models.py:2169 msgid "Object type" msgstr "" -#: models.py:2151 +#: models.py:2170 msgid "Integrity type" msgstr "" -#: models.py:2152 +#: models.py:2171 msgid "Remarkability type" msgstr "" -#: models.py:2153 +#: models.py:2172 msgid "Batch type" msgstr "" -#: models.py:2155 +#: models.py:2174 msgid "Identification type" msgstr "" -#: models.py:2157 +#: models.py:2176 msgid "Context record relation type" msgstr "" -#: models.py:2158 models.py:3063 +#: models.py:2177 models.py:3107 msgid "Spatial reference system" msgstr "" -#: models.py:2159 models.py:2891 +#: models.py:2178 models.py:2935 msgid "Support type" msgstr "" -#: models.py:2160 models.py:2553 +#: models.py:2179 models.py:2572 msgid "Title type" msgstr "" -#: models.py:2166 +#: models.py:2185 msgid "Integer" msgstr "" -#: models.py:2167 +#: models.py:2186 msgid "Float" msgstr "" -#: models.py:2168 +#: models.py:2187 msgid "String" msgstr "" -#: models.py:2169 templates/sheet_ope.html:86 +#: models.py:2188 templates/sheet_ope.html:86 msgid "Date" msgstr "" -#: models.py:2171 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2190 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "" -#: models.py:2172 +#: models.py:2191 msgid "String to boolean" msgstr "" -#: models.py:2173 +#: models.py:2192 msgctxt "filesystem" msgid "File" msgstr "" -#: models.py:2174 +#: models.py:2193 msgid "Unknow type" msgstr "" -#: models.py:2190 +#: models.py:2209 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: models.py:2191 +#: models.py:2210 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: models.py:2192 +#: models.py:2211 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: models.py:2202 +#: models.py:2221 msgid "Options" msgstr "" -#: models.py:2204 +#: models.py:2223 msgid "Split character(s)" msgstr "" -#: models.py:2208 +#: models.py:2227 msgid "Importer - Formater type" msgstr "" -#: models.py:2209 +#: models.py:2228 msgid "Importer - Formater types" msgstr "" -#: models.py:2261 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2280 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "" -#: models.py:2262 +#: models.py:2281 msgid "Analyse in progress" msgstr "" -#: models.py:2263 +#: models.py:2282 msgid "Analysed" msgstr "" -#: models.py:2264 +#: models.py:2283 msgid "Import pending" msgstr "" -#: models.py:2265 +#: models.py:2284 msgid "Import in progress" msgstr "" -#: models.py:2266 +#: models.py:2285 msgid "Finished with errors" msgstr "" -#: models.py:2267 +#: models.py:2286 msgid "Finished" msgstr "" -#: models.py:2268 +#: models.py:2287 msgid "Archived" msgstr "" -#: models.py:2283 +#: models.py:2302 msgid "Imported file" msgstr "" -#: models.py:2285 +#: models.py:2304 msgid "Associated images (zip file)" msgstr "" -#: models.py:2287 +#: models.py:2306 msgid "Encoding" msgstr "" -#: models.py:2289 +#: models.py:2308 msgid "Skip lines" msgstr "" -#: models.py:2290 templates/ishtar/import_list.html:51 +#: models.py:2309 templates/ishtar/import_list.html:51 msgid "Error file" msgstr "" -#: models.py:2293 +#: models.py:2312 msgid "Result file" msgstr "" -#: models.py:2296 templates/ishtar/import_list.html:57 +#: models.py:2315 templates/ishtar/import_list.html:57 msgid "Match file" msgstr "" -#: models.py:2302 +#: models.py:2321 msgid "Conservative import" msgstr "" -#: models.py:2307 +#: models.py:2326 msgid "End date" msgstr "" -#: models.py:2309 +#: models.py:2328 msgid "Remaining seconds" msgstr "" -#: models.py:2314 +#: models.py:2333 msgid "Import" msgstr "" -#: models.py:2343 +#: models.py:2362 msgid "Analyse" msgstr "" -#: models.py:2345 models.py:2348 +#: models.py:2364 models.py:2367 msgid "Re-analyse" msgstr "" -#: models.py:2346 +#: models.py:2365 msgid "Launch import" msgstr "" -#: models.py:2349 +#: models.py:2368 msgid "Re-import" msgstr "" -#: models.py:2350 +#: models.py:2369 msgid "Archive" msgstr "" -#: models.py:2352 +#: models.py:2371 msgid "Unarchive" msgstr "" -#: models.py:2353 widgets.py:130 templates/ishtar/form_delete.html:11 +#: models.py:2372 widgets.py:184 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "" -#: models.py:2494 +#: models.py:2513 msgid "Organizations" msgstr "" -#: models.py:2496 +#: models.py:2515 msgid "Can view all Organizations" msgstr "" -#: models.py:2497 +#: models.py:2516 msgid "Can view own Organization" msgstr "" -#: models.py:2498 +#: models.py:2517 msgid "Can add own Organization" msgstr "" -#: models.py:2500 +#: models.py:2519 msgid "Can change own Organization" msgstr "" -#: models.py:2502 +#: models.py:2521 msgid "Can delete own Organization" msgstr "" -#: models.py:2537 +#: models.py:2556 msgid "Groups" msgstr "" -#: models.py:2542 +#: models.py:2561 msgid "Person types" msgstr "" -#: models.py:2554 +#: models.py:2573 msgid "Title types" msgstr "" -#: models.py:2563 +#: models.py:2582 msgid "Mr" msgstr "" -#: models.py:2564 +#: models.py:2583 msgid "Miss" msgstr "" -#: models.py:2565 +#: models.py:2584 msgid "Mr and Mrs" msgstr "" -#: models.py:2566 +#: models.py:2585 msgid "Mrs" msgstr "" -#: models.py:2567 +#: models.py:2586 msgid "Doctor" msgstr "" -#: models.py:2600 +#: models.py:2619 msgid "Contact type" msgstr "" -#: models.py:2603 models.py:2667 +#: models.py:2622 models.py:2686 msgid "Types" msgstr "" -#: models.py:2606 +#: models.py:2625 msgid "Is attached to" msgstr "" -#: models.py:2611 +#: models.py:2630 msgid "Persons" msgstr "" -#: models.py:2613 +#: models.py:2632 msgid "Can view all Persons" msgstr "" -#: models.py:2614 +#: models.py:2633 msgid "Can view own Person" msgstr "" -#: models.py:2615 +#: models.py:2634 msgid "Can add own Person" msgstr "" -#: models.py:2616 +#: models.py:2635 msgid "Can change own Person" msgstr "" -#: models.py:2617 +#: models.py:2636 msgid "Can delete own Person" msgstr "" -#: models.py:2794 +#: models.py:2825 msgid "Advanced shortcut menu" msgstr "" -#: models.py:2797 +#: models.py:2828 msgid "Ishtar user" msgstr "" -#: models.py:2798 +#: models.py:2829 msgid "Ishtar users" msgstr "" -#: models.py:2842 +#: models.py:2873 msgid "To modify the password use the form in Auth > User" msgstr "" -#: models.py:2849 +#: models.py:2881 msgid "Author types" msgstr "" -#: models.py:2883 +#: models.py:2898 +msgid "Can view all Authors" +msgstr "" + +#: models.py:2900 +msgid "Can view own Author" +msgstr "" + +#: models.py:2902 +msgid "Can add own Author" +msgstr "" + +#: models.py:2904 +msgid "Can change own Author" +msgstr "" + +#: models.py:2906 +msgid "Can delete own Author" +msgstr "" + +#: models.py:2927 msgid "Source types" msgstr "" -#: models.py:2892 +#: models.py:2936 msgid "Support types" msgstr "" -#: models.py:2899 +#: models.py:2943 msgid "Format type" msgstr "" -#: models.py:2900 +#: models.py:2944 msgid "Format types" msgstr "" -#: models.py:2908 +#: models.py:2952 msgid "External ID" msgstr "" -#: models.py:2911 +#: models.py:2955 msgid "Support" msgstr "" -#: models.py:2915 +#: models.py:2959 msgid "Scale" msgstr "" -#: models.py:2929 +#: models.py:2973 msgid "Item number" msgstr "" -#: models.py:2930 +#: models.py:2974 msgid "Ref." msgstr "" -#: models.py:2933 +#: models.py:2977 msgid "Internal ref." msgstr "" -#: models.py:2976 +#: models.py:3020 msgid "Surface (m2)" msgstr "" -#: models.py:2977 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:3021 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "" -#: models.py:3002 +#: models.py:3046 msgid "Is preventive" msgstr "" -#: models.py:3006 +#: models.py:3050 msgid "Operation types" msgstr "" -#: models.py:3035 +#: models.py:3079 msgid "Preventive" msgstr "" -#: models.py:3036 +#: models.py:3080 msgid "Research" msgstr "" -#: models.py:3059 +#: models.py:3103 msgid "Authority name" msgstr "" -#: models.py:3060 +#: models.py:3104 msgid "Authority SRID" msgstr "" -#: models.py:3064 +#: models.py:3108 msgid "Spatial reference systems" msgstr "" @@ -1513,108 +1533,108 @@ msgstr "" msgid "Account deletion" msgstr "" -#: views.py:241 +#: views.py:251 msgid "Archaeological file" msgstr "" -#: views.py:242 +#: views.py:252 msgid "Operation" msgstr "" -#: views.py:244 +#: views.py:254 msgid "Context record" msgstr "" -#: views.py:246 +#: views.py:256 msgid "Find" msgstr "" -#: views.py:248 +#: views.py:258 msgid "Treatment request" msgstr "" -#: views.py:249 +#: views.py:259 msgid "Treatment" msgstr "" -#: views.py:1363 views.py:1406 +#: views.py:1387 views.py:1430 msgid "Operation not permitted." msgstr "" -#: views.py:1365 +#: views.py:1389 #, python-format msgid "New %s" msgstr "" -#: views.py:1424 views.py:1474 +#: views.py:1448 views.py:1498 msgid "Archaeological files" msgstr "" -#: views.py:1425 views.py:1478 +#: views.py:1449 views.py:1502 msgid "Operations" msgstr "" -#: views.py:1427 views.py:1482 +#: views.py:1451 views.py:1506 msgid "Context records" msgstr "" -#: views.py:1429 views.py:1485 +#: views.py:1453 views.py:1509 msgid "Finds" msgstr "" -#: views.py:1683 templates/ishtar/import_list.html:47 +#: views.py:1707 templates/ishtar/import_list.html:47 msgid "Link unmatched items" msgstr "" -#: views.py:1698 +#: views.py:1722 msgid "Delete import" msgstr "" -#: views.py:1737 +#: views.py:1761 msgid "Merge persons" msgstr "" -#: views.py:1761 +#: views.py:1785 msgid "Select the main person" msgstr "" -#: views.py:1770 +#: views.py:1794 msgid "Merge organization" msgstr "" -#: views.py:1780 +#: views.py:1804 msgid "Select the main organization" msgstr "" -#: views.py:1820 views.py:1836 +#: views.py:1844 views.py:1860 msgid "Corporation manager" msgstr "" -#: widgets.py:259 widgets.py:366 widgets.py:481 +#: widgets.py:313 widgets.py:420 widgets.py:535 msgid "Search..." msgstr "" -#: widgets.py:670 templatetags/window_tables.py:96 +#: widgets.py:724 templatetags/window_tables.py:96 msgid "No results" msgstr "" -#: widgets.py:671 templatetags/window_tables.py:97 +#: widgets.py:725 templatetags/window_tables.py:97 msgid "Loading..." msgstr "" -#: widgets.py:672 +#: widgets.py:726 msgid "Remove" msgstr "" -#: wizards.py:374 templates/ishtar/import_delete.html:21 +#: wizards.py:380 templates/ishtar/import_delete.html:21 msgid "Yes" msgstr "" -#: wizards.py:376 +#: wizards.py:382 msgid "No" msgstr "" -#: wizards.py:1396 +#: wizards.py:1404 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "" @@ -1689,19 +1709,19 @@ msgstr "" msgid ":" msgstr "" -#: templates/base.html:120 +#: templates/base.html:123 msgid "Processing..." msgstr "" -#: templates/base.html:121 +#: templates/base.html:124 msgid "This can be long." msgstr "" -#: templates/base.html:122 +#: templates/base.html:125 msgid "Time to take a coffee?" msgstr "" -#: templates/base.html:123 +#: templates/base.html:126 msgid "Time to take another coffee?" msgstr "" diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index 3b0762092..d9d2f3506 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -7,21 +7,23 @@ # Étienne Loks , 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-04-05 12:20+0200\n" "PO-Revision-Date: 2017-03-21 06:22-0400\n" "Last-Translator: Étienne Loks \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:216 models.py:589 wizards.py:77 +#: forms.py:47 forms.py:51 models.py:216 models.py:599 wizards.py:77 msgid "Operation" msgstr "Opération" -#: forms.py:59 forms.py:141 models.py:218 models.py:557 +#: forms.py:59 forms.py:141 models.py:218 models.py:567 msgid "ID" msgstr "Identifiant" @@ -73,11 +75,11 @@ msgstr "Vous devez sélectionner au moins une Unité d'Enregistrement." msgid "General" msgstr "Général" -#: forms.py:140 models.py:181 models.py:214 models.py:559 +#: forms.py:140 models.py:181 models.py:214 models.py:569 msgid "Parcel" msgstr "Parcelle" -#: forms.py:143 models.py:219 models.py:560 +#: forms.py:143 models.py:219 models.py:570 #: templates/ishtar/sheet_contextrecord.html:30 msgid "Description" msgstr "Description" @@ -114,7 +116,7 @@ msgstr "Profondeur (m)" msgid "Depth of appearance (m)" msgstr "Profondeur d'apparition" -#: forms.py:156 forms.py:376 models.py:241 models.py:558 +#: forms.py:156 forms.py:376 models.py:241 models.py:568 msgid "Context record type" msgstr "Type d'Unité d'Enregistrement" @@ -163,7 +165,7 @@ msgstr "Qualité" msgid "Dating type" msgstr "Type de datation" -#: forms.py:285 ishtar_menu.py:29 models.py:619 +#: forms.py:285 ishtar_menu.py:29 models.py:641 msgid "Context record" msgstr "Unité d'Enregistrement" @@ -332,7 +334,7 @@ msgstr "Type de documentation" msgid "Documentation types" msgstr "Types de documentation" -#: models.py:172 models.py:561 +#: models.py:172 models.py:571 msgid "Periods" msgstr "Périodes" @@ -441,74 +443,99 @@ msgctxt "short" msgid "Context record" msgstr "UE" -#: models.py:491 +#: models.py:501 msgid "Inverse relation" msgstr "Relation inverse" -#: models.py:495 models.py:518 models.py:556 +#: models.py:505 models.py:528 models.py:566 msgid "Relation type" msgstr "Type de relation" -#: models.py:496 +#: models.py:506 msgid "Relation types" msgstr "Types de relation" -#: models.py:513 +#: models.py:523 msgid "ID (left)" msgstr "ID (gauche)" -#: models.py:514 +#: models.py:524 msgid "Context record type (left)" msgstr "Type d'UE (gauche)" -#: models.py:515 +#: models.py:525 msgid "Parcel (left)" msgstr "Parcelle (gauche)" -#: models.py:516 +#: models.py:526 msgid "Description (left)" msgstr "Description (gauche)" -#: models.py:517 +#: models.py:527 msgid "Periods (left)" msgstr "Périodes (gauche)" -#: models.py:519 +#: models.py:529 msgid "ID (right)" msgstr "ID (droit)" -#: models.py:520 +#: models.py:530 msgid "Context record type (right)" msgstr "Type d'UE (droite)" -#: models.py:521 +#: models.py:531 msgid "Parcel (right)" msgstr "Parcelle (droite)" -#: models.py:522 +#: models.py:532 msgid "Description (right)" msgstr "Description (droite)" -#: models.py:523 +#: models.py:533 msgid "Periods (right)" msgstr "Périodes (droite)" -#: models.py:532 +#: models.py:542 msgid "Record relation" msgstr "Relation entre Unités d'Enregistrement" -#: models.py:533 +#: models.py:543 msgid "Record relations" msgstr "Relations entre Unités d'Enregistrement" -#: models.py:616 +#: models.py:626 msgid "Context record documentation" msgstr "Documentation d'une Unité d'Enregistrement" -#: models.py:617 +#: models.py:627 msgid "Context record documentations" msgstr "Documentations des Unités d'Enregistrement" +#: models.py:630 +#, fuzzy +msgid "Can view all Context record sources" +msgstr "Peut voir toutes les Unités d'Enregistrement" + +#: models.py:632 +#, fuzzy +msgid "Can view own Context record source" +msgstr "Peut voir sa propre Unité d'Enregistrement" + +#: models.py:634 +#, fuzzy +msgid "Can add own Context record source" +msgstr "Peut ajouter sa propre Unité d'Enregistrement" + +#: models.py:636 +#, fuzzy +msgid "Can change own Context record source" +msgstr "Peut modifier sa propre Unité d'Enregistrement" + +#: models.py:638 +#, fuzzy +msgid "Can delete own Context record source" +msgstr "Peut supprimer sa propre Unité d'Enregistrement" + #: views.py:102 msgid "New context record" msgstr "Ajouter une Unité d'Enregistrement" diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po index 23d75e0d0..2b2804547 100644 --- a/translations/fr/archaeological_files.po +++ b/translations/fr/archaeological_files.po @@ -8,17 +8,19 @@ # 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-04-05 12:20+0200\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" -#: forms.py:47 forms.py:210 forms.py:255 forms.py:396 forms.py:423 +#: forms.py:47 forms.py:210 forms.py:255 forms.py:394 forms.py:421 #: models.py:108 templates/ishtar/sheet_file.html:144 msgid "Year" msgstr "Année" @@ -31,15 +33,15 @@ msgstr "Référence numérique" msgid "Other reference" msgstr "Autre référence" -#: forms.py:52 forms.py:431 +#: forms.py:52 forms.py:429 msgid "Parcel (section/number/public domain)" msgstr "Parcelle (section/numéro/domaine public)" -#: forms.py:55 forms.py:407 forms.py:434 models.py:558 +#: forms.py:55 forms.py:405 forms.py:432 models.py:558 msgid "Department" msgstr "Département" -#: forms.py:56 forms.py:443 +#: forms.py:56 forms.py:441 msgid "File name" msgstr "Nom du dossier" @@ -63,7 +65,7 @@ msgstr "Type de permis" msgid "Permit reference" msgstr "Référence du permis" -#: forms.py:63 forms.py:227 forms.py:364 models.py:180 +#: forms.py:63 forms.py:227 forms.py:362 models.py:180 #: templates/ishtar/sheet_file.html:97 msgid "Comment" msgstr "Commentaire" @@ -72,19 +74,19 @@ msgstr "Commentaire" msgid "In charge" msgstr "Responsable" -#: forms.py:72 forms.py:281 forms.py:445 models.py:126 +#: forms.py:72 forms.py:281 forms.py:443 models.py:126 msgid "General contractor" msgstr "Aménageur" -#: forms.py:79 forms.py:453 +#: forms.py:79 forms.py:451 msgid "Organization of general contractor" msgstr "Organisation de l'aménageur" -#: forms.py:87 forms.py:476 +#: forms.py:87 forms.py:474 msgid "Created by" msgstr "Créé par" -#: forms.py:94 forms.py:484 +#: forms.py:94 forms.py:482 msgid "Modified by" msgstr "Modifié par" @@ -178,83 +180,83 @@ msgstr "Surface totale aménagée (m2)" msgid "Research archaeology" msgstr "Archéologie programmée" -#: forms.py:341 models.py:183 templates/ishtar/sheet_file.html:88 +#: forms.py:340 models.py:183 templates/ishtar/sheet_file.html:88 msgid "Departments" msgstr "Départements" -#: forms.py:351 models.py:192 +#: forms.py:349 models.py:192 msgid "Scientist in charge" msgstr "Responsable scientifique" -#: forms.py:353 models.py:186 templates/ishtar/sheet_file.html:90 +#: forms.py:351 models.py:186 templates/ishtar/sheet_file.html:90 msgid "Requested operation type" msgstr "Type d'opération demandée" -#: forms.py:355 +#: forms.py:353 msgid "Lead organization" msgstr "Organisation porteuse du projet" -#: forms.py:371 models.py:196 templates/ishtar/sheet_file.html:95 +#: forms.py:369 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:96 +#: forms.py:371 models.py:198 templates/ishtar/sheet_file.html:96 msgid "Protected area" msgstr "Au sein d'un secteur sauvegardé" -#: forms.py:387 +#: forms.py:385 msgid "Would you like to close this archaeological file?" msgstr "Voulez-vous clore ce dossier archéologique ?" -#: forms.py:392 +#: forms.py:390 msgid "Would you like to delete this archaeological file ?" msgstr "Voulez-vous supprimer ce dossier archéologique ?" -#: forms.py:397 forms.py:424 forms.py:547 +#: forms.py:395 forms.py:422 forms.py:545 msgid "Index" msgstr "Index" -#: forms.py:401 forms.py:428 forms.py:533 +#: forms.py:399 forms.py:426 forms.py:531 msgid "Act type" msgstr "Type d'acte" -#: forms.py:402 +#: forms.py:400 msgid "Object (full text search)" msgstr "Objet (recherche texte intégral)" -#: forms.py:429 +#: forms.py:427 msgid "Indexed?" msgstr "Indexé ?" -#: forms.py:435 +#: forms.py:433 msgid "Object" msgstr "Objet" -#: forms.py:439 +#: forms.py:437 msgid "Signature date after" msgstr "Date de signature après" -#: forms.py:441 +#: forms.py:439 msgid "Signature date before" msgstr "Date de signature avant" -#: forms.py:461 +#: forms.py:459 msgid "File numeric reference" msgstr "Dossier : réf. numérique" -#: forms.py:462 +#: forms.py:460 msgid "File year" msgstr "Dossier : année" -#: forms.py:464 +#: forms.py:462 msgid "File other reference" msgstr "Dossier : autre référence" -#: forms.py:466 +#: forms.py:464 msgid "File in charge" msgstr "Dossier : responsable" -#: forms.py:474 +#: forms.py:472 msgid "File permit reference" msgstr "Dossier : réf. du permis" diff --git a/translations/fr/archaeological_files_pdl.po b/translations/fr/archaeological_files_pdl.po index 949555adc..6b026d72e 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-04-05 12:20+0200\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 32c8a4861..6446c4f38 100644 --- a/translations/fr/archaeological_finds.po +++ b/translations/fr/archaeological_finds.po @@ -8,179 +8,181 @@ # Étienne Loks , 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-04-05 12:20+0200\n" "PO-Revision-Date: 2017-03-21 06:23-0400\n" "Last-Translator: Étienne Loks \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:93 forms.py:97 models_finds.py:505 wizards.py:64 +#: forms.py:93 forms.py:97 models_finds.py:518 wizards.py:64 msgid "Context record" msgstr "Unité d'Enregistrement" -#: forms.py:126 ishtar_menu.py:32 models_finds.py:668 models_finds.py:1071 -#: models_finds.py:1080 models_treatments.py:281 +#: forms.py:126 ishtar_menu.py:32 models_finds.py:682 models_finds.py:1113 +#: models_finds.py:1134 models_treatments.py:281 #: templates/ishtar/sheet_find.html:5 msgid "Find" msgstr "Mobilier" -#: forms.py:140 forms.py:333 forms.py:601 models_finds.py:151 -#: models_finds.py:599 +#: forms.py:140 forms.py:337 forms.py:605 models_finds.py:150 +#: models_finds.py:612 msgid "Free ID" msgstr "ID libre" -#: forms.py:142 models_finds.py:651 +#: forms.py:142 models_finds.py:665 msgid "Previous ID" msgstr "Identifiant précédent" -#: forms.py:143 forms.py:364 forms_treatments.py:134 models_finds.py:155 -#: models_finds.py:600 models_treatments.py:127 +#: forms.py:143 forms.py:368 forms_treatments.py:134 models_finds.py:154 +#: models_finds.py:613 models_treatments.py:127 msgid "Description" msgstr "Description" -#: forms.py:146 forms.py:366 models_finds.py:164 +#: forms.py:146 forms.py:370 models_finds.py:163 msgid "Batch/object" msgstr "Lot/objet" -#: forms.py:148 models_finds.py:628 +#: forms.py:148 models_finds.py:642 msgid "Is complete?" msgstr "Est complet ?" -#: forms.py:151 forms.py:354 forms.py:605 models_finds.py:51 +#: forms.py:151 forms.py:358 forms.py:609 models_finds.py:50 msgid "Material type" msgstr "Type de matériau" -#: forms.py:152 forms.py:358 models_finds.py:63 models_finds.py:604 +#: forms.py:154 forms.py:362 models_finds.py:62 models_finds.py:617 msgid "Conservatory state" msgstr "État sanitaire" -#: forms.py:155 models_finds.py:606 +#: forms.py:157 models_finds.py:619 msgid "Conservatory comment" msgstr "Commentaire relatif à la conservation" -#: forms.py:158 models_finds.py:113 models_finds.py:631 +#: forms.py:160 models_finds.py:112 models_finds.py:645 msgid "Object types" msgstr "Types d'objet" -#: forms.py:160 forms.py:357 models_finds.py:72 +#: forms.py:164 forms.py:361 models_finds.py:71 msgid "Preservation type" msgstr "Type de conservation" -#: forms.py:163 forms.py:360 models_finds.py:633 +#: forms.py:167 forms.py:364 models_finds.py:647 msgid "Integrity / interest" msgstr "Intégrité / intérêt" -#: forms.py:166 forms.py:362 models_finds.py:636 +#: forms.py:170 forms.py:366 models_finds.py:650 msgid "Remarkability" msgstr "Remarquabilité" -#: forms.py:169 models_finds.py:169 +#: forms.py:173 models_finds.py:168 msgid "Point of topographic reference" msgstr "Point de référence topographique" -#: forms.py:172 models_finds.py:171 +#: forms.py:176 models_finds.py:170 msgid "X" msgstr "X" -#: forms.py:173 models_finds.py:172 +#: forms.py:177 models_finds.py:171 msgid "Y" msgstr "Y" -#: forms.py:174 models_finds.py:173 +#: forms.py:178 models_finds.py:172 msgid "Z" msgstr "Z" -#: forms.py:176 models_finds.py:181 +#: forms.py:180 models_finds.py:180 msgid "Spatial Reference System" msgstr "Système de référence spatiale" -#: forms.py:179 models_finds.py:174 +#: forms.py:183 models_finds.py:173 msgid "Estimated error for X" msgstr "Erreur estimée pour X" -#: forms.py:181 models_finds.py:176 +#: forms.py:185 models_finds.py:175 msgid "Estimated error for Y" msgstr "Erreur estimée pour Y" -#: forms.py:183 models_finds.py:178 +#: forms.py:187 models_finds.py:177 msgid "Estimated error for Z" msgstr "Erreur estimée pour Z" -#: forms.py:184 models_finds.py:640 +#: forms.py:188 models_finds.py:654 msgid "Length (cm)" msgstr "Longueur (cm)" -#: forms.py:185 models_finds.py:641 +#: forms.py:189 models_finds.py:655 msgid "Width (cm)" msgstr "Largeur (cm)" -#: forms.py:186 models_finds.py:642 +#: forms.py:190 models_finds.py:656 msgid "Height (cm)" msgstr "Hauteur (cm)" -#: forms.py:187 models_finds.py:643 +#: forms.py:191 models_finds.py:657 msgid "Diameter (cm)" msgstr "Diamètre (cm)" -#: forms.py:188 models_finds.py:644 +#: forms.py:192 models_finds.py:658 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" -#: forms.py:189 forms.py:606 models_finds.py:611 +#: forms.py:193 forms.py:610 models_finds.py:624 msgid "Volume (l)" msgstr "Volume (l)" -#: forms.py:190 forms.py:607 models_finds.py:612 +#: forms.py:194 forms.py:611 models_finds.py:625 msgid "Weight (g)" msgstr "Poids (g)" -#: forms.py:192 models_finds.py:645 +#: forms.py:196 models_finds.py:659 msgid "Dimensions comment" msgstr "Commentaire concernant les dimensions" -#: forms.py:193 forms.py:608 models_finds.py:615 +#: forms.py:197 forms.py:612 models_finds.py:628 msgid "Find number" msgstr "Mobilier (en nombre)" -#: forms.py:195 models_finds.py:639 +#: forms.py:199 models_finds.py:653 msgid "Minimum number of individuals (MNI)" msgstr "Nombre minimum d'individus (NMI)" -#: forms.py:196 models_finds.py:647 +#: forms.py:200 models_finds.py:661 msgid "Mark" msgstr "Marque" -#: forms.py:197 forms.py:367 models_finds.py:653 +#: forms.py:201 forms.py:371 models_finds.py:667 msgid "Check" msgstr "Vérification" -#: forms.py:199 models_finds.py:655 +#: forms.py:203 models_finds.py:669 msgid "Check date" msgstr "Date de vérification" -#: forms.py:200 forms_treatments.py:132 forms_treatments.py:434 -#: models_finds.py:156 models_finds.py:648 models_treatments.py:126 +#: forms.py:204 forms_treatments.py:132 forms_treatments.py:434 +#: models_finds.py:155 models_finds.py:662 models_treatments.py:126 #: models_treatments.py:494 msgid "Comment" msgstr "Commentaires" -#: forms.py:203 models_finds.py:649 +#: forms.py:207 models_finds.py:663 msgid "Comment on dating" msgstr "Commentaire général sur les datations" -#: forms.py:204 models_finds.py:657 +#: forms.py:208 models_finds.py:671 msgid "Estimated value" msgstr "Valeur estimée" -#: forms.py:206 forms_treatments.py:151 +#: forms.py:210 forms_treatments.py:151 msgid "Image" msgstr "Image" -#: forms.py:207 forms_treatments.py:152 +#: forms.py:211 forms_treatments.py:152 #, 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:281 -msgid "" -"You should at least provide X, Y and the spatial reference system used." +#: forms.py:285 +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:290 -msgid "" -"Coordinates are not relevant for the spatial reference system used: {}." +#: forms.py:294 +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:296 forms.py:327 models_finds.py:623 +#: forms.py:300 forms.py:331 models_finds.py:636 msgid "Dating" msgstr "Datation" -#: forms.py:301 forms.py:353 +#: forms.py:305 forms.py:357 msgid "Period" msgstr "Période" -#: forms.py:302 forms_treatments.py:138 forms_treatments.py:436 -#: models_finds.py:1085 models_treatments.py:129 models_treatments.py:292 +#: forms.py:306 forms_treatments.py:138 forms_treatments.py:436 +#: models_finds.py:1139 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:304 models_finds.py:1086 models_treatments.py:293 +#: forms.py:308 models_finds.py:1140 models_treatments.py:293 #: templates/ishtar/sheet_find.html:92 templates/ishtar/sheet_find.html:134 msgid "End date" msgstr "Date de fin" -#: forms.py:305 +#: forms.py:309 msgid "Quality" msgstr "Qualité" -#: forms.py:307 +#: forms.py:311 msgid "Dating type" msgstr "Type de datation" -#: forms.py:309 +#: forms.py:313 msgid "Precise dating" msgstr "Datation précise" -#: forms.py:331 models_finds.py:188 +#: forms.py:335 models_finds.py:187 msgid "Short ID" msgstr "ID court" -#: forms.py:332 models_finds.py:191 +#: forms.py:336 models_finds.py:190 msgid "Complete ID" msgstr "ID complet" -#: forms.py:336 forms_treatments.py:54 forms_treatments.py:96 +#: forms.py:340 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:102 models_treatments.py:466 msgid "Year" msgstr "Année" -#: forms.py:338 +#: forms.py:342 msgid "Operation's number (index by year)" msgstr "Numéro de l'opération (index par année)" -#: forms.py:341 +#: forms.py:345 msgid "Code PATRIARCHE" msgstr "Code PATRIARCHE" -#: forms.py:345 +#: forms.py:349 msgid "Archaeological site" msgstr "Entité archéologique" -#: forms.py:351 +#: forms.py:355 msgid "Search within related operations" msgstr "Rechercher parmi les opérations liées" -#: forms.py:355 models_finds.py:112 +#: forms.py:359 models_finds.py:111 msgid "Object type" msgstr "Type d'objet" -#: forms.py:368 forms_treatments.py:57 +#: forms.py:372 forms_treatments.py:57 msgid "Has an image?" msgstr "Dispose d'une image ?" -#: forms.py:417 +#: forms.py:421 msgid "Warehouse (location)" msgstr "Dépôt (lieu)" -#: forms.py:423 +#: forms.py:427 msgid "Warehouse (responsible)" msgstr "Dépôt (responsable)" -#: forms.py:428 +#: forms.py:432 msgid "Container ID" msgstr "Identifiant du contenant" -#: forms.py:429 +#: forms.py:433 msgid "Container ref." msgstr "Réf. contenant" -#: forms.py:433 forms.py:456 views.py:149 +#: forms.py:437 forms.py:460 views.py:149 msgid "Find search" msgstr "Rechercher un mobilier" -#: forms.py:481 templates/ishtar/sheet_treatment.html:46 +#: forms.py:485 templates/ishtar/sheet_treatment.html:46 msgid "Upstream finds" msgstr "Mobilier amont" -#: forms.py:483 models_finds.py:669 +#: forms.py:487 models_finds.py:683 msgid "Finds" msgstr "Mobilier" -#: forms.py:495 +#: forms.py:499 msgid "You should at least select one archaeological find." msgstr "Vous devez sélectionner au moins un mobilier archéologique." -#: forms.py:598 +#: forms.py:602 msgid "Resulting find" msgstr "Mobilier résultant" -#: forms.py:603 +#: forms.py:607 msgid "Precise description" msgstr "Description précise" -#: forms.py:618 +#: forms.py:622 msgid "Resulting finds" msgstr "Mobiliers résultants" -#: forms.py:623 +#: forms.py:627 msgid "Would you like to delete this find?" msgstr "Voulez-vous supprimer ce mobilier ?" -#: forms.py:627 models_treatments.py:90 +#: forms.py:631 models_treatments.py:90 msgid "Upstream find" msgstr "Mobilier amont" -#: forms.py:640 +#: forms.py:644 msgid "Archaeological find search" msgstr "Rechercher un mobilier" -#: forms.py:642 +#: forms.py:646 msgid "You should select an archaeological find." msgstr "Vous devez sélectionner du mobilier." -#: forms.py:647 +#: forms.py:651 msgid "Year of the operation" msgstr "Année de l'opération" -#: forms.py:649 +#: forms.py:653 msgid "Numeric reference" msgstr "Référence numérique" -#: forms.py:656 +#: forms.py:660 msgid "Period of the archaeological find" msgstr "Période du mobilier" -#: forms.py:658 +#: forms.py:662 msgid "Material type of the archaeological find" msgstr "Type de matériau du mobilier" -#: forms.py:660 +#: forms.py:664 msgid "Description of the archaeological find" msgstr "Description du mobilier" -#: forms.py:672 forms_treatments.py:590 forms_treatments.py:616 +#: forms.py:676 forms_treatments.py:590 forms_treatments.py:616 msgid "Documentation search" msgstr "Rechercher une documentation" -#: forms.py:674 forms_treatments.py:592 forms_treatments.py:618 +#: forms.py:678 forms_treatments.py:592 forms_treatments.py:618 msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: forms.py:691 +#: forms.py:695 msgid "Another basket already exists with this name." msgstr "Un autre panier existant utilise déjà ce nom." -#: forms.py:701 forms.py:705 forms_treatments.py:175 ishtar_menu.py:57 +#: forms.py:705 forms.py:709 forms_treatments.py:175 ishtar_menu.py:57 msgid "Basket" msgstr "Panier" @@ -486,7 +486,7 @@ msgid "Associated request" msgstr "Demande associée" #: forms_treatments.py:266 forms_treatments.py:397 ishtar_menu.py:108 -#: models_treatments.py:499 models_treatments.py:521 models_treatments.py:584 +#: models_treatments.py:499 models_treatments.py:527 models_treatments.py:602 #: wizards.py:187 templates/ishtar/sheet_treatmentfile.html:5 msgid "Treatment request" msgstr "Demande de traitement" @@ -652,7 +652,7 @@ msgstr "Gestion des éléments" msgid "Documentation" msgstr "Documentation" -#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1082 +#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1136 msgid "Administrative act" msgstr "Acte administratif" @@ -666,7 +666,7 @@ msgid "Source" msgstr "Documentation" #: ishtar_menu.py:185 models_treatments.py:147 models_treatments.py:283 -#: models_treatments.py:567 models_treatments.py:570 +#: models_treatments.py:573 models_treatments.py:576 #: templates/ishtar/sheet_treatment.html:5 msgid "Treatment" msgstr "Traitement" @@ -675,113 +675,113 @@ msgstr "Traitement" msgid "Simple treatments" msgstr "Traitements simples" -#: models_finds.py:44 +#: models_finds.py:43 msgid "Code" msgstr "Code" -#: models_finds.py:45 +#: models_finds.py:44 msgid "Recommendation" msgstr "Recommandation" -#: models_finds.py:48 +#: models_finds.py:47 msgid "Parent material" msgstr "Matériau parent" -#: models_finds.py:52 models_finds.py:525 models_finds.py:602 +#: models_finds.py:51 models_finds.py:538 models_finds.py:615 msgid "Material types" msgstr "Types de matériau" -#: models_finds.py:60 +#: models_finds.py:59 msgid "Parent conservatory state" msgstr "État sanitaire - parent" -#: models_finds.py:64 +#: models_finds.py:63 msgid "Conservatory states" msgstr "États sanitaires" -#: models_finds.py:73 +#: models_finds.py:72 msgid "Preservation types" msgstr "Types de conservation" -#: models_finds.py:81 +#: models_finds.py:80 msgid "Integrity / interest type" msgstr "Type d'intégrité / intérêt" -#: models_finds.py:82 +#: models_finds.py:81 msgid "Integrity / interest types" msgstr "Types d'intégrité / intérêt" -#: models_finds.py:90 +#: models_finds.py:89 msgid "Remarkability type" msgstr "Type de remarquabilité" -#: models_finds.py:91 +#: models_finds.py:90 msgid "Remarkability types" msgstr "Types de remarquabilité" -#: models_finds.py:98 models_finds.py:598 models_treatments.py:40 +#: models_finds.py:97 models_finds.py:611 models_treatments.py:40 #: models_treatments.py:287 msgid "Order" msgstr "Ordre" -#: models_finds.py:100 +#: models_finds.py:99 msgid "Batch type" msgstr "Type de lot" -#: models_finds.py:101 +#: models_finds.py:100 msgid "Batch types" msgstr "Types de lot" -#: models_finds.py:109 +#: models_finds.py:108 msgid "Parent" msgstr "Parent" -#: models_finds.py:152 models_finds.py:595 models_treatments.py:124 +#: models_finds.py:151 models_finds.py:608 models_treatments.py:124 #: models_treatments.py:471 msgid "External ID" msgstr "ID externe" -#: models_finds.py:154 models_finds.py:597 +#: models_finds.py:153 models_finds.py:610 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" -#: models_finds.py:157 +#: models_finds.py:156 msgid "Special interest" msgstr "Intérêt spécifique" -#: models_finds.py:161 +#: models_finds.py:160 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: models_finds.py:162 +#: models_finds.py:161 msgid "Discovery date" msgstr "Date de découverte" -#: models_finds.py:167 +#: models_finds.py:166 msgid "Material index" msgstr "Index matériel" -#: models_finds.py:183 +#: models_finds.py:182 msgid "Point (2D)" msgstr "Point (2D)" -#: models_finds.py:184 +#: models_finds.py:183 msgid "Point" msgstr "Point" -#: models_finds.py:185 +#: models_finds.py:184 msgid "Line" msgstr "Ligne" -#: models_finds.py:186 +#: models_finds.py:185 msgid "Polygon" msgstr "Polygon" -#: models_finds.py:189 models_finds.py:192 +#: models_finds.py:188 models_finds.py:191 msgid "Cached value - do not edit" msgstr "Valeur en cache - ne pas éditer" -#: models_finds.py:197 models_finds.py:593 +#: models_finds.py:197 models_finds.py:606 msgid "Base find" msgstr "Mobilier de base" @@ -809,149 +809,174 @@ msgstr "Peut modifier son propre Mobilier de base" msgid "Can delete own Base find" msgstr "Peut supprimer son propre Mobilier de base" -#: models_finds.py:430 +#: models_finds.py:443 msgid "g" msgstr "g" -#: models_finds.py:431 +#: models_finds.py:444 msgid "kg" msgstr "kg" -#: models_finds.py:433 +#: models_finds.py:446 msgid "Not checked" msgstr "Non vérifié" -#: models_finds.py:434 +#: models_finds.py:447 msgid "Checked but incorrect" msgstr "Vérifié mais incorrect" -#: models_finds.py:435 +#: models_finds.py:448 msgid "Checked and correct" msgstr "Vérifié et correct" -#: models_finds.py:506 +#: models_finds.py:519 msgid "Base find - Short ID" msgstr "Mobilier de base - ID court" -#: models_finds.py:507 +#: models_finds.py:520 msgid "Base find - Complete ID" msgstr "Mobilier de base - ID complet" -#: models_finds.py:509 +#: models_finds.py:522 msgid "Operation (code)" msgstr "Opération (code)" -#: models_finds.py:511 +#: models_finds.py:524 msgid "Town" msgstr "Ville" -#: models_finds.py:513 +#: models_finds.py:526 msgid "Operation (name)" msgstr "Opération (nom)" -#: models_finds.py:515 +#: models_finds.py:528 msgid "Parcel" msgstr "Parcelle" -#: models_finds.py:516 +#: models_finds.py:529 msgid "Batch" msgstr "Lot" -#: models_finds.py:517 +#: models_finds.py:530 msgid "Base find - Comment" msgstr "Mobilier de base - Commentaires" -#: models_finds.py:518 +#: models_finds.py:531 msgid "Base find - Description" msgstr "Mobilier de base - Description" -#: models_finds.py:519 +#: models_finds.py:532 msgid "Base find - Topographic localisation" msgstr "Mobilier de base - Localisation topographique" -#: models_finds.py:521 +#: models_finds.py:534 msgid "Base find - Special interest" msgstr "Mobilier de base - Intérêt spécifique" -#: models_finds.py:522 +#: models_finds.py:535 msgid "Base find - Discovery date" msgstr "Mobilier de base - Date de découverte" -#: models_finds.py:523 models_finds.py:626 models_treatments.py:131 +#: models_finds.py:536 models_finds.py:639 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 +#: models_finds.py:537 msgid "Periods" msgstr "Périodes" -#: models_finds.py:609 +#: models_finds.py:622 msgid "Type of preservation to consider" msgstr "Mesures de conservation à envisager" -#: models_finds.py:613 +#: models_finds.py:626 msgid "Weight unit" msgstr "Unité de poids" -#: models_finds.py:619 templates/ishtar/sheet_find.html:78 +#: models_finds.py:632 templates/ishtar/sheet_find.html:78 msgid "Upstream treatment" msgstr "Traitement amont" -#: models_finds.py:622 templates/ishtar/sheet_find.html:120 +#: models_finds.py:635 templates/ishtar/sheet_find.html:120 msgid "Downstream treatment" msgstr "Traitement aval" -#: models_finds.py:660 +#: models_finds.py:674 msgid "Collection" msgstr "Collection" -#: models_finds.py:662 models_treatments.py:143 models_treatments.py:495 +#: models_finds.py:676 models_treatments.py:143 models_treatments.py:495 msgid "Cached name" msgstr "Nom en cache" -#: models_finds.py:671 +#: models_finds.py:685 msgid "Can view all Finds" msgstr "Peut voir tout le Mobilier" -#: models_finds.py:672 +#: models_finds.py:686 msgid "Can view own Find" msgstr "Peut voir son propre Mobilier" -#: models_finds.py:673 +#: models_finds.py:687 msgid "Can add own Find" msgstr "Peut ajouter son propre Mobilier" -#: models_finds.py:674 +#: models_finds.py:688 msgid "Can change own Find" msgstr "Peut modifier son propre Mobilier" -#: models_finds.py:675 +#: models_finds.py:689 msgid "Can delete own Find" msgstr "Peut supprimer son propre Mobilier" -#: models_finds.py:681 +#: models_finds.py:695 msgid "FIND" msgstr "MOBILIER" -#: models_finds.py:1069 +#: models_finds.py:1099 msgid "Find documentation" msgstr "Documentation de mobilier" -#: models_finds.py:1070 +#: models_finds.py:1100 msgid "Find documentations" msgstr "Documentations de mobilier" -#: models_finds.py:1083 +#: models_finds.py:1103 +#, fuzzy +msgid "Can view all Find sources" +msgstr "Peut voir tout le Mobilier" + +#: models_finds.py:1105 +#, fuzzy +msgid "Can view own Find source" +msgstr "Peut voir son propre Mobilier" + +#: models_finds.py:1107 +#, fuzzy +msgid "Can add own Find source" +msgstr "Peut ajouter son propre Mobilier" + +#: models_finds.py:1109 +#, fuzzy +msgid "Can change own Find source" +msgstr "Peut modifier son propre Mobilier" + +#: models_finds.py:1111 +#, fuzzy +msgid "Can delete own Find source" +msgstr "Peut supprimer son propre Mobilier" + +#: models_finds.py:1137 msgid "Person" msgstr "Individu" -#: models_finds.py:1089 +#: models_finds.py:1143 msgid "Property" msgstr "Propriété" -#: models_finds.py:1090 +#: models_finds.py:1144 msgid "Properties" msgstr "Propriétés" @@ -1092,41 +1117,121 @@ msgid "Can view all Treatment requests" msgstr "Peut voir toutes les Demandes de traitement" #: models_treatments.py:506 +#, fuzzy +msgid "Can add Treatment request" +msgstr "Peut ajouter sa propre Demande de traitement" + +#: models_treatments.py:508 +#, fuzzy +msgid "Can change Treatment request" +msgstr "Peut modifier sa propre Demande de traitement" + +#: models_treatments.py:510 +#, fuzzy +msgid "Can delete Treatment request" +msgstr "Peut supprimer sa propre Demande de traitement" + +#: models_treatments.py:512 msgid "Can view own Treatment request" msgstr "Peut voir sa propre Demande de traitement" -#: models_treatments.py:508 +#: models_treatments.py:514 msgid "Can add own Treatment request" msgstr "Peut ajouter sa propre Demande de traitement" -#: models_treatments.py:510 +#: models_treatments.py:516 msgid "Can change own Treatment request" msgstr "Peut modifier sa propre Demande de traitement" -#: models_treatments.py:512 +#: models_treatments.py:518 msgid "Can delete own Treatment request" msgstr "Peut supprimer sa propre Demande de traitement" -#: models_treatments.py:574 +#: models_treatments.py:580 msgid "Treatment documentation" msgstr "Documentation de traitement" -#: models_treatments.py:575 +#: models_treatments.py:581 msgid "Treament documentations" msgstr "Documentations de traitement" +#: models_treatments.py:584 +#, fuzzy +msgid "Can view all Treatment source" +msgstr "Peut voir tous les Traitements" + +#: models_treatments.py:586 +#, fuzzy +msgid "Can view own Treatment source" +msgstr "Peut voir son propre Traitement" + #: models_treatments.py:588 +#, fuzzy +msgid "Can add own Treatment source" +msgstr "Peut ajouter son propre Traitement" + +#: models_treatments.py:590 +#, fuzzy +msgid "Can change own Treatment source" +msgstr "Peut modifier son propre Traitement" + +#: models_treatments.py:592 +#, fuzzy +msgid "Can delete own Treatment source" +msgstr "Peut supprimer son propre Traitement" + +#: models_treatments.py:606 msgid "Treatment file" msgstr "Dossier de traitement" -#: models_treatments.py:592 +#: models_treatments.py:610 msgid "Treatment request documentation" msgstr "Documentation de demande de traitement" -#: models_treatments.py:593 +#: models_treatments.py:611 msgid "Treatment request documentations" msgstr "Documentations de demande de traitement" +#: models_treatments.py:614 +#, fuzzy +msgid "Can view all Treatment request source" +msgstr "Peut voir toutes les Demandes de traitement" + +#: models_treatments.py:616 +#, fuzzy +msgid "Can add Treatment request source" +msgstr "Documentation de demande de traitement" + +#: models_treatments.py:618 +#, fuzzy +msgid "Can change Treatment request source" +msgstr "Peut modifier sa propre Demande de traitement" + +#: models_treatments.py:620 +#, fuzzy +msgid "Can delete Treatment request source" +msgstr "Peut supprimer sa propre Demande de traitement" + +#: models_treatments.py:622 +#, fuzzy +msgid "Can view own Treatment request source" +msgstr "Peut voir sa propre Demande de traitement" + +#: models_treatments.py:624 +#, fuzzy +msgid "Can add own Treatment request source" +msgstr "Peut ajouter sa propre Demande de traitement" + +#: models_treatments.py:626 +#, fuzzy +msgid "Can change own Treatment request source" +msgstr "Peut modifier sa propre Demande de traitement" + +#: models_treatments.py:628 +#, fuzzy +msgid "Can delete own Treatment request source" +msgstr "Peut supprimer sa propre Demande de traitement" + #: views.py:138 msgid "New find" msgstr "Ajouter un mobilier" diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index af55782dc..67c09a4fb 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -9,23 +9,25 @@ # Étienne Loks , 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-04-05 12:20+0200\n" "PO-Revision-Date: 2017-03-16 05:04-0400\n" "Last-Translator: Étienne Loks \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:1013 forms.py:1035 forms.py:1039 -#: models.py:1247 templates/ishtar/sheet_operation.html:151 +#: forms.py:69 forms.py:371 forms.py:1047 forms.py:1069 forms.py:1073 +#: models.py:1252 templates/ishtar/sheet_operation.html:153 #: templates/ishtar/blocks/window_tables/parcels.html:10 msgid "Parcels" msgstr "Parcelles" -#: forms.py:72 forms.py:205 forms.py:989 models.py:1233 +#: forms.py:72 forms.py:205 forms.py:1023 models.py:1238 #: templates/ishtar/blocks/window_tables/parcels.html:7 #: templates/ishtar/dashboards/dashboard_operation.html:432 #: templates/ishtar/dashboards/dashboard_operation.html:446 @@ -34,22 +36,22 @@ msgstr "Parcelles" msgid "Town" msgstr "Commune" -#: forms.py:74 forms.py:455 forms.py:756 forms.py:1259 models.py:272 -#: models.py:1039 models.py:1231 +#: forms.py:74 forms.py:481 forms.py:783 forms.py:1293 models.py:276 +#: models.py:1044 models.py:1236 #: templates/ishtar/blocks/window_tables/parcels.html:8 msgid "Year" msgstr "Année" -#: forms.py:77 models.py:1234 +#: forms.py:77 models.py:1239 #: templates/ishtar/blocks/window_tables/parcels.html:9 msgid "Section" msgstr "Section" -#: forms.py:80 models.py:1236 +#: forms.py:80 models.py:1241 msgid "Parcel number" msgstr "Numéro de parcelle" -#: forms.py:82 models.py:1238 models.py:1255 models.py:1304 +#: forms.py:82 models.py:1243 models.py:1260 models.py:1309 msgid "Public domain" msgstr "Domaine public" @@ -85,45 +87,49 @@ 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:849 models.py:884 -#: models.py:917 models.py:1021 models.py:1230 wizards.py:344 wizards.py:355 +#: forms.py:383 ishtar_menu.py:30 models.py:372 models.py:847 models.py:882 +#: models.py:922 models.py:1026 models.py:1235 wizards.py:353 wizards.py:364 #: templates/ishtar/sheet_operation.html:4 msgid "Operation" msgstr "Opération" -#: forms.py:403 +#: forms.py:406 msgid ":" msgstr ": " -#: forms.py:411 forms.py:607 forms.py:1224 +#: forms.py:414 forms.py:633 forms.py:1258 msgid "You should select an operation." msgstr "Vous devez sélectionner une opération." -#: forms.py:415 +#: forms.py:418 msgid "You should select a relation type." msgstr "Vous devez sélectionner un type de relation." -#: forms.py:445 +#: forms.py:421 +msgid "An operation cannot be related to herself." +msgstr "" + +#: forms.py:451 msgid "Current relations" msgstr "Relations actuelles" -#: forms.py:447 +#: forms.py:453 msgid "Deleted relations" msgstr "Relations supprimées" -#: forms.py:451 templates/ishtar/sheet_operation.html:85 +#: forms.py:477 templates/ishtar/sheet_operation.html:86 msgid "Relations" msgstr "Relations" -#: forms.py:456 forms.py:1230 models.py:273 +#: forms.py:482 forms.py:1264 models.py:277 msgid "Numeric reference" msgstr "Identifiant numérique" -#: forms.py:462 forms.py:1270 +#: forms.py:488 forms.py:1304 msgid "Parcel (section/number/public domain)" msgstr "Parcelle (section/numéro/domaine public)" -#: forms.py:465 forms.py:1273 models.py:850 +#: forms.py:491 forms.py:1307 models.py:848 #: templates/ishtar/dashboards/dashboard_operation.html:390 #: templates/ishtar/dashboards/dashboard_operation.html:411 #: templates/ishtar/dashboards/dashboard_operation.html:643 @@ -132,253 +138,257 @@ msgstr "Parcelle (section/numéro/domaine public)" msgid "Department" msgstr "Département" -#: forms.py:466 forms.py:1101 models.py:86 +#: forms.py:492 forms.py:1135 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:752 models.py:334 +#: forms.py:494 forms.py:779 models.py:338 msgid "Address / Locality" msgstr "Adresse / Lieu-dit" -#: forms.py:470 forms.py:674 forms.py:754 forms.py:1236 models.py:280 +#: forms.py:496 forms.py:700 forms.py:781 forms.py:1270 models.py:284 msgid "Operation type" msgstr "Type d'opération" -#: forms.py:472 +#: forms.py:498 msgid "Is open?" msgstr "Est ouvert ?" -#: forms.py:480 forms.py:786 models.py:269 +#: forms.py:506 forms.py:813 models.py:269 msgid "In charge" msgstr "Responsable du suivi scientifique" -#: forms.py:487 models.py:1015 +#: forms.py:513 models.py:1020 msgid "Scientist in charge" msgstr "Responsable scientifique" -#: forms.py:489 forms.py:676 forms.py:776 models.py:267 +#: forms.py:515 forms.py:702 forms.py:803 models.py:267 msgid "Operator" msgstr "Opérateur" -#: forms.py:498 forms.py:1106 models.py:90 models.py:282 +#: forms.py:524 forms.py:1140 models.py:90 models.py:286 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10 msgid "Remains" msgstr "Vestiges" -#: forms.py:499 forms.py:1084 forms.py:1103 models.py:88 models.py:288 +#: forms.py:525 forms.py:1118 forms.py:1137 models.py:88 models.py:292 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9 msgid "Periods" msgstr "Périodes" -#: forms.py:500 +#: forms.py:526 msgid "Started before" msgstr "Commencé avant" -#: forms.py:502 +#: forms.py:528 msgid "Started after" msgstr "Commencé après" -#: forms.py:504 +#: forms.py:530 msgid "Ended before" msgstr "Terminé avant" -#: forms.py:506 +#: forms.py:532 msgid "Ended after" msgstr "Terminé après" -#: forms.py:509 +#: forms.py:535 msgid "Search within relations" msgstr "Rechercher parmi les relations" -#: forms.py:511 forms.py:841 +#: forms.py:537 forms.py:867 msgid "Comment" msgstr "Commentaire" -#: forms.py:512 +#: forms.py:538 msgid "Abstract (full text search)" msgstr "Résumé (recherche texte intégral)" -#: forms.py:514 forms.py:844 models.py:337 +#: forms.py:540 forms.py:870 models.py:341 msgid "Comment about scientific documentation" msgstr "Commentaire concernant la documentation scientifique" -#: forms.py:515 forms.py:846 models.py:349 +#: forms.py:541 forms.py:872 models.py:353 msgid "Record quality" msgstr "Qualité d'enregistrement" -#: forms.py:516 forms.py:811 models.py:300 +#: forms.py:542 forms.py:837 models.py:304 msgid "Report processing" msgstr "Traitement du rapport" -#: forms.py:518 forms.py:849 models.py:344 +#: forms.py:544 forms.py:875 models.py:348 msgid "Virtual operation" msgstr "Opération virtuelle" -#: forms.py:520 forms.py:1146 forms.py:1150 models.py:94 +#: forms.py:546 forms.py:1180 forms.py:1184 models.py:94 msgid "Archaeological site" msgstr "Entité archéologique" -#: forms.py:526 forms.py:1277 +#: forms.py:552 forms.py:1311 msgid "Created by" msgstr "Créé par" -#: forms.py:532 forms.py:1283 +#: forms.py:558 forms.py:1317 msgid "Modified by" msgstr "Modifié par" -#: forms.py:539 +#: forms.py:565 msgid "Documentation deadline before" msgstr "Date limite de rendu de la documentation avant" -#: forms.py:541 +#: forms.py:567 msgid "Documentation deadline after" msgstr "Date limite de rendu de la documentation après" -#: forms.py:543 forms.py:834 models.py:356 +#: forms.py:569 forms.py:860 models.py:360 msgid "Documentation received" msgstr "Documentation reçue" -#: forms.py:545 +#: forms.py:571 msgid "Finds deadline before" msgstr "Date limite de rendu du mobilier avant" -#: forms.py:547 +#: forms.py:573 msgid "Finds deadline after" msgstr "Date limite de rendu du mobilier après" -#: forms.py:549 forms.py:839 models.py:360 +#: forms.py:575 forms.py:865 models.py:364 msgid "Finds received" msgstr "Mobilier reçu" -#: forms.py:594 forms.py:1222 views.py:168 +#: forms.py:620 forms.py:1256 views.py:168 msgid "Operation search" msgstr "Rechercher une opération" -#: forms.py:638 +#: forms.py:664 msgid "Associated file" msgstr "Dossier associé" -#: forms.py:642 forms.py:937 models.py:516 models.py:916 models.py:1026 +#: forms.py:668 forms.py:971 models.py:520 models.py:921 models.py:1031 #: wizards.py:80 msgid "Archaeological file" msgstr "Dossier archéologique" -#: forms.py:649 forms.py:651 models.py:351 +#: forms.py:675 forms.py:677 models.py:355 msgid "Abstract" msgstr "Résumé" -#: forms.py:654 +#: forms.py:680 msgid "months" msgstr "mois" -#: forms.py:654 +#: forms.py:680 msgid "years" msgstr "années" -#: forms.py:656 models.py:253 +#: forms.py:682 models.py:253 msgid "Creation date" msgstr "Date de création" -#: forms.py:657 +#: forms.py:683 msgid "Start of field work" msgstr "Début du travail de terrain" -#: forms.py:659 +#: forms.py:685 msgid "All" msgstr "Tout" -#: forms.py:660 +#: forms.py:686 msgid "Preventive" msgstr "Préventif" -#: forms.py:661 +#: forms.py:687 msgid "Research" msgstr "Programmé" -#: forms.py:665 +#: forms.py:691 msgid "Slicing" msgstr "Découpage" -#: forms.py:668 +#: forms.py:694 msgid "Department detail" msgstr "Détail par département" -#: forms.py:670 +#: forms.py:696 msgid "Date get from" msgstr "Date obtenue depuis" -#: forms.py:672 +#: forms.py:698 msgid "Preventive/Research" msgstr "Préventif/Programmé" -#: forms.py:678 +#: forms.py:704 msgid "Date after" msgstr "Date après" -#: forms.py:680 +#: forms.py:706 msgid "Date before" msgstr "Date avant" -#: forms.py:682 +#: forms.py:708 msgid "With reports" msgstr "Avec un rapport" -#: forms.py:683 +#: forms.py:709 msgid "With finds" msgstr "Avec du mobilier" -#: forms.py:735 forms.py:1331 templates/ishtar/sheet_administrativeact.html:20 +#: forms.py:761 forms.py:1365 templates/ishtar/sheet_administrativeact.html:20 #: templates/ishtar/sheet_operation.html:26 msgid "General" msgstr "Général" -#: forms.py:750 models.py:333 +#: forms.py:777 models.py:337 msgid "Generic name" msgstr "Nom générique" -#: forms.py:761 models.py:302 +#: forms.py:788 models.py:306 msgid "Old code" msgstr "Ancien code" -#: forms.py:764 +#: forms.py:791 msgid "Head scientist" msgstr "Responsable scientifique" -#: forms.py:783 models.py:332 +#: forms.py:810 models.py:336 msgid "Operator reference" msgstr "Référence de l'opérateur" -#: forms.py:797 +#: forms.py:823 models.py:273 +msgid "Collaborators" +msgstr "" + +#: forms.py:826 msgid "Total surface (m2)" msgstr "Surface totale (m2)" -#: forms.py:804 models.py:54 models.py:256 models.py:1443 +#: forms.py:830 models.py:54 models.py:256 models.py:1448 msgid "Start date" msgstr "Date de début" -#: forms.py:806 models.py:258 +#: forms.py:832 models.py:258 msgid "Excavation end date" msgstr "Date de fin de chantier" -#: forms.py:809 models.py:259 +#: forms.py:835 models.py:259 msgid "Report delivery date" msgstr "Date de livraison du rapport" -#: forms.py:831 models.py:353 +#: forms.py:857 models.py:357 msgid "Deadline for submission of the documentation" msgstr "Date limite de rendu de la documentation" -#: forms.py:836 models.py:358 +#: forms.py:862 models.py:362 msgid "Deadline for submission of the finds" msgstr "Date limite de rendu du mobilier" -#: forms.py:851 +#: forms.py:877 msgid "Image" msgstr "Image" -#: forms.py:852 +#: forms.py:878 #, 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:890 +#: forms.py:924 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:895 +#: forms.py:929 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 +#: forms.py:957 #, python-format msgid "" "Operation code already exists for year: %(year)d - use a value bigger than " @@ -408,106 +417,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:927 +#: forms.py:961 msgid "Bad operation code" msgstr "Mauvais code d'opération" -#: forms.py:933 models.py:531 models.py:879 +#: forms.py:967 models.py:535 models.py:877 msgid "Operation code" msgstr "Code de l'opération" -#: forms.py:959 +#: forms.py:993 msgid "Preventive informations - excavation" msgstr "Information archéologie préventive - fouille" -#: forms.py:960 models.py:286 +#: forms.py:994 models.py:290 #: templates/ishtar/dashboards/dashboard_operation.html:701 msgid "Cost (euros)" msgstr "Coût (euros)" -#: forms.py:961 models.py:291 +#: forms.py:995 models.py:295 msgid "Scheduled man-days" msgstr "Jours-hommes prévus" -#: forms.py:963 models.py:294 +#: forms.py:997 models.py:298 msgid "Optional man-days" msgstr "Jours-hommes optionnels" -#: forms.py:965 models.py:297 +#: forms.py:999 models.py:301 msgid "Effective man-days" msgstr "Jours-hommes effectifs" -#: forms.py:975 +#: forms.py:1009 msgid "Preventive informations - diagnostic" msgstr "Information archéologie préventive - diagnostic" -#: forms.py:978 models.py:316 +#: forms.py:1012 models.py:320 msgid "Prescription on zoning" msgstr "Prescription sur zonage" -#: forms.py:980 models.py:319 +#: forms.py:1014 models.py:323 msgid "Prescription on large area" msgstr "Prescription sur une vaste surface" -#: forms.py:983 models.py:321 +#: forms.py:1017 models.py:325 msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" -#: forms.py:987 forms.py:1009 models.py:284 models.py:1049 +#: forms.py:1021 forms.py:1043 models.py:288 models.py:1054 msgid "Towns" msgstr "Communes" -#: forms.py:1016 models.py:1246 models.py:1441 +#: forms.py:1050 models.py:1251 models.py:1446 msgid "Parcel" msgstr "Parcelle" -#: forms.py:1068 models.py:46 +#: forms.py:1102 models.py:46 msgid "Remain types" msgstr "Types de vestige" -#: forms.py:1072 models.py:45 +#: forms.py:1106 models.py:45 msgid "Remain type" msgstr "Type de vestige" -#: forms.py:1088 templates/ishtar/sheet_operation.html:171 -#: templates/ishtar/sheet_operation.html:202 +#: forms.py:1122 templates/ishtar/sheet_operation.html:173 +#: templates/ishtar/sheet_operation.html:204 msgid "Period" msgstr "Période" -#: forms.py:1100 models.py:85 +#: forms.py:1134 models.py:85 msgid "Reference" msgstr "Référence" -#: forms.py:1129 +#: forms.py:1163 msgid "This reference already exists." msgstr "Cette référence existe déjà." -#: forms.py:1161 models.py:95 models.py:341 -#: templates/ishtar/sheet_operation.html:96 +#: forms.py:1195 models.py:95 models.py:345 +#: templates/ishtar/sheet_operation.html:97 msgid "Archaeological sites" msgstr "Entités archéologiques" -#: forms.py:1165 +#: forms.py:1199 msgid "Associated archaeological sites" msgstr "Entités archéologiques associées" -#: forms.py:1171 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93 +#: forms.py:1205 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93 msgid "Search" msgstr "Recherche" -#: forms.py:1176 +#: forms.py:1210 msgid "Would you like to close this operation?" msgstr "Voulez-vous clore cette opération ?" -#: forms.py:1181 +#: forms.py:1215 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:886 models.py:1006 +#: forms.py:1224 forms.py:1294 forms.py:1430 models.py:884 models.py:1011 msgid "Index" msgstr "Index" -#: forms.py:1216 +#: forms.py:1250 #, python-format msgid "" "Index already exists for operation: %(operation)s - use a value bigger than " @@ -516,48 +525,48 @@ msgstr "" "Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur " "plus grande que %(last_val)d" -#: forms.py:1228 +#: forms.py:1262 msgid "Operation's year" msgstr "Année de l'opération" -#: forms.py:1235 +#: forms.py:1269 msgid "Operation's town" msgstr "Commune de l'opération" -#: forms.py:1248 +#: forms.py:1282 msgid "Documentation search" msgstr "Rechercher une documentation" -#: forms.py:1250 +#: forms.py:1284 msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: forms.py:1267 forms.py:1334 models.py:930 models.py:1000 +#: forms.py:1301 forms.py:1368 models.py:935 models.py:1005 msgid "Act type" msgstr "Type d'acte" -#: forms.py:1268 forms.py:1466 +#: forms.py:1302 forms.py:1500 msgid "Indexed?" msgstr "Indexé ?" -#: forms.py:1274 forms.py:1339 models.py:1040 +#: forms.py:1308 forms.py:1373 models.py:1045 #: templates/ishtar/blocks/window_tables/administrativacts.html:10 msgid "Object" msgstr "Objet" -#: forms.py:1311 views.py:333 +#: forms.py:1345 views.py:348 msgid "Administrative act search" msgstr "Rechercher un acte administratif" -#: forms.py:1326 forms.py:1424 forms.py:1491 +#: forms.py:1360 forms.py:1458 forms.py:1525 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: forms.py:1342 models.py:1037 +#: forms.py:1376 models.py:1042 msgid "Signature date" msgstr "Date de signature" -#: forms.py:1384 +#: forms.py:1418 #, python-format msgid "" "This index already exists for year: %(year)d - use a value bigger than " @@ -566,31 +575,31 @@ msgstr "" "Cet index existe déjà pour l'année : %(year)d, utilisez une valeur plus " "grande que %(last_val)d" -#: forms.py:1388 +#: forms.py:1422 msgid "Bad index" msgstr "Mauvais index" -#: forms.py:1401 +#: forms.py:1435 msgid "Would you like to delete this administrative act?" msgstr "Voulez-vous supprimer cet acte administratif ?" -#: forms.py:1406 +#: forms.py:1440 msgid "Template" msgstr "Patron" -#: forms.py:1430 forms.py:1434 +#: forms.py:1464 forms.py:1468 msgid "This document is not intended for this type of act." msgstr "Ce document n'est pas destiné à ce type d'acte." -#: forms.py:1452 +#: forms.py:1486 msgid "Doc generation" msgstr "Génération de document" -#: forms.py:1454 +#: forms.py:1488 msgid "Generate the associated doc?" msgstr "Générer le document associé ?" -#: forms.py:1475 ishtar_menu.py:123 views.py:386 +#: forms.py:1509 ishtar_menu.py:123 views.py:401 msgctxt "admin act register" msgid "Register" msgstr "Registre" @@ -611,7 +620,7 @@ msgstr "Clôture" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:59 models.py:1056 +#: ishtar_menu.py:59 models.py:1061 #: templates/ishtar/sheet_administrativeact.html:4 msgid "Administrative act" msgstr "Acte administratif" @@ -636,16 +645,16 @@ msgstr "Tableau de bord" msgid "General informations" msgstr "Informations générales" -#: ishtar_menu.py:139 models.py:369 +#: ishtar_menu.py:139 models.py:373 #: templates/ishtar/dashboards/dashboard_operation.html:8 msgid "Operations" msgstr "Opérations" -#: models.py:53 models.py:71 models.py:1913 +#: models.py:53 models.py:71 models.py:1918 msgid "Order" msgstr "Ordre" -#: models.py:55 models.py:1444 +#: models.py:55 models.py:1449 msgid "End date" msgstr "Date de fin" @@ -761,359 +770,359 @@ msgstr "Date de clôture" msgid "In charge scientist" msgstr "Responsable du suivi scientifique" -#: models.py:277 models.py:1226 +#: models.py:281 models.py:1231 msgid "File" msgstr "Dossier" -#: models.py:281 +#: models.py:285 msgid "Surface (m2)" msgstr "Surface (m2)" -#: models.py:335 +#: models.py:339 msgid "General comment" msgstr "Commentaire général" -#: models.py:338 +#: models.py:342 msgid "Cached name" msgstr "Nom en cache" -#: models.py:346 +#: models.py:350 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:362 +#: models.py:366 msgid "Point" msgstr "Point" -#: models.py:363 +#: models.py:367 msgid "Multi polygon" msgstr "Polygones multi-parties" -#: models.py:371 +#: models.py:375 msgid "Can view all Operations" msgstr "Peut voir toutes les Opérations" -#: models.py:372 +#: models.py:376 msgid "Can view own Operation" msgstr "Peut voir sa propre Opération" -#: models.py:373 +#: models.py:377 msgid "Can add own Operation" msgstr "Peut ajouter sa propre Opération" -#: models.py:374 +#: models.py:378 msgid "Can change own Operation" msgstr "Peut modifier sa propre Opération" -#: models.py:375 +#: models.py:379 msgid "Can delete own Operation" msgstr "Peut supprimer sa propre Opération" -#: models.py:376 +#: models.py:380 msgid "Can close Operation" msgstr "Peut clore une Opération" -#: models.py:405 +#: models.py:409 msgid "OPE" msgstr "OPE" -#: models.py:479 +#: models.py:483 msgid "Intercommunal" msgstr "Intercommunal" -#: models.py:517 +#: models.py:521 msgid "Code patriarche" msgstr "Code patriarche" -#: models.py:557 +#: models.py:561 msgid "This operation code already exists for this year" msgstr "Ce code d'opération existe déjà pour cette année." -#: models.py:582 +#: models.py:588 msgid "Number of parcels" msgstr "Nombre de parcelles" -#: models.py:600 +#: models.py:598 msgid "Number of administrative acts" msgstr "Nombre d'actes administratifs" -#: models.py:608 +#: models.py:606 msgid "Number of indexed administrative acts" msgstr "Nombre d'actes administratifs indexés" -#: models.py:616 +#: models.py:614 msgid "Number of context records" msgstr "Nombre d'Unités d'Enregistrement" -#: models.py:652 +#: models.py:650 msgid "Number of finds" msgstr "Nombre d'éléments de mobilier" -#: models.py:697 +#: models.py:695 msgid "No type" msgstr "Pas de type" -#: models.py:728 +#: models.py:726 msgid "Number of sources" msgstr "Nombre de documents" -#: models.py:770 templates/ishtar/dashboards/dashboard_operation.html:309 +#: models.py:768 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:820 +#: models.py:818 msgid "Inverse relation" msgstr "Relation inverse" -#: models.py:824 +#: models.py:822 msgid "Operation relation type" msgstr "Type de relation entre opérations" -#: models.py:825 +#: models.py:823 msgid "Operation relation types" msgstr "Types de relation entre opérations" -#: models.py:838 +#: models.py:836 msgid "Operation record relation" msgstr "Relation entre opérations" -#: models.py:839 +#: models.py:837 msgid "Operation record relations" msgstr "Relations entre opérations" -#: models.py:878 +#: models.py:876 msgid "Operation year" msgstr "Année de l'opération" -#: models.py:880 +#: models.py:878 msgid "Document code" msgstr "Code du document" -#: models.py:890 +#: models.py:888 msgid "Operation documentation" msgstr "Documentation d'une opération" -#: models.py:891 +#: models.py:889 msgid "Operation documentations" msgstr "Documentations des opérations" -#: models.py:894 +#: models.py:892 msgid "Can view all Operation sources" msgstr "Peut voir toutes les Documentations d'opération" -#: models.py:896 +#: models.py:894 msgid "Can view own Operation source" msgstr "Peut voir sa propre Documentation d'opération" -#: models.py:898 +#: models.py:896 msgid "Can add own Operation source" msgstr "Peut ajouter sa propre Documentation d'opération" -#: models.py:900 +#: models.py:898 msgid "Can change own Operation source" msgstr "Peut modifier sa propre Documentation d'opération" -#: models.py:902 +#: models.py:900 msgid "Can delete own Operation source" msgstr "Peut supprimer sa propre Documentation d'opération" -#: models.py:918 models.py:1031 +#: models.py:923 models.py:1036 msgid "Treatment request" msgstr "Demande de traitement" -#: models.py:919 models.py:1036 +#: models.py:924 models.py:1041 msgid "Treatment" msgstr "Traitement" -#: models.py:921 +#: models.py:926 msgid "Intended to" msgstr "Destiné à" -#: models.py:923 +#: models.py:928 msgid "Code" msgstr "Code" -#: models.py:926 +#: models.py:931 msgid "Associated template" msgstr "Patron associé" -#: models.py:927 +#: models.py:932 msgid "Indexed" msgstr "Indexé" -#: models.py:931 +#: models.py:936 msgid "Act types" msgstr "Types d'acte" -#: models.py:997 models.py:1077 +#: models.py:1002 models.py:1082 #: templates/ishtar/blocks/window_tables/administrativacts.html:7 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 msgid "Ref." msgstr "Réf." -#: models.py:1004 +#: models.py:1009 msgid "Person in charge of the operation" msgstr "Responsable d'opération" -#: models.py:1010 +#: models.py:1015 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: models.py:1018 +#: models.py:1023 msgid "Signatory" msgstr "Signataire" -#: models.py:1046 +#: models.py:1051 msgid "Departments" msgstr "Départements" -#: models.py:1047 +#: models.py:1052 msgid "Cached values get from associated departments" msgstr "Valeur en cache des départements associés" -#: models.py:1050 +#: models.py:1055 msgid "Cached values get from associated towns" msgstr "Valeur en cache des communes associées" -#: models.py:1057 templates/ishtar/sheet_operation.html:104 -#: templates/ishtar/sheet_operation.html:145 +#: models.py:1062 templates/ishtar/sheet_operation.html:105 +#: templates/ishtar/sheet_operation.html:147 msgid "Administrative acts" msgstr "Actes administratifs" -#: models.py:1060 +#: models.py:1065 msgid "Can view all Administrative acts" msgstr "Peut voir tous les Actes administratifs" -#: models.py:1062 +#: models.py:1067 msgid "Can view own Administrative act" msgstr "Peut voir son propre Acte administratif" -#: models.py:1064 +#: models.py:1069 msgid "Can add own Administrative act" msgstr "Peut ajouter son propre Acte administratif" -#: models.py:1066 +#: models.py:1071 msgid "Can change own Administrative act" msgstr "Peut modifier son propre Acte administratif" -#: models.py:1068 +#: models.py:1073 msgid "Can delete own Administrative act" msgstr "Peut supprimer son propre Acte administratif" -#: models.py:1171 +#: models.py:1176 msgid "This index already exists for this year" msgstr "Cet index existe déjà pour cette année." -#: models.py:1239 +#: models.py:1244 msgid "External ID" msgstr "ID externe" -#: models.py:1242 +#: models.py:1247 msgid "External ID is set automatically" msgstr "L'identifiant externe est configuré automatiquement" -#: models.py:1243 +#: models.py:1248 msgid "Address - Locality" msgstr "Adresse - Lieu-dit" -#: models.py:1439 +#: models.py:1444 msgid "Owner" msgstr "Propriétaire" -#: models.py:1447 +#: models.py:1452 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: models.py:1448 +#: models.py:1453 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: models.py:1474 +#: models.py:1479 msgid "Recorded" msgstr "Enregistré" -#: models.py:1475 +#: models.py:1480 msgid "Effective" msgstr "Effectif" -#: models.py:1476 +#: models.py:1481 msgid "Active" msgstr "Actif" -#: models.py:1477 +#: models.py:1482 msgid "Field completed" msgstr "Terrain achevé" -#: models.py:1478 +#: models.py:1483 msgid "Associated report" msgstr "Rapport associé" -#: models.py:1479 +#: models.py:1484 msgid "Closed" msgstr "Clos" -#: models.py:1480 +#: models.py:1485 msgid "Documented and closed" msgstr "Documenté et clos" -#: models.py:1914 +#: models.py:1919 msgid "Is preventive" msgstr "Préventif" -#: models.py:1917 +#: models.py:1922 msgid "Operation type old" msgstr "Type d'opération - ancien" -#: models.py:1918 +#: models.py:1923 msgid "Operation types old" msgstr "Types d'opération - ancien" -#: views.py:214 +#: views.py:223 msgid "New operation" msgstr "Ajouter une opération" -#: views.py:237 +#: views.py:267 msgid "Operation modification" msgstr "Modifier une opération" -#: views.py:280 +#: views.py:295 msgid "Operation closing" msgstr "Clôturer une opération" -#: views.py:291 +#: views.py:306 msgid "Operation deletion" msgstr "Supprimer une opération" -#: views.py:296 +#: views.py:311 msgid "Operation: source search" msgstr "Opération : rechercher une documentation associée" -#: views.py:304 +#: views.py:319 msgid "Operation: source creation" msgstr "Opération : ajouter une documentation associée" -#: views.py:312 +#: views.py:327 msgid "Operation: source modification" msgstr "Opération : modifier une documentation associée" -#: views.py:327 +#: views.py:342 msgid "Operation: source deletion" msgstr "Opération : supprimer une documentation associée" -#: views.py:346 +#: views.py:361 msgid "Operation: new administrative act" msgstr "Opération : ajouter un acte administratif" -#: views.py:356 +#: views.py:371 msgid "Operation: administrative act modification" msgstr "Opération : modification d'un acte administratif" -#: views.py:380 +#: views.py:395 msgid "Operation: administrative act deletion" msgstr "Opération : supprimer un acte administratif" @@ -1130,7 +1139,7 @@ msgstr "" "oubli, définissez-le à la première étape." #: templates/ishtar/sheet_administrativeact.html:36 -#: templates/ishtar/sheet_operation.html:40 +#: templates/ishtar/sheet_operation.html:41 msgid "Surface:" msgstr "Surface :" @@ -1150,92 +1159,96 @@ msgstr "Adresse" msgid "Begining date" msgstr "Date de début" -#: templates/ishtar/sheet_operation.html:36 +#: templates/ishtar/sheet_operation.html:37 msgid "State:" msgstr "État :" -#: templates/ishtar/sheet_operation.html:36 +#: templates/ishtar/sheet_operation.html:37 msgid "Active file" msgstr "Dossier actif" -#: templates/ishtar/sheet_operation.html:37 +#: templates/ishtar/sheet_operation.html:38 msgid "Closed operation" msgstr "Opération close" -#: templates/ishtar/sheet_operation.html:38 +#: templates/ishtar/sheet_operation.html:39 msgid "Closing date:" msgstr "Date de clôture :" -#: templates/ishtar/sheet_operation.html:38 +#: templates/ishtar/sheet_operation.html:39 msgid "by" msgstr "par" -#: templates/ishtar/sheet_operation.html:41 +#: templates/ishtar/sheet_operation.html:42 msgid "Cost:" msgstr "Coût :" -#: templates/ishtar/sheet_operation.html:42 +#: templates/ishtar/sheet_operation.html:43 msgid "Duration:" msgstr "Durée :" -#: templates/ishtar/sheet_operation.html:42 +#: templates/ishtar/sheet_operation.html:43 msgid "Day" msgstr "Jour" -#: templates/ishtar/sheet_operation.html:75 +#: templates/ishtar/sheet_operation.html:76 msgid "Localisation" msgstr "Localisation" -#: templates/ishtar/sheet_operation.html:100 +#: templates/ishtar/sheet_operation.html:101 msgid "Associated parcels" msgstr "Parcelles associées" -#: templates/ishtar/sheet_operation.html:108 +#: templates/ishtar/sheet_operation.html:109 msgid "Document from this operation" msgstr "Documents de cette opération" -#: templates/ishtar/sheet_operation.html:114 -#: templates/ishtar/sheet_operation.html:156 +#: templates/ishtar/sheet_operation.html:115 +#: templates/ishtar/sheet_operation.html:158 msgid "Context records" msgstr "Unités d'Enregistrement" -#: templates/ishtar/sheet_operation.html:119 +#: templates/ishtar/sheet_operation.html:120 msgid "Context record relations" msgstr "Relations entre Unités d'Enregistrement" -#: templates/ishtar/sheet_operation.html:124 +#: templates/ishtar/sheet_operation.html:125 msgid "Documents from associated context records" msgstr "Documents des Unités d'Enregistrement associées" -#: templates/ishtar/sheet_operation.html:129 -#: templates/ishtar/sheet_operation.html:179 +#: templates/ishtar/sheet_operation.html:130 +#: templates/ishtar/sheet_operation.html:181 msgid "Finds" msgstr "Mobilier" -#: templates/ishtar/sheet_operation.html:134 +#: templates/ishtar/sheet_operation.html:135 msgid "Documents from associated finds" msgstr "Documents du mobilier associé" -#: templates/ishtar/sheet_operation.html:139 +#: templates/ishtar/sheet_operation.html:140 msgid "Associated containers" msgstr "Contenants associés" -#: templates/ishtar/sheet_operation.html:143 +#: templates/ishtar/sheet_operation.html:144 msgid "Statistics" msgstr "Statistiques" -#: templates/ishtar/sheet_operation.html:163 -#: templates/ishtar/sheet_operation.html:217 +#: templates/ishtar/sheet_operation.html:145 +msgid "Theses number are updated hourly" +msgstr "" + +#: templates/ishtar/sheet_operation.html:165 +#: templates/ishtar/sheet_operation.html:219 #: templates/ishtar/blocks/window_tables/administrativacts.html:8 msgid "Type" msgstr "Type" -#: 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/sheet_operation.html:165 +#: templates/ishtar/sheet_operation.html:173 +#: templates/ishtar/sheet_operation.html:188 +#: templates/ishtar/sheet_operation.html:196 +#: templates/ishtar/sheet_operation.html:204 +#: templates/ishtar/sheet_operation.html:219 #: templates/ishtar/dashboards/dashboard_operation.html:18 #: templates/ishtar/dashboards/dashboard_operation.html:164 #: templates/ishtar/dashboards/dashboard_operation.html:432 @@ -1244,19 +1257,19 @@ msgstr "Type" msgid "Number" msgstr "Nombre" -#: templates/ishtar/sheet_operation.html:186 +#: templates/ishtar/sheet_operation.html:188 msgid "Material type" msgstr "Type de matériau" -#: templates/ishtar/sheet_operation.html:194 +#: templates/ishtar/sheet_operation.html:196 msgid "Object type" msgstr "Type d'objet" -#: templates/ishtar/sheet_operation.html:210 +#: templates/ishtar/sheet_operation.html:212 msgid "Sources" msgstr "Documents" -#: templates/ishtar/sheet_operation.html:226 +#: templates/ishtar/sheet_operation.html:228 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 15d86d645..0356ebec7 100644 --- a/translations/fr/archaeological_warehouse.po +++ b/translations/fr/archaeological_warehouse.po @@ -7,26 +7,28 @@ # Étienne Loks , 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-04-05 12:20+0200\n" "PO-Revision-Date: 2017-03-21 06:24-0400\n" "Last-Translator: Étienne Loks \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:36 forms.py:99 ishtar_menu.py:40 models.py:63 models.py:103 +#: forms.py:36 forms.py:99 ishtar_menu.py:40 models.py:66 models.py:202 #: templates/ishtar/sheet_warehouse.html:4 msgid "Warehouse" msgstr "Dépôt" -#: forms.py:45 forms.py:50 models.py:281 +#: forms.py:45 forms.py:50 models.py:387 msgid "Division" msgstr "Division" -#: forms.py:52 models.py:127 +#: forms.py:52 models.py:226 msgid "Order" msgstr "Ordre" @@ -34,15 +36,15 @@ msgstr "Ordre" msgid "There are identical divisions." msgstr "Il y a des divisions identiques" -#: forms.py:70 models.py:53 +#: forms.py:70 models.py:56 msgid "Divisions" msgstr "Divisions" -#: forms.py:74 forms.py:103 models.py:45 models.py:100 +#: forms.py:74 forms.py:103 models.py:48 models.py:199 msgid "Name" msgstr "Nom" -#: forms.py:75 forms.py:105 models.py:36 models.py:47 +#: forms.py:75 forms.py:105 models.py:39 models.py:50 msgid "Warehouse type" msgstr "Type de dépôt" @@ -54,11 +56,11 @@ msgstr "Commune" msgid "Warehouse search" msgstr "Rechercher un dépôt" -#: forms.py:108 models.py:50 +#: forms.py:108 models.py:53 msgid "Person in charge" msgstr "Responsable" -#: forms.py:114 forms.py:184 models.py:51 models.py:181 +#: forms.py:114 forms.py:184 models.py:54 models.py:280 msgid "Comment" msgstr "Commentaires" @@ -90,16 +92,16 @@ msgstr "Téléphone mobile" msgid "Would you like to delete this warehouse?" msgstr "Voulez-vous supprimer ce dépôt ?" -#: forms.py:158 models.py:192 models.py:279 +#: forms.py:158 models.py:291 models.py:384 #: templates/ishtar/sheet_container.html:4 msgid "Container" msgstr "Contenant" -#: forms.py:163 forms.py:237 models.py:142 +#: forms.py:163 forms.py:237 models.py:241 msgid "Ref." msgstr "Réf." -#: forms.py:164 forms.py:236 models.py:145 models.py:179 +#: forms.py:164 forms.py:236 models.py:244 models.py:278 msgid "Container type" msgstr "Type de contenant" @@ -107,7 +109,7 @@ msgstr "Type de contenant" msgid "Current location (warehouse)" msgstr "Lieu actuel (dépôt)" -#: forms.py:172 models.py:176 +#: forms.py:172 models.py:275 msgid "Responsible warehouse" msgstr "Dépôt responsable" @@ -160,7 +162,7 @@ msgstr "Date" msgid "Packaged finds" msgstr "Mobilier conditionné" -#: forms.py:280 models.py:182 +#: forms.py:280 models.py:281 msgid "Localisation" msgstr "Localisation" @@ -188,115 +190,116 @@ msgstr "Modification" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:57 models.py:193 templates/ishtar/sheet_warehouse.html:20 +#: ishtar_menu.py:57 models.py:292 templates/ishtar/sheet_warehouse.html:20 +#: templates/ishtar/sheet_warehouse.html:53 msgid "Containers" msgstr "Contenants" -#: models.py:37 +#: models.py:40 msgid "Warehouse types" msgstr "Types de dépôt" -#: models.py:56 models.py:187 +#: models.py:59 models.py:286 msgid "External ID" msgstr "ID externe" -#: models.py:58 models.py:189 +#: models.py:61 models.py:288 msgid "External ID is set automatically" msgstr "L'ID externe est attribué automatiquement" -#: models.py:64 +#: models.py:67 msgid "Warehouses" msgstr "Dépôts" -#: models.py:66 +#: models.py:69 msgid "Can view all Warehouses" msgstr "Peut voir tous les Dépôts" -#: models.py:67 +#: models.py:70 msgid "Can view own Warehouse" msgstr "Peut voir son propre Dépôt" -#: models.py:68 +#: models.py:71 msgid "Can add own Warehouse" msgstr "Peut ajouter son propre Dépôt" -#: models.py:69 +#: models.py:72 msgid "Can change own Warehouse" msgstr "Peut modifier son propre Dépôt" -#: models.py:70 +#: models.py:73 msgid "Can delete own Warehouse" msgstr "Peut supprimer son propre Dépôt" -#: models.py:102 +#: models.py:201 msgid "Description" msgstr "Description" -#: models.py:107 models.py:108 +#: models.py:206 models.py:207 msgid "Collection" msgstr "Collection" -#: models.py:117 +#: models.py:216 msgid "Warehouse division type" msgstr "Type de division de dépôt" -#: models.py:118 +#: models.py:217 msgid "Warehouse division types" msgstr "Types de division de dépôt" -#: models.py:138 +#: models.py:237 msgid "Length (mm)" msgstr "Longueur (mm)" -#: models.py:139 +#: models.py:238 msgid "Width (mm)" msgstr "Largeur (mm)" -#: models.py:140 +#: models.py:239 msgid "Height (mm)" msgstr "Hauteur (mm)" -#: models.py:141 +#: models.py:240 msgid "Volume (l)" msgstr "Volume (l)" -#: models.py:146 +#: models.py:245 msgid "Container types" msgstr "Types de contenant" -#: models.py:165 +#: models.py:264 msgid "Location - index" msgstr "Lieu - index" -#: models.py:166 +#: models.py:265 msgid "Precise localisation" msgstr "Localisation précise" -#: models.py:167 +#: models.py:266 msgid "Type" msgstr "Type" -#: models.py:173 +#: models.py:272 msgid "Location (warehouse)" msgstr "Lieu (dépôt)" -#: models.py:180 +#: models.py:279 msgid "Container ref." msgstr "Réf. du contenant" -#: models.py:184 +#: models.py:283 msgid "Cached location" msgstr "Lieu - en cache" -#: models.py:282 +#: models.py:388 msgid "Reference" msgstr "Référence" -#: models.py:285 +#: models.py:391 msgid "Container localisation" msgstr "Localisation de contenant" -#: models.py:286 +#: models.py:392 msgid "Container localisations" msgstr "Localisations de contenant" @@ -332,10 +335,38 @@ msgstr "Contenu" msgid "Attached containers" msgstr "Contenants associés" -#: templates/ishtar/wizard/wizard_containerlocalisation.html:6 +#: templates/ishtar/sheet_warehouse.html:29 +msgid "Statistics" +msgstr "" + +#: templates/ishtar/sheet_warehouse.html:30 +msgid "Theses number are updated hourly" +msgstr "" + +#: templates/ishtar/sheet_warehouse.html:32 +msgid "Finds" +msgstr "" + +#: templates/ishtar/sheet_warehouse.html:39 +#, fuzzy +msgid "Finds by location in the warehouse" +msgstr "Lieu actuel (dépôt)" + +#: templates/ishtar/sheet_warehouse.html:59 +#, fuzzy +msgid "Containers by location in the warehouse" +msgstr "Lieu actuel (dépôt)" + +#: templates/ishtar/wizard/wizard_containerlocalisation.html:8 msgid "" "No division set for this warehouse. Define at least one division to localise " "containers in this warehouse." msgstr "" "Pas de division configurée pour ce dépôt. Définissez au moins une division " "pour localiser les contenants dans ce dépôt." + +#: templates/ishtar/wizard/wizard_warehouse_divisions.html:8 +msgid "" +"Containers with localisation are associated to this warehouse. You cannot " +"change divisions." +msgstr "" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index 6a9d80265..0c4c94036 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-04-05 12:20+0200\n" "PO-Revision-Date: 2017-03-21 01:54-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" @@ -168,40 +170,40 @@ msgstr "résultat" msgid "\"%(value)s\" not in %(values)s" msgstr "\"%(value)s\" n'est pas dans %(values)s" -#: forms.py:73 +#: forms.py:74 msgid "Enter a valid name consisting of letters, spaces and hyphens." msgstr "Entrez un nom correct composé de lettres, espaces et tirets." -#: forms.py:89 forms_common.py:626 +#: forms.py:90 forms_common.py:626 msgid "Confirm" msgstr "Confirmer" -#: forms.py:94 +#: forms.py:95 msgid "Are you sure you want to delete?" msgstr "Êtes-vous sûr de vouloir supprimer ?" -#: forms.py:103 +#: forms.py:129 msgid "There are identical items." msgstr "Il y a des éléments identiques." -#: forms.py:141 forms.py:142 +#: forms.py:176 forms.py:177 msgid "Closing date" msgstr "Date de clôture" -#: forms.py:155 +#: forms.py:190 msgid "You should select an item." msgstr "Vous devez sélectionner un élément." -#: forms.py:156 +#: forms.py:191 msgid "Add a new item" msgstr "Ajouter un nouvel élément" -#: forms.py:262 models.py:1482 +#: forms.py:297 models.py:1501 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:2989 +#: forms_common.py:408 models.py:1567 models.py:3033 #: 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:2610 -#: models.py:2791 models.py:2856 templates/ishtar/sheet_person.html:4 +#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2629 +#: models.py:2822 models.py:2888 templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "Personne" @@ -238,64 +240,64 @@ msgstr "" "pas possible." #: forms_common.py:172 forms_common.py:329 forms_common.py:453 -#: ishtar_menu.py:75 models.py:2493 models.py:2584 +#: ishtar_menu.py:75 models.py:2512 models.py:2603 #: 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:2279 models.py:2487 -#: models.py:2596 models.py:2975 templates/ishtar/import_list.html:13 +#: forms_common.py:378 forms_common.py:448 models.py:1109 models.py:1500 +#: models.py:1769 models.py:1785 models.py:2022 models.py:2298 models.py:2506 +#: models.py:2615 models.py:3019 templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "Nom" -#: forms_common.py:176 models.py:1703 models.py:2134 +#: forms_common.py:176 models.py:1722 models.py:2153 msgid "Organization type" msgstr "Type d'organisation" -#: forms_common.py:178 forms_common.py:402 models.py:1543 +#: forms_common.py:178 forms_common.py:402 models.py:1562 #: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "Adresse" -#: forms_common.py:180 forms_common.py:405 models.py:1544 +#: forms_common.py:180 forms_common.py:405 models.py:1563 #: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "Complément d'adresse" -#: forms_common.py:182 forms_common.py:406 models.py:1546 +#: forms_common.py:182 forms_common.py:406 models.py:1565 #: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "Code postal" -#: forms_common.py:185 forms_common.py:409 models.py:1549 +#: forms_common.py:185 forms_common.py:409 models.py:1568 msgid "Country" msgstr "Pays" #: forms_common.py:187 forms_common.py:326 forms_common.py:382 -#: forms_common.py:450 forms_common.py:574 models.py:1576 +#: forms_common.py:450 forms_common.py:574 models.py:1595 msgid "Email" msgstr "Courriel" -#: forms_common.py:188 forms_common.py:385 models.py:1561 +#: forms_common.py:188 forms_common.py:385 models.py:1580 #: templates/ishtar/sheet_organization.html:14 #: 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 +#: forms_common.py:189 forms_common.py:394 models.py:1592 #: templates/ishtar/sheet_organization.html:15 #: 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:2489 models.py:2910 templates/sheet_ope.html:85 +#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2189 +#: models.py:2508 models.py:2954 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:14 #: templates/ishtar/sheet_organization.html:23 @@ -319,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:2594 +#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2613 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "Prénom" @@ -337,25 +339,25 @@ msgstr "Personne à fusionner" msgid "Identity" msgstr "Identité" -#: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2135 -#: models.py:2588 models.py:2590 models.py:2907 templates/sheet_ope.html:104 +#: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2154 +#: models.py:2607 models.py:2609 models.py:2951 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "Titre" -#: forms_common.py:374 models.py:2592 +#: forms_common.py:374 models.py:2611 msgid "Salutation" msgstr "Formule d'appel" -#: forms_common.py:380 models.py:2598 +#: forms_common.py:380 models.py:2617 msgid "Raw name" msgstr "Nom brut" -#: forms_common.py:383 models.py:1562 +#: forms_common.py:383 models.py:1581 msgid "Phone description" msgstr "Type de téléphone" -#: forms_common.py:386 models.py:1564 models.py:1566 +#: forms_common.py:386 models.py:1583 models.py:1585 msgid "Phone description 2" msgstr "Type de téléphone 2" @@ -363,11 +365,11 @@ msgstr "Type de téléphone 2" msgid "Phone 2" msgstr "Téléphone 2" -#: forms_common.py:390 models.py:1570 +#: forms_common.py:390 models.py:1589 msgid "Phone description 3" msgstr "Type de téléphone 3" -#: forms_common.py:392 models.py:1568 +#: forms_common.py:392 models.py:1587 msgid "Phone 3" msgstr "Téléphone 3" @@ -375,23 +377,23 @@ msgstr "Téléphone 3" msgid "Current organization" msgstr "Organisation actuelle" -#: forms_common.py:411 models.py:1551 +#: forms_common.py:411 models.py:1570 msgid "Other address: address" msgstr "Autre adresse : adresse" -#: forms_common.py:414 models.py:1554 +#: forms_common.py:414 models.py:1573 msgid "Other address: address complement" msgstr "Autre adresse : complément d'adresse" -#: forms_common.py:416 models.py:1555 +#: forms_common.py:416 models.py:1574 msgid "Other address: postal code" msgstr "Autre adresse : code postal" -#: forms_common.py:418 models.py:1557 +#: forms_common.py:418 models.py:1576 msgid "Other address: town" msgstr "Autre adresse : ville" -#: forms_common.py:420 models.py:1559 +#: forms_common.py:420 models.py:1578 msgid "Other address: country" msgstr "Autre adresse : pays" @@ -407,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:2541 +#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2560 msgid "Person type" msgstr "Type de personne" @@ -415,7 +417,7 @@ msgstr "Type de personne" msgid "Account" msgstr "Compte" -#: forms_common.py:577 wizards.py:1339 +#: forms_common.py:577 wizards.py:1347 msgid "New password" msgstr "Nouveau mot de passe" @@ -439,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:2990 +#: forms_common.py:636 forms_common.py:649 models.py:3034 msgid "Towns" msgstr "Communes" @@ -455,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:2882 +#: forms_common.py:783 forms_common.py:831 models.py:2155 models.py:2926 msgid "Source type" msgstr "Type de document" @@ -467,37 +469,37 @@ msgstr "Référence" msgid "Internal reference" msgstr "Référence interne" -#: forms_common.py:791 models.py:2921 +#: forms_common.py:791 models.py:2965 msgid "Numerical ressource (web address)" msgstr "Ressource numérique (adresse web)" -#: forms_common.py:792 models.py:2923 +#: forms_common.py:792 models.py:2967 msgid "Receipt date" msgstr "Date de réception" -#: forms_common.py:794 models.py:2304 models.py:2925 +#: forms_common.py:794 models.py:2323 models.py:2969 msgid "Creation date" msgstr "Date de création" -#: forms_common.py:797 models.py:2928 +#: forms_common.py:797 models.py:2972 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:2602 models.py:2935 +#: forms_common.py:799 forms_common.py:835 models.py:381 models.py:698 +#: models.py:2049 models.py:2621 models.py:2979 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:2934 templates/sheet_ope.html:128 +#: forms_common.py:801 forms_common.py:834 models.py:1111 models.py:1789 +#: models.py:1976 models.py:2023 models.py:2978 templates/sheet_ope.html:128 msgid "Description" msgstr "Description" -#: forms_common.py:804 models.py:2936 +#: forms_common.py:804 models.py:2980 msgid "Additional information" msgstr "Information supplémentaire" -#: forms_common.py:806 forms_common.py:838 models.py:2938 +#: forms_common.py:806 forms_common.py:838 models.py:2982 msgid "Has a duplicate" msgstr "Existe en doublon" @@ -514,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:2861 +#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2893 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "Auteur" @@ -527,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:2848 models.py:2858 +#: forms_common.py:864 models.py:2156 models.py:2880 models.py:2890 msgid "Author type" msgstr "Type d'auteur" @@ -539,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:2862 models.py:2917 +#: forms_common.py:901 models.py:2894 models.py:2961 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -557,7 +559,7 @@ msgstr "Ajout/modification" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:39 models.py:1277 views.py:1608 +#: ishtar_menu.py:39 models.py:1283 views.py:1632 msgid "Global variables" msgstr "Variables globales" @@ -585,19 +587,19 @@ msgstr "Fusion automatique" msgid "Manual merge" msgstr "Fusion manuelle" -#: ishtar_menu.py:109 models.py:2315 +#: ishtar_menu.py:109 models.py:2334 msgid "Imports" msgstr "Imports" -#: ishtar_menu.py:112 views.py:1616 +#: ishtar_menu.py:112 views.py:1640 msgid "New import" msgstr "Nouvel import" -#: ishtar_menu.py:116 views.py:1630 +#: ishtar_menu.py:116 views.py:1654 msgid "Current imports" msgstr "Imports en cours" -#: ishtar_menu.py:120 views.py:1669 +#: ishtar_menu.py:120 views.py:1693 msgid "Old imports" msgstr "Anciens imports" @@ -605,127 +607,127 @@ msgstr "Anciens imports" msgid "Not a valid item." msgstr "Élément invalide." -#: models.py:199 +#: models.py:201 msgid "A selected item is not a valid item." msgstr "Un élément sélectionné n'est pas valide." -#: models.py:210 +#: models.py:212 msgid "This item already exists." msgstr "Cet élément existe déjà." -#: models.py:375 models.py:695 models.py:1516 models.py:1528 models.py:1954 +#: models.py:377 models.py:697 models.py:1535 models.py:1547 models.py:1973 msgid "Label" msgstr "Libellé" -#: models.py:377 +#: models.py:379 msgid "Textual ID" msgstr "Identifiant textuel" -#: models.py:380 models.py:698 models.py:1485 +#: models.py:382 models.py:700 models.py:1504 msgid "Available" msgstr "Disponible" -#: models.py:722 models.py:2076 +#: models.py:724 models.py:2095 msgid "Key" msgstr "Clé" -#: models.py:728 +#: models.py:730 msgid "Specific key to an import" msgstr "Clé spécifique à un import" -#: models.py:820 +#: models.py:826 msgid "Last editor" msgstr "Dernier éditeur" -#: models.py:823 +#: models.py:829 msgid "Creator" msgstr "Créateur" -#: models.py:965 models.py:2846 models.py:3001 models.py:3057 +#: models.py:971 models.py:2877 models.py:3045 models.py:3101 msgid "Order" msgstr "Ordre" -#: models.py:966 +#: models.py:972 msgid "Symmetrical" msgstr "Symétrique" -#: models.py:967 +#: models.py:973 msgid "Tiny label" msgstr "Libellé court" -#: models.py:981 +#: models.py:987 msgid "Cannot have symmetrical and an inverse_relation" msgstr "Ne peut pas être symétrique et avoir une relation inverse" -#: models.py:1097 +#: models.py:1103 msgid "Euro" msgstr "Euro" -#: models.py:1098 +#: models.py:1104 msgid "US dollar" msgstr "Dollar US" -#: models.py:1104 models.py:1768 +#: models.py:1110 models.py:1787 msgid "Slug" msgstr "Identifiant texte" -#: models.py:1107 +#: models.py:1113 msgid "CSS color code for base module" msgstr "Code couleur CSS pour le tronc commun" -#: models.py:1109 +#: models.py:1115 msgid "Files module" msgstr "Module Dossiers" -#: models.py:1111 +#: models.py:1117 msgid "CSS color code for files module" msgstr "Code couleur CSS pour le module Dossier" -#: models.py:1113 +#: models.py:1119 msgid "Context records module" msgstr "Module Unités d'Enregistrement" -#: models.py:1116 +#: models.py:1122 msgid "CSS color code for context record module" msgstr "Code couleur CSS pour le module Unité d'Enregistrement" -#: models.py:1118 +#: models.py:1124 msgid "Finds module" msgstr "Module Mobilier" -#: models.py:1119 +#: models.py:1125 msgid "Need context records module" msgstr "Nécessite le module Unités d'Enregistrement" -#: models.py:1121 +#: models.py:1127 msgid "CSS color code for find module" msgstr "Code couleur CSS pour le module Mobilier" -#: models.py:1124 +#: models.py:1130 msgid "Warehouses module" msgstr "Module Dépôts" -#: models.py:1125 +#: models.py:1131 msgid "Need finds module" msgstr "Nécessite le module mobilier" -#: models.py:1127 +#: models.py:1133 msgid "CSS code for warehouse module" msgstr "Code couleur CSS pour le module Dépôt" -#: models.py:1129 +#: models.py:1135 msgid "Mapping module" msgstr "Module cartographique" -#: models.py:1131 +#: models.py:1137 msgid "CSS code for mapping module" msgstr "Code couleur CSS pour le module cartographique" -#: models.py:1134 +#: models.py:1140 msgid "Home page" msgstr "Page d'accueil" -#: models.py:1135 +#: models.py:1141 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " @@ -735,11 +737,11 @@ msgstr "" "défaut apparaît. Utiliser la syntaxe Markdown. {random_image} peut être " "utilisé pour afficher une image au hasard." -#: models.py:1139 +#: models.py:1145 msgid "File external id" msgstr "Identifiant externe de fichier" -#: models.py:1141 +#: models.py:1147 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -749,11 +751,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1146 +#: models.py:1152 msgid "Parcel external id" msgstr "Identifiant externe de parcelle" -#: models.py:1149 +#: models.py:1155 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -763,11 +765,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1154 +#: models.py:1160 msgid "Context record external id" msgstr "Identifiant externe d'unité d'enregistrement" -#: models.py:1156 +#: models.py:1162 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -777,11 +779,11 @@ msgstr "" "manipuler avec précaution. Une formule incorrecte peut rendre l'application " "inutilisable et l'import de données externes peut alors être destructif." -#: models.py:1161 +#: models.py:1167 msgid "Base find external id" msgstr "Identifiant externe de mobilier de base" -#: models.py:1163 +#: models.py:1169 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -791,11 +793,11 @@ msgstr "" "manipuler avec précaution. Une formule incorrecte peut rendre l'application " "inutilisable et l'import de données externes peut alors être destructif." -#: models.py:1168 +#: models.py:1174 msgid "Find external id" msgstr "Identifiant externe de mobilier" -#: models.py:1170 +#: models.py:1176 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -805,11 +807,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1175 +#: models.py:1181 msgid "Container external id" msgstr "ID externe du contenant" -#: models.py:1177 +#: models.py:1183 msgid "" "Formula to manage container external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -819,11 +821,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1182 +#: models.py:1188 msgid "Warehouse external id" msgstr "ID externe du dépôt" -#: models.py:1184 +#: models.py:1190 msgid "" "Formula to manage warehouse external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " @@ -833,11 +835,11 @@ msgstr "" "précaution. Une formule incorrecte peut rendre l'application inutilisable et " "l'import de données externes peut alors être destructif." -#: models.py:1189 +#: models.py:1195 msgid "Raw name for person" msgstr "Nom brut pour une personne" -#: models.py:1191 +#: models.py:1197 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " @@ -847,43 +849,43 @@ msgstr "" "Une formule incorrecte peut rendre l'application inutilisable et l'import de " "données externes peut alors être destructif." -#: models.py:1195 +#: models.py:1201 msgid "Current active" msgstr "Actuellement utilisé" -#: models.py:1196 +#: models.py:1202 msgid "Currency" msgstr "Devise" -#: models.py:1200 +#: models.py:1206 msgid "Ishtar site profile" msgstr "Profil d'instance Ishtar" -#: models.py:1201 +#: models.py:1207 msgid "Ishtar site profiles" msgstr "Profils d'instance Ishtar" -#: models.py:1270 +#: models.py:1276 msgid "Variable name" msgstr "Nom de la variable" -#: models.py:1271 +#: models.py:1277 msgid "Description of the variable" msgstr "Description de la variable" -#: models.py:1273 models.py:2077 +#: models.py:1279 models.py:2096 msgid "Value" msgstr "Valeur" -#: models.py:1276 +#: models.py:1282 msgid "Global variable" msgstr "Variable globale" -#: models.py:1386 models.py:1416 +#: models.py:1405 models.py:1435 msgid "Total" msgstr "Total" -#: models.py:1393 models.py:1517 models.py:1529 +#: models.py:1412 models.py:1536 models.py:1548 #: templates/ishtar/sheet_person.html:24 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 @@ -891,135 +893,135 @@ msgstr "Total" msgid "Number" msgstr "Nombre" -#: models.py:1480 +#: models.py:1499 msgid "Administrative Act" msgstr "Acte administratif" -#: models.py:1484 +#: models.py:1503 msgid "Associated object" msgstr "Objet associé" -#: models.py:1488 +#: models.py:1507 msgid "Document template" msgstr "Patron de document" -#: models.py:1489 +#: models.py:1508 msgid "Document templates" msgstr "Patrons de document" -#: models.py:1520 models.py:1530 models.py:2299 +#: models.py:1539 models.py:1549 models.py:2318 msgid "State" msgstr "État" -#: models.py:1534 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1553 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "Département" -#: models.py:1535 +#: models.py:1554 msgid "Departments" msgstr "Départements" -#: models.py:1572 +#: models.py:1591 msgid "Raw phone" msgstr "Téléphone brut" -#: models.py:1578 +#: models.py:1597 msgid "Alternative address is prefered" msgstr "L'adresse alternative est préférée" -#: models.py:1617 +#: models.py:1636 msgid "Tel: " msgstr "Tél :" -#: models.py:1621 +#: models.py:1640 msgid "Mobile: " msgstr "Mobile :" -#: models.py:1625 +#: models.py:1644 msgid "Email: " msgstr "Courriel :" -#: models.py:1630 +#: models.py:1649 msgid "Merge key" msgstr "Clé de fusion" -#: models.py:1704 +#: models.py:1723 msgid "Organization types" msgstr "Types d'organisation" -#: models.py:1751 +#: models.py:1770 msgid "Class name" msgstr "Nom de la classe" -#: models.py:1754 +#: models.py:1773 msgid "Importer - Model" msgstr "Importeur - Modèle" -#: models.py:1755 +#: models.py:1774 msgid "Importer - Models" msgstr "Importeur - Modèles" -#: models.py:1772 templates/ishtar/dashboards/dashboard_main.html:25 +#: models.py:1791 templates/ishtar/dashboards/dashboard_main.html:25 msgid "Users" msgstr "Utilisateurs" -#: models.py:1775 +#: models.py:1794 msgid "Associated model" msgstr "Modèle associé" -#: models.py:1778 +#: models.py:1797 msgid "Models that can accept new items" msgstr "Modèles qui peuvent accepter de nouveaux éléments" -#: models.py:1779 +#: models.py:1798 msgid "Leave blank for no restrictions" msgstr "Laissez vide pour aucune restriction" -#: models.py:1781 +#: models.py:1800 msgid "Is template" msgstr "Est un patron" -#: models.py:1782 +#: models.py:1801 msgid "Unicity keys (separator \";\")" msgstr "Clés d'unicité (séparateur « ; »)" -#: models.py:1786 +#: models.py:1805 msgid "Importer - Type" msgstr "Importeur - Type" -#: models.py:1787 +#: models.py:1806 msgid "Importer - Types" msgstr "Importeur - Types" -#: models.py:1886 +#: models.py:1905 msgid "Importer - Default" msgstr "Importeur - Par défaut" -#: models.py:1887 +#: models.py:1906 msgid "Importer - Defaults" msgstr "Importeur - Par défaut" -#: models.py:1922 +#: models.py:1941 msgid "Importer - Default value" msgstr "Importeur - Valeur par défaut" -#: models.py:1923 +#: models.py:1942 msgid "Importer - Default values" msgstr "Importeur - Valeurs par défaut" -#: models.py:1956 +#: models.py:1975 msgid "Column number" msgstr "Numéro de colonne" -#: models.py:1959 +#: models.py:1978 msgid "Required" msgstr "Requis" -#: models.py:1961 +#: models.py:1980 msgid "Export field name" msgstr "Exporter le nom du champ" -#: models.py:1962 +#: models.py:1981 msgid "" "Fill this field if the field name is ambiguous for export. For instance: " "concatenated fields." @@ -1027,511 +1029,536 @@ msgstr "" "Remplir ce champ si le nom du champ est ambigu pour l'export, par exemple " "dans le cas de champs concaténés." -#: models.py:1967 +#: models.py:1986 msgid "Importer - Column" msgstr "Importeur - Colonne" -#: models.py:1968 +#: models.py:1987 msgid "Importer - Columns" msgstr "Importeur - Colonnes" -#: models.py:1988 +#: models.py:2007 msgid "Field name" msgstr "Nom du champ" -#: models.py:1990 models.py:2024 +#: models.py:2009 models.py:2043 msgid "Force creation of new items" msgstr "Forcer la création de nouveaux éléments" -#: models.py:1992 models.py:2026 +#: models.py:2011 models.py:2045 msgid "Concatenate with existing" msgstr "Concaténer avec l'existant" -#: models.py:1994 models.py:2028 +#: models.py:2013 models.py:2047 msgid "Concatenate character" msgstr "Caractère de concaténation" -#: models.py:1998 +#: models.py:2017 msgid "Importer - Duplicate field" msgstr "Importeur - Champ dupliqué" -#: models.py:1999 +#: models.py:2018 msgid "Importer - Duplicate fields" msgstr "Importeur - Champs dupliqués" -#: models.py:2006 +#: models.py:2025 msgid "Regular expression" msgstr "Expression régulière" -#: models.py:2009 +#: models.py:2028 msgid "Importer - Regular expression" msgstr "Importeur - Expression régulière" -#: models.py:2010 +#: models.py:2029 msgid "Importer - Regular expressions" msgstr "Importeur - Expressions régulières" -#: models.py:2033 +#: models.py:2052 msgid "Importer - Target" msgstr "Importeur - Cible" -#: models.py:2034 +#: models.py:2053 msgid "Importer - Targets" msgstr "Importeur - Cibles" -#: models.py:2058 views.py:549 +#: models.py:2077 views.py:568 msgid "True" msgstr "Oui" -#: models.py:2059 views.py:551 +#: models.py:2078 views.py:570 msgid "False" msgstr "Non" -#: models.py:2078 +#: models.py:2097 msgid "Is set" msgstr "Est défini" -#: models.py:2085 +#: models.py:2104 msgid "Importer - Target key" msgstr "Importeur - Clé de rapprochement" -#: models.py:2086 +#: models.py:2105 msgid "Importer - Targets keys" msgstr "Importeur - Clés de rapprochement" -#: models.py:2138 models.py:2913 +#: models.py:2157 models.py:2957 msgid "Format" msgstr "Format" -#: models.py:2139 models.py:3005 +#: models.py:2158 models.py:3049 msgid "Operation type" msgstr "Type d'opération" -#: models.py:2140 +#: models.py:2159 msgid "Period" msgstr "Période" -#: models.py:2141 +#: models.py:2160 msgid "Report state" msgstr "État de rapport" -#: models.py:2142 +#: models.py:2161 msgid "Remain type" msgstr "Type de vestige" -#: models.py:2143 +#: models.py:2162 msgid "Unit" msgstr "Unité" -#: models.py:2144 +#: models.py:2163 msgid "Activity type" msgstr "Type d'activité" -#: models.py:2145 +#: models.py:2164 msgid "Material" msgstr "Matériau" -#: models.py:2147 +#: models.py:2166 msgid "Conservatory state" msgstr "État de conservation" -#: models.py:2148 +#: models.py:2167 msgid "Container type" msgstr "Type de contenant" -#: models.py:2149 +#: models.py:2168 msgid "Preservation type" msgstr "Type de conservation" -#: models.py:2150 +#: models.py:2169 msgid "Object type" msgstr "Type d'objet" -#: models.py:2151 +#: models.py:2170 msgid "Integrity type" msgstr "Type d'intégrité" -#: models.py:2152 +#: models.py:2171 msgid "Remarkability type" msgstr "Type de remarquabilité" -#: models.py:2153 +#: models.py:2172 msgid "Batch type" msgstr "Type de lot" -#: models.py:2155 +#: models.py:2174 msgid "Identification type" msgstr "Type d'identification" -#: models.py:2157 +#: models.py:2176 msgid "Context record relation type" msgstr "Type de relations entre Unités d'Enregistrement" -#: models.py:2158 models.py:3063 +#: models.py:2177 models.py:3107 msgid "Spatial reference system" msgstr "Système de référence spatiale" -#: models.py:2159 models.py:2891 +#: models.py:2178 models.py:2935 msgid "Support type" msgstr "Type de support" -#: models.py:2160 models.py:2553 +#: models.py:2179 models.py:2572 msgid "Title type" msgstr "Type de titre" -#: models.py:2166 +#: models.py:2185 msgid "Integer" msgstr "Entier" -#: models.py:2167 +#: models.py:2186 msgid "Float" msgstr "Nombre à virgule" -#: models.py:2168 +#: models.py:2187 msgid "String" msgstr "Chaîne de caractères" -#: models.py:2169 templates/sheet_ope.html:86 +#: models.py:2188 templates/sheet_ope.html:86 msgid "Date" msgstr "Date" -#: models.py:2171 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2190 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "Année" -#: models.py:2172 +#: models.py:2191 msgid "String to boolean" msgstr "Chaîne de caractères vers booléen" -#: models.py:2173 +#: models.py:2192 msgctxt "filesystem" msgid "File" msgstr "Fichier" -#: models.py:2174 +#: models.py:2193 msgid "Unknow type" msgstr "Type inconnu" -#: models.py:2190 +#: models.py:2209 msgid "4 digit year. e.g.: \"2015\"" msgstr "Année sur 4 chiffres. Exemple : « 2015 »" -#: models.py:2191 +#: models.py:2210 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "Année sur 4 chiffres/mois/jour. Exemple : « 2015/02/04 »" -#: models.py:2192 +#: models.py:2211 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "Jour/mois/année sur 4 chiffres. Exemple : « 04/02/2015 »" -#: models.py:2202 +#: models.py:2221 msgid "Options" msgstr "Options" -#: models.py:2204 +#: models.py:2223 msgid "Split character(s)" msgstr "Caractère(s) de séparation" -#: models.py:2208 +#: models.py:2227 msgid "Importer - Formater type" msgstr "Importeur - Type de mise en forme" -#: models.py:2209 +#: models.py:2228 msgid "Importer - Formater types" msgstr "Importeur - Types de mise en forme" -#: models.py:2261 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2280 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "Créé" -#: models.py:2262 +#: models.py:2281 msgid "Analyse in progress" msgstr "Analyse en cours" -#: models.py:2263 +#: models.py:2282 msgid "Analysed" msgstr "Analysé" -#: models.py:2264 +#: models.py:2283 msgid "Import pending" msgstr "Import en attente" -#: models.py:2265 +#: models.py:2284 msgid "Import in progress" msgstr "Import en cours" -#: models.py:2266 +#: models.py:2285 msgid "Finished with errors" msgstr "Terminé avec des erreurs" -#: models.py:2267 +#: models.py:2286 msgid "Finished" msgstr "Terminé" -#: models.py:2268 +#: models.py:2287 msgid "Archived" msgstr "Archivé" -#: models.py:2283 +#: models.py:2302 msgid "Imported file" msgstr "Fichier importé" -#: models.py:2285 +#: models.py:2304 msgid "Associated images (zip file)" msgstr "Images associées (fichier zip)" -#: models.py:2287 +#: models.py:2306 msgid "Encoding" msgstr "Codage" -#: models.py:2289 +#: models.py:2308 msgid "Skip lines" msgstr "Nombre de lignes d'entête" -#: models.py:2290 templates/ishtar/import_list.html:51 +#: models.py:2309 templates/ishtar/import_list.html:51 msgid "Error file" msgstr "Fichier erreur" -#: models.py:2293 +#: models.py:2312 msgid "Result file" msgstr "Fichier résultant" -#: models.py:2296 templates/ishtar/import_list.html:57 +#: models.py:2315 templates/ishtar/import_list.html:57 msgid "Match file" msgstr "Fichier de correspondance" -#: models.py:2302 +#: models.py:2321 msgid "Conservative import" msgstr "Import conservateur" -#: models.py:2307 +#: models.py:2326 msgid "End date" msgstr "Date de fin" -#: models.py:2309 +#: models.py:2328 msgid "Remaining seconds" msgstr "Secondes restantes" -#: models.py:2314 +#: models.py:2333 msgid "Import" msgstr "Import" -#: models.py:2343 +#: models.py:2362 msgid "Analyse" msgstr "Analyser" -#: models.py:2345 models.py:2348 +#: models.py:2364 models.py:2367 msgid "Re-analyse" msgstr "Analyser de nouveau " -#: models.py:2346 +#: models.py:2365 msgid "Launch import" msgstr "Lancer l'import" -#: models.py:2349 +#: models.py:2368 msgid "Re-import" msgstr "Ré-importer" -#: models.py:2350 +#: models.py:2369 msgid "Archive" msgstr "Archiver" -#: models.py:2352 +#: models.py:2371 msgid "Unarchive" msgstr "Désarchiver" -#: models.py:2353 widgets.py:130 templates/ishtar/form_delete.html:11 +#: models.py:2372 widgets.py:184 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "Supprimer" -#: models.py:2494 +#: models.py:2513 msgid "Organizations" msgstr "Organisations" -#: models.py:2496 +#: models.py:2515 msgid "Can view all Organizations" msgstr "Peut voir toutes les Organisations" -#: models.py:2497 +#: models.py:2516 msgid "Can view own Organization" msgstr "Peut voir sa propre Organisation" -#: models.py:2498 +#: models.py:2517 msgid "Can add own Organization" msgstr "Peut ajouter sa propre Organisation" -#: models.py:2500 +#: models.py:2519 msgid "Can change own Organization" msgstr "Peut modifier sa propre Organisation" -#: models.py:2502 +#: models.py:2521 msgid "Can delete own Organization" msgstr "Peut supprimer sa propre Organisation" -#: models.py:2537 +#: models.py:2556 msgid "Groups" msgstr "Groupes" -#: models.py:2542 +#: models.py:2561 msgid "Person types" msgstr "Types de personne" -#: models.py:2554 +#: models.py:2573 msgid "Title types" msgstr "Types de titre" -#: models.py:2563 +#: models.py:2582 msgid "Mr" msgstr "M." -#: models.py:2564 +#: models.py:2583 msgid "Miss" msgstr "Mlle" -#: models.py:2565 +#: models.py:2584 msgid "Mr and Mrs" msgstr "M. et Mme" -#: models.py:2566 +#: models.py:2585 msgid "Mrs" msgstr "Mme" -#: models.py:2567 +#: models.py:2586 msgid "Doctor" msgstr "Dr." -#: models.py:2600 +#: models.py:2619 msgid "Contact type" msgstr "Type de contact" -#: models.py:2603 models.py:2667 +#: models.py:2622 models.py:2686 msgid "Types" msgstr "Types" -#: models.py:2606 +#: models.py:2625 msgid "Is attached to" msgstr "Est rattaché à" -#: models.py:2611 +#: models.py:2630 msgid "Persons" msgstr "Personnes" -#: models.py:2613 +#: models.py:2632 msgid "Can view all Persons" msgstr "Peut voir toutes les Personnes" -#: models.py:2614 +#: models.py:2633 msgid "Can view own Person" msgstr "Peut voir sa propre Personne" -#: models.py:2615 +#: models.py:2634 msgid "Can add own Person" msgstr "Peut ajouter sa propre Personne" -#: models.py:2616 +#: models.py:2635 msgid "Can change own Person" msgstr "Peut modifier sa propre Personne" -#: models.py:2617 +#: models.py:2636 msgid "Can delete own Person" msgstr "Peut supprimer sa propre Personne" -#: models.py:2794 +#: models.py:2825 msgid "Advanced shortcut menu" msgstr "Menu de raccourci (avancé)" -#: models.py:2797 +#: models.py:2828 msgid "Ishtar user" msgstr "Utilisateur d'Ishtar" -#: models.py:2798 +#: models.py:2829 msgid "Ishtar users" msgstr "Utilisateurs d'Ishtar" -#: models.py:2842 +#: models.py:2873 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:2849 +#: models.py:2881 msgid "Author types" msgstr "Types d'auteur" -#: models.py:2883 +#: models.py:2898 +#, fuzzy +msgid "Can view all Authors" +msgstr "Peut voir toutes les Personnes" + +#: models.py:2900 +#, fuzzy +msgid "Can view own Author" +msgstr "Peut voir sa propre Personne" + +#: models.py:2902 +#, fuzzy +msgid "Can add own Author" +msgstr "Peut ajouter sa propre Personne" + +#: models.py:2904 +#, fuzzy +msgid "Can change own Author" +msgstr "Peut modifier sa propre Personne" + +#: models.py:2906 +#, fuzzy +msgid "Can delete own Author" +msgstr "Peut supprimer sa propre Personne" + +#: models.py:2927 msgid "Source types" msgstr "Types de document" -#: models.py:2892 +#: models.py:2936 msgid "Support types" msgstr "Types de support" -#: models.py:2899 +#: models.py:2943 msgid "Format type" msgstr "Type de format" -#: models.py:2900 +#: models.py:2944 msgid "Format types" msgstr "Types de format" -#: models.py:2908 +#: models.py:2952 msgid "External ID" msgstr "Identifiant externe" -#: models.py:2911 +#: models.py:2955 msgid "Support" msgstr "Support" -#: models.py:2915 +#: models.py:2959 msgid "Scale" msgstr "Échelle" -#: models.py:2929 +#: models.py:2973 msgid "Item number" msgstr "Numéro d'élément" -#: models.py:2930 +#: models.py:2974 msgid "Ref." msgstr "Réf." -#: models.py:2933 +#: models.py:2977 msgid "Internal ref." msgstr "Réf. interne" -#: models.py:2976 +#: models.py:3020 msgid "Surface (m2)" msgstr "Surface (m2)" -#: models.py:2977 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:3021 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "Localisation" -#: models.py:3002 +#: models.py:3046 msgid "Is preventive" msgstr "Est du préventif" -#: models.py:3006 +#: models.py:3050 msgid "Operation types" msgstr "Types d'opération" -#: models.py:3035 +#: models.py:3079 msgid "Preventive" msgstr "Préventif" -#: models.py:3036 +#: models.py:3080 msgid "Research" msgstr "Programmé" -#: models.py:3059 +#: models.py:3103 msgid "Authority name" msgstr "Registre" -#: models.py:3060 +#: models.py:3104 msgid "Authority SRID" msgstr "SRID" -#: models.py:3064 +#: models.py:3108 msgid "Spatial reference systems" msgstr "Systèmes de référence spatiale" @@ -1575,108 +1602,108 @@ msgstr "Gérer les comptes" msgid "Account deletion" msgstr "Supprimer un compte" -#: views.py:241 +#: views.py:251 msgid "Archaeological file" msgstr "Dossier" -#: views.py:242 +#: views.py:252 msgid "Operation" msgstr "Opération" -#: views.py:244 +#: views.py:254 msgid "Context record" msgstr "Unité d'Enregistrement" -#: views.py:246 +#: views.py:256 msgid "Find" msgstr "Mobilier" -#: views.py:248 +#: views.py:258 msgid "Treatment request" msgstr "Demande de traitement" -#: views.py:249 +#: views.py:259 msgid "Treatment" msgstr "Traitement" -#: views.py:1363 views.py:1406 +#: views.py:1387 views.py:1430 msgid "Operation not permitted." msgstr "Opération non permise." -#: views.py:1365 +#: views.py:1389 #, python-format msgid "New %s" msgstr "Nouveau %s" -#: views.py:1424 views.py:1474 +#: views.py:1448 views.py:1498 msgid "Archaeological files" msgstr "Dossiers" -#: views.py:1425 views.py:1478 +#: views.py:1449 views.py:1502 msgid "Operations" msgstr "Opérations" -#: views.py:1427 views.py:1482 +#: views.py:1451 views.py:1506 msgid "Context records" msgstr "Unités d'Enregistrement" -#: views.py:1429 views.py:1485 +#: views.py:1453 views.py:1509 msgid "Finds" msgstr "Mobilier" -#: views.py:1683 templates/ishtar/import_list.html:47 +#: views.py:1707 templates/ishtar/import_list.html:47 msgid "Link unmatched items" msgstr "Associer les éléments non rapprochés" -#: views.py:1698 +#: views.py:1722 msgid "Delete import" msgstr "Supprimer un import" -#: views.py:1737 +#: views.py:1761 msgid "Merge persons" msgstr "Fusionner des personnes" -#: views.py:1761 +#: views.py:1785 msgid "Select the main person" msgstr "Choisir la personne principale" -#: views.py:1770 +#: views.py:1794 msgid "Merge organization" msgstr "Fusionner des organisations" -#: views.py:1780 +#: views.py:1804 msgid "Select the main organization" msgstr "Sélectionner l'organisation principale" -#: views.py:1820 views.py:1836 +#: views.py:1844 views.py:1860 msgid "Corporation manager" msgstr "Représentant de la personne morale" -#: widgets.py:259 widgets.py:366 widgets.py:481 +#: widgets.py:313 widgets.py:420 widgets.py:535 msgid "Search..." msgstr "Recherche..." -#: widgets.py:670 templatetags/window_tables.py:96 +#: widgets.py:724 templatetags/window_tables.py:96 msgid "No results" msgstr "Pas de résultats" -#: widgets.py:671 templatetags/window_tables.py:97 +#: widgets.py:725 templatetags/window_tables.py:97 msgid "Loading..." msgstr "Chargement..." -#: widgets.py:672 +#: widgets.py:726 msgid "Remove" msgstr "Enlever" -#: wizards.py:374 templates/ishtar/import_delete.html:21 +#: wizards.py:380 templates/ishtar/import_delete.html:21 msgid "Yes" msgstr "Oui" -#: wizards.py:376 +#: wizards.py:382 msgid "No" msgstr "Non" -#: wizards.py:1396 +#: wizards.py:1404 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "[%(app_name)s] Création/modification du compte" @@ -1717,8 +1744,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." @@ -1753,19 +1779,19 @@ msgstr "Éléments courants" msgid ":" msgstr " :" -#: templates/base.html:120 +#: templates/base.html:123 msgid "Processing..." msgstr "En traitement..." -#: templates/base.html:121 +#: templates/base.html:124 msgid "This can be long." msgstr "Cela peut être long." -#: templates/base.html:122 +#: templates/base.html:125 msgid "Time to take a coffee?" msgstr "Il est peut-être temps de prendre un café ?" -#: templates/base.html:123 +#: templates/base.html:126 msgid "Time to take another coffee?" msgstr "Pourquoi pas un autre café ?" @@ -2394,8 +2420,8 @@ 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 msgctxt "Sheet" -- cgit v1.2.3