From f10181c013adb11a3629ccf2905f8bf1d0ec1433 Mon Sep 17 00:00:00 2001
From: Valérie-Emma Leroux
Date: Fri, 10 Mar 2017 00:07:23 +0100
Subject: Context records table: add new fields and reorder
---
archaeological_context_records/models.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'archaeological_context_records')
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 1ec32ea83..2b43635ac 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -144,9 +144,8 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms,
ValueGetter, ShortMenuItem):
SHOW_URL = 'show-contextrecord'
SLUG = 'contextrecord'
- TABLE_COLS = ['parcel__town__name', 'operation__year',
- 'operation__operation_code',
- 'label', 'unit']
+ TABLE_COLS = ['label', 'parcel__town__name', 'operation__common_name',
+ 'parcel__label', 'unit']
if settings.COUNTRY == 'fr':
TABLE_COLS.insert(1, 'operation__code_patriarche')
TABLE_COLS_FOR_OPE = ['label', 'parcel', 'unit',
--
cgit v1.2.3
From 83a5855c7bb49f0caca9b18d01579688b6490380 Mon Sep 17 00:00:00 2001
From: Étienne Loks
Date: Mon, 13 Mar 2017 13:54:25 +0100
Subject: Sheets: add ishtar ID (refs #3517)
---
.../templates/ishtar/sheet_contextrecord.html | 18 +++---------
archaeological_files/models.py | 5 ++++
.../templates/ishtar/sheet_file.html | 27 +++++-------------
.../templates/ishtar/sheet_find.html | 32 +++++++++-------------
archaeological_operations/models.py | 4 +++
.../templates/ishtar/sheet_operation.html | 3 +-
.../templates/ishtar/sheet_container.html | 6 ++--
.../templates/ishtar/sheet_warehouse.html | 7 +++--
example_project/settings.py | 1 +
ishtar_common/static/media/style.css | 4 +++
.../ishtar/blocks/sheet_creation_section.html | 19 +++++++++++++
.../templates/ishtar/blocks/sheet_external_id.html | 7 +++++
version.py | 2 +-
13 files changed, 76 insertions(+), 59 deletions(-)
create mode 100644 ishtar_common/templates/ishtar/blocks/sheet_creation_section.html
create mode 100644 ishtar_common/templates/ishtar/blocks/sheet_external_id.html
(limited to 'archaeological_context_records')
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index 1c024dcfc..7ba34fd13 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -12,23 +12,13 @@
{{ item.parcel.short_label }}
{{ item.label|default:"" }}
+{% include "ishtar/blocks/sheet_external_id.html" %}
" "
" %}
--
cgit v1.2.3
From cd2854ba9d57d40ae2bd95d8926345c7d63fc2b3 Mon Sep 17 00:00:00 2001
From: Étienne Loks
Date: Wed, 15 Mar 2017 10:00:12 +0100
Subject: Refactoring: EXTRA_FULL_FIELDS_LABELS -> COL_LABELS (with merge)
(refs #3491)
---
archaeological_context_records/models.py | 22 +++++++++++-----------
archaeological_finds/models_finds.py | 20 +++++++++-----------
archaeological_finds/models_treatments.py | 2 +-
archaeological_operations/models.py | 3 ++-
ishtar_common/models.py | 2 +-
ishtar_common/views.py | 8 ++++----
6 files changed, 28 insertions(+), 29 deletions(-)
(limited to 'archaeological_context_records')
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 04ca358e3..1ffdea2f3 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -159,9 +159,17 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms,
TABLE_COLS.insert(1, 'operation__code_patriarche')
TABLE_COLS_FOR_OPE = ['label', 'parcel', 'unit',
'datings__period__label', 'description']
- COL_LABELS = {'section__parcel_number': _(u"Parcel"),
- 'datings__period__label': _(u"Periods"),
- 'parcel__town__name': _(u"Town")}
+ COL_LABELS = {
+ 'datings__period__label': _(u"Periods"),
+ 'datings__period': _(u"Datings (period)"),
+ 'detailled_related_context_records': _(u"Related context records"),
+ 'operation__code_patriarche': u"Operation (code patriarche)",
+ 'parcel__external_id': _(u"Parcel (external ID)"),
+ 'parcel__town__name': _(u"Parcel (town)"),
+ 'parcel__town': _(u"Parcel (town)"),
+ 'parcel__year': _(u"Parcel (year)"),
+ 'section__parcel_number': _(u"Parcel"),
+ }
CONTEXTUAL_TABLE_COLS = {
'full': {
'related_context_records': 'detailled_related_context_records'
@@ -188,14 +196,6 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms,
RELATIVE_SESSION_NAMES = [
('operation', 'operation__pk'),
('file', 'operation__associated_file__pk')]
- EXTRA_FULL_FIELDS_LABELS = {
- 'parcel__town': _(u"Parcel (town)"),
- 'detailled_related_context_records': _(u"Related context records"),
- 'operation__code_patriarche': u"Operation (code patriarche)",
- 'parcel__external_id': _(u"Parcel (external ID)"),
- 'datings__period': _(u"Datings (period)"),
- 'parcel__year': _(u"Parcel (year)"),
- }
# fields
external_id = models.TextField(_(u"External ID"), blank=True, null=True)
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index eb88371ea..9b4860e51 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -502,8 +502,16 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
'base_finds__context_record__parcel', ]
COL_LABELS = {
'base_finds__context_record__label': _(u"Context record"),
- 'datings__period__label': _(u"Periods"),
+ 'base_finds__cache_short_id': _(u"Base find - Short ID"),
+ 'base_finds__cache_complete_id': _(u"Base find - Complete ID"),
+ 'base_finds__comment': _(u"Base find - Comment"),
+ 'base_finds__description': _(u"Base find - Description"),
+ 'base_finds__topographic_localisation': _(u"Base find - "
+ u"Topographic localisation"),
+ 'base_finds__special_interest': _(u"Base find - Special interest"),
+ 'base_finds__discovery_date': _(u"Base find - Discovery date"),
'container__cached_label': _(u"Container"),
+ 'datings__period__label': _(u"Periods"),
'material_types__label': _(u"Material types"),
}
@@ -513,16 +521,6 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
'base_finds__topographic_localisation',
'base_finds__special_interest',
'base_finds__discovery_date']
- EXTRA_FULL_FIELDS_LABELS = {
- 'base_finds__cache_short_id': _(u"Base find - Short ID"),
- 'base_finds__cache_complete_id': _(u"Base find - Complete ID"),
- 'base_finds__comment': _(u"Base find - Comment"),
- 'base_finds__description': _(u"Base find - Description"),
- 'base_finds__topographic_localisation': _(u"Base find - "
- u"Topographic localisation"),
- 'base_finds__special_interest': _(u"Base find - Special interest"),
- 'base_finds__discovery_date': _(u"Base find - Discovery date"),
- }
ATTRS_EQUIV = {'get_first_base_find': 'base_finds'}
# search parameters
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index 3e9077a48..dd080835e 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -285,7 +285,7 @@ class AbsFindTreatments(models.Model):
treatment_nb = models.IntegerField(_(u"Order"))
TABLE_COLS = ["treatment__" + col for col in Treatment.TABLE_COLS] + \
['treatment_nb']
- EXTRA_FULL_FIELDS_LABELS = {
+ COL_LABELS = {
'treatment__treatment_type': _(u"Treatment type"),
'treatment__start_date': _(u"Start date"),
'treatment__end_date': _(u"End date"),
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 3b06bc449..727b29cb5 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -227,7 +227,7 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms,
'context_record__base_finds__find__upstream_treatment__id'
}
- EXTRA_FULL_FIELDS_LABELS = {
+ COL_LABELS = {
'full_code_patriarche': u"Code patriarche",
'associated_file_short_label': _(u"Associated file (label)"),
'operator__name': _(u"Operator name"),
@@ -988,6 +988,7 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter):
REVERSED_BOOL_FIELDS = ['index__isnull']
RELATIVE_SESSION_NAMES = [('operation', 'operation__pk'),
('file', 'associated_file__pk')]
+ COL_LABELS = {'full_ref': _(u"Ref.")}
# fields
act_type = models.ForeignKey(ActType, verbose_name=_(u"Act type"))
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index ca6ba36c9..35608abdf 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -102,7 +102,7 @@ class Imported(models.Model):
class ValueGetter(object):
_prefix = ""
GET_VALUES_EXTRA = []
- EXTRA_FULL_FIELDS_LABELS = {}
+ COL_LABELS = {}
def get_values(self, prefix=''):
if not prefix:
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 95b7689ec..cbf27c8e7 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -1115,9 +1115,9 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
for field_name in table_cols:
if type(field_name) in (list, tuple):
field_name = u" & ".join(field_name)
- if hasattr(model, 'EXTRA_FULL_FIELDS_LABELS') and\
- field_name in model.EXTRA_FULL_FIELDS_LABELS:
- field = model.EXTRA_FULL_FIELDS_LABELS[field_name]
+ if hasattr(model, 'COL_LABELS') and\
+ field_name in model.COL_LABELS:
+ field = model.COL_LABELS[field_name]
col_names.append(unicode(field).encode(ENCODING))
continue
else:
@@ -1128,7 +1128,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
logger.warning(
"**WARN get_item - csv export**: no col name "
"for {}\nadd explicit label to "
- "EXTRA_FULL_FIELDS_LABELS attribute of "
+ "COL_LABELS attribute of "
"{}".format(field_name, model))
continue
col_names.append(
--
cgit v1.2.3
From 1d8af2bea7701a1c36ac341cdc7e5b9bca490012 Mon Sep 17 00:00:00 2001
From: Étienne Loks
Date: Wed, 15 Mar 2017 10:20:35 +0100
Subject: Tables: add missing headers (refs #3491)
---
archaeological_context_records/models.py | 3 ++-
archaeological_finds/models_finds.py | 11 ++++++++++-
archaeological_finds/models_treatments.py | 2 ++
3 files changed, 14 insertions(+), 2 deletions(-)
(limited to 'archaeological_context_records')
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 1ffdea2f3..dd0f0b736 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -153,7 +153,7 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms,
ValueGetter, ShortMenuItem):
SHOW_URL = 'show-contextrecord'
SLUG = 'contextrecord'
- TABLE_COLS = ['label', 'parcel__town__name', 'operation__common_name',
+ TABLE_COLS = ['label', 'operation__common_name', 'parcel__town__name',
'parcel__label', 'unit']
if settings.COUNTRY == 'fr':
TABLE_COLS.insert(1, 'operation__code_patriarche')
@@ -164,6 +164,7 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms,
'datings__period': _(u"Datings (period)"),
'detailled_related_context_records': _(u"Related context records"),
'operation__code_patriarche': u"Operation (code patriarche)",
+ 'operation__common_name': u"Operation (name)",
'parcel__external_id': _(u"Parcel (external ID)"),
'parcel__town__name': _(u"Parcel (town)"),
'parcel__town': _(u"Parcel (town)"),
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 9b4860e51..5872a241f 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -490,7 +490,7 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
'base_finds__batch', ]
if settings.COUNTRY == 'fr':
TABLE_COLS.insert(
- 1, 'base_finds__context_record__operation__code_patriarche')
+ 2, 'base_finds__context_record__operation__code_patriarche')
TABLE_COLS_FOR_OPE = [
'base_finds__cache_short_id',
'base_finds__cache_complete_id',
@@ -504,6 +504,15 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
'base_finds__context_record__label': _(u"Context record"),
'base_finds__cache_short_id': _(u"Base find - Short ID"),
'base_finds__cache_complete_id': _(u"Base find - Complete ID"),
+ 'base_finds__context_record__operation__code_patriarche': _(
+ u"Operation (code)"
+ ),
+ 'base_finds__context_record__parcel__town': _(u"Town"),
+ 'base_finds__context_record__operation__common_name': _(
+ u"Operation (name)"
+ ),
+ 'base_finds__context_record__parcel': _(u"Parcel"),
+ 'base_finds__batch':_(u"Batch"),
'base_finds__comment': _(u"Base find - Comment"),
'base_finds__description': _(u"Base find - Description"),
'base_finds__topographic_localisation': _(u"Base find - "
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index dd080835e..2efedbc22 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -88,6 +88,8 @@ class Treatment(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
COL_LABELS = {
"downstream_cached_label": _(u"Downstream find"),
"upstream_cached_label": _(u"Upstream find"),
+ "treatment_types__label": _(u"Type"),
+ "treatment_state__label": _(u"State"),
}
IMAGE_PREFIX = 'treatment'
# extra keys than can be passed to save method
--
cgit v1.2.3
From 5123e2e09d801fa9d428d860a170fc561348a339 Mon Sep 17 00:00:00 2001
From: Valérie-Emma Leroux
Date: Wed, 15 Mar 2017 11:03:08 +0100
Subject: Update labels
---
archaeological_context_records/models.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'archaeological_context_records')
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index dd0f0b736..14e98e76b 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -122,8 +122,8 @@ post_delete.connect(post_save_cache, sender=IdentificationType)
class ExcavationTechnicType(GeneralType):
class Meta:
- verbose_name = _(u"Excavation technic type")
- verbose_name_plural = _(u"Excavation technic types")
+ verbose_name = _(u"Excavation technique type")
+ verbose_name_plural = _(u"Excavation technique types")
ordering = ('label',)
post_save.connect(post_save_cache, sender=ExcavationTechnicType)
post_delete.connect(post_save_cache, sender=ExcavationTechnicType)
@@ -252,7 +252,7 @@ class ContextRecord(BaseHistorizedItem, ImageModel, OwnPerms,
verbose_name=_(u"Activity"),)
excavation_technic = models.ForeignKey(
ExcavationTechnicType, blank=True, null=True,
- verbose_name=_(u"Excavation technic"))
+ verbose_name=_(u"Excavation technique"))
related_context_records = models.ManyToManyField(
'ContextRecord', through='RecordRelations', blank=True, null=True)
point = models.PointField(_(u"Point"), blank=True, null=True, dim=3)
--
cgit v1.2.3
From 5dd2be142e031d21108296b601c261665d32fb7e Mon Sep 17 00:00:00 2001
From: Étienne Loks
Date: Wed, 15 Mar 2017 11:54:54 +0100
Subject: Sheets: mark explicitly some fields as translated fields (refs #3459)
---
.../templates/ishtar/sheet_contextrecord.html | 3 ++-
.../templates/ishtar/sheet_contextrecordsource.html | 3 ++-
archaeological_finds/models_finds.py | 3 ++-
archaeological_finds/templates/ishtar/sheet_find.html | 3 ++-
archaeological_finds/templates/ishtar/sheet_findsource.html | 3 ++-
.../templates/ishtar/sheet_treatmentfilesource.html | 3 ++-
archaeological_finds/templates/ishtar/sheet_treatmentsource.html | 3 ++-
archaeological_operations/templates/ishtar/sheet_operation.html | 3 ++-
.../templates/ishtar/sheet_operationsource.html | 3 ++-
ishtar_common/templates/ishtar/sheet_source.html | 6 ++++--
10 files changed, 22 insertions(+), 11 deletions(-)
(limited to 'archaeological_context_records')
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index 3f19289e0..8398a0523 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -73,7 +73,8 @@
{% endif %}
"
#: forms.py:278
-msgid ""
-"You should at least provide X, Y and the spatial reference system used."
+msgid "You should at least provide X, Y and the spatial reference system used."
msgstr ""
"Vous devez au minimum fournir X, Y et le système de référence spatiale "
"utilisé."
#: forms.py:287
-msgid ""
-"Coordinates are not relevant for the spatial reference system used: {}."
+msgid "Coordinates are not relevant for the spatial reference system used: {}."
msgstr ""
"Les coordonnées ne sont pas pertinentes pour le système de référence "
"spatiale utilisé : {}."
-#: forms.py:293 forms.py:324 models_finds.py:611
+#: forms.py:293 forms.py:324 models_finds.py:619
msgid "Dating"
msgstr "Datation"
@@ -210,13 +210,13 @@ msgid "Period"
msgstr "Période"
#: forms.py:299 forms_treatments.py:138 forms_treatments.py:436
-#: models_finds.py:1073 models_treatments.py:127 models_treatments.py:290
-#: templates/ishtar/sheet_find.html:103 templates/ishtar/sheet_find.html:145
+#: models_finds.py:1081 models_treatments.py:129 models_treatments.py:292
+#: templates/ishtar/sheet_find.html:91 templates/ishtar/sheet_find.html:133
msgid "Start date"
msgstr "Date de début"
-#: forms.py:301 models_finds.py:1074 models_treatments.py:291
-#: templates/ishtar/sheet_find.html:104 templates/ishtar/sheet_find.html:146
+#: forms.py:301 models_finds.py:1082 models_treatments.py:293
+#: templates/ishtar/sheet_find.html:92 templates/ishtar/sheet_find.html:134
msgid "End date"
msgstr "Date de fin"
@@ -242,7 +242,7 @@ msgstr "ID complet"
#: forms.py:333 forms_treatments.py:54 forms_treatments.py:96
#: forms_treatments.py:284 forms_treatments.py:356 forms_treatments.py:406
-#: forms_treatments.py:489 models_treatments.py:100 models_treatments.py:464
+#: forms_treatments.py:489 models_treatments.py:102 models_treatments.py:466
msgid "Year"
msgstr "Année"
@@ -278,7 +278,7 @@ msgstr "Rechercher un mobilier"
msgid "Upstream finds"
msgstr "Mobilier amont"
-#: forms.py:443 models_finds.py:657
+#: forms.py:443 models_finds.py:665
msgid "Finds"
msgstr "Mobilier"
@@ -350,25 +350,25 @@ msgstr "Un autre panier existant utilise déjà ce nom."
msgid "Basket"
msgstr "Panier"
-#: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:96
-#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:139
+#: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:98
+#: templates/ishtar/sheet_find.html:85 templates/ishtar/sheet_find.html:127
msgid "Label"
msgstr "Intitulé"
-#: forms_treatments.py:53 forms_treatments.py:95 models_treatments.py:98
+#: forms_treatments.py:53 forms_treatments.py:95 models_treatments.py:100
msgid "Other ref."
msgstr "Autre réf."
#: forms_treatments.py:55 forms_treatments.py:237 forms_treatments.py:285
#: forms_treatments.py:348 forms_treatments.py:357 forms_treatments.py:459
-#: forms_treatments.py:490 forms_treatments.py:557 models_treatments.py:102
-#: models_treatments.py:466
+#: forms_treatments.py:490 forms_treatments.py:557 models_treatments.py:104
+#: models_treatments.py:468
msgid "Index"
msgstr "Index"
#: forms_treatments.py:56 forms_treatments.py:101 forms_treatments.py:301
-#: forms_treatments.py:578 models_treatments.py:56 models_treatments.py:107
-#: models_treatments.py:289
+#: forms_treatments.py:578 models_treatments.py:56 models_treatments.py:109
+#: models_treatments.py:291
msgid "Treatment type"
msgstr "Type de traitement"
@@ -380,8 +380,8 @@ msgstr "Rechercher un traitement"
msgid "Base treatment"
msgstr "Traitement de base"
-#: forms_treatments.py:103 models_treatments.py:109
-#: templates/ishtar/sheet_find.html:99 templates/ishtar/sheet_find.html:141
+#: forms_treatments.py:103 models_treatments.py:92 models_treatments.py:111
+#: templates/ishtar/sheet_find.html:87 templates/ishtar/sheet_find.html:129
msgid "State"
msgstr "État"
@@ -389,15 +389,15 @@ msgstr "État"
msgid "Target"
msgstr "Destination"
-#: forms_treatments.py:107 forms_treatments.py:417 models_treatments.py:117
+#: forms_treatments.py:107 forms_treatments.py:417 models_treatments.py:119
msgid "Responsible"
msgstr "Responsable"
-#: forms_treatments.py:113 models_treatments.py:120
+#: forms_treatments.py:113 models_treatments.py:122
msgid "Organization"
msgstr "Organisation"
-#: forms_treatments.py:119 models_treatments.py:112 models_treatments.py:292
+#: forms_treatments.py:119 models_treatments.py:114 models_treatments.py:294
msgid "Location"
msgstr "Lieu"
@@ -409,12 +409,12 @@ msgstr "Contenant (pertinent dans le cadre du conditionnement)"
msgid "External ref."
msgstr "Réf. externe"
-#: forms_treatments.py:136 models_treatments.py:126
+#: forms_treatments.py:136 models_treatments.py:128
msgid "Goal"
msgstr "But"
-#: forms_treatments.py:140 forms_treatments.py:442 models_treatments.py:128
-#: models_treatments.py:486
+#: forms_treatments.py:140 forms_treatments.py:442 models_treatments.py:130
+#: models_treatments.py:488
msgid "Closing date"
msgstr "Date de clôture"
@@ -463,12 +463,12 @@ msgstr "Un responsable ou une organisation doit être défini."
msgid "Another treatment with this index exists for {}."
msgstr "Un autre traitement avec cet index existe pour {}."
-#: forms_treatments.py:262 models_treatments.py:105
+#: forms_treatments.py:262 models_treatments.py:107
msgid "Associated request"
msgstr "Demande associée"
#: forms_treatments.py:266 forms_treatments.py:397 ishtar_menu.py:108
-#: models_treatments.py:497 models_treatments.py:519 models_treatments.py:581
+#: models_treatments.py:499 models_treatments.py:521 models_treatments.py:583
#: wizards.py:183 templates/ishtar/sheet_treatmentfile.html:5
msgid "Treatment request"
msgstr "Demande de traitement"
@@ -527,7 +527,7 @@ msgstr "Référence interne du traitement"
msgid "Modified by"
msgstr "Modifié par"
-#: forms_treatments.py:354 forms_treatments.py:404 models_treatments.py:471
+#: forms_treatments.py:354 forms_treatments.py:404 models_treatments.py:473
msgid "Name"
msgstr "Nom"
@@ -535,9 +535,9 @@ msgstr "Nom"
msgid "Internal ref."
msgstr "Réf. interne"
-#: forms_treatments.py:358 forms_treatments.py:415
-#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:140
-#: templates/ishtar/sheet_find.html:232
+#: forms_treatments.py:358 forms_treatments.py:415 models_treatments.py:91
+#: templates/ishtar/sheet_find.html:86 templates/ishtar/sheet_find.html:128
+#: templates/ishtar/sheet_find.html:227
msgid "Type"
msgstr "Type"
@@ -545,12 +545,12 @@ msgstr "Type"
msgid "In charge"
msgstr "Responsable"
-#: forms_treatments.py:366 forms_treatments.py:423 models_treatments.py:480
+#: forms_treatments.py:366 forms_treatments.py:423 models_treatments.py:482
#: templates/ishtar/sheet_treatmentfile.html:31
msgid "Applicant"
msgstr "Demandeur"
-#: forms_treatments.py:372 forms_treatments.py:429 models_treatments.py:484
+#: forms_treatments.py:372 forms_treatments.py:429 models_treatments.py:486
#: templates/ishtar/sheet_treatmentfile.html:38
msgid "Applicant organisation"
msgstr "Organisation du demandeur"
@@ -559,7 +559,7 @@ msgstr "Organisation du demandeur"
msgid "Treatment request search"
msgstr "Rechercher une demande de traitement"
-#: forms_treatments.py:439 models_treatments.py:490
+#: forms_treatments.py:439 models_treatments.py:492
msgid "Reception date"
msgstr "Date de réception"
@@ -591,8 +591,8 @@ msgstr "Index de la demande de traitement"
msgid "Treatment request internal reference"
msgstr "Référence interne de la demande de traitement"
-#: forms_treatments.py:508 forms_treatments.py:604 models_treatments.py:449
-#: models_treatments.py:473
+#: forms_treatments.py:508 forms_treatments.py:604 models_treatments.py:451
+#: models_treatments.py:475
msgid "Treatment request type"
msgstr "Type de demande de traitement"
@@ -634,12 +634,12 @@ msgstr "Gestion des éléments"
msgid "Documentation"
msgstr "Documentation"
-#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1070
+#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1078
msgid "Administrative act"
msgstr "Acte administratif"
-#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:227
-#: templates/ishtar/sheet_find.html:229
+#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:222
+#: templates/ishtar/sheet_find.html:224
msgid "Documents"
msgstr "Documents"
@@ -647,8 +647,8 @@ msgstr "Documents"
msgid "Source"
msgstr "Documentation"
-#: ishtar_menu.py:185 models_treatments.py:145 models_treatments.py:281
-#: models_treatments.py:565 templates/ishtar/sheet_treatment.html:5
+#: ishtar_menu.py:185 models_treatments.py:147 models_treatments.py:283
+#: models_treatments.py:567 templates/ishtar/sheet_treatment.html:5
msgid "Treatment"
msgstr "Traitement"
@@ -668,7 +668,7 @@ msgstr "Recommandation"
msgid "Parent material"
msgstr "Matériau parent"
-#: models_finds.py:52 models_finds.py:507 models_finds.py:590
+#: models_finds.py:52 models_finds.py:525 models_finds.py:598
msgid "Material types"
msgstr "Types de matériau"
@@ -700,8 +700,8 @@ msgstr "Type de remarquabilité"
msgid "Remarkability types"
msgstr "Types de remarquabilité"
-#: models_finds.py:98 models_finds.py:586 models_treatments.py:40
-#: models_treatments.py:285
+#: models_finds.py:98 models_finds.py:594 models_treatments.py:40
+#: models_treatments.py:287
msgid "Order"
msgstr "Ordre"
@@ -717,12 +717,12 @@ msgstr "Types de lot"
msgid "Parent"
msgstr "Parent"
-#: models_finds.py:152 models_finds.py:583 models_treatments.py:122
-#: models_treatments.py:469
+#: models_finds.py:152 models_finds.py:591 models_treatments.py:124
+#: models_treatments.py:471
msgid "External ID"
msgstr "ID externe"
-#: models_finds.py:154 models_finds.py:585
+#: models_finds.py:154 models_finds.py:593
msgid "External ID is set automatically"
msgstr "L'identifiant externe est configuré automatiquement"
@@ -762,7 +762,7 @@ msgstr "Polygon"
msgid "Cached value - do not edit"
msgstr "Valeur en cache - ne pas éditer"
-#: models_finds.py:197 models_finds.py:581
+#: models_finds.py:197 models_finds.py:589
msgid "Base find"
msgstr "Mobilier de base"
@@ -810,109 +810,132 @@ msgstr "Vérifié mais incorrect"
msgid "Checked and correct"
msgstr "Vérifié et correct"
-#: models_finds.py:505
-msgid "Periods"
-msgstr "Périodes"
-
-#: models_finds.py:506 models_finds.py:614 models_treatments.py:129
-#: models_treatments.py:293 templates/ishtar/sheet_find.html:102
-#: templates/ishtar/sheet_find.html:144
-msgid "Container"
-msgstr "Contenant"
-
-#: models_finds.py:517
+#: models_finds.py:506
msgid "Base find - Short ID"
msgstr "Mobilier de base - ID court"
-#: models_finds.py:518
+#: models_finds.py:507
msgid "Base find - Complete ID"
msgstr "Mobilier de base - ID complet"
-#: models_finds.py:519
+#: models_finds.py:509
+#, fuzzy
+msgid "Operation (code)"
+msgstr "Opération"
+
+#: models_finds.py:511
+msgid "Town"
+msgstr ""
+
+#: models_finds.py:513
+#, fuzzy
+msgid "Operation (name)"
+msgstr "Opération"
+
+#: models_finds.py:515
+msgid "Parcel"
+msgstr ""
+
+#: models_finds.py:516
+#, fuzzy
+msgid "Batch"
+msgstr "Type de lot"
+
+#: models_finds.py:517
msgid "Base find - Comment"
msgstr "Mobilier de base - Commentaires"
-#: models_finds.py:520
+#: models_finds.py:518
msgid "Base find - Description"
msgstr "Mobilier de base - Description"
-#: models_finds.py:521
+#: models_finds.py:519
msgid "Base find - Topographic localisation"
msgstr "Mobilier de base - Localisation topographique"
-#: models_finds.py:523
+#: models_finds.py:521
msgid "Base find - Special interest"
msgstr "Mobilier de base - Intérêt spécifique"
-#: models_finds.py:524
+#: models_finds.py:522
msgid "Base find - Discovery date"
msgstr "Mobilier de base - Date de découverte"
-#: models_finds.py:597
+#: models_finds.py:523 models_finds.py:622 models_treatments.py:131
+#: models_treatments.py:295 templates/ishtar/sheet_find.html:90
+#: templates/ishtar/sheet_find.html:132
+msgid "Container"
+msgstr "Contenant"
+
+#: models_finds.py:524
+msgid "Periods"
+msgstr "Périodes"
+
+#: models_finds.py:605
msgid "Type of preservation to consider"
msgstr "Mesures de conservation à envisager"
-#: models_finds.py:601
+#: models_finds.py:609
msgid "Weight unit"
msgstr "Unité de poids"
-#: models_finds.py:607 templates/ishtar/sheet_find.html:90
+#: models_finds.py:615 templates/ishtar/sheet_find.html:78
msgid "Upstream treatment"
msgstr "Traitement amont"
-#: models_finds.py:610 templates/ishtar/sheet_find.html:132
+#: models_finds.py:618 templates/ishtar/sheet_find.html:120
msgid "Downstream treatment"
msgstr "Traitement aval"
-#: models_finds.py:648
+#: models_finds.py:656
msgid "Collection"
msgstr "Collection"
-#: models_finds.py:650 models_treatments.py:141 models_treatments.py:493
+#: models_finds.py:658 models_treatments.py:143 models_treatments.py:495
msgid "Cached name"
msgstr "Nom en cache"
-#: models_finds.py:659
+#: models_finds.py:667
msgid "Can view all Finds"
msgstr "Peut voir tout le Mobilier"
-#: models_finds.py:660
+#: models_finds.py:668
msgid "Can view own Find"
msgstr "Peut voir son propre Mobilier"
-#: models_finds.py:661
+#: models_finds.py:669
msgid "Can add own Find"
msgstr "Peut ajouter son propre Mobilier"
-#: models_finds.py:662
+#: models_finds.py:670
msgid "Can change own Find"
msgstr "Peut modifier son propre Mobilier"
-#: models_finds.py:663
+#: models_finds.py:671
msgid "Can delete own Find"
msgstr "Peut supprimer son propre Mobilier"
-#: models_finds.py:669
+#: models_finds.py:677
msgid "FIND"
msgstr "MOBILIER"
-#: models_finds.py:1057
+#: models_finds.py:1065
msgid "Find documentation"
msgstr "Documentation de mobilier"
-#: models_finds.py:1058
+#: models_finds.py:1066
msgid "Find documentations"
msgstr "Documentations de mobilier"
-#: models_finds.py:1071
+#: models_finds.py:1079
msgid "Person"
msgstr "Individu"
-#: models_finds.py:1077
+#: models_finds.py:1085
msgid "Property"
msgstr "Propriété"
-#: models_finds.py:1078
+#: models_finds.py:1086
msgid "Properties"
msgstr "Propriétés"
@@ -960,127 +983,127 @@ msgstr "Types d'état de traitement"
msgid "Downstream find"
msgstr "Mobilier aval"
-#: models_treatments.py:114
+#: models_treatments.py:116
msgid "Location where the treatment is done. Target warehouse for a move."
msgstr ""
"Endroit où le traitement est réalisé. Renseignez le dépôt de destination "
"pour un déplacement."
-#: models_treatments.py:131
+#: models_treatments.py:133
msgid "Estimated cost"
msgstr "Coût estimé"
-#: models_treatments.py:133
+#: models_treatments.py:135
msgid "Quoted cost"
msgstr "Coût devisé"
-#: models_treatments.py:135
+#: models_treatments.py:137
msgid "Realized cost"
msgstr "Coût réalisé"
-#: models_treatments.py:137
+#: models_treatments.py:139
msgid "Insurance cost"
msgstr "Coût d'assurance"
-#: models_treatments.py:139
+#: models_treatments.py:141
msgid "Target a basket"
msgstr "Appliquer à un panier"
-#: models_treatments.py:146 templates/ishtar/sheet_find.html:87
+#: models_treatments.py:148 templates/ishtar/sheet_find.html:75
#: templates/ishtar/sheet_treatmentfile.html:45
msgid "Treatments"
msgstr "Traitements"
-#: models_treatments.py:149
+#: models_treatments.py:151
msgid "Can view all Treatments"
msgstr "Peut voir tous les Traitements"
-#: models_treatments.py:150
+#: models_treatments.py:152
msgid "Can view own Treatment"
msgstr "Peut voir son propre Traitement"
-#: models_treatments.py:151
+#: models_treatments.py:153
msgid "Can add own Treatment"
msgstr "Peut ajouter son propre Traitement"
-#: models_treatments.py:152
+#: models_treatments.py:154
msgid "Can change own Treatment"
msgstr "Peut modifier son propre Traitement"
-#: models_treatments.py:153
+#: models_treatments.py:155
msgid "Can delete own Treatment"
msgstr "Peut supprimer son propre Traitement"
-#: models_treatments.py:165
+#: models_treatments.py:167
msgid "TREATMENT"
msgstr "TRAITEMENT"
-#: models_treatments.py:294 templates/ishtar/sheet_find.html:101
-#: templates/ishtar/sheet_find.html:143
+#: models_treatments.py:296 templates/ishtar/sheet_find.html:89
+#: templates/ishtar/sheet_find.html:131
msgid "Doer"
msgstr "Opérateur"
-#: models_treatments.py:295 models_treatments.py:296
+#: models_treatments.py:297 models_treatments.py:298
msgid "Related finds"
msgstr "Mobilier associé"
-#: models_treatments.py:438
+#: models_treatments.py:440
msgid "Is upstream"
msgstr "Est en amont"
-#: models_treatments.py:450
+#: models_treatments.py:452
msgid "Treatment request types"
msgstr "Types de demande de traitement"
-#: models_treatments.py:467
+#: models_treatments.py:469
msgid "Internal reference"
msgstr "Référence interne"
-#: models_treatments.py:476
+#: models_treatments.py:478
msgid "Person in charge"
msgstr "Personne responsable"
-#: models_treatments.py:488
+#: models_treatments.py:490
msgid "Creation date"
msgstr "Date de création"
-#: models_treatments.py:498
+#: models_treatments.py:500
msgid "Treatment requests"
msgstr "Demandes de traitement"
-#: models_treatments.py:502
+#: models_treatments.py:504
msgid "Can view all Treatment requests"
msgstr "Peut voir toutes les Demandes de traitement"
-#: models_treatments.py:504
+#: models_treatments.py:506
msgid "Can view own Treatment request"
msgstr "Peut voir sa propre Demande de traitement"
-#: models_treatments.py:506
+#: models_treatments.py:508
msgid "Can add own Treatment request"
msgstr "Peut ajouter sa propre Demande de traitement"
-#: models_treatments.py:508
+#: models_treatments.py:510
msgid "Can change own Treatment request"
msgstr "Peut modifier sa propre Demande de traitement"
-#: models_treatments.py:510
+#: models_treatments.py:512
msgid "Can delete own Treatment request"
msgstr "Peut supprimer sa propre Demande de traitement"
-#: models_treatments.py:571
+#: models_treatments.py:573
msgid "Treatment documentation"
msgstr "Documentation de traitement"
-#: models_treatments.py:572
+#: models_treatments.py:574
msgid "Treament documentations"
msgstr "Documentations de traitement"
-#: models_treatments.py:588
+#: models_treatments.py:590
msgid "Treatment request documentation"
msgstr "Documentation de demande de traitement"
-#: models_treatments.py:589
+#: models_treatments.py:591
msgid "Treatment request documentations"
msgstr "Documentations de demande de traitement"
@@ -1208,67 +1231,69 @@ msgstr "Demande de traitement : supprimer une documentation associée"
msgid "Operation"
msgstr "Opération"
-#: templates/ishtar/sheet_find.html:24
-msgid "Creation:"
-msgstr "Création :"
-
-#: templates/ishtar/sheet_find.html:31
-msgid "Modification:"
-msgstr "Modification :"
+#: templates/ishtar/sheet_find.html:25
+#, fuzzy
+msgid "Administrative index"
+msgstr "Acte administratif"
-#: templates/ishtar/sheet_find.html:79
+#: templates/ishtar/sheet_find.html:67
msgid "Warehouse"
msgstr "Dépôt"
-#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:138
+#: templates/ishtar/sheet_find.html:84 templates/ishtar/sheet_find.html:126
msgid "Year - index"
msgstr "Année - index"
-#: templates/ishtar/sheet_find.html:100 templates/ishtar/sheet_find.html:142
+#: templates/ishtar/sheet_find.html:88 templates/ishtar/sheet_find.html:130
msgid "Related finds (max. 15 displayed)"
msgstr "Mobilier associé (max. 15 affichés)"
-#: templates/ishtar/sheet_find.html:128
+#: templates/ishtar/sheet_find.html:116
msgid "Export as CSV"
msgstr "Export en CSV"
-#: templates/ishtar/sheet_find.html:128 templates/ishtar/sheet_find.html:171
+#: templates/ishtar/sheet_find.html:116 templates/ishtar/sheet_find.html:159
msgid "CSV"
msgstr "CSV"
-#: templates/ishtar/sheet_find.html:176
+#: templates/ishtar/sheet_find.html:164
msgid "Associated base finds"
msgstr "Mobilier de base associé"
-#: templates/ishtar/sheet_find.html:208
+#: templates/ishtar/sheet_find.html:171
+#, fuzzy
+msgid "Internal ID"
+msgstr "ID externe"
+
+#: templates/ishtar/sheet_find.html:203
msgid "Coordinates:"
msgstr "Cordonnées :"
-#: templates/ishtar/sheet_find.html:210
+#: templates/ishtar/sheet_find.html:205
msgid "X:"
msgstr "X :"
-#: templates/ishtar/sheet_find.html:211
+#: templates/ishtar/sheet_find.html:206
msgid "Y:"
msgstr "Y :"
-#: templates/ishtar/sheet_find.html:212
+#: templates/ishtar/sheet_find.html:207
msgid "Z:"
msgstr "Z :"
-#: templates/ishtar/sheet_find.html:215
+#: templates/ishtar/sheet_find.html:210
msgid "SRID:"
msgstr "SRID :"
-#: templates/ishtar/sheet_find.html:231
+#: templates/ishtar/sheet_find.html:226
msgid "Title"
msgstr "Titre"
-#: templates/ishtar/sheet_find.html:233
+#: templates/ishtar/sheet_find.html:228
msgid "Authors"
msgstr "Auteurs"
-#: templates/ishtar/sheet_find.html:234
+#: templates/ishtar/sheet_find.html:229
msgid "Link"
msgstr "Lien"
@@ -1280,6 +1305,11 @@ msgstr "Panier de mobilier"
msgid "Find source"
msgstr "Documentation associée au mobilier"
+#: templates/ishtar/sheet_findsource.html:11
+#, fuzzy
+msgid "Related find"
+msgstr "Mobilier associé"
+
#: templates/ishtar/sheet_treatment.html:20
msgctxt "Treatment"
msgid "Closed"
@@ -1312,6 +1342,22 @@ msgstr "Active"
msgid "Treatment request source"
msgstr "Documentation de demande de traitement"
+#: templates/ishtar/sheet_treatmentfilesource.html:11
+#, fuzzy
+msgid "Related treatment request"
+msgstr "Ajouter une demande de traitement"
+
#: templates/ishtar/sheet_treatmentsource.html:4
msgid "Treatment source"
msgstr "Documentation de traitement"
+
+#: templates/ishtar/sheet_treatmentsource.html:11
+#, fuzzy
+msgid "Related treatment"
+msgstr "Traitement de base"
+
+#~ msgid "Creation:"
+#~ msgstr "Création :"
+
+#~ msgid "Modification:"
+#~ msgstr "Modification :"
diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po
index 966e83092..5695b1d9f 100644
--- a/translations/fr/archaeological_operations.po
+++ b/translations/fr/archaeological_operations.po
@@ -8,23 +8,25 @@
# Valérie-Emma Leroux , 2017. #zanata
msgid ""
msgstr ""
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-15 11:56+0100\n"
"PO-Revision-Date: 2017-03-09 05:01-0500\n"
"Last-Translator: Valérie-Emma Leroux \n"
"Language-Team: \n"
"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
"X-Generator: Zanata 3.9.6\n"
-#: forms.py:69 forms.py:371 forms.py:1009 forms.py:1031 forms.py:1035
-#: models.py:1221 templates/ishtar/sheet_operation.html:156
+#: forms.py:69 forms.py:371 forms.py:1013 forms.py:1035 forms.py:1039
+#: models.py:1241 templates/ishtar/sheet_operation.html:146
#: templates/ishtar/blocks/window_tables/parcels.html:10
msgid "Parcels"
msgstr "Parcelles"
-#: forms.py:72 forms.py:205 forms.py:985 models.py:1207
+#: forms.py:72 forms.py:205 forms.py:989 models.py:1227
#: templates/ishtar/blocks/window_tables/parcels.html:7
#: templates/ishtar/dashboards/dashboard_operation.html:432
#: templates/ishtar/dashboards/dashboard_operation.html:446
@@ -33,22 +35,22 @@ msgstr "Parcelles"
msgid "Town"
msgstr "Commune"
-#: forms.py:74 forms.py:455 forms.py:752 forms.py:1255 models.py:272
-#: models.py:1013 models.py:1205
+#: forms.py:74 forms.py:455 forms.py:756 forms.py:1259 models.py:272
+#: models.py:1033 models.py:1225
#: templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Year"
msgstr "Année"
-#: forms.py:77 models.py:1208
+#: forms.py:77 models.py:1228
#: templates/ishtar/blocks/window_tables/parcels.html:9
msgid "Section"
msgstr "Section"
-#: forms.py:80 models.py:1210
+#: forms.py:80 models.py:1230
msgid "Parcel number"
msgstr "Numéro de parcelle"
-#: forms.py:82 models.py:1212 models.py:1229 models.py:1278
+#: forms.py:82 models.py:1232 models.py:1249 models.py:1298
msgid "Public domain"
msgstr "Domaine public"
@@ -84,8 +86,8 @@ msgstr "Il y a des parcelles identiques."
msgid "Relation type"
msgstr "Type de relation"
-#: forms.py:383 ishtar_menu.py:30 models.py:367 models.py:834 models.py:864
-#: models.py:892 models.py:995 models.py:1204 wizards.py:344 wizards.py:355
+#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:843 models.py:878
+#: models.py:911 models.py:1015 models.py:1224 wizards.py:344 wizards.py:355
#: templates/ishtar/sheet_operation.html:4
msgid "Operation"
msgstr "Opération"
@@ -94,7 +96,7 @@ msgstr "Opération"
msgid ":"
msgstr ": "
-#: forms.py:411 forms.py:605 forms.py:1220
+#: forms.py:411 forms.py:607 forms.py:1224
msgid "You should select an operation."
msgstr "Vous devez sélectionner une opération."
@@ -110,19 +112,19 @@ msgstr "Relations actuelles"
msgid "Deleted relations"
msgstr "Relations supprimées"
-#: forms.py:451 templates/ishtar/sheet_operation.html:95
+#: forms.py:451 templates/ishtar/sheet_operation.html:85
msgid "Relations"
msgstr "Relations"
-#: forms.py:456 forms.py:1226 models.py:273
+#: forms.py:456 forms.py:1230 models.py:273
msgid "Numeric reference"
msgstr "Identifiant numérique"
-#: forms.py:462 forms.py:1266
+#: forms.py:462 forms.py:1270
msgid "Parcel (section/number/public domain)"
msgstr "Parcelle (section/numéro/domaine public)"
-#: forms.py:465 forms.py:1269 models.py:835
+#: forms.py:465 forms.py:1273 models.py:844
#: templates/ishtar/dashboards/dashboard_operation.html:390
#: templates/ishtar/dashboards/dashboard_operation.html:411
#: templates/ishtar/dashboards/dashboard_operation.html:643
@@ -131,248 +133,254 @@ msgstr "Parcelle (section/numéro/domaine public)"
msgid "Department"
msgstr "Département"
-#: forms.py:466 forms.py:1097 models.py:86
+#: forms.py:466 forms.py:1101 models.py:86
+#: templates/ishtar/sheet_operation.html:22
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8
msgid "Name"
msgstr "Nom"
-#: forms.py:468 forms.py:672 forms.py:750 forms.py:1232 models.py:280
+#: forms.py:468 forms.py:752 models.py:334
+#, fuzzy
+msgid "Address / Locality"
+msgstr "Adresse - Lieu-dit"
+
+#: forms.py:470 forms.py:674 forms.py:754 forms.py:1236 models.py:280
msgid "Operation type"
msgstr "Type d'opération"
-#: forms.py:470
+#: forms.py:472
msgid "Is open?"
msgstr "Est ouvert ?"
-#: forms.py:478 forms.py:782 models.py:269
+#: forms.py:480 forms.py:786 models.py:269
msgid "In charge"
msgstr "Responsable du suivi scientifique"
-#: forms.py:485 models.py:989
+#: forms.py:487 models.py:1009
msgid "Scientist in charge"
msgstr "Responsable scientifique"
-#: forms.py:487 forms.py:674 forms.py:772 models.py:267
+#: forms.py:489 forms.py:676 forms.py:776 models.py:267
msgid "Operator"
msgstr "Opérateur"
-#: forms.py:496 forms.py:1102 models.py:90 models.py:282
+#: forms.py:498 forms.py:1106 models.py:90 models.py:282
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10
msgid "Remains"
msgstr "Vestiges"
-#: forms.py:497 forms.py:1080 forms.py:1099 models.py:88 models.py:288
+#: forms.py:499 forms.py:1084 forms.py:1103 models.py:88 models.py:288
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9
msgid "Periods"
msgstr "Périodes"
-#: forms.py:498
+#: forms.py:500
msgid "Started before"
msgstr "Commencé avant"
-#: forms.py:500
+#: forms.py:502
msgid "Started after"
msgstr "Commencé après"
-#: forms.py:502
+#: forms.py:504
msgid "Ended before"
msgstr "Terminé avant"
-#: forms.py:504
+#: forms.py:506
msgid "Ended after"
msgstr "Terminé après"
-#: forms.py:507
+#: forms.py:509
msgid "Search within relations"
msgstr "Rechercher parmi les relations"
-#: forms.py:509 forms.py:837
+#: forms.py:511 forms.py:841
msgid "Comment"
msgstr "Commentaire"
-#: forms.py:510
+#: forms.py:512
msgid "Abstract (full text search)"
msgstr "Résumé (recherche texte intégral)"
-#: forms.py:512 forms.py:840 models.py:336
+#: forms.py:514 forms.py:844 models.py:337
msgid "Comment about scientific documentation"
msgstr "Commentaire concernant la documentation scientifique"
-#: forms.py:513 forms.py:842 models.py:348
+#: forms.py:515 forms.py:846 models.py:349
msgid "Record quality"
msgstr "Qualité d'enregistrement"
-#: forms.py:514 forms.py:807 models.py:300
+#: forms.py:516 forms.py:811 models.py:300
msgid "Report processing"
msgstr "Traitement du rapport"
-#: forms.py:516 forms.py:845 models.py:343
+#: forms.py:518 forms.py:849 models.py:344
msgid "Virtual operation"
msgstr "Opération virtuelle"
-#: forms.py:518 forms.py:1142 forms.py:1146 models.py:94
+#: forms.py:520 forms.py:1146 forms.py:1150 models.py:94
msgid "Archaeological site"
msgstr "Entité archéologique"
-#: forms.py:524 forms.py:1273
+#: forms.py:526 forms.py:1277
msgid "Created by"
msgstr "Créé par"
-#: forms.py:530 forms.py:1279
+#: forms.py:532 forms.py:1283
msgid "Modified by"
msgstr "Modifié par"
-#: forms.py:537
+#: forms.py:539
msgid "Documentation deadline before"
msgstr "Date limite de rendu de la documentation avant"
-#: forms.py:539
+#: forms.py:541
msgid "Documentation deadline after"
msgstr "Date limite de rendu de la documentation après"
-#: forms.py:541 forms.py:830 models.py:355
+#: forms.py:543 forms.py:834 models.py:356
msgid "Documentation received"
msgstr "Documentation reçue"
-#: forms.py:543
+#: forms.py:545
msgid "Finds deadline before"
msgstr "Date limite de rendu du mobilier avant"
-#: forms.py:545
+#: forms.py:547
msgid "Finds deadline after"
msgstr "Date limite de rendu du mobilier après"
-#: forms.py:547 forms.py:835 models.py:359
+#: forms.py:549 forms.py:839 models.py:360
msgid "Finds received"
msgstr "Mobilier reçu"
-#: forms.py:592 forms.py:1218 views.py:168
+#: forms.py:594 forms.py:1222 views.py:168
msgid "Operation search"
msgstr "Rechercher une opération"
-#: forms.py:636
+#: forms.py:638
msgid "Associated file"
msgstr "Dossier associé"
-#: forms.py:640 forms.py:933 models.py:501 models.py:891 models.py:1000
+#: forms.py:642 forms.py:937 models.py:510 models.py:910 models.py:1020
#: wizards.py:80
msgid "Archaeological file"
msgstr "Dossier archéologique"
-#: forms.py:647 forms.py:649 models.py:350
+#: forms.py:649 forms.py:651 models.py:351
msgid "Abstract"
msgstr "Résumé"
-#: forms.py:652
+#: forms.py:654
msgid "months"
msgstr "mois"
-#: forms.py:652
+#: forms.py:654
msgid "years"
msgstr "années"
-#: forms.py:654 models.py:253
+#: forms.py:656 models.py:253
msgid "Creation date"
msgstr "Date de création"
-#: forms.py:655
+#: forms.py:657
msgid "Start of field work"
msgstr "Début du travail de terrain"
-#: forms.py:657
+#: forms.py:659
msgid "All"
msgstr "Tout"
-#: forms.py:658
+#: forms.py:660
msgid "Preventive"
msgstr "Préventif"
-#: forms.py:659
+#: forms.py:661
msgid "Research"
msgstr "Programmé"
-#: forms.py:663
+#: forms.py:665
msgid "Slicing"
msgstr "Découpage"
-#: forms.py:666
+#: forms.py:668
msgid "Department detail"
msgstr "Détail par département"
-#: forms.py:668
+#: forms.py:670
msgid "Date get from"
msgstr "Date obtenue depuis"
-#: forms.py:670
+#: forms.py:672
msgid "Preventive/Research"
msgstr "Préventif/Programmé"
-#: forms.py:676
+#: forms.py:678
msgid "Date after"
msgstr "Date après"
-#: forms.py:678
+#: forms.py:680
msgid "Date before"
msgstr "Date avant"
-#: forms.py:680
+#: forms.py:682
msgid "With reports"
msgstr "Avec un rapport"
-#: forms.py:681
+#: forms.py:683
msgid "With finds"
msgstr "Avec du mobilier"
-#: forms.py:733 forms.py:1327 templates/ishtar/sheet_administrativeact.html:20
-#: templates/ishtar/sheet_operation.html:24
+#: forms.py:735 forms.py:1331 templates/ishtar/sheet_administrativeact.html:20
+#: templates/ishtar/sheet_operation.html:26
msgid "General"
msgstr "Général"
-#: forms.py:748 models.py:333
+#: forms.py:750 models.py:333
msgid "Generic name"
msgstr "Nom générique"
-#: forms.py:757 models.py:302
+#: forms.py:761 models.py:302
msgid "Old code"
msgstr "Ancien code"
-#: forms.py:760
+#: forms.py:764
msgid "Head scientist"
msgstr "Responsable scientifique"
-#: forms.py:779 models.py:332
+#: forms.py:783 models.py:332
msgid "Operator reference"
msgstr "Référence de l'opérateur"
-#: forms.py:793
+#: forms.py:797
msgid "Total surface (m2)"
msgstr "Surface totale (m2)"
-#: forms.py:800 models.py:54 models.py:256 models.py:1417
+#: forms.py:804 models.py:54 models.py:256 models.py:1437
msgid "Start date"
msgstr "Date de début"
-#: forms.py:802 models.py:258
+#: forms.py:806 models.py:258
msgid "Excavation end date"
msgstr "Date de fin de chantier"
-#: forms.py:805 models.py:259
+#: forms.py:809 models.py:259
msgid "Report delivery date"
msgstr "Date de livraison du rapport"
-#: forms.py:827 models.py:352
+#: forms.py:831 models.py:353
msgid "Deadline for submission of the documentation"
msgstr "Date limite de rendu de la documentation"
-#: forms.py:832 models.py:357
+#: forms.py:836 models.py:358
msgid "Deadline for submission of the finds"
msgstr "Date limite de rendu du mobilier"
-#: forms.py:847
+#: forms.py:851
msgid "Image"
msgstr "Image"
-#: forms.py:848
+#: forms.py:852
#, python-format
msgid ""
"Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)."
@@ -381,19 +389,18 @@ msgstr ""
"
Les images trop grandes sont retaillées en : %(width)dx%(height)d (le "
"ratio est conservé).
"
-#: forms.py:886
+#: forms.py:890
msgid ""
"If you want to set an excavation end date you have to provide a start date."
msgstr ""
"Avant de renseigner la date de fin de chantier, il est nécessaire de "
"renseigner une date de début."
-#: forms.py:891
+#: forms.py:895
msgid "The excavation end date cannot be before the start date."
-msgstr ""
-"La date de fin de chantier ne peut être antérieure à la date de début."
+msgstr "La date de fin de chantier ne peut être antérieure à la date de début."
-#: forms.py:919
+#: forms.py:923
#, python-format
msgid ""
"Operation code already exists for year: %(year)d - use a value bigger than "
@@ -402,106 +409,106 @@ msgstr ""
"Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur "
"plus grande que %(last_val)d"
-#: forms.py:923
+#: forms.py:927
msgid "Bad operation code"
msgstr "Mauvais code d'opération"
-#: forms.py:929 models.py:516
+#: forms.py:933 models.py:525 models.py:873
msgid "Operation code"
msgstr "Code de l'opération"
-#: forms.py:955
+#: forms.py:959
msgid "Preventive informations - excavation"
msgstr "Information archéologie préventive - fouille"
-#: forms.py:956 models.py:286
+#: forms.py:960 models.py:286
#: templates/ishtar/dashboards/dashboard_operation.html:701
msgid "Cost (euros)"
msgstr "Coût (euros)"
-#: forms.py:957 models.py:291
+#: forms.py:961 models.py:291
msgid "Scheduled man-days"
msgstr "Jours-hommes prévus"
-#: forms.py:959 models.py:294
+#: forms.py:963 models.py:294
msgid "Optional man-days"
msgstr "Jours-hommes optionnels"
-#: forms.py:961 models.py:297
+#: forms.py:965 models.py:297
msgid "Effective man-days"
msgstr "Jours-hommes effectifs"
-#: forms.py:971
+#: forms.py:975
msgid "Preventive informations - diagnostic"
msgstr "Information archéologie préventive - diagnostic"
-#: forms.py:974 models.py:316
+#: forms.py:978 models.py:316
msgid "Prescription on zoning"
msgstr "Prescription sur zonage"
-#: forms.py:976 models.py:319
+#: forms.py:980 models.py:319
msgid "Prescription on large area"
msgstr "Prescription sur une vaste surface"
-#: forms.py:979 models.py:321
+#: forms.py:983 models.py:321
msgid "Prescription on geoarchaeological context"
msgstr "Prescription sur un contexte géoarchéologique"
-#: forms.py:983 forms.py:1005 models.py:284 models.py:1023
+#: forms.py:987 forms.py:1009 models.py:284 models.py:1043
msgid "Towns"
msgstr "Communes"
-#: forms.py:1012 models.py:1220 models.py:1415
+#: forms.py:1016 models.py:1240 models.py:1435
msgid "Parcel"
msgstr "Parcelle"
-#: forms.py:1064 models.py:46
+#: forms.py:1068 models.py:46
msgid "Remain types"
msgstr "Types de vestige"
-#: forms.py:1068 models.py:45
+#: forms.py:1072 models.py:45
msgid "Remain type"
msgstr "Type de vestige"
-#: forms.py:1084 templates/ishtar/sheet_operation.html:176
-#: templates/ishtar/sheet_operation.html:207
+#: forms.py:1088 templates/ishtar/sheet_operation.html:166
+#: templates/ishtar/sheet_operation.html:197
msgid "Period"
msgstr "Période"
-#: forms.py:1096 models.py:85
+#: forms.py:1100 models.py:85
msgid "Reference"
msgstr "Référence"
-#: forms.py:1125
+#: forms.py:1129
msgid "This reference already exists."
msgstr "Cette référence existe déjà."
-#: forms.py:1157 models.py:95 models.py:340
-#: templates/ishtar/sheet_operation.html:106
+#: forms.py:1161 models.py:95 models.py:341
+#: templates/ishtar/sheet_operation.html:96
msgid "Archaeological sites"
msgstr "Entités archéologiques"
-#: forms.py:1161
+#: forms.py:1165
msgid "Associated archaeological sites"
msgstr "Entités archéologiques associées"
-#: forms.py:1167 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93
+#: forms.py:1171 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93
msgid "Search"
msgstr "Recherche"
-#: forms.py:1172
+#: forms.py:1176
msgid "Would you like to close this operation?"
msgstr "Voulez-vous clore cette opération ?"
-#: forms.py:1177
+#: forms.py:1181
msgid "Would you like to delete this operation?"
msgstr "Voulez-vous supprimer cette opération ?"
-#: forms.py:1186 forms.py:1256 forms.py:1392 models.py:866 models.py:980
+#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:880 models.py:1000
msgid "Index"
msgstr "Index"
-#: forms.py:1212
+#: forms.py:1216
#, python-format
msgid ""
"Index already exists for operation: %(operation)s - use a value bigger than "
@@ -510,48 +517,48 @@ msgstr ""
"Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur "
"plus grande que %(last_val)d"
-#: forms.py:1224
+#: forms.py:1228
msgid "Operation's year"
msgstr "Année de l'opération"
-#: forms.py:1231
+#: forms.py:1235
msgid "Operation's town"
msgstr "Commune de l'opération"
-#: forms.py:1244
+#: forms.py:1248
msgid "Documentation search"
msgstr "Rechercher une documentation"
-#: forms.py:1246
+#: forms.py:1250
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
-#: forms.py:1263 forms.py:1330 models.py:905 models.py:974
+#: forms.py:1267 forms.py:1334 models.py:924 models.py:994
msgid "Act type"
msgstr "Type d'acte"
-#: forms.py:1264 forms.py:1462
+#: forms.py:1268 forms.py:1466
msgid "Indexed?"
msgstr "Indexé ?"
-#: forms.py:1270 forms.py:1335 models.py:1014
+#: forms.py:1274 forms.py:1339 models.py:1034
#: templates/ishtar/blocks/window_tables/administrativacts.html:10
msgid "Object"
msgstr "Objet"
-#: forms.py:1307 views.py:333
+#: forms.py:1311 views.py:333
msgid "Administrative act search"
msgstr "Rechercher un acte administratif"
-#: forms.py:1322 forms.py:1420 forms.py:1487
+#: forms.py:1326 forms.py:1424 forms.py:1491
msgid "You should select an administrative act."
msgstr "Vous devez sélectionner un acte administratif."
-#: forms.py:1338 models.py:1011
+#: forms.py:1342 models.py:1031
msgid "Signature date"
msgstr "Date de signature"
-#: forms.py:1380
+#: forms.py:1384
#, python-format
msgid ""
"This index already exists for year: %(year)d - use a value bigger than "
@@ -560,31 +567,31 @@ msgstr ""
"Cet index existe déjà pour l'année : %(year)d, utilisez une valeur plus "
"grande que %(last_val)d"
-#: forms.py:1384
+#: forms.py:1388
msgid "Bad index"
msgstr "Mauvais index"
-#: forms.py:1397
+#: forms.py:1401
msgid "Would you like to delete this administrative act?"
msgstr "Voulez-vous supprimer cet acte administratif ?"
-#: forms.py:1402
+#: forms.py:1406
msgid "Template"
msgstr "Patron"
-#: forms.py:1426 forms.py:1430
+#: forms.py:1430 forms.py:1434
msgid "This document is not intended for this type of act."
msgstr "Ce document n'est pas destiné à ce type d'acte."
-#: forms.py:1448
+#: forms.py:1452
msgid "Doc generation"
msgstr "Génération de document"
-#: forms.py:1450
+#: forms.py:1454
msgid "Generate the associated doc?"
msgstr "Générer le document associé ?"
-#: forms.py:1471 ishtar_menu.py:123 views.py:386
+#: forms.py:1475 ishtar_menu.py:123 views.py:386
msgctxt "admin act register"
msgid "Register"
msgstr "Registre"
@@ -605,7 +612,7 @@ msgstr "Clôture"
msgid "Deletion"
msgstr "Suppression"
-#: ishtar_menu.py:59 models.py:1030
+#: ishtar_menu.py:59 models.py:1050
#: templates/ishtar/sheet_administrativeact.html:4
msgid "Administrative act"
msgstr "Acte administratif"
@@ -630,16 +637,16 @@ msgstr "Tableau de bord"
msgid "General informations"
msgstr "Informations générales"
-#: ishtar_menu.py:139 models.py:368
+#: ishtar_menu.py:139 models.py:369
#: templates/ishtar/dashboards/dashboard_operation.html:8
msgid "Operations"
msgstr "Opérations"
-#: models.py:53 models.py:71 models.py:1879
+#: models.py:53 models.py:71 models.py:1907
msgid "Order"
msgstr "Ordre"
-#: models.py:55 models.py:1418
+#: models.py:55 models.py:1438
msgid "End date"
msgstr "Date de fin"
@@ -755,7 +762,7 @@ msgstr "Date de clôture"
msgid "In charge scientist"
msgstr "Responsable du suivi scientifique"
-#: models.py:277 models.py:1200
+#: models.py:277 models.py:1220
msgid "File"
msgstr "Dossier"
@@ -763,299 +770,309 @@ msgstr "Dossier"
msgid "Surface (m2)"
msgstr "Surface (m2)"
-#: models.py:334
+#: models.py:335
msgid "General comment"
msgstr "Commentaire général"
-#: models.py:337
+#: models.py:338
msgid "Cached name"
msgstr "Nom en cache"
-#: models.py:345
+#: models.py:346
msgid ""
"If checked, it means that this operation have not been officialy registered."
msgstr ""
"Si coché, cela signifie que cette opération n'a pas été officiellement "
"enregistrée."
-#: models.py:361
+#: models.py:362
msgid "Point"
msgstr "Point"
-#: models.py:362
+#: models.py:363
msgid "Multi polygon"
msgstr "Polygones multi-parties"
-#: models.py:370
+#: models.py:371
msgid "Can view all Operations"
msgstr "Peut voir toutes les Opérations"
-#: models.py:371
+#: models.py:372
msgid "Can view own Operation"
msgstr "Peut voir sa propre Opération"
-#: models.py:372
+#: models.py:373
msgid "Can add own Operation"
msgstr "Peut ajouter sa propre Opération"
-#: models.py:373
+#: models.py:374
msgid "Can change own Operation"
msgstr "Peut modifier sa propre Opération"
-#: models.py:374
+#: models.py:375
msgid "Can delete own Operation"
msgstr "Peut supprimer sa propre Opération"
-#: models.py:375
+#: models.py:376
msgid "Can close Operation"
msgstr "Peut clore une Opération"
-#: models.py:404
+#: models.py:405
msgid "OPE"
msgstr "OPE"
-#: models.py:470
+#: models.py:479
msgid "Intercommunal"
msgstr "Intercommunal"
-#: models.py:502
+#: models.py:511
msgid "Code patriarche"
msgstr "Code patriarche"
-#: models.py:542
+#: models.py:551
msgid "This operation code already exists for this year"
msgstr "Ce code d'opération existe déjà pour cette année."
-#: models.py:567
+#: models.py:576
msgid "Number of parcels"
msgstr "Nombre de parcelles"
-#: models.py:585
+#: models.py:594
msgid "Number of administrative acts"
msgstr "Nombre d'actes administratifs"
-#: models.py:593
+#: models.py:602
msgid "Number of indexed administrative acts"
msgstr "Nombre d'actes administratifs indexés"
-#: models.py:601
+#: models.py:610
msgid "Number of context records"
msgstr "Nombre d'Unités d'Enregistrement"
-#: models.py:637
+#: models.py:646
msgid "Number of finds"
msgstr "Nombre d'éléments de mobilier"
-#: models.py:682
+#: models.py:691
msgid "No type"
msgstr "Pas de type"
-#: models.py:713
+#: models.py:722
msgid "Number of sources"
msgstr "Nombre de documents"
-#: models.py:755 templates/ishtar/dashboards/dashboard_operation.html:309
+#: models.py:764 templates/ishtar/dashboards/dashboard_operation.html:309
#: templates/ishtar/dashboards/dashboard_operation.html:575
#: templates/ishtar/dashboards/dashboard_operation.html:611
msgid "Mean"
msgstr "Moyenne"
-#: models.py:805
+#: models.py:814
msgid "Inverse relation"
msgstr "Relation inverse"
-#: models.py:809
+#: models.py:818
msgid "Operation relation type"
msgstr "Type de relation entre opérations"
-#: models.py:810
+#: models.py:819
msgid "Operation relation types"
msgstr "Types de relation entre opérations"
-#: models.py:823
+#: models.py:832
msgid "Operation record relation"
msgstr "Relation entre opérations"
-#: models.py:824
+#: models.py:833
msgid "Operation record relations"
msgstr "Relations entre opérations"
-#: models.py:870
+#: models.py:872
+#, fuzzy
+msgid "Operation year"
+msgstr "Année de l'opération"
+
+#: models.py:874
+#, fuzzy
+msgid "Document code"
+msgstr "Documents"
+
+#: models.py:884
msgid "Operation documentation"
msgstr "Documentation d'une opération"
-#: models.py:871
+#: models.py:885
msgid "Operation documentations"
msgstr "Documentations des opérations"
-#: models.py:874
+#: models.py:888
msgid "Can view all Operation sources"
msgstr "Peut voir toutes les Documentations d'opération"
-#: models.py:876
+#: models.py:890
msgid "Can view own Operation source"
msgstr "Peut voir sa propre Documentation d'opération"
-#: models.py:878
+#: models.py:892
msgid "Can add own Operation source"
msgstr "Peut ajouter sa propre Documentation d'opération"
-#: models.py:880
+#: models.py:894
msgid "Can change own Operation source"
msgstr "Peut modifier sa propre Documentation d'opération"
-#: models.py:882
+#: models.py:896
msgid "Can delete own Operation source"
msgstr "Peut supprimer sa propre Documentation d'opération"
-#: models.py:893 models.py:1005
+#: models.py:912 models.py:1025
msgid "Treatment request"
msgstr "Demande de traitement"
-#: models.py:894 models.py:1010
+#: models.py:913 models.py:1030
msgid "Treatment"
msgstr "Traitement"
-#: models.py:896
+#: models.py:915
msgid "Intended to"
msgstr "Destiné à"
-#: models.py:898
+#: models.py:917
msgid "Code"
msgstr "Code"
-#: models.py:901
+#: models.py:920
msgid "Associated template"
msgstr "Patron associé"
-#: models.py:902
+#: models.py:921
msgid "Indexed"
msgstr "Indexé"
-#: models.py:906
+#: models.py:925
msgid "Act types"
msgstr "Types d'acte"
-#: models.py:978
+#: models.py:991 models.py:1071
+#: templates/ishtar/blocks/window_tables/administrativacts.html:7
+#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
+msgid "Ref."
+msgstr "Réf."
+
+#: models.py:998
msgid "Person in charge of the operation"
msgstr "Responsable d'opération"
-#: models.py:984
+#: models.py:1004
msgid "Archaeological preventive operator"
msgstr "Opérateur d'archéologie préventive"
-#: models.py:992
+#: models.py:1012
msgid "Signatory"
msgstr "Signataire"
-#: models.py:1020
+#: models.py:1040
msgid "Departments"
msgstr "Départements"
-#: models.py:1021
+#: models.py:1041
msgid "Cached values get from associated departments"
msgstr "Valeur en cache des départements associés"
-#: models.py:1024
+#: models.py:1044
msgid "Cached values get from associated towns"
msgstr "Valeur en cache des communes associées"
-#: models.py:1031 templates/ishtar/sheet_operation.html:114
-#: templates/ishtar/sheet_operation.html:150
+#: models.py:1051 templates/ishtar/sheet_operation.html:104
+#: templates/ishtar/sheet_operation.html:140
msgid "Administrative acts"
msgstr "Actes administratifs"
-#: models.py:1034
+#: models.py:1054
msgid "Can view all Administrative acts"
msgstr "Peut voir tous les Actes administratifs"
-#: models.py:1036
+#: models.py:1056
msgid "Can view own Administrative act"
msgstr "Peut voir son propre Acte administratif"
-#: models.py:1038
+#: models.py:1058
msgid "Can add own Administrative act"
msgstr "Peut ajouter son propre Acte administratif"
-#: models.py:1040
+#: models.py:1060
msgid "Can change own Administrative act"
msgstr "Peut modifier son propre Acte administratif"
-#: models.py:1042
+#: models.py:1062
msgid "Can delete own Administrative act"
msgstr "Peut supprimer son propre Acte administratif"
-#: models.py:1051
-#: templates/ishtar/blocks/window_tables/administrativacts.html:7
-#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
-msgid "Ref."
-msgstr "Réf."
-
-#: models.py:1145
+#: models.py:1165
msgid "This index already exists for this year"
msgstr "Cet index existe déjà pour cette année."
-#: models.py:1213
+#: models.py:1233
msgid "External ID"
msgstr "ID externe"
-#: models.py:1216
+#: models.py:1236
msgid "External ID is set automatically"
msgstr "L'identifiant externe est configuré automatiquement"
-#: models.py:1217
+#: models.py:1237
msgid "Address - Locality"
msgstr "Adresse - Lieu-dit"
-#: models.py:1413
+#: models.py:1433
msgid "Owner"
msgstr "Propriétaire"
-#: models.py:1421
+#: models.py:1441
msgid "Parcel owner"
msgstr "Propriétaire de parcelle"
-#: models.py:1422
+#: models.py:1442
msgid "Parcel owners"
msgstr "Propriétaires de parcelle"
-#: models.py:1448
+#: models.py:1468
msgid "Recorded"
msgstr "Enregistré"
-#: models.py:1449
+#: models.py:1469
msgid "Effective"
msgstr "Effectif"
-#: models.py:1450
+#: models.py:1470
msgid "Active"
msgstr "Actif"
-#: models.py:1451
+#: models.py:1471
msgid "Field completed"
msgstr "Terrain achevé"
-#: models.py:1452
+#: models.py:1472
msgid "Associated report"
msgstr "Rapport associé"
-#: models.py:1453
+#: models.py:1473
msgid "Closed"
msgstr "Clos"
-#: models.py:1454
+#: models.py:1474
msgid "Documented and closed"
msgstr "Documenté et clos"
-#: models.py:1880
+#: models.py:1908
msgid "Is preventive"
msgstr "Préventif"
-#: models.py:1883
+#: models.py:1911
msgid "Operation type old"
msgstr "Type d'opération - ancien"
-#: models.py:1884
+#: models.py:1912
msgid "Operation types old"
msgstr "Types d'opération - ancien"
@@ -1116,7 +1133,7 @@ msgstr ""
"oubli, définissez-le à la première étape."
#: templates/ishtar/sheet_administrativeact.html:36
-#: templates/ishtar/sheet_operation.html:50
+#: templates/ishtar/sheet_operation.html:40
msgid "Surface:"
msgstr "Surface :"
@@ -1128,96 +1145,97 @@ msgstr "Cette opération est virtuelle."
msgid "Patriarche OA code not yet recorded!"
msgstr "Code d'opération Patriarche non renseigné !"
-#: templates/ishtar/sheet_operation.html:27
-msgid "Creation:"
-msgstr "Création :"
+#: templates/ishtar/sheet_operation.html:23
+msgid "Address"
+msgstr ""
-#: templates/ishtar/sheet_operation.html:34
-msgid "Modification:"
-msgstr "Modification :"
+#: templates/ishtar/sheet_operation.html:30
+#, fuzzy
+msgid "Begining date"
+msgstr "Date de clôture"
-#: templates/ishtar/sheet_operation.html:46
+#: templates/ishtar/sheet_operation.html:36
msgid "State:"
msgstr "État :"
-#: templates/ishtar/sheet_operation.html:46
+#: templates/ishtar/sheet_operation.html:36
msgid "Active file"
msgstr "Dossier actif"
-#: templates/ishtar/sheet_operation.html:47
+#: templates/ishtar/sheet_operation.html:37
msgid "Closed operation"
msgstr "Opération close"
-#: templates/ishtar/sheet_operation.html:48
+#: templates/ishtar/sheet_operation.html:38
msgid "Closing date:"
msgstr "Date de clôture :"
-#: templates/ishtar/sheet_operation.html:48
+#: templates/ishtar/sheet_operation.html:38
msgid "by"
msgstr "par"
-#: templates/ishtar/sheet_operation.html:51
+#: templates/ishtar/sheet_operation.html:41
msgid "Cost:"
msgstr "Coût :"
-#: templates/ishtar/sheet_operation.html:52
+#: templates/ishtar/sheet_operation.html:42
msgid "Duration:"
msgstr "Durée :"
-#: templates/ishtar/sheet_operation.html:52
+#: templates/ishtar/sheet_operation.html:42
msgid "Day"
msgstr "Jour"
-#: templates/ishtar/sheet_operation.html:85
+#: templates/ishtar/sheet_operation.html:75
msgid "Localisation"
msgstr "Localisation"
-#: templates/ishtar/sheet_operation.html:110
+#: templates/ishtar/sheet_operation.html:100
msgid "Associated parcels"
msgstr "Parcelles associées"
-#: templates/ishtar/sheet_operation.html:118
+#: templates/ishtar/sheet_operation.html:108
msgid "Document from this operation"
msgstr "Documents de cette opération"
-#: templates/ishtar/sheet_operation.html:124
-#: templates/ishtar/sheet_operation.html:161
+#: templates/ishtar/sheet_operation.html:114
+#: templates/ishtar/sheet_operation.html:151
msgid "Context records"
msgstr "Unités d'Enregistrement"
-#: templates/ishtar/sheet_operation.html:128
+#: templates/ishtar/sheet_operation.html:118
msgid "Context record relations"
msgstr "Relations entre Unités d'Enregistrement"
-#: templates/ishtar/sheet_operation.html:133
+#: templates/ishtar/sheet_operation.html:123
msgid "Documents from associated context records"
msgstr "Documents des Unités d'Enregistrement associées"
-#: templates/ishtar/sheet_operation.html:138
-#: templates/ishtar/sheet_operation.html:184
+#: templates/ishtar/sheet_operation.html:128
+#: templates/ishtar/sheet_operation.html:174
msgid "Finds"
msgstr "Mobilier"
-#: templates/ishtar/sheet_operation.html:143
+#: templates/ishtar/sheet_operation.html:133
msgid "Documents from associated finds"
msgstr "Documents du mobilier associé"
-#: templates/ishtar/sheet_operation.html:148
+#: templates/ishtar/sheet_operation.html:138
msgid "Statistics"
msgstr "Statistiques"
-#: templates/ishtar/sheet_operation.html:168
-#: templates/ishtar/sheet_operation.html:222
+#: templates/ishtar/sheet_operation.html:158
+#: templates/ishtar/sheet_operation.html:212
#: templates/ishtar/blocks/window_tables/administrativacts.html:8
msgid "Type"
msgstr "Type"
-#: templates/ishtar/sheet_operation.html:168
-#: templates/ishtar/sheet_operation.html:176
-#: templates/ishtar/sheet_operation.html:191
-#: templates/ishtar/sheet_operation.html:199
-#: templates/ishtar/sheet_operation.html:207
-#: templates/ishtar/sheet_operation.html:222
+#: templates/ishtar/sheet_operation.html:158
+#: templates/ishtar/sheet_operation.html:166
+#: templates/ishtar/sheet_operation.html:181
+#: templates/ishtar/sheet_operation.html:189
+#: templates/ishtar/sheet_operation.html:197
+#: templates/ishtar/sheet_operation.html:212
#: templates/ishtar/dashboards/dashboard_operation.html:18
#: templates/ishtar/dashboards/dashboard_operation.html:164
#: templates/ishtar/dashboards/dashboard_operation.html:432
@@ -1226,19 +1244,19 @@ msgstr "Type"
msgid "Number"
msgstr "Nombre"
-#: templates/ishtar/sheet_operation.html:191
+#: templates/ishtar/sheet_operation.html:181
msgid "Material type"
msgstr "Type de matériau"
-#: templates/ishtar/sheet_operation.html:199
+#: templates/ishtar/sheet_operation.html:189
msgid "Object type"
msgstr "Type d'objet"
-#: templates/ishtar/sheet_operation.html:215
+#: templates/ishtar/sheet_operation.html:205
msgid "Sources"
msgstr "Documents"
-#: templates/ishtar/sheet_operation.html:231
+#: templates/ishtar/sheet_operation.html:221
msgid "Finds by context records"
msgstr "Mobilier par Unités d'Enregistrement"
@@ -1246,6 +1264,11 @@ msgstr "Mobilier par Unités d'Enregistrement"
msgid "Operation source"
msgstr "Documentation associée à l'opération"
+#: templates/ishtar/sheet_operationsource.html:11
+#, fuzzy
+msgid "Related operation"
+msgstr "Opération close"
+
#: templates/ishtar/blocks/window_tables/administrativacts.html:9
msgid "Date"
msgstr "Date"
@@ -1481,3 +1504,9 @@ msgstr "communes principales par coût"
#: templates/ishtar/wizard/wizard_adminact_deletion.html:6
msgid "This act is indexed!"
msgstr "Cet acte est indexé !"
+
+#~ msgid "Creation:"
+#~ msgstr "Création :"
+
+#~ msgid "Modification:"
+#~ msgstr "Modification :"
diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po
index 6780d7b3a..0938cf839 100644
--- a/translations/fr/archaeological_warehouse.po
+++ b/translations/fr/archaeological_warehouse.po
@@ -6,13 +6,15 @@
# Valérie-Emma Leroux , 2017. #zanata
msgid ""
msgstr ""
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-15 11:57+0100\n"
"PO-Revision-Date: 2017-02-04 08:26-0500\n"
"Last-Translator: Copied by Zanata \n"
"Language-Team: \n"
"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
"X-Generator: Zanata 3.9.6\n"
@@ -170,7 +172,7 @@ msgstr "Modification"
msgid "Deletion"
msgstr "Suppression"
-#: ishtar_menu.py:57 models.py:192 templates/ishtar/sheet_warehouse.html:17
+#: ishtar_menu.py:57 models.py:192 templates/ishtar/sheet_warehouse.html:20
msgid "Containers"
msgstr "Contenants"
@@ -219,11 +221,13 @@ msgid "Collection"
msgstr "Collection"
#: models.py:117
-msgid "Warehouse division"
+#, fuzzy
+msgid "Warehouse division type"
msgstr "Division de dépôt"
#: models.py:118
-msgid "Warehouse divisions"
+#, fuzzy
+msgid "Warehouse division types"
msgstr "Divisions de dépôt"
#: models.py:138
@@ -306,11 +310,11 @@ msgstr "Modifier un contenant"
msgid "Container deletion"
msgstr "Supprimer un contenant"
-#: templates/ishtar/sheet_container.html:19
+#: templates/ishtar/sheet_container.html:22
msgid "Content"
msgstr "Contenu"
-#: templates/ishtar/sheet_warehouse.html:22
+#: templates/ishtar/sheet_warehouse.html:25
msgid "Attached containers"
msgstr "Contenants associés"
diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po
index 34ff2b5a6..200c1fcc3 100644
--- a/translations/fr/ishtar_common.po
+++ b/translations/fr/ishtar_common.po
@@ -8,13 +8,15 @@
# Valérie-Emma Leroux , 2017. #zanata
msgid ""
msgstr ""
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-15 11:56+0100\n"
"PO-Revision-Date: 2017-03-09 05:02-0500\n"
"Last-Translator: Valérie-Emma Leroux \n"
"Language-Team: \n"
"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
"X-Generator: Zanata 3.9.6\n"
@@ -26,7 +28,7 @@ msgstr "identifiant"
msgid "email address"
msgstr "courriel"
-#: __init__.py:10
+#: __init__.py:10 templates/ishtar/sheet_source.html:8
msgid "Related item"
msgstr "Élément associé"
@@ -139,31 +141,31 @@ msgstr ""
"Erreur de configuration de l'importeur : le champ \"{}\" n'existe pas pour "
"{}."
-#: data_importer.py:1555
+#: data_importer.py:1559
msgid "line"
msgstr "ligne"
-#: data_importer.py:1555
+#: data_importer.py:1559
msgid "col"
msgstr "colonne"
-#: data_importer.py:1555
+#: data_importer.py:1559
msgid "error"
msgstr "erreur"
-#: data_importer.py:1561
+#: data_importer.py:1565
msgid "field"
msgstr "champ"
-#: data_importer.py:1561
+#: data_importer.py:1565
msgid "source"
msgstr "source"
-#: data_importer.py:1561
+#: data_importer.py:1565
msgid "result"
msgstr "résultat"
-#: data_importer.py:1577
+#: data_importer.py:1581
#, python-format
msgid "\"%(value)s\" not in %(values)s"
msgstr "\"%(value)s\" n'est pas dans %(values)s"
@@ -201,7 +203,7 @@ msgid "Template"
msgstr "Patron"
#: forms_common.py:41 forms_common.py:59 forms_common.py:184
-#: forms_common.py:408 models.py:1548 models.py:2986
+#: forms_common.py:408 models.py:1548 models.py:2989
#: templates/blocks/JQueryAdvancedTown.html:19
#: templates/ishtar/sheet_organization.html:13
msgid "Town"
@@ -224,8 +226,8 @@ msgstr ""
"Par exemple tapez « saint denis 93 » pour obtenir la "
"commune Saint-Denis dans le département français de Seine-Saint-Denis.
"
-#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2609
-#: models.py:2790 models.py:2854 templates/ishtar/sheet_person.html:4
+#: forms_common.py:68 forms_common.py:863 ishtar_menu.py:47 models.py:2610
+#: models.py:2791 models.py:2856 templates/ishtar/sheet_person.html:4
msgid "Person"
msgstr "Personne"
@@ -238,15 +240,16 @@ msgstr ""
"pas possible."
#: forms_common.py:172 forms_common.py:329 forms_common.py:453
-#: ishtar_menu.py:75 models.py:2492 models.py:2583
+#: ishtar_menu.py:75 models.py:2493 models.py:2584
#: templates/ishtar/sheet_organization.html:4
msgid "Organization"
msgstr "Organisation"
#: forms_common.py:175 forms_common.py:212 forms_common.py:324
#: forms_common.py:378 forms_common.py:448 models.py:1103 models.py:1481
-#: models.py:1750 models.py:1766 models.py:2003 models.py:2486 models.py:2595
-#: models.py:2972 templates/ishtar/sheet_organization.html:8
+#: models.py:1750 models.py:1766 models.py:2003 models.py:2279 models.py:2487
+#: models.py:2596 models.py:2975 templates/ishtar/import_list.html:13
+#: templates/ishtar/sheet_organization.html:8
#: templates/ishtar/sheet_organization.html:21
msgid "Name"
msgstr "Nom"
@@ -281,22 +284,22 @@ msgstr "Courriel"
#: forms_common.py:188 forms_common.py:385 models.py:1561
#: templates/ishtar/sheet_organization.html:14
-#: templates/ishtar/sheet_person.html:19
+#: templates/ishtar/sheet_person.html:21
#: templates/ishtar/wizard/wizard_person.html:17
msgid "Phone"
msgstr "Téléphone"
#: forms_common.py:189 forms_common.py:394 models.py:1573
#: templates/ishtar/sheet_organization.html:15
-#: templates/ishtar/sheet_person.html:37
+#: templates/ishtar/sheet_person.html:39
#: templates/ishtar/wizard/wizard_person.html:35
msgid "Mobile phone"
msgstr "Téléphone portable"
#: forms_common.py:213 forms_common.py:327 forms_common.py:451 models.py:2170
-#: models.py:2488 models.py:2907 templates/sheet_ope.html:85
+#: models.py:2489 models.py:2910 templates/sheet_ope.html:85
#: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126
-#: templates/ishtar/import_list.html:13
+#: templates/ishtar/import_list.html:14
#: templates/ishtar/sheet_organization.html:23
#: templates/ishtar/blocks/window_tables/documents.html:8
msgid "Type"
@@ -318,7 +321,7 @@ msgstr "Fusionner tous les éléments dans"
msgid "Organization to merge"
msgstr "Organisation à fusionner"
-#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2593
+#: forms_common.py:325 forms_common.py:376 forms_common.py:449 models.py:2594
#: templates/ishtar/sheet_organization.html:22
msgid "Surname"
msgstr "Prénom"
@@ -337,16 +340,16 @@ msgid "Identity"
msgstr "Identité"
#: forms_common.py:373 forms_common.py:781 forms_common.py:830 models.py:2135
-#: models.py:2587 models.py:2589 models.py:2904 templates/sheet_ope.html:104
+#: models.py:2588 models.py:2590 models.py:2907 templates/sheet_ope.html:104
#: templates/ishtar/blocks/window_tables/documents.html:7
msgid "Title"
msgstr "Titre"
-#: forms_common.py:374 models.py:2591
+#: forms_common.py:374 models.py:2592
msgid "Salutation"
msgstr "Formule d'appel"
-#: forms_common.py:380 models.py:2597
+#: forms_common.py:380 models.py:2598
msgid "Raw name"
msgstr "Nom brut"
@@ -406,7 +409,7 @@ msgstr "Nom d'utilisateur"
msgid "Account search"
msgstr "Rechercher un compte"
-#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2540
+#: forms_common.py:512 forms_common.py:552 forms_common.py:556 models.py:2541
msgid "Person type"
msgstr "Type de personne"
@@ -438,7 +441,7 @@ msgstr "Ce nom d'utilisateur existe déjà."
msgid "Send the new password by email?"
msgstr "Envoyer le nouveau mot de passe par courriel ?"
-#: forms_common.py:636 forms_common.py:649 models.py:2987
+#: forms_common.py:636 forms_common.py:649 models.py:2990
msgid "Towns"
msgstr "Communes"
@@ -454,7 +457,7 @@ msgstr "Seul un choix peut être coché."
msgid "Documentation informations"
msgstr "Information sur le document"
-#: forms_common.py:783 forms_common.py:831 models.py:2136 models.py:2879
+#: forms_common.py:783 forms_common.py:831 models.py:2136 models.py:2882
msgid "Source type"
msgstr "Type de document"
@@ -466,37 +469,37 @@ msgstr "Référence"
msgid "Internal reference"
msgstr "Référence interne"
-#: forms_common.py:791 models.py:2918
+#: forms_common.py:791 models.py:2921
msgid "Numerical ressource (web address)"
msgstr "Ressource numérique (adresse web)"
-#: forms_common.py:792 models.py:2920
+#: forms_common.py:792 models.py:2923
msgid "Receipt date"
msgstr "Date de réception"
-#: forms_common.py:794 models.py:2302 models.py:2922
+#: forms_common.py:794 models.py:2304 models.py:2925
msgid "Creation date"
msgstr "Date de création"
-#: forms_common.py:797 models.py:2925
+#: forms_common.py:797 models.py:2928
msgid "Receipt date in documentation"
msgstr "Date de réception en documentation"
#: forms_common.py:799 forms_common.py:835 models.py:379 models.py:696
-#: models.py:2030 models.py:2601 models.py:2932
+#: models.py:2030 models.py:2602 models.py:2935
msgid "Comment"
msgstr "Commentaire"
#: forms_common.py:801 forms_common.py:834 models.py:1105 models.py:1770
-#: models.py:1957 models.py:2004 models.py:2931 templates/sheet_ope.html:128
+#: models.py:1957 models.py:2004 models.py:2934 templates/sheet_ope.html:128
msgid "Description"
msgstr "Description"
-#: forms_common.py:804 models.py:2933
+#: forms_common.py:804 models.py:2936
msgid "Additional information"
msgstr "Information supplémentaire"
-#: forms_common.py:806 forms_common.py:838 models.py:2935
+#: forms_common.py:806 forms_common.py:838 models.py:2938
msgid "Has a duplicate"
msgstr "Existe en doublon"
@@ -513,7 +516,7 @@ msgstr ""
"Les images trop grandes sont retaillées en : %(width)dx%(height)d (le "
"ratio est conservé).
"
-#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2859
+#: forms_common.py:827 forms_common.py:856 forms_common.py:890 models.py:2861
#: templates/ishtar/wizard/wizard_person_deletion.html:124
msgid "Author"
msgstr "Auteur"
@@ -526,7 +529,7 @@ msgstr "Informations supplémentaires"
msgid "Would you like to delete this documentation?"
msgstr "Voulez-vous supprimer ce document ?"
-#: forms_common.py:864 models.py:2137 models.py:2846 models.py:2856
+#: forms_common.py:864 models.py:2137 models.py:2848 models.py:2858
msgid "Author type"
msgstr "Type d'auteur"
@@ -538,7 +541,7 @@ msgstr "Sélection d'auteur"
msgid "There are identical authors."
msgstr "Il y a des auteurs identiques."
-#: forms_common.py:901 models.py:2860 models.py:2914
+#: forms_common.py:901 models.py:2862 models.py:2917
#: templates/sheet_ope.html:106
#: templates/ishtar/blocks/window_tables/documents.html:9
msgid "Authors"
@@ -568,7 +571,7 @@ msgstr "Annuaire"
msgid "Search"
msgstr "Recherche"
-#: ishtar_menu.py:54 ishtar_menu.py:83 templates/ishtar/import_list.html:15
+#: ishtar_menu.py:54 ishtar_menu.py:83 templates/ishtar/import_list.html:16
msgid "Creation"
msgstr "Ajout"
@@ -584,7 +587,7 @@ msgstr "Fusion automatique"
msgid "Manual merge"
msgstr "Fusion manuelle"
-#: ishtar_menu.py:109 models.py:2313
+#: ishtar_menu.py:109 models.py:2315
msgid "Imports"
msgstr "Imports"
@@ -596,7 +599,7 @@ msgstr "Nouvel import"
msgid "Current imports"
msgstr "Imports en cours"
-#: ishtar_menu.py:120 views.py:1664
+#: ishtar_menu.py:120 views.py:1667
msgid "Old imports"
msgstr "Anciens imports"
@@ -640,7 +643,7 @@ msgstr "Dernier éditeur"
msgid "Creator"
msgstr "Créateur"
-#: models.py:965 models.py:2998 models.py:3054
+#: models.py:965 models.py:2846 models.py:3001 models.py:3057
msgid "Order"
msgstr "Ordre"
@@ -883,7 +886,7 @@ msgid "Total"
msgstr "Total"
#: models.py:1393 models.py:1517 models.py:1529
-#: templates/ishtar/sheet_person.html:22
+#: templates/ishtar/sheet_person.html:24
#: templates/ishtar/dashboards/dashboard_main_detail.html:141
#: templates/ishtar/dashboards/dashboard_main_detail_users.html:26
#: templates/ishtar/wizard/wizard_person.html:20
@@ -906,7 +909,7 @@ msgstr "Patron de document"
msgid "Document templates"
msgstr "Patrons de document"
-#: models.py:1520 models.py:1530 models.py:2297
+#: models.py:1520 models.py:1530 models.py:2299
msgid "State"
msgstr "État"
@@ -1098,11 +1101,11 @@ msgstr "Importeur - Clé de rapprochement"
msgid "Importer - Targets keys"
msgstr "Importeur - Clés de rapprochement"
-#: models.py:2138 models.py:2910
+#: models.py:2138 models.py:2913
msgid "Format"
msgstr "Format"
-#: models.py:2139 models.py:3002
+#: models.py:2139 models.py:3005
msgid "Operation type"
msgstr "Type d'opération"
@@ -1166,15 +1169,15 @@ msgstr "Type d'identification"
msgid "Context record relation type"
msgstr "Type de relations entre Unités d'Enregistrement"
-#: models.py:2158 models.py:3060
+#: models.py:2158 models.py:3063
msgid "Spatial reference system"
msgstr "Système de référence spatiale"
-#: models.py:2159 models.py:2888
+#: models.py:2159 models.py:2891
msgid "Support type"
msgstr "Type de support"
-#: models.py:2160 models.py:2552
+#: models.py:2160 models.py:2553
msgid "Title type"
msgstr "Type de titre"
@@ -1272,265 +1275,265 @@ msgstr "Terminé"
msgid "Archived"
msgstr "Archivé"
-#: models.py:2281
+#: models.py:2283
msgid "Imported file"
msgstr "Fichier importé"
-#: models.py:2283
+#: models.py:2285
msgid "Associated images (zip file)"
msgstr "Images associées (fichier zip)"
-#: models.py:2285
+#: models.py:2287
msgid "Encoding"
msgstr "Codage"
-#: models.py:2287
+#: models.py:2289
msgid "Skip lines"
msgstr "Nombre de lignes d'entête"
-#: models.py:2288 templates/ishtar/import_list.html:47
+#: models.py:2290 templates/ishtar/import_list.html:51
msgid "Error file"
msgstr "Fichier erreur"
-#: models.py:2291
+#: models.py:2293
msgid "Result file"
msgstr "Fichier résultant"
-#: models.py:2294 templates/ishtar/import_list.html:53
+#: models.py:2296 templates/ishtar/import_list.html:57
msgid "Match file"
msgstr "Fichier de correspondance"
-#: models.py:2300
+#: models.py:2302
msgid "Conservative import"
msgstr "Import conservateur"
-#: models.py:2305
+#: models.py:2307
msgid "End date"
msgstr "Date de fin"
-#: models.py:2307
+#: models.py:2309
msgid "Remaining seconds"
msgstr "Secondes restantes"
-#: models.py:2312
+#: models.py:2314
msgid "Import"
msgstr "Import"
-#: models.py:2342
+#: models.py:2343
msgid "Analyse"
msgstr "Analyser"
-#: models.py:2344 models.py:2347
+#: models.py:2345 models.py:2348
msgid "Re-analyse"
msgstr "Analyser de nouveau "
-#: models.py:2345
+#: models.py:2346
msgid "Launch import"
msgstr "Lancer l'import"
-#: models.py:2348
+#: models.py:2349
msgid "Re-import"
msgstr "Ré-importer"
-#: models.py:2349
+#: models.py:2350
msgid "Archive"
msgstr "Archiver"
-#: models.py:2351
+#: models.py:2352
msgid "Unarchive"
msgstr "Désarchiver"
-#: models.py:2352 widgets.py:130 templates/ishtar/form_delete.html:11
+#: models.py:2353 widgets.py:130 templates/ishtar/form_delete.html:11
msgid "Delete"
msgstr "Supprimer"
-#: models.py:2493
+#: models.py:2494
msgid "Organizations"
msgstr "Organisations"
-#: models.py:2495
+#: models.py:2496
msgid "Can view all Organizations"
msgstr "Peut voir toutes les Organisations"
-#: models.py:2496
+#: models.py:2497
msgid "Can view own Organization"
msgstr "Peut voir sa propre Organisation"
-#: models.py:2497
+#: models.py:2498
msgid "Can add own Organization"
msgstr "Peut ajouter sa propre Organisation"
-#: models.py:2499
+#: models.py:2500
msgid "Can change own Organization"
msgstr "Peut modifier sa propre Organisation"
-#: models.py:2501
+#: models.py:2502
msgid "Can delete own Organization"
msgstr "Peut supprimer sa propre Organisation"
-#: models.py:2536
+#: models.py:2537
msgid "Groups"
msgstr "Groupes"
-#: models.py:2541
+#: models.py:2542
msgid "Person types"
msgstr "Types de personne"
-#: models.py:2553
+#: models.py:2554
msgid "Title types"
msgstr "Types de titre"
-#: models.py:2562
+#: models.py:2563
msgid "Mr"
msgstr "M."
-#: models.py:2563
+#: models.py:2564
msgid "Miss"
msgstr "Mlle"
-#: models.py:2564
+#: models.py:2565
msgid "Mr and Mrs"
msgstr "M. et Mme"
-#: models.py:2565
+#: models.py:2566
msgid "Mrs"
msgstr "Mme"
-#: models.py:2566
+#: models.py:2567
msgid "Doctor"
msgstr "Dr."
-#: models.py:2599
+#: models.py:2600
msgid "Contact type"
msgstr "Type de contact"
-#: models.py:2602 models.py:2666
+#: models.py:2603 models.py:2667
msgid "Types"
msgstr "Types"
-#: models.py:2605
+#: models.py:2606
msgid "Is attached to"
msgstr "Est rattaché à"
-#: models.py:2610
+#: models.py:2611
msgid "Persons"
msgstr "Personnes"
-#: models.py:2612
+#: models.py:2613
msgid "Can view all Persons"
msgstr "Peut voir toutes les Personnes"
-#: models.py:2613
+#: models.py:2614
msgid "Can view own Person"
msgstr "Peut voir sa propre Personne"
-#: models.py:2614
+#: models.py:2615
msgid "Can add own Person"
msgstr "Peut ajouter sa propre Personne"
-#: models.py:2615
+#: models.py:2616
msgid "Can change own Person"
msgstr "Peut modifier sa propre Personne"
-#: models.py:2616
+#: models.py:2617
msgid "Can delete own Person"
msgstr "Peut supprimer sa propre Personne"
-#: models.py:2793
+#: models.py:2794
msgid "Advanced shortcut menu"
msgstr "Menu de raccourci (avancé)"
-#: models.py:2796
+#: models.py:2797
msgid "Ishtar user"
msgstr "Utilisateur d'Ishtar"
-#: models.py:2797
+#: models.py:2798
msgid "Ishtar users"
msgstr "Utilisateurs d'Ishtar"
-#: models.py:2841
+#: models.py:2842
msgid "To modify the password use the form in Auth > User"
msgstr ""
"Pour modifier le mot de passe, utilisez le formulaire dans Authentification "
"> Utilisateurs"
-#: models.py:2847
+#: models.py:2849
msgid "Author types"
msgstr "Types d'auteur"
-#: models.py:2880
+#: models.py:2883
msgid "Source types"
msgstr "Types de document"
-#: models.py:2889
+#: models.py:2892
msgid "Support types"
msgstr "Types de support"
-#: models.py:2896
+#: models.py:2899
msgid "Format type"
msgstr "Type de format"
-#: models.py:2897
+#: models.py:2900
msgid "Format types"
msgstr "Types de format"
-#: models.py:2905
+#: models.py:2908
msgid "External ID"
msgstr "Identifiant externe"
-#: models.py:2908
+#: models.py:2911
msgid "Support"
msgstr "Support"
-#: models.py:2912
+#: models.py:2915
msgid "Scale"
msgstr "Échelle"
-#: models.py:2926
+#: models.py:2929
msgid "Item number"
msgstr "Numéro d'élément"
-#: models.py:2927
+#: models.py:2930
msgid "Ref."
msgstr "Réf."
-#: models.py:2930
+#: models.py:2933
msgid "Internal ref."
msgstr "Réf. interne"
-#: models.py:2973
+#: models.py:2976
msgid "Surface (m2)"
msgstr "Surface (m2)"
-#: models.py:2974 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
+#: models.py:2977 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107
msgid "Localisation"
msgstr "Localisation"
-#: models.py:2999
+#: models.py:3002
msgid "Is preventive"
msgstr "Est du préventif"
-#: models.py:3003
+#: models.py:3006
msgid "Operation types"
msgstr "Types d'opération"
-#: models.py:3032
+#: models.py:3035
msgid "Preventive"
msgstr "Préventif"
-#: models.py:3033
+#: models.py:3036
msgid "Research"
msgstr "Programmé"
-#: models.py:3056
+#: models.py:3059
msgid "Authority name"
msgstr "Registre"
-#: models.py:3057
+#: models.py:3060
msgid "Authority SRID"
msgstr "SRID"
-#: models.py:3061
+#: models.py:3064
msgid "Spatial reference systems"
msgstr "Systèmes de référence spatiale"
@@ -1623,31 +1626,31 @@ msgstr "Unités d'Enregistrement"
msgid "Finds"
msgstr "Mobilier"
-#: views.py:1676 templates/ishtar/import_list.html:43
+#: views.py:1681 templates/ishtar/import_list.html:47
msgid "Link unmatched items"
msgstr "Associer les éléments non rapprochés"
-#: views.py:1691
+#: views.py:1696
msgid "Delete import"
msgstr "Supprimer un import"
-#: views.py:1730
+#: views.py:1735
msgid "Merge persons"
msgstr "Fusionner des personnes"
-#: views.py:1754
+#: views.py:1759
msgid "Select the main person"
msgstr "Choisir la personne principale"
-#: views.py:1763
+#: views.py:1768
msgid "Merge organization"
msgstr "Fusionner des organisations"
-#: views.py:1773
+#: views.py:1778
msgid "Select the main organization"
msgstr "Sélectionner l'organisation principale"
-#: views.py:1813 views.py:1829
+#: views.py:1818 views.py:1834
msgid "Corporation manager"
msgstr "Représentant de la personne morale"
@@ -1667,7 +1670,7 @@ msgstr "Chargement..."
msgid "Remove"
msgstr "Enlever"
-#: wizards.py:372 templates/ishtar/import_delete.html:20
+#: wizards.py:372 templates/ishtar/import_delete.html:21
msgid "Yes"
msgstr "Oui"
@@ -1716,8 +1719,7 @@ msgstr "L'équipe %(app_name)s"
#: templates/base.html:41
msgid "Searches in the shortcut menu deal with all items."
-msgstr ""
-"Les recherches dans le menu de raccourci concernent tous les éléments."
+msgstr "Les recherches dans le menu de raccourci concernent tous les éléments."
#: templates/base.html:42
msgid "Searches in the shortcut menu deal with only your items."
@@ -2128,7 +2130,7 @@ msgid "remove"
msgstr "supprimer"
#: templates/ishtar/form.html:11 templates/ishtar/formset.html:8
-#: templates/ishtar/import_list.html:58 templates/ishtar/merge.html:31
+#: templates/ishtar/import_list.html:62 templates/ishtar/merge.html:31
#: templates/ishtar/simple_form.html:7
#: templates/ishtar/wizard/default_wizard.html:31
#: templates/ishtar/wizard/search.html:13
@@ -2136,19 +2138,19 @@ msgstr "supprimer"
msgid "Validate"
msgstr "Valider"
-#: templates/ishtar/import_delete.html:8
+#: templates/ishtar/import_delete.html:9
msgid "The current items are linked to this import:"
msgstr "Les éléments suivants sont associés à cet import :"
-#: templates/ishtar/import_delete.html:18
+#: templates/ishtar/import_delete.html:19
msgid "All these items will be deleted with this import."
msgstr "Tous ces éléments vont être supprimés avec cet import."
-#: templates/ishtar/import_delete.html:19
+#: templates/ishtar/import_delete.html:20
msgid "Are you sure?"
msgstr "Êtes-vous sûr ?"
-#: templates/ishtar/import_delete.html:22
+#: templates/ishtar/import_delete.html:23
msgid "Back"
msgstr "Retour"
@@ -2156,24 +2158,24 @@ msgstr "Retour"
msgid "No pending imports."
msgstr "Pas d'imports en attente."
-#: templates/ishtar/import_list.html:14
+#: templates/ishtar/import_list.html:15
msgctxt "file"
msgid "File"
msgstr "Fichier"
-#: templates/ishtar/import_list.html:16
+#: templates/ishtar/import_list.html:17
msgid "Status"
msgstr "État"
-#: templates/ishtar/import_list.html:17
+#: templates/ishtar/import_list.html:18
msgid "Action"
msgstr "Action"
-#: templates/ishtar/import_list.html:25
+#: templates/ishtar/import_list.html:29
msgid "Source file"
msgstr "Fichier source"
-#: templates/ishtar/import_list.html:50
+#: templates/ishtar/import_list.html:54
msgid "Control file"
msgstr "Fichier de contrôle"
@@ -2281,60 +2283,64 @@ msgstr "Organisation de l'aménageur des dossiers"
msgid "Planning service of archaeological files"
msgstr "Service instructeur des dossiers"
-#: templates/ishtar/sheet_person.html:21
+#: templates/ishtar/sheet_person.html:23
#: templates/ishtar/wizard/wizard_person.html:19
msgid "Phone type"
msgstr "Type de téléphone"
-#: templates/ishtar/sheet_person.html:44
+#: templates/ishtar/sheet_person.html:46
#: templates/ishtar/wizard/wizard_person.html:42
msgid "Business address"
msgstr "Adresse professionnelle"
-#: templates/ishtar/sheet_person.html:52
+#: templates/ishtar/sheet_person.html:55
#: templates/ishtar/wizard/wizard_person.html:51
msgid "Other address"
msgstr "Autre adresse"
-#: templates/ishtar/sheet_person.html:60
+#: templates/ishtar/sheet_person.html:64
msgid "Associated organization"
msgstr "Organisation associée"
-#: templates/ishtar/sheet_person.html:71
+#: templates/ishtar/sheet_person.html:76
msgid "Associated operations as scientist"
msgstr "Opérations associées en tant que responsable scientifique"
-#: templates/ishtar/sheet_person.html:75
+#: templates/ishtar/sheet_person.html:80
msgid "Associated operations as responsible"
msgstr "Opérations associées en tant que responsable"
-#: templates/ishtar/sheet_person.html:80
+#: templates/ishtar/sheet_person.html:85
#: templates/ishtar/wizard/wizard_person_deletion.html:6
msgid "In charge of archaeological files"
msgstr "Responsable des dossiers"
-#: templates/ishtar/sheet_person.html:85
+#: templates/ishtar/sheet_person.html:90
#: templates/ishtar/wizard/wizard_person_deletion.html:14
msgid "General contractor of archaeological files"
msgstr "Aménageur des dossiers"
-#: templates/ishtar/sheet_person.html:90
+#: templates/ishtar/sheet_person.html:95
#: templates/ishtar/wizard/wizard_person_deletion.html:22
msgid "Responsible for planning service of archaeological files"
msgstr "Responsable pour le service instructeur des dossiers"
-#: templates/ishtar/sheet_person.html:96
+#: templates/ishtar/sheet_person.html:101
msgid "Documents associated to operations"
msgstr "Documents des opérations associées"
-#: templates/ishtar/sheet_person.html:101
+#: templates/ishtar/sheet_person.html:106
msgid "Documents associated to context records"
msgstr "Documents des Unités d'Enregistrement associées"
-#: templates/ishtar/sheet_person.html:106
+#: templates/ishtar/sheet_person.html:111
msgid "Documents associated to finds"
msgstr "Documents du mobilier associé"
+#: templates/ishtar/sheet_source.html:22
+msgid "Web link"
+msgstr ""
+
#: templates/ishtar/blocks/advanced_shortcut_menu.html:15
#: templates/ishtar/blocks/shortcut_menu.html:15
msgid ""
@@ -2393,8 +2399,23 @@ msgid ""
"Powered by Ishtar v%(VERSION)s - "
"a free software under AGPL v3 license."
msgstr ""
-"Propulsé par Ishtar v%(VERSION)s -"
-" logiciel libre sous licence AGPL v3."
+"Propulsé par Ishtar v%(VERSION)s "
+"- logiciel libre sous licence AGPL v3."
+
+#: templates/ishtar/blocks/sheet_creation_section.html:3
+#, fuzzy
+msgid "Creation:"
+msgstr "Ajout"
+
+#: templates/ishtar/blocks/sheet_creation_section.html:12
+#, fuzzy
+msgid "Modification:"
+msgstr "Modification"
+
+#: templates/ishtar/blocks/sheet_external_id.html:3
+#, fuzzy
+msgid "Internal ID"
+msgstr "Identifiant externe"
#: templates/ishtar/blocks/window_nav.html:6
msgid "Previous version"
--
cgit v1.2.3
From be74531db5197863fc7fcc42a6cfa7184ec1a543 Mon Sep 17 00:00:00 2001
From: Valérie-Emma Leroux
Date: Thu, 16 Mar 2017 00:08:13 +0100
Subject: Update labels
---
archaeological_context_records/forms.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'archaeological_context_records')
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 2506ae857..ef17e561e 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -142,7 +142,7 @@ class RecordFormGeneral(ManageOldType, forms.Form):
comment = forms.CharField(label=_(u"General comment"),
widget=forms.Textarea, required=False)
excavation_technic = forms.ChoiceField(
- label=_(u"Excavation technic"), choices=[], required=False)
+ label=_(u"Excavation technique"), choices=[], required=False)
length = forms.FloatField(label=_(u"Length (m)"), required=False)
width = forms.FloatField(label=_(u"Width (m)"), required=False)
thickness = forms.FloatField(label=_(u"Thickness (m)"), required=False)
--
cgit v1.2.3
From 49a6f8b40a6af038c1a2d4313d8a8c09afa53878 Mon Sep 17 00:00:00 2001
From: Étienne Loks
Date: Thu, 16 Mar 2017 10:05:49 +0100
Subject: Update french translation
---
Makefile.example | 2 +-
archaeological_context_records/locale/django.pot | 8 +-
archaeological_finds/locale/django.pot | 9 +-
archaeological_operations/locale/django.pot | 216 ++++++++++-----------
archaeological_warehouse/locale/django.pot | 18 +-
translations/fr/archaeological_context_records.po | 10 +-
translations/fr/archaeological_finds.po | 8 +-
translations/fr/archaeological_operations.po | 221 +++++++++++-----------
translations/fr/archaeological_warehouse.po | 18 +-
9 files changed, 256 insertions(+), 254 deletions(-)
(limited to 'archaeological_context_records')
diff --git a/Makefile.example b/Makefile.example
index f356ce93e..f3ec3f7fd 100644
--- a/Makefile.example
+++ b/Makefile.example
@@ -248,7 +248,7 @@ fixtures_files:
archaeological_files.permittype \
> '../archaeological_files/fixtures/initial_data-'$(default_data)'.json'
-translations_push: makemessages
+translations_push: translations_pull makemessages
zanata-cli push
translations_pull:
diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot
index 75cb3b4a4..3320c91a6 100644
--- a/archaeological_context_records/locale/django.pot
+++ b/archaeological_context_records/locale/django.pot
@@ -76,8 +76,8 @@ msgstr ""
msgid "General comment"
msgstr ""
-#: forms.py:145
-msgid "Excavation technic"
+#: forms.py:145 models.py:255
+msgid "Excavation technique"
msgstr ""
#: forms.py:146 models.py:215
@@ -372,10 +372,6 @@ msgstr ""
msgid "Estimation of a \"Terminus Post Quem\""
msgstr ""
-#: models.py:255
-msgid "Excavation technique"
-msgstr ""
-
#: models.py:258
msgid "Point"
msgstr ""
diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot
index 0fda2ed23..21cfba64a 100644
--- a/archaeological_finds/locale/django.pot
+++ b/archaeological_finds/locale/django.pot
@@ -3,6 +3,7 @@
# This file is distributed under the same license as the Ishtar package.
# Étienne Loks , 2010-2015.
# Valérie-Emma Leroux , 2016. #zanata
+# Étienne Loks , 2016. #zanata
# Valérie-Emma Leroux , 2017. #zanata
msgid ""
msgstr ""
@@ -514,7 +515,7 @@ msgstr ""
#: forms_treatments.py:358 forms_treatments.py:415 models_treatments.py:91
#: templates/ishtar/sheet_find.html:86 templates/ishtar/sheet_find.html:128
-#: templates/ishtar/sheet_find.html:227
+#: templates/ishtar/sheet_find.html:228
msgid "Type"
msgstr ""
@@ -1251,15 +1252,15 @@ msgstr ""
msgid "SRID:"
msgstr ""
-#: templates/ishtar/sheet_find.html:226
+#: templates/ishtar/sheet_find.html:227
msgid "Title"
msgstr ""
-#: templates/ishtar/sheet_find.html:228
+#: templates/ishtar/sheet_find.html:229
msgid "Authors"
msgstr ""
-#: templates/ishtar/sheet_find.html:229
+#: templates/ishtar/sheet_find.html:230
msgid "Link"
msgstr ""
diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot
index 35facbbf5..3c8b1c7e5 100644
--- a/archaeological_operations/locale/django.pot
+++ b/archaeological_operations/locale/django.pot
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
#: forms.py:69 forms.py:371 forms.py:1013 forms.py:1035 forms.py:1039
-#: models.py:1241 templates/ishtar/sheet_operation.html:146
+#: models.py:1247 templates/ishtar/sheet_operation.html:151
#: templates/ishtar/blocks/window_tables/parcels.html:10
msgid "Parcels"
msgstr ""
-#: forms.py:72 forms.py:205 forms.py:989 models.py:1227
+#: forms.py:72 forms.py:205 forms.py:989 models.py:1233
#: templates/ishtar/blocks/window_tables/parcels.html:7
#: templates/ishtar/dashboards/dashboard_operation.html:432
#: templates/ishtar/dashboards/dashboard_operation.html:446
@@ -25,21 +25,21 @@ msgid "Town"
msgstr ""
#: forms.py:74 forms.py:455 forms.py:756 forms.py:1259 models.py:272
-#: models.py:1033 models.py:1225
+#: models.py:1039 models.py:1231
#: templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Year"
msgstr ""
-#: forms.py:77 models.py:1228
+#: forms.py:77 models.py:1234
#: templates/ishtar/blocks/window_tables/parcels.html:9
msgid "Section"
msgstr ""
-#: forms.py:80 models.py:1230
+#: forms.py:80 models.py:1236
msgid "Parcel number"
msgstr ""
-#: forms.py:82 models.py:1232 models.py:1249 models.py:1298
+#: forms.py:82 models.py:1238 models.py:1255 models.py:1304
msgid "Public domain"
msgstr ""
@@ -75,8 +75,8 @@ msgstr ""
msgid "Relation type"
msgstr ""
-#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:843 models.py:878
-#: models.py:911 models.py:1015 models.py:1224 wizards.py:344 wizards.py:355
+#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:849 models.py:884
+#: models.py:917 models.py:1021 models.py:1230 wizards.py:344 wizards.py:355
#: templates/ishtar/sheet_operation.html:4
msgid "Operation"
msgstr ""
@@ -113,7 +113,7 @@ msgstr ""
msgid "Parcel (section/number/public domain)"
msgstr ""
-#: forms.py:465 forms.py:1273 models.py:844
+#: forms.py:465 forms.py:1273 models.py:850
#: templates/ishtar/dashboards/dashboard_operation.html:390
#: templates/ishtar/dashboards/dashboard_operation.html:411
#: templates/ishtar/dashboards/dashboard_operation.html:643
@@ -144,7 +144,7 @@ msgstr ""
msgid "In charge"
msgstr ""
-#: forms.py:487 models.py:1009
+#: forms.py:487 models.py:1015
msgid "Scientist in charge"
msgstr ""
@@ -250,7 +250,7 @@ msgstr ""
msgid "Associated file"
msgstr ""
-#: forms.py:642 forms.py:937 models.py:510 models.py:910 models.py:1020
+#: forms.py:642 forms.py:937 models.py:516 models.py:916 models.py:1026
#: wizards.py:80
msgid "Archaeological file"
msgstr ""
@@ -344,7 +344,7 @@ msgstr ""
msgid "Total surface (m2)"
msgstr ""
-#: forms.py:804 models.py:54 models.py:256 models.py:1437
+#: forms.py:804 models.py:54 models.py:256 models.py:1443
msgid "Start date"
msgstr ""
@@ -395,7 +395,7 @@ msgstr ""
msgid "Bad operation code"
msgstr ""
-#: forms.py:933 models.py:525 models.py:873
+#: forms.py:933 models.py:531 models.py:879
msgid "Operation code"
msgstr ""
@@ -436,11 +436,11 @@ msgstr ""
msgid "Prescription on geoarchaeological context"
msgstr ""
-#: forms.py:987 forms.py:1009 models.py:284 models.py:1043
+#: forms.py:987 forms.py:1009 models.py:284 models.py:1049
msgid "Towns"
msgstr ""
-#: forms.py:1016 models.py:1240 models.py:1435
+#: forms.py:1016 models.py:1246 models.py:1441
msgid "Parcel"
msgstr ""
@@ -452,8 +452,8 @@ msgstr ""
msgid "Remain type"
msgstr ""
-#: forms.py:1088 templates/ishtar/sheet_operation.html:166
-#: templates/ishtar/sheet_operation.html:197
+#: forms.py:1088 templates/ishtar/sheet_operation.html:171
+#: templates/ishtar/sheet_operation.html:202
msgid "Period"
msgstr ""
@@ -486,7 +486,7 @@ msgstr ""
msgid "Would you like to delete this operation?"
msgstr ""
-#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:880 models.py:1000
+#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:886 models.py:1006
msgid "Index"
msgstr ""
@@ -513,7 +513,7 @@ msgstr ""
msgid "You should select a document."
msgstr ""
-#: forms.py:1267 forms.py:1334 models.py:924 models.py:994
+#: forms.py:1267 forms.py:1334 models.py:930 models.py:1000
msgid "Act type"
msgstr ""
@@ -521,7 +521,7 @@ msgstr ""
msgid "Indexed?"
msgstr ""
-#: forms.py:1274 forms.py:1339 models.py:1034
+#: forms.py:1274 forms.py:1339 models.py:1040
#: templates/ishtar/blocks/window_tables/administrativacts.html:10
msgid "Object"
msgstr ""
@@ -534,7 +534,7 @@ msgstr ""
msgid "You should select an administrative act."
msgstr ""
-#: forms.py:1342 models.py:1031
+#: forms.py:1342 models.py:1037
msgid "Signature date"
msgstr ""
@@ -590,7 +590,7 @@ msgstr ""
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:59 models.py:1050
+#: ishtar_menu.py:59 models.py:1056
#: templates/ishtar/sheet_administrativeact.html:4
msgid "Administrative act"
msgstr ""
@@ -620,11 +620,11 @@ msgstr ""
msgid "Operations"
msgstr ""
-#: models.py:53 models.py:71 models.py:1907
+#: models.py:53 models.py:71 models.py:1913
msgid "Order"
msgstr ""
-#: models.py:55 models.py:1438
+#: models.py:55 models.py:1444
msgid "End date"
msgstr ""
@@ -740,7 +740,7 @@ msgstr ""
msgid "In charge scientist"
msgstr ""
-#: models.py:277 models.py:1220
+#: models.py:277 models.py:1226
msgid "File"
msgstr ""
@@ -801,252 +801,252 @@ msgstr ""
msgid "Intercommunal"
msgstr ""
-#: models.py:511
+#: models.py:517
msgid "Code patriarche"
msgstr ""
-#: models.py:551
+#: models.py:557
msgid "This operation code already exists for this year"
msgstr ""
-#: models.py:576
+#: models.py:582
msgid "Number of parcels"
msgstr ""
-#: models.py:594
+#: models.py:600
msgid "Number of administrative acts"
msgstr ""
-#: models.py:602
+#: models.py:608
msgid "Number of indexed administrative acts"
msgstr ""
-#: models.py:610
+#: models.py:616
msgid "Number of context records"
msgstr ""
-#: models.py:646
+#: models.py:652
msgid "Number of finds"
msgstr ""
-#: models.py:691
+#: models.py:697
msgid "No type"
msgstr ""
-#: models.py:722
+#: models.py:728
msgid "Number of sources"
msgstr ""
-#: models.py:764 templates/ishtar/dashboards/dashboard_operation.html:309
+#: models.py:770 templates/ishtar/dashboards/dashboard_operation.html:309
#: templates/ishtar/dashboards/dashboard_operation.html:575
#: templates/ishtar/dashboards/dashboard_operation.html:611
msgid "Mean"
msgstr ""
-#: models.py:814
+#: models.py:820
msgid "Inverse relation"
msgstr ""
-#: models.py:818
+#: models.py:824
msgid "Operation relation type"
msgstr ""
-#: models.py:819
+#: models.py:825
msgid "Operation relation types"
msgstr ""
-#: models.py:832
+#: models.py:838
msgid "Operation record relation"
msgstr ""
-#: models.py:833
+#: models.py:839
msgid "Operation record relations"
msgstr ""
-#: models.py:872
+#: models.py:878
msgid "Operation year"
msgstr ""
-#: models.py:874
+#: models.py:880
msgid "Document code"
msgstr ""
-#: models.py:884
+#: models.py:890
msgid "Operation documentation"
msgstr ""
-#: models.py:885
+#: models.py:891
msgid "Operation documentations"
msgstr ""
-#: models.py:888
+#: models.py:894
msgid "Can view all Operation sources"
msgstr ""
-#: models.py:890
+#: models.py:896
msgid "Can view own Operation source"
msgstr ""
-#: models.py:892
+#: models.py:898
msgid "Can add own Operation source"
msgstr ""
-#: models.py:894
+#: models.py:900
msgid "Can change own Operation source"
msgstr ""
-#: models.py:896
+#: models.py:902
msgid "Can delete own Operation source"
msgstr ""
-#: models.py:912 models.py:1025
+#: models.py:918 models.py:1031
msgid "Treatment request"
msgstr ""
-#: models.py:913 models.py:1030
+#: models.py:919 models.py:1036
msgid "Treatment"
msgstr ""
-#: models.py:915
+#: models.py:921
msgid "Intended to"
msgstr ""
-#: models.py:917
+#: models.py:923
msgid "Code"
msgstr ""
-#: models.py:920
+#: models.py:926
msgid "Associated template"
msgstr ""
-#: models.py:921
+#: models.py:927
msgid "Indexed"
msgstr ""
-#: models.py:925
+#: models.py:931
msgid "Act types"
msgstr ""
-#: models.py:991 models.py:1071
+#: models.py:997 models.py:1077
#: templates/ishtar/blocks/window_tables/administrativacts.html:7
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
msgid "Ref."
msgstr ""
-#: models.py:998
+#: models.py:1004
msgid "Person in charge of the operation"
msgstr ""
-#: models.py:1004
+#: models.py:1010
msgid "Archaeological preventive operator"
msgstr ""
-#: models.py:1012
+#: models.py:1018
msgid "Signatory"
msgstr ""
-#: models.py:1040
+#: models.py:1046
msgid "Departments"
msgstr ""
-#: models.py:1041
+#: models.py:1047
msgid "Cached values get from associated departments"
msgstr ""
-#: models.py:1044
+#: models.py:1050
msgid "Cached values get from associated towns"
msgstr ""
-#: models.py:1051 templates/ishtar/sheet_operation.html:104
-#: templates/ishtar/sheet_operation.html:140
+#: models.py:1057 templates/ishtar/sheet_operation.html:104
+#: templates/ishtar/sheet_operation.html:145
msgid "Administrative acts"
msgstr ""
-#: models.py:1054
+#: models.py:1060
msgid "Can view all Administrative acts"
msgstr ""
-#: models.py:1056
+#: models.py:1062
msgid "Can view own Administrative act"
msgstr ""
-#: models.py:1058
+#: models.py:1064
msgid "Can add own Administrative act"
msgstr ""
-#: models.py:1060
+#: models.py:1066
msgid "Can change own Administrative act"
msgstr ""
-#: models.py:1062
+#: models.py:1068
msgid "Can delete own Administrative act"
msgstr ""
-#: models.py:1165
+#: models.py:1171
msgid "This index already exists for this year"
msgstr ""
-#: models.py:1233
+#: models.py:1239
msgid "External ID"
msgstr ""
-#: models.py:1236
+#: models.py:1242
msgid "External ID is set automatically"
msgstr ""
-#: models.py:1237
+#: models.py:1243
msgid "Address - Locality"
msgstr ""
-#: models.py:1433
+#: models.py:1439
msgid "Owner"
msgstr ""
-#: models.py:1441
+#: models.py:1447
msgid "Parcel owner"
msgstr ""
-#: models.py:1442
+#: models.py:1448
msgid "Parcel owners"
msgstr ""
-#: models.py:1468
+#: models.py:1474
msgid "Recorded"
msgstr ""
-#: models.py:1469
+#: models.py:1475
msgid "Effective"
msgstr ""
-#: models.py:1470
+#: models.py:1476
msgid "Active"
msgstr ""
-#: models.py:1471
+#: models.py:1477
msgid "Field completed"
msgstr ""
-#: models.py:1472
+#: models.py:1478
msgid "Associated report"
msgstr ""
-#: models.py:1473
+#: models.py:1479
msgid "Closed"
msgstr ""
-#: models.py:1474
+#: models.py:1480
msgid "Documented and closed"
msgstr ""
-#: models.py:1908
+#: models.py:1914
msgid "Is preventive"
msgstr ""
-#: models.py:1911
+#: models.py:1917
msgid "Operation type old"
msgstr ""
-#: models.py:1912
+#: models.py:1918
msgid "Operation types old"
msgstr ""
@@ -1170,43 +1170,47 @@ msgid "Document from this operation"
msgstr ""
#: templates/ishtar/sheet_operation.html:114
-#: templates/ishtar/sheet_operation.html:151
+#: templates/ishtar/sheet_operation.html:156
msgid "Context records"
msgstr ""
-#: templates/ishtar/sheet_operation.html:118
+#: templates/ishtar/sheet_operation.html:119
msgid "Context record relations"
msgstr ""
-#: templates/ishtar/sheet_operation.html:123
+#: templates/ishtar/sheet_operation.html:124
msgid "Documents from associated context records"
msgstr ""
-#: templates/ishtar/sheet_operation.html:128
-#: templates/ishtar/sheet_operation.html:174
+#: templates/ishtar/sheet_operation.html:129
+#: templates/ishtar/sheet_operation.html:179
msgid "Finds"
msgstr ""
-#: templates/ishtar/sheet_operation.html:133
+#: templates/ishtar/sheet_operation.html:134
msgid "Documents from associated finds"
msgstr ""
-#: templates/ishtar/sheet_operation.html:138
+#: templates/ishtar/sheet_operation.html:139
+msgid "Associated containers"
+msgstr ""
+
+#: templates/ishtar/sheet_operation.html:143
msgid "Statistics"
msgstr ""
-#: templates/ishtar/sheet_operation.html:158
-#: templates/ishtar/sheet_operation.html:212
+#: templates/ishtar/sheet_operation.html:163
+#: templates/ishtar/sheet_operation.html:217
#: templates/ishtar/blocks/window_tables/administrativacts.html:8
msgid "Type"
msgstr ""
-#: templates/ishtar/sheet_operation.html:158
-#: templates/ishtar/sheet_operation.html:166
-#: templates/ishtar/sheet_operation.html:181
-#: templates/ishtar/sheet_operation.html:189
-#: templates/ishtar/sheet_operation.html:197
-#: templates/ishtar/sheet_operation.html:212
+#: templates/ishtar/sheet_operation.html:163
+#: templates/ishtar/sheet_operation.html:171
+#: templates/ishtar/sheet_operation.html:186
+#: templates/ishtar/sheet_operation.html:194
+#: templates/ishtar/sheet_operation.html:202
+#: templates/ishtar/sheet_operation.html:217
#: templates/ishtar/dashboards/dashboard_operation.html:18
#: templates/ishtar/dashboards/dashboard_operation.html:164
#: templates/ishtar/dashboards/dashboard_operation.html:432
@@ -1215,19 +1219,19 @@ msgstr ""
msgid "Number"
msgstr ""
-#: templates/ishtar/sheet_operation.html:181
+#: templates/ishtar/sheet_operation.html:186
msgid "Material type"
msgstr ""
-#: templates/ishtar/sheet_operation.html:189
+#: templates/ishtar/sheet_operation.html:194
msgid "Object type"
msgstr ""
-#: templates/ishtar/sheet_operation.html:205
+#: templates/ishtar/sheet_operation.html:210
msgid "Sources"
msgstr ""
-#: templates/ishtar/sheet_operation.html:221
+#: templates/ishtar/sheet_operation.html:226
msgid "Finds by context records"
msgstr ""
diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot
index 87fedd778..60b35a633 100644
--- a/archaeological_warehouse/locale/django.pot
+++ b/archaeological_warehouse/locale/django.pot
@@ -36,7 +36,7 @@ msgstr ""
msgid "Town"
msgstr ""
-#: forms.py:79 views.py:98
+#: forms.py:79 views.py:100
msgid "Warehouse search"
msgstr ""
@@ -105,7 +105,7 @@ msgstr ""
msgid "This ID already exists for this warehouse."
msgstr ""
-#: forms.py:231 forms.py:237 views.py:131
+#: forms.py:231 forms.py:237 views.py:142
msgid "Container search"
msgstr ""
@@ -117,7 +117,7 @@ msgstr ""
msgid "Add a new container"
msgstr ""
-#: forms.py:244 ishtar_menu.py:36 views.py:93
+#: forms.py:244 ishtar_menu.py:36 views.py:95
msgid "Packaging"
msgstr ""
@@ -273,27 +273,27 @@ msgstr ""
msgid "Container localisations"
msgstr ""
-#: views.py:110
+#: views.py:112
msgid "Warehouse creation"
msgstr ""
-#: views.py:119
+#: views.py:121
msgid "Warehouse modification"
msgstr ""
-#: views.py:126
+#: views.py:137
msgid "Warehouse deletion"
msgstr ""
-#: views.py:142
+#: views.py:153
msgid "Container creation"
msgstr ""
-#: views.py:151
+#: views.py:162
msgid "Container modification"
msgstr ""
-#: views.py:158
+#: views.py:177
msgid "Container deletion"
msgstr ""
diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po
index 47a9f5333..9cdf05399 100644
--- a/translations/fr/archaeological_context_records.po
+++ b/translations/fr/archaeological_context_records.po
@@ -85,9 +85,9 @@ msgstr "Description"
msgid "General comment"
msgstr "Commentaire général"
-#: forms.py:145
-msgid "Excavation technic"
-msgstr ""
+#: forms.py:145 models.py:255
+msgid "Excavation technique"
+msgstr "Méthode de fouille"
#: forms.py:146 models.py:215
msgid "Length (m)"
@@ -387,10 +387,6 @@ msgstr ""
msgid "Estimation of a \"Terminus Post Quem\""
msgstr "Estimation d'un « Terminus Post Quem »."
-#: models.py:255
-msgid "Excavation technique"
-msgstr "Méthode de fouille"
-
#: models.py:258
msgid "Point"
msgstr "Point"
diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po
index 9bdbbeb57..8aa993d5d 100644
--- a/translations/fr/archaeological_finds.po
+++ b/translations/fr/archaeological_finds.po
@@ -538,7 +538,7 @@ msgstr "Réf. interne"
#: forms_treatments.py:358 forms_treatments.py:415 models_treatments.py:91
#: templates/ishtar/sheet_find.html:86 templates/ishtar/sheet_find.html:128
-#: templates/ishtar/sheet_find.html:227
+#: templates/ishtar/sheet_find.html:228
msgid "Type"
msgstr "Type"
@@ -1281,15 +1281,15 @@ msgstr "Z :"
msgid "SRID:"
msgstr "SRID :"
-#: templates/ishtar/sheet_find.html:226
+#: templates/ishtar/sheet_find.html:227
msgid "Title"
msgstr "Titre"
-#: templates/ishtar/sheet_find.html:228
+#: templates/ishtar/sheet_find.html:229
msgid "Authors"
msgstr "Auteurs"
-#: templates/ishtar/sheet_find.html:229
+#: templates/ishtar/sheet_find.html:230
msgid "Link"
msgstr "Lien"
diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po
index 737ebc29e..af55782dc 100644
--- a/translations/fr/archaeological_operations.po
+++ b/translations/fr/archaeological_operations.po
@@ -6,25 +6,26 @@
# Valérie-Emma Leroux , 2016. #zanata
# Étienne Loks , 2016. #zanata
# Valérie-Emma Leroux , 2017. #zanata
+# Étienne Loks , 2017. #zanata
msgid ""
msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2017-03-15 07:12-0400\n"
-"Last-Translator: Valérie-Emma Leroux \n"
+"PO-Revision-Date: 2017-03-16 05:04-0400\n"
+"Last-Translator: Étienne Loks \n"
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
"X-Generator: Zanata 3.9.6\n"
#: forms.py:69 forms.py:371 forms.py:1013 forms.py:1035 forms.py:1039
-#: models.py:1241 templates/ishtar/sheet_operation.html:146
+#: models.py:1247 templates/ishtar/sheet_operation.html:151
#: templates/ishtar/blocks/window_tables/parcels.html:10
msgid "Parcels"
msgstr "Parcelles"
-#: forms.py:72 forms.py:205 forms.py:989 models.py:1227
+#: forms.py:72 forms.py:205 forms.py:989 models.py:1233
#: templates/ishtar/blocks/window_tables/parcels.html:7
#: templates/ishtar/dashboards/dashboard_operation.html:432
#: templates/ishtar/dashboards/dashboard_operation.html:446
@@ -34,21 +35,21 @@ msgid "Town"
msgstr "Commune"
#: forms.py:74 forms.py:455 forms.py:756 forms.py:1259 models.py:272
-#: models.py:1033 models.py:1225
+#: models.py:1039 models.py:1231
#: templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Year"
msgstr "Année"
-#: forms.py:77 models.py:1228
+#: forms.py:77 models.py:1234
#: templates/ishtar/blocks/window_tables/parcels.html:9
msgid "Section"
msgstr "Section"
-#: forms.py:80 models.py:1230
+#: forms.py:80 models.py:1236
msgid "Parcel number"
msgstr "Numéro de parcelle"
-#: forms.py:82 models.py:1232 models.py:1249 models.py:1298
+#: forms.py:82 models.py:1238 models.py:1255 models.py:1304
msgid "Public domain"
msgstr "Domaine public"
@@ -84,8 +85,8 @@ msgstr "Il y a des parcelles identiques."
msgid "Relation type"
msgstr "Type de relation"
-#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:843 models.py:878
-#: models.py:911 models.py:1015 models.py:1224 wizards.py:344 wizards.py:355
+#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:849 models.py:884
+#: models.py:917 models.py:1021 models.py:1230 wizards.py:344 wizards.py:355
#: templates/ishtar/sheet_operation.html:4
msgid "Operation"
msgstr "Opération"
@@ -122,7 +123,7 @@ msgstr "Identifiant numérique"
msgid "Parcel (section/number/public domain)"
msgstr "Parcelle (section/numéro/domaine public)"
-#: forms.py:465 forms.py:1273 models.py:844
+#: forms.py:465 forms.py:1273 models.py:850
#: templates/ishtar/dashboards/dashboard_operation.html:390
#: templates/ishtar/dashboards/dashboard_operation.html:411
#: templates/ishtar/dashboards/dashboard_operation.html:643
@@ -153,7 +154,7 @@ msgstr "Est ouvert ?"
msgid "In charge"
msgstr "Responsable du suivi scientifique"
-#: forms.py:487 models.py:1009
+#: forms.py:487 models.py:1015
msgid "Scientist in charge"
msgstr "Responsable scientifique"
@@ -259,7 +260,7 @@ msgstr "Rechercher une opération"
msgid "Associated file"
msgstr "Dossier associé"
-#: forms.py:642 forms.py:937 models.py:510 models.py:910 models.py:1020
+#: forms.py:642 forms.py:937 models.py:516 models.py:916 models.py:1026
#: wizards.py:80
msgid "Archaeological file"
msgstr "Dossier archéologique"
@@ -353,7 +354,7 @@ msgstr "Référence de l'opérateur"
msgid "Total surface (m2)"
msgstr "Surface totale (m2)"
-#: forms.py:804 models.py:54 models.py:256 models.py:1437
+#: forms.py:804 models.py:54 models.py:256 models.py:1443
msgid "Start date"
msgstr "Date de début"
@@ -411,7 +412,7 @@ msgstr ""
msgid "Bad operation code"
msgstr "Mauvais code d'opération"
-#: forms.py:933 models.py:525 models.py:873
+#: forms.py:933 models.py:531 models.py:879
msgid "Operation code"
msgstr "Code de l'opération"
@@ -452,11 +453,11 @@ msgstr "Prescription sur une vaste surface"
msgid "Prescription on geoarchaeological context"
msgstr "Prescription sur un contexte géoarchéologique"
-#: forms.py:987 forms.py:1009 models.py:284 models.py:1043
+#: forms.py:987 forms.py:1009 models.py:284 models.py:1049
msgid "Towns"
msgstr "Communes"
-#: forms.py:1016 models.py:1240 models.py:1435
+#: forms.py:1016 models.py:1246 models.py:1441
msgid "Parcel"
msgstr "Parcelle"
@@ -468,8 +469,8 @@ msgstr "Types de vestige"
msgid "Remain type"
msgstr "Type de vestige"
-#: forms.py:1088 templates/ishtar/sheet_operation.html:166
-#: templates/ishtar/sheet_operation.html:197
+#: forms.py:1088 templates/ishtar/sheet_operation.html:171
+#: templates/ishtar/sheet_operation.html:202
msgid "Period"
msgstr "Période"
@@ -502,7 +503,7 @@ msgstr "Voulez-vous clore cette opération ?"
msgid "Would you like to delete this operation?"
msgstr "Voulez-vous supprimer cette opération ?"
-#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:880 models.py:1000
+#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:886 models.py:1006
msgid "Index"
msgstr "Index"
@@ -531,7 +532,7 @@ msgstr "Rechercher une documentation"
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
-#: forms.py:1267 forms.py:1334 models.py:924 models.py:994
+#: forms.py:1267 forms.py:1334 models.py:930 models.py:1000
msgid "Act type"
msgstr "Type d'acte"
@@ -539,7 +540,7 @@ msgstr "Type d'acte"
msgid "Indexed?"
msgstr "Indexé ?"
-#: forms.py:1274 forms.py:1339 models.py:1034
+#: forms.py:1274 forms.py:1339 models.py:1040
#: templates/ishtar/blocks/window_tables/administrativacts.html:10
msgid "Object"
msgstr "Objet"
@@ -552,7 +553,7 @@ msgstr "Rechercher un acte administratif"
msgid "You should select an administrative act."
msgstr "Vous devez sélectionner un acte administratif."
-#: forms.py:1342 models.py:1031
+#: forms.py:1342 models.py:1037
msgid "Signature date"
msgstr "Date de signature"
@@ -610,7 +611,7 @@ msgstr "Clôture"
msgid "Deletion"
msgstr "Suppression"
-#: ishtar_menu.py:59 models.py:1050
+#: ishtar_menu.py:59 models.py:1056
#: templates/ishtar/sheet_administrativeact.html:4
msgid "Administrative act"
msgstr "Acte administratif"
@@ -640,11 +641,11 @@ msgstr "Informations générales"
msgid "Operations"
msgstr "Opérations"
-#: models.py:53 models.py:71 models.py:1907
+#: models.py:53 models.py:71 models.py:1913
msgid "Order"
msgstr "Ordre"
-#: models.py:55 models.py:1438
+#: models.py:55 models.py:1444
msgid "End date"
msgstr "Date de fin"
@@ -760,7 +761,7 @@ msgstr "Date de clôture"
msgid "In charge scientist"
msgstr "Responsable du suivi scientifique"
-#: models.py:277 models.py:1220
+#: models.py:277 models.py:1226
msgid "File"
msgstr "Dossier"
@@ -823,252 +824,252 @@ msgstr "OPE"
msgid "Intercommunal"
msgstr "Intercommunal"
-#: models.py:511
+#: models.py:517
msgid "Code patriarche"
msgstr "Code patriarche"
-#: models.py:551
+#: models.py:557
msgid "This operation code already exists for this year"
msgstr "Ce code d'opération existe déjà pour cette année."
-#: models.py:576
+#: models.py:582
msgid "Number of parcels"
msgstr "Nombre de parcelles"
-#: models.py:594
+#: models.py:600
msgid "Number of administrative acts"
msgstr "Nombre d'actes administratifs"
-#: models.py:602
+#: models.py:608
msgid "Number of indexed administrative acts"
msgstr "Nombre d'actes administratifs indexés"
-#: models.py:610
+#: models.py:616
msgid "Number of context records"
msgstr "Nombre d'Unités d'Enregistrement"
-#: models.py:646
+#: models.py:652
msgid "Number of finds"
msgstr "Nombre d'éléments de mobilier"
-#: models.py:691
+#: models.py:697
msgid "No type"
msgstr "Pas de type"
-#: models.py:722
+#: models.py:728
msgid "Number of sources"
msgstr "Nombre de documents"
-#: models.py:764 templates/ishtar/dashboards/dashboard_operation.html:309
+#: models.py:770 templates/ishtar/dashboards/dashboard_operation.html:309
#: templates/ishtar/dashboards/dashboard_operation.html:575
#: templates/ishtar/dashboards/dashboard_operation.html:611
msgid "Mean"
msgstr "Moyenne"
-#: models.py:814
+#: models.py:820
msgid "Inverse relation"
msgstr "Relation inverse"
-#: models.py:818
+#: models.py:824
msgid "Operation relation type"
msgstr "Type de relation entre opérations"
-#: models.py:819
+#: models.py:825
msgid "Operation relation types"
msgstr "Types de relation entre opérations"
-#: models.py:832
+#: models.py:838
msgid "Operation record relation"
msgstr "Relation entre opérations"
-#: models.py:833
+#: models.py:839
msgid "Operation record relations"
msgstr "Relations entre opérations"
-#: models.py:872
+#: models.py:878
msgid "Operation year"
msgstr "Année de l'opération"
-#: models.py:874
+#: models.py:880
msgid "Document code"
msgstr "Code du document"
-#: models.py:884
+#: models.py:890
msgid "Operation documentation"
msgstr "Documentation d'une opération"
-#: models.py:885
+#: models.py:891
msgid "Operation documentations"
msgstr "Documentations des opérations"
-#: models.py:888
+#: models.py:894
msgid "Can view all Operation sources"
msgstr "Peut voir toutes les Documentations d'opération"
-#: models.py:890
+#: models.py:896
msgid "Can view own Operation source"
msgstr "Peut voir sa propre Documentation d'opération"
-#: models.py:892
+#: models.py:898
msgid "Can add own Operation source"
msgstr "Peut ajouter sa propre Documentation d'opération"
-#: models.py:894
+#: models.py:900
msgid "Can change own Operation source"
msgstr "Peut modifier sa propre Documentation d'opération"
-#: models.py:896
+#: models.py:902
msgid "Can delete own Operation source"
msgstr "Peut supprimer sa propre Documentation d'opération"
-#: models.py:912 models.py:1025
+#: models.py:918 models.py:1031
msgid "Treatment request"
msgstr "Demande de traitement"
-#: models.py:913 models.py:1030
+#: models.py:919 models.py:1036
msgid "Treatment"
msgstr "Traitement"
-#: models.py:915
+#: models.py:921
msgid "Intended to"
msgstr "Destiné à"
-#: models.py:917
+#: models.py:923
msgid "Code"
msgstr "Code"
-#: models.py:920
+#: models.py:926
msgid "Associated template"
msgstr "Patron associé"
-#: models.py:921
+#: models.py:927
msgid "Indexed"
msgstr "Indexé"
-#: models.py:925
+#: models.py:931
msgid "Act types"
msgstr "Types d'acte"
-#: models.py:991 models.py:1071
+#: models.py:997 models.py:1077
#: templates/ishtar/blocks/window_tables/administrativacts.html:7
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
msgid "Ref."
msgstr "Réf."
-#: models.py:998
+#: models.py:1004
msgid "Person in charge of the operation"
msgstr "Responsable d'opération"
-#: models.py:1004
+#: models.py:1010
msgid "Archaeological preventive operator"
msgstr "Opérateur d'archéologie préventive"
-#: models.py:1012
+#: models.py:1018
msgid "Signatory"
msgstr "Signataire"
-#: models.py:1040
+#: models.py:1046
msgid "Departments"
msgstr "Départements"
-#: models.py:1041
+#: models.py:1047
msgid "Cached values get from associated departments"
msgstr "Valeur en cache des départements associés"
-#: models.py:1044
+#: models.py:1050
msgid "Cached values get from associated towns"
msgstr "Valeur en cache des communes associées"
-#: models.py:1051 templates/ishtar/sheet_operation.html:104
-#: templates/ishtar/sheet_operation.html:140
+#: models.py:1057 templates/ishtar/sheet_operation.html:104
+#: templates/ishtar/sheet_operation.html:145
msgid "Administrative acts"
msgstr "Actes administratifs"
-#: models.py:1054
+#: models.py:1060
msgid "Can view all Administrative acts"
msgstr "Peut voir tous les Actes administratifs"
-#: models.py:1056
+#: models.py:1062
msgid "Can view own Administrative act"
msgstr "Peut voir son propre Acte administratif"
-#: models.py:1058
+#: models.py:1064
msgid "Can add own Administrative act"
msgstr "Peut ajouter son propre Acte administratif"
-#: models.py:1060
+#: models.py:1066
msgid "Can change own Administrative act"
msgstr "Peut modifier son propre Acte administratif"
-#: models.py:1062
+#: models.py:1068
msgid "Can delete own Administrative act"
msgstr "Peut supprimer son propre Acte administratif"
-#: models.py:1165
+#: models.py:1171
msgid "This index already exists for this year"
msgstr "Cet index existe déjà pour cette année."
-#: models.py:1233
+#: models.py:1239
msgid "External ID"
msgstr "ID externe"
-#: models.py:1236
+#: models.py:1242
msgid "External ID is set automatically"
msgstr "L'identifiant externe est configuré automatiquement"
-#: models.py:1237
+#: models.py:1243
msgid "Address - Locality"
msgstr "Adresse - Lieu-dit"
-#: models.py:1433
+#: models.py:1439
msgid "Owner"
msgstr "Propriétaire"
-#: models.py:1441
+#: models.py:1447
msgid "Parcel owner"
msgstr "Propriétaire de parcelle"
-#: models.py:1442
+#: models.py:1448
msgid "Parcel owners"
msgstr "Propriétaires de parcelle"
-#: models.py:1468
+#: models.py:1474
msgid "Recorded"
msgstr "Enregistré"
-#: models.py:1469
+#: models.py:1475
msgid "Effective"
msgstr "Effectif"
-#: models.py:1470
+#: models.py:1476
msgid "Active"
msgstr "Actif"
-#: models.py:1471
+#: models.py:1477
msgid "Field completed"
msgstr "Terrain achevé"
-#: models.py:1472
+#: models.py:1478
msgid "Associated report"
msgstr "Rapport associé"
-#: models.py:1473
+#: models.py:1479
msgid "Closed"
msgstr "Clos"
-#: models.py:1474
+#: models.py:1480
msgid "Documented and closed"
msgstr "Documenté et clos"
-#: models.py:1908
+#: models.py:1914
msgid "Is preventive"
msgstr "Préventif"
-#: models.py:1911
+#: models.py:1917
msgid "Operation type old"
msgstr "Type d'opération - ancien"
-#: models.py:1912
+#: models.py:1918
msgid "Operation types old"
msgstr "Types d'opération - ancien"
@@ -1194,43 +1195,47 @@ msgid "Document from this operation"
msgstr "Documents de cette opération"
#: templates/ishtar/sheet_operation.html:114
-#: templates/ishtar/sheet_operation.html:151
+#: templates/ishtar/sheet_operation.html:156
msgid "Context records"
msgstr "Unités d'Enregistrement"
-#: templates/ishtar/sheet_operation.html:118
+#: templates/ishtar/sheet_operation.html:119
msgid "Context record relations"
msgstr "Relations entre Unités d'Enregistrement"
-#: templates/ishtar/sheet_operation.html:123
+#: templates/ishtar/sheet_operation.html:124
msgid "Documents from associated context records"
msgstr "Documents des Unités d'Enregistrement associées"
-#: templates/ishtar/sheet_operation.html:128
-#: templates/ishtar/sheet_operation.html:174
+#: templates/ishtar/sheet_operation.html:129
+#: templates/ishtar/sheet_operation.html:179
msgid "Finds"
msgstr "Mobilier"
-#: templates/ishtar/sheet_operation.html:133
+#: templates/ishtar/sheet_operation.html:134
msgid "Documents from associated finds"
msgstr "Documents du mobilier associé"
-#: templates/ishtar/sheet_operation.html:138
+#: templates/ishtar/sheet_operation.html:139
+msgid "Associated containers"
+msgstr "Contenants associés"
+
+#: templates/ishtar/sheet_operation.html:143
msgid "Statistics"
msgstr "Statistiques"
-#: templates/ishtar/sheet_operation.html:158
-#: templates/ishtar/sheet_operation.html:212
+#: templates/ishtar/sheet_operation.html:163
+#: templates/ishtar/sheet_operation.html:217
#: templates/ishtar/blocks/window_tables/administrativacts.html:8
msgid "Type"
msgstr "Type"
-#: templates/ishtar/sheet_operation.html:158
-#: templates/ishtar/sheet_operation.html:166
-#: templates/ishtar/sheet_operation.html:181
-#: templates/ishtar/sheet_operation.html:189
-#: templates/ishtar/sheet_operation.html:197
-#: templates/ishtar/sheet_operation.html:212
+#: templates/ishtar/sheet_operation.html:163
+#: templates/ishtar/sheet_operation.html:171
+#: templates/ishtar/sheet_operation.html:186
+#: templates/ishtar/sheet_operation.html:194
+#: templates/ishtar/sheet_operation.html:202
+#: templates/ishtar/sheet_operation.html:217
#: templates/ishtar/dashboards/dashboard_operation.html:18
#: templates/ishtar/dashboards/dashboard_operation.html:164
#: templates/ishtar/dashboards/dashboard_operation.html:432
@@ -1239,19 +1244,19 @@ msgstr "Type"
msgid "Number"
msgstr "Nombre"
-#: templates/ishtar/sheet_operation.html:181
+#: templates/ishtar/sheet_operation.html:186
msgid "Material type"
msgstr "Type de matériau"
-#: templates/ishtar/sheet_operation.html:189
+#: templates/ishtar/sheet_operation.html:194
msgid "Object type"
msgstr "Type d'objet"
-#: templates/ishtar/sheet_operation.html:205
+#: templates/ishtar/sheet_operation.html:210
msgid "Sources"
msgstr "Documents"
-#: templates/ishtar/sheet_operation.html:221
+#: templates/ishtar/sheet_operation.html:226
msgid "Finds by context records"
msgstr "Mobilier par Unités d'Enregistrement"
diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po
index 978153b62..689d122df 100644
--- a/translations/fr/archaeological_warehouse.po
+++ b/translations/fr/archaeological_warehouse.po
@@ -45,7 +45,7 @@ msgstr "Type de dépôt"
msgid "Town"
msgstr "Commune"
-#: forms.py:79 views.py:98
+#: forms.py:79 views.py:100
msgid "Warehouse search"
msgstr "Rechercher un dépôt"
@@ -114,7 +114,7 @@ msgstr "Index"
msgid "This ID already exists for this warehouse."
msgstr "Cet identifiant existe déjà pour ce dépôt."
-#: forms.py:231 forms.py:237 views.py:131
+#: forms.py:231 forms.py:237 views.py:142
msgid "Container search"
msgstr "Rechercher un contenant"
@@ -126,7 +126,7 @@ msgstr "Vous devez sélectionner un contenant."
msgid "Add a new container"
msgstr "Ajouter un nouveau contenant"
-#: forms.py:244 ishtar_menu.py:36 views.py:93
+#: forms.py:244 ishtar_menu.py:36 views.py:95
msgid "Packaging"
msgstr "Conditionnement"
@@ -282,27 +282,27 @@ msgstr "Localisation de contenant"
msgid "Container localisations"
msgstr "Localisations de contenant"
-#: views.py:110
+#: views.py:112
msgid "Warehouse creation"
msgstr "Ajouter un dépôt"
-#: views.py:119
+#: views.py:121
msgid "Warehouse modification"
msgstr "Modifier un dépôt"
-#: views.py:126
+#: views.py:137
msgid "Warehouse deletion"
msgstr "Supprimer un dépôt"
-#: views.py:142
+#: views.py:153
msgid "Container creation"
msgstr "Ajouter un contenant"
-#: views.py:151
+#: views.py:162
msgid "Container modification"
msgstr "Modifier un contenant"
-#: views.py:158
+#: views.py:177
msgid "Container deletion"
msgstr "Supprimer un contenant"
--
cgit v1.2.3
From 9406a2043afe25ebc08e65b9cc223dd999bc003f Mon Sep 17 00:00:00 2001
From: Étienne Loks
Date: Fri, 17 Mar 2017 09:56:02 +0100
Subject: Adapt tests for localisation
---
archaeological_context_records/tests.py | 5 ++++-
archaeological_operations/tests.py | 11 +++++------
2 files changed, 9 insertions(+), 7 deletions(-)
(limited to 'archaeological_context_records')
diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py
index c9795fce7..6bb293e4d 100644
--- a/archaeological_context_records/tests.py
+++ b/archaeological_context_records/tests.py
@@ -92,7 +92,10 @@ class ImportContextRecordTest(ImportTest, TestCase):
# set for a column that references Dating
impt.importation()
self.assertEqual(len(impt.errors), 4)
- self.assertIn("doesn't exist in the database.", impt.errors[0]['error'])
+ self.assertTrue(
+ "doesn't exist in the database." in impt.errors[0]['error'] or
+ "n'existe pas dans la base" in impt.errors[0]['error']
+ )
# retry with only Dating (no context record)
for cr in models.ContextRecord.objects.all():
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 52a14ce44..9d5b9c616 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -17,9 +17,6 @@
# See the file COPYING for details.
-"""
-Unit tests
-"""
import json
import datetime
@@ -245,7 +242,10 @@ class ImportOperationTest(ImportTest, TestCase):
self.init_ope_targetkey(imp=impt)
impt.importation()
self.assertEqual(len(impt.errors), 2)
- self.assertIn("Importer configuration error", impt.errors[0]['error'])
+ self.assertTrue(
+ "Importer configuration error" in impt.errors[0]['error'] or
+ "Erreur de configuration de l\'importeur" in impt.errors[0]['error']
+ )
def test_model_limitation(self):
importer, form = self.init_ope_import()
@@ -665,7 +665,6 @@ class OperationInitTest(object):
self.operations.pop(0)
return self.create_operation()[-1]
-
def tearDown(self):
# cleanup for further test
if hasattr(self, 'user'):
@@ -1195,7 +1194,7 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase):
def post_first_wizard(test_object, final_step_response):
test_object.assertEqual(models.Operation.objects.count(),
- test_object.operation_number)
+ test_object.operation_number)
operation = models.Operation.objects.get(
pk=test_object.operations[0].pk)
test_object.assertEqual(operation.operation_type.pk, 2)
--
cgit v1.2.3
From abe0902d8c88b1e1acc7a1bff666109f5d18cfe8 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 "" "
" %}
{% endif %}
@@ -42,9 +44,9 @@
{% trans "Interpretation"%}
{% 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 b6f23adf3800a2c91e03aae25d30b87c8219f2e4 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)."
"p>"
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)."
"p>"
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)."
"p>"
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)."
@@ -132,112 +139,112 @@ msgstr ""
"
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)."
@@ -190,173 +189,182 @@ msgstr ""
"
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)."
"p>"
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