From e2321b650989bfb79975a6ba5b6758d36d0189d0 Mon Sep 17 00:00:00 2001
From: Valérie-Emma Leroux {{ item.parcel.short_label }} {{ item.label|default:"" }} {{item.full_internal_ref|default:''}} {{item.internal_reference|default:''}} {{item.name|default:''}} {% for base_find in item.base_finds.all %}{% if forloop.counter0 %} – {% endif %}{{base_find.short_id}}{% endfor %} {{ item.administrative_index|default:"" }} {{ item.contextrecord|default:"" }} {{base_find.complete_id }} {{base_find.short_id }}
+
+
+ {{base_find.external_id|default:''}}
+
+ {% if item.year or item.operation_code %}{{item.year|default:''}}-{{item.operation_code|default:''}}{% endif %}{% if item.code_patriarche %} – OA{{item.code_patriarche}}{% endif %}
{{item.common_name|default:''}} {{ item.reference|default:"" }} {{ item.container_type|default:"" }} {{ item.name|default:"" }} {{ item.warehouse_type|default:"" }}
+
+
+ {{item.external_id|default:''}}
+
+ Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)."
"p>"
msgstr ""
-#: forms.py:222
+#: forms.py:230
msgid "This ID already exists for this operation."
msgstr ""
-#: forms.py:228 forms.py:255 models.py:67
+#: forms.py:236 forms.py:263 models.py:67
msgid "Dating"
msgstr ""
-#: forms.py:234 models.py:57
+#: forms.py:242 models.py:57
msgid "Start date"
msgstr ""
-#: forms.py:235 models.py:58 models.py:205
+#: forms.py:243 models.py:58 models.py:214
msgid "End date"
msgstr ""
-#: forms.py:236 models.py:61
+#: forms.py:244 models.py:61
msgid "Quality"
msgstr ""
-#: forms.py:237 models.py:39 models.py:59
+#: forms.py:245 models.py:39 models.py:59
msgid "Dating type"
msgstr ""
-#: forms.py:264 ishtar_menu.py:29 models.py:595
+#: forms.py:272 ishtar_menu.py:29 models.py:607
msgid "Context record"
msgstr ""
-#: forms.py:285
+#: forms.py:293
msgid "Relations"
msgstr ""
-#: forms.py:289 forms.py:297 models.py:223
-#: templates/ishtar/sheet_contextrecord.html:51
+#: forms.py:297 forms.py:305 models.py:232
+#: templates/ishtar/sheet_contextrecord.html:42
msgid "Interpretation"
msgstr ""
-#: forms.py:293
+#: forms.py:301
msgid "Comments on dating"
msgstr ""
-#: forms.py:295 models.py:222
+#: forms.py:303 models.py:231
msgid "Filling"
msgstr ""
-#: forms.py:299 models.py:243
+#: forms.py:307 models.py:252
msgid "Activity"
msgstr ""
-#: forms.py:301 models.py:241
+#: forms.py:309 models.py:250
msgid "Identification"
msgstr ""
-#: forms.py:303 models.py:226
+#: forms.py:311 models.py:235
msgid "TAQ"
msgstr ""
-#: forms.py:304 models.py:230
+#: forms.py:312 models.py:239
msgid "Estimated TAQ"
msgstr ""
-#: forms.py:306 models.py:233
+#: forms.py:314 models.py:242
msgid "TPQ"
msgstr ""
-#: forms.py:307 models.py:237
+#: forms.py:315 models.py:246
msgid "Estimated TPQ"
msgstr ""
-#: forms.py:322
+#: forms.py:330
msgid "Operation search"
msgstr ""
-#: forms.py:324
+#: forms.py:332
msgid "You should select an operation."
msgstr ""
-#: forms.py:329
+#: forms.py:337
msgid "Would you like to delete this context record?"
msgstr ""
-#: forms.py:338
+#: forms.py:346
msgid "You should select a context record."
msgstr ""
-#: forms.py:343
+#: forms.py:351
msgid "Year of the operation"
msgstr ""
-#: forms.py:345
+#: forms.py:353
msgid "Numeric reference"
msgstr ""
-#: forms.py:351
+#: forms.py:359
msgid "Town of the operation"
msgstr ""
-#: forms.py:353
+#: forms.py:361
msgid "Period of the context record"
msgstr ""
-#: forms.py:368
+#: forms.py:376
msgid "Documentation search"
msgstr ""
-#: forms.py:370
+#: forms.py:378
msgid "You should select a document."
msgstr ""
@@ -296,180 +300,188 @@ msgstr ""
msgid "Identification Types"
msgstr ""
-#: models.py:155 models.py:537
-msgid "Periods"
+#: models.py:125
+msgid "Excavation technique type"
msgstr ""
-#: models.py:156
-msgid "Town"
+#: models.py:126
+msgid "Excavation technique types"
msgstr ""
-#: models.py:184
-msgid "Parcel (town)"
+#: models.py:163 models.py:549
+msgid "Periods"
msgstr ""
-#: models.py:185
+#: models.py:164
+msgid "Datings (period)"
+msgstr ""
+
+#: models.py:165
msgid "Related context records"
msgstr ""
-#: models.py:187
+#: models.py:168
msgid "Parcel (external ID)"
msgstr ""
-#: models.py:188
-msgid "Datings (period)"
+#: models.py:169 models.py:170
+msgid "Parcel (town)"
msgstr ""
-#: models.py:189
+#: models.py:171
msgid "Parcel (year)"
msgstr ""
-#: models.py:193
+#: models.py:202
msgid "External ID"
msgstr ""
-#: models.py:195
+#: models.py:204
msgid "External ID is set automatically"
msgstr ""
-#: models.py:203
+#: models.py:212
msgid "Date d'ouverture"
msgstr ""
-#: models.py:213
+#: models.py:222
msgid "A short description of the location of the context record"
msgstr ""
-#: models.py:216
+#: models.py:225
msgid "Comment on datings"
msgstr ""
-#: models.py:227
+#: models.py:236
msgid ""
"\"Terminus Ante Quem\" the context record can't have been created after this "
"date"
msgstr ""
-#: models.py:231
+#: models.py:240
msgid "Estimation of a \"Terminus Ante Quem\""
msgstr ""
-#: models.py:234
+#: models.py:243
msgid ""
"\"Terminus Post Quem\" the context record can't have been created before "
"this date"
msgstr ""
-#: models.py:238
+#: models.py:247
msgid "Estimation of a \"Terminus Post Quem\""
msgstr ""
-#: models.py:246
+#: models.py:255
+msgid "Excavation technique"
+msgstr ""
+
+#: models.py:258
msgid "Point"
msgstr ""
-#: models.py:247
+#: models.py:259
msgid "Polygon"
msgstr ""
-#: models.py:248
+#: models.py:260
msgid "Cached name"
msgstr ""
-#: models.py:252 models.py:253 templates/ishtar/sheet_contextrecord.html:4
+#: models.py:264 models.py:265 templates/ishtar/sheet_contextrecord.html:4
msgid "Context Record"
msgstr ""
-#: models.py:255
+#: models.py:267
msgid "Can view all Context Records"
msgstr ""
-#: models.py:257
+#: models.py:269
msgid "Can view own Context Record"
msgstr ""
-#: models.py:259
+#: models.py:271
msgid "Can add own Context Record"
msgstr ""
-#: models.py:261
+#: models.py:273
msgid "Can change own Context Record"
msgstr ""
-#: models.py:263
+#: models.py:275
msgid "Can delete own Context Record"
msgstr ""
-#: models.py:273
+#: models.py:285
msgctxt "short"
msgid "Context record"
msgstr ""
-#: models.py:467
+#: models.py:479
msgid "Inverse relation"
msgstr ""
-#: models.py:471 models.py:494 models.py:532
+#: models.py:483 models.py:506 models.py:544
msgid "Relation type"
msgstr ""
-#: models.py:472
+#: models.py:484
msgid "Relation types"
msgstr ""
-#: models.py:489
+#: models.py:501
msgid "ID (left)"
msgstr ""
-#: models.py:490
+#: models.py:502
msgid "Context record type (left)"
msgstr ""
-#: models.py:491
+#: models.py:503
msgid "Parcel (left)"
msgstr ""
-#: models.py:492
+#: models.py:504
msgid "Description (left)"
msgstr ""
-#: models.py:493
+#: models.py:505
msgid "Periods (left)"
msgstr ""
-#: models.py:495
+#: models.py:507
msgid "ID (right)"
msgstr ""
-#: models.py:496
+#: models.py:508
msgid "Context record type (right)"
msgstr ""
-#: models.py:497
+#: models.py:509
msgid "Parcel (right)"
msgstr ""
-#: models.py:498
+#: models.py:510
msgid "Description (right)"
msgstr ""
-#: models.py:499
+#: models.py:511
msgid "Periods (right)"
msgstr ""
-#: models.py:508
+#: models.py:520
msgid "Record relation"
msgstr ""
-#: models.py:509
+#: models.py:521
msgid "Record relations"
msgstr ""
-#: models.py:592
+#: models.py:604
msgid "Context record documentation"
msgstr ""
-#: models.py:593
+#: models.py:605
msgid "Context record documentations"
msgstr ""
@@ -501,86 +513,86 @@ msgstr ""
msgid "Context record: source deletion"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:17
+#: templates/ishtar/sheet_contextrecord.html:18
msgid "Complete ID:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:17
-msgid "Temporary ID:"
-msgstr ""
-
#: templates/ishtar/sheet_contextrecord.html:18
-msgid "Creation:"
-msgstr ""
-
-#: templates/ishtar/sheet_contextrecord.html:25
-msgid "Modification:"
+msgid "Temporary ID:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:63
+#: templates/ishtar/sheet_contextrecord.html:54
msgid "Datations"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:72
+#: templates/ishtar/sheet_contextrecord.html:63
msgid "Context record relations"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:79
+#: templates/ishtar/sheet_contextrecord.html:70
msgid "Operation summary"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:81
+#: templates/ishtar/sheet_contextrecord.html:72
msgid "Patriarche OA code not yet recorded!"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:88
+#: templates/ishtar/sheet_contextrecord.html:76
+msgid "Numerical reference"
+msgstr ""
+
+#: templates/ishtar/sheet_contextrecord.html:80
msgid "State:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:88
+#: templates/ishtar/sheet_contextrecord.html:80
msgid "Active file"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:88
+#: templates/ishtar/sheet_contextrecord.html:80
msgid "Closed operation"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:90
+#: templates/ishtar/sheet_contextrecord.html:82
msgid "Closing date:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:90
+#: templates/ishtar/sheet_contextrecord.html:82
msgid "by"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:98
+#: templates/ishtar/sheet_contextrecord.html:90
msgid "Localisation"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:99
+#: templates/ishtar/sheet_contextrecord.html:91
msgid "Towns:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:100
+#: templates/ishtar/sheet_contextrecord.html:92
msgid "Related operation:"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:102
+#: templates/ishtar/sheet_contextrecord.html:94
msgid "No operation linked to this context unit!"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:105
+#: templates/ishtar/sheet_contextrecord.html:97
msgid "Document from this context record"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:110
+#: templates/ishtar/sheet_contextrecord.html:102
msgid "Finds"
msgstr ""
-#: templates/ishtar/sheet_contextrecord.html:115
+#: templates/ishtar/sheet_contextrecord.html:107
msgid "Documents from associated finds"
msgstr ""
#: templates/ishtar/sheet_contextrecordsource.html:4
msgid "Context record source"
msgstr ""
+
+#: templates/ishtar/sheet_contextrecordsource.html:11
+msgid "Related context record"
+msgstr ""
diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot
index 966c983c8..1e513ae12 100644
--- a/archaeological_files/locale/django.pot
+++ b/archaeological_files/locale/django.pot
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
#: forms.py:47 forms.py:210 forms.py:255 forms.py:396 forms.py:423
-#: models.py:108 templates/ishtar/sheet_file.html:157
+#: models.py:108 templates/ishtar/sheet_file.html:144
msgid "Year"
msgstr ""
@@ -26,7 +26,7 @@ msgstr ""
msgid "Parcel (section/number/public domain)"
msgstr ""
-#: forms.py:55 forms.py:407 forms.py:434 models.py:553
+#: forms.py:55 forms.py:407 forms.py:434 models.py:558
msgid "Department"
msgstr ""
@@ -55,11 +55,11 @@ msgid "Permit reference"
msgstr ""
#: forms.py:63 forms.py:227 forms.py:364 models.py:180
-#: templates/ishtar/sheet_file.html:110
+#: templates/ishtar/sheet_file.html:97
msgid "Comment"
msgstr ""
-#: forms.py:65 templates/ishtar/sheet_file.html:130
+#: forms.py:65 templates/ishtar/sheet_file.html:117
msgid "In charge"
msgstr ""
@@ -115,7 +115,7 @@ msgstr ""
msgid "Date before"
msgstr ""
-#: forms.py:197 templates/ishtar/sheet_file.html:14
+#: forms.py:197 templates/ishtar/sheet_file.html:19
msgid "General"
msgstr ""
@@ -164,12 +164,12 @@ msgstr ""
msgid "Total developed surface (m2)"
msgstr ""
-#: forms.py:333 templates/ishtar/sheet_file.html:100
+#: forms.py:333 templates/ishtar/sheet_file.html:87
#: templates/ishtar/dashboards/dashboard_file.html:45
msgid "Research archaeology"
msgstr ""
-#: forms.py:341 models.py:183 templates/ishtar/sheet_file.html:101
+#: forms.py:341 models.py:183 templates/ishtar/sheet_file.html:88
msgid "Departments"
msgstr ""
@@ -177,7 +177,7 @@ msgstr ""
msgid "Scientist in charge"
msgstr ""
-#: forms.py:353 models.py:186 templates/ishtar/sheet_file.html:103
+#: forms.py:353 models.py:186 templates/ishtar/sheet_file.html:90
msgid "Requested operation type"
msgstr ""
@@ -185,11 +185,11 @@ msgstr ""
msgid "Lead organization"
msgstr ""
-#: forms.py:371 models.py:196 templates/ishtar/sheet_file.html:108
+#: forms.py:371 models.py:196 templates/ishtar/sheet_file.html:95
msgid "Classified area"
msgstr ""
-#: forms.py:373 models.py:198 templates/ishtar/sheet_file.html:109
+#: forms.py:373 models.py:198 templates/ishtar/sheet_file.html:96
msgid "Protected area"
msgstr ""
@@ -363,7 +363,7 @@ msgstr ""
msgid "Main address - postal code"
msgstr ""
-#: models.py:188 templates/ishtar/sheet_file.html:104
+#: models.py:188 templates/ishtar/sheet_file.html:91
msgid "Organization"
msgstr ""
@@ -407,15 +407,15 @@ msgstr ""
msgid "FILE"
msgstr ""
-#: models.py:413
+#: models.py:418
msgid "Multi-town"
msgstr ""
-#: models.py:419
+#: models.py:424
msgid "No town"
msgstr ""
-#: models.py:552
+#: models.py:557
msgid "File"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "File: administrative act deletion"
msgstr ""
-#: wizards.py:124 templates/ishtar/sheet_file.html:122
+#: wizards.py:124 templates/ishtar/sheet_file.html:109
msgid "Associated operations"
msgstr ""
@@ -471,122 +471,114 @@ msgstr ""
msgid "Generate"
msgstr ""
-#: templates/ishtar/sheet_file.html:23
-msgid "Creation:"
-msgstr ""
-
-#: templates/ishtar/sheet_file.html:30
-msgid "Modification:"
-msgstr ""
-
-#: templates/ishtar/sheet_file.html:47
+#: templates/ishtar/sheet_file.html:34
msgid "State:"
msgstr ""
-#: templates/ishtar/sheet_file.html:47
+#: templates/ishtar/sheet_file.html:34
msgid "Active file"
msgstr ""
-#: templates/ishtar/sheet_file.html:48
+#: templates/ishtar/sheet_file.html:35
msgid "Closed file"
msgstr ""
-#: templates/ishtar/sheet_file.html:50
+#: templates/ishtar/sheet_file.html:37
msgid "Closing date:"
msgstr ""
-#: templates/ishtar/sheet_file.html:50
+#: templates/ishtar/sheet_file.html:37
msgid "by"
msgstr ""
-#: templates/ishtar/sheet_file.html:55
+#: templates/ishtar/sheet_file.html:42
msgid "Related file:"
msgstr ""
-#: templates/ishtar/sheet_file.html:60
+#: templates/ishtar/sheet_file.html:47
msgid "Localisation"
msgstr ""
-#: templates/ishtar/sheet_file.html:61
+#: templates/ishtar/sheet_file.html:48
msgid "Towns:"
msgstr ""
-#: templates/ishtar/sheet_file.html:62
+#: templates/ishtar/sheet_file.html:49
msgid "Departments:"
msgstr ""
-#: templates/ishtar/sheet_file.html:64
+#: templates/ishtar/sheet_file.html:51
msgid "Main address:"
msgstr ""
-#: templates/ishtar/sheet_file.html:65
+#: templates/ishtar/sheet_file.html:52
msgid "Complement:"
msgstr ""
-#: templates/ishtar/sheet_file.html:66
+#: templates/ishtar/sheet_file.html:53
msgid "Postal code:"
msgstr ""
-#: templates/ishtar/sheet_file.html:68
+#: templates/ishtar/sheet_file.html:55
msgid "Surface:"
msgstr ""
-#: templates/ishtar/sheet_file.html:73
+#: templates/ishtar/sheet_file.html:60
msgid "Preventive archaeological file"
msgstr ""
-#: templates/ishtar/sheet_file.html:75
+#: templates/ishtar/sheet_file.html:62
msgid "Developed surface:"
msgstr ""
-#: templates/ishtar/sheet_file.html:101 templates/ishtar/sheet_file.html:102
-#: templates/ishtar/sheet_file.html:103 templates/ishtar/sheet_file.html:104
-#: templates/ishtar/sheet_file.html:110
+#: templates/ishtar/sheet_file.html:88 templates/ishtar/sheet_file.html:89
+#: templates/ishtar/sheet_file.html:90 templates/ishtar/sheet_file.html:91
+#: templates/ishtar/sheet_file.html:97
#: templates/ishtar/dashboards/dashboard_file.html:14
msgid ":"
msgstr ""
-#: templates/ishtar/sheet_file.html:102
+#: templates/ishtar/sheet_file.html:89
msgid "Head scientist"
msgstr ""
-#: templates/ishtar/sheet_file.html:116
+#: templates/ishtar/sheet_file.html:103
msgid "Associated parcels"
msgstr ""
-#: templates/ishtar/sheet_file.html:119
+#: templates/ishtar/sheet_file.html:106
msgid "Administrative acts"
msgstr ""
-#: templates/ishtar/sheet_file.html:127 templates/ishtar/sheet_file.html:158
+#: templates/ishtar/sheet_file.html:114 templates/ishtar/sheet_file.html:145
msgid "Ref."
msgstr ""
-#: templates/ishtar/sheet_file.html:129 templates/ishtar/sheet_file.html:159
+#: templates/ishtar/sheet_file.html:116 templates/ishtar/sheet_file.html:146
msgid "Type"
msgstr ""
-#: templates/ishtar/sheet_file.html:131
+#: templates/ishtar/sheet_file.html:118
msgid "Start date"
msgstr ""
-#: templates/ishtar/sheet_file.html:132
+#: templates/ishtar/sheet_file.html:119
msgid "Excavation end date"
msgstr ""
-#: templates/ishtar/sheet_file.html:146
+#: templates/ishtar/sheet_file.html:133
msgid "No operation associated to this archaeological file"
msgstr ""
-#: templates/ishtar/sheet_file.html:152
+#: templates/ishtar/sheet_file.html:139
msgid "Admninistrative acts linked to associated operations"
msgstr ""
-#: templates/ishtar/sheet_file.html:160
+#: templates/ishtar/sheet_file.html:147
msgid "Date"
msgstr ""
-#: templates/ishtar/sheet_file.html:170
+#: templates/ishtar/sheet_file.html:157
msgid "No administrative act linked to operations"
msgstr ""
diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot
index 002da929e..0fda2ed23 100644
--- a/archaeological_finds/locale/django.pot
+++ b/archaeological_finds/locale/django.pot
@@ -7,27 +7,27 @@
msgid ""
msgstr ""
-#: forms.py:90 forms.py:94 wizards.py:64
+#: forms.py:90 forms.py:94 models_finds.py:505 wizards.py:64
msgid "Context record"
msgstr ""
-#: forms.py:123 ishtar_menu.py:32 models_finds.py:656 models_finds.py:1059
-#: models_finds.py:1068 models_treatments.py:279
+#: forms.py:123 ishtar_menu.py:32 models_finds.py:664 models_finds.py:1067
+#: models_finds.py:1076 models_treatments.py:281
#: templates/ishtar/sheet_find.html:5
msgid "Find"
msgstr ""
#: forms.py:137 forms.py:330 forms.py:559 models_finds.py:151
-#: models_finds.py:587
+#: models_finds.py:595
msgid "Free ID"
msgstr ""
-#: forms.py:139 models_finds.py:639
+#: forms.py:139 models_finds.py:647
msgid "Previous ID"
msgstr ""
#: forms.py:140 forms.py:362 forms_treatments.py:134 models_finds.py:155
-#: models_finds.py:588 models_treatments.py:125
+#: models_finds.py:596 models_treatments.py:127
msgid "Description"
msgstr ""
@@ -35,7 +35,7 @@ msgstr ""
msgid "Batch/object"
msgstr ""
-#: forms.py:145 models_finds.py:616
+#: forms.py:145 models_finds.py:624
msgid "Is complete?"
msgstr ""
@@ -43,15 +43,15 @@ msgstr ""
msgid "Material type"
msgstr ""
-#: forms.py:149 forms.py:356 models_finds.py:63 models_finds.py:592
+#: forms.py:149 forms.py:356 models_finds.py:63 models_finds.py:600
msgid "Conservatory state"
msgstr ""
-#: forms.py:152 models_finds.py:594
+#: forms.py:152 models_finds.py:602
msgid "Conservatory comment"
msgstr ""
-#: forms.py:155 models_finds.py:113 models_finds.py:619
+#: forms.py:155 models_finds.py:113 models_finds.py:627
msgid "Object types"
msgstr ""
@@ -59,11 +59,11 @@ msgstr ""
msgid "Preservation type"
msgstr ""
-#: forms.py:160 forms.py:358 models_finds.py:621
+#: forms.py:160 forms.py:358 models_finds.py:629
msgid "Integrity / interest"
msgstr ""
-#: forms.py:163 forms.py:360 models_finds.py:624
+#: forms.py:163 forms.py:360 models_finds.py:632
msgid "Remarkability"
msgstr ""
@@ -99,69 +99,69 @@ msgstr ""
msgid "Estimated error for Z"
msgstr ""
-#: forms.py:181 models_finds.py:628
+#: forms.py:181 models_finds.py:636
msgid "Length (cm)"
msgstr ""
-#: forms.py:182 models_finds.py:629
+#: forms.py:182 models_finds.py:637
msgid "Width (cm)"
msgstr ""
-#: forms.py:183 models_finds.py:630
+#: forms.py:183 models_finds.py:638
msgid "Height (cm)"
msgstr ""
-#: forms.py:184 models_finds.py:631
+#: forms.py:184 models_finds.py:639
msgid "Diameter (cm)"
msgstr ""
-#: forms.py:185 models_finds.py:632
+#: forms.py:185 models_finds.py:640
msgid "Thickness (cm)"
msgstr ""
-#: forms.py:186 forms.py:564 models_finds.py:599
+#: forms.py:186 forms.py:564 models_finds.py:607
msgid "Volume (l)"
msgstr ""
-#: forms.py:187 forms.py:565 models_finds.py:600
+#: forms.py:187 forms.py:565 models_finds.py:608
msgid "Weight (g)"
msgstr ""
-#: forms.py:189 models_finds.py:633
+#: forms.py:189 models_finds.py:641
msgid "Dimensions comment"
msgstr ""
-#: forms.py:190 forms.py:566 models_finds.py:603
+#: forms.py:190 forms.py:566 models_finds.py:611
msgid "Find number"
msgstr ""
-#: forms.py:192 models_finds.py:627
+#: forms.py:192 models_finds.py:635
msgid "Minimum number of individuals (MNI)"
msgstr ""
-#: forms.py:193 models_finds.py:635
+#: forms.py:193 models_finds.py:643
msgid "Mark"
msgstr ""
-#: forms.py:194 forms.py:365 models_finds.py:641
+#: forms.py:194 forms.py:365 models_finds.py:649
msgid "Check"
msgstr ""
-#: forms.py:196 models_finds.py:643
+#: forms.py:196 models_finds.py:651
msgid "Check date"
msgstr ""
#: forms.py:197 forms_treatments.py:132 forms_treatments.py:434
-#: models_finds.py:156 models_finds.py:636 models_treatments.py:124
-#: models_treatments.py:492
+#: models_finds.py:156 models_finds.py:644 models_treatments.py:126
+#: models_treatments.py:494
msgid "Comment"
msgstr ""
-#: forms.py:200 models_finds.py:637
+#: forms.py:200 models_finds.py:645
msgid "Comment on dating"
msgstr ""
-#: forms.py:201 models_finds.py:645
+#: forms.py:201 models_finds.py:653
msgid "Estimated value"
msgstr ""
@@ -184,7 +184,7 @@ msgstr ""
msgid "Coordinates are not relevant for the spatial reference system used: {}."
msgstr ""
-#: forms.py:293 forms.py:324 models_finds.py:611
+#: forms.py:293 forms.py:324 models_finds.py:619
msgid "Dating"
msgstr ""
@@ -193,13 +193,13 @@ msgid "Period"
msgstr ""
#: forms.py:299 forms_treatments.py:138 forms_treatments.py:436
-#: models_finds.py:1073 models_treatments.py:127 models_treatments.py:290
-#: templates/ishtar/sheet_find.html:103 templates/ishtar/sheet_find.html:145
+#: models_finds.py:1081 models_treatments.py:129 models_treatments.py:292
+#: templates/ishtar/sheet_find.html:91 templates/ishtar/sheet_find.html:133
msgid "Start date"
msgstr ""
-#: forms.py:301 models_finds.py:1074 models_treatments.py:291
-#: templates/ishtar/sheet_find.html:104 templates/ishtar/sheet_find.html:146
+#: forms.py:301 models_finds.py:1082 models_treatments.py:293
+#: templates/ishtar/sheet_find.html:92 templates/ishtar/sheet_find.html:134
msgid "End date"
msgstr ""
@@ -225,7 +225,7 @@ msgstr ""
#: forms.py:333 forms_treatments.py:54 forms_treatments.py:96
#: forms_treatments.py:284 forms_treatments.py:356 forms_treatments.py:406
-#: forms_treatments.py:489 models_treatments.py:100 models_treatments.py:464
+#: forms_treatments.py:489 models_treatments.py:102 models_treatments.py:466
msgid "Year"
msgstr ""
@@ -261,7 +261,7 @@ msgstr ""
msgid "Upstream finds"
msgstr ""
-#: forms.py:443 models_finds.py:657
+#: forms.py:443 models_finds.py:665
msgid "Finds"
msgstr ""
@@ -333,25 +333,25 @@ msgstr ""
msgid "Basket"
msgstr ""
-#: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:96
-#: templates/ishtar/sheet_find.html:97 templates/ishtar/sheet_find.html:139
+#: forms_treatments.py:52 forms_treatments.py:92 models_treatments.py:98
+#: templates/ishtar/sheet_find.html:85 templates/ishtar/sheet_find.html:127
msgid "Label"
msgstr ""
-#: forms_treatments.py:53 forms_treatments.py:95 models_treatments.py:98
+#: forms_treatments.py:53 forms_treatments.py:95 models_treatments.py:100
msgid "Other ref."
msgstr ""
#: forms_treatments.py:55 forms_treatments.py:237 forms_treatments.py:285
#: forms_treatments.py:348 forms_treatments.py:357 forms_treatments.py:459
-#: forms_treatments.py:490 forms_treatments.py:557 models_treatments.py:102
-#: models_treatments.py:466
+#: forms_treatments.py:490 forms_treatments.py:557 models_treatments.py:104
+#: models_treatments.py:468
msgid "Index"
msgstr ""
#: forms_treatments.py:56 forms_treatments.py:101 forms_treatments.py:301
-#: forms_treatments.py:578 models_treatments.py:56 models_treatments.py:107
-#: models_treatments.py:289
+#: forms_treatments.py:578 models_treatments.py:56 models_treatments.py:109
+#: models_treatments.py:291
msgid "Treatment type"
msgstr ""
@@ -363,8 +363,8 @@ msgstr ""
msgid "Base treatment"
msgstr ""
-#: forms_treatments.py:103 models_treatments.py:109
-#: templates/ishtar/sheet_find.html:99 templates/ishtar/sheet_find.html:141
+#: forms_treatments.py:103 models_treatments.py:92 models_treatments.py:111
+#: templates/ishtar/sheet_find.html:87 templates/ishtar/sheet_find.html:129
msgid "State"
msgstr ""
@@ -372,15 +372,15 @@ msgstr ""
msgid "Target"
msgstr ""
-#: forms_treatments.py:107 forms_treatments.py:417 models_treatments.py:117
+#: forms_treatments.py:107 forms_treatments.py:417 models_treatments.py:119
msgid "Responsible"
msgstr ""
-#: forms_treatments.py:113 models_treatments.py:120
+#: forms_treatments.py:113 models_treatments.py:122
msgid "Organization"
msgstr ""
-#: forms_treatments.py:119 models_treatments.py:112 models_treatments.py:292
+#: forms_treatments.py:119 models_treatments.py:114 models_treatments.py:294
msgid "Location"
msgstr ""
@@ -392,12 +392,12 @@ msgstr ""
msgid "External ref."
msgstr ""
-#: forms_treatments.py:136 models_treatments.py:126
+#: forms_treatments.py:136 models_treatments.py:128
msgid "Goal"
msgstr ""
-#: forms_treatments.py:140 forms_treatments.py:442 models_treatments.py:128
-#: models_treatments.py:486
+#: forms_treatments.py:140 forms_treatments.py:442 models_treatments.py:130
+#: models_treatments.py:488
msgid "Closing date"
msgstr ""
@@ -443,12 +443,12 @@ msgstr ""
msgid "Another treatment with this index exists for {}."
msgstr ""
-#: forms_treatments.py:262 models_treatments.py:105
+#: forms_treatments.py:262 models_treatments.py:107
msgid "Associated request"
msgstr ""
#: forms_treatments.py:266 forms_treatments.py:397 ishtar_menu.py:108
-#: models_treatments.py:497 models_treatments.py:519 models_treatments.py:581
+#: models_treatments.py:499 models_treatments.py:521 models_treatments.py:583
#: wizards.py:183 templates/ishtar/sheet_treatmentfile.html:5
msgid "Treatment request"
msgstr ""
@@ -504,7 +504,7 @@ msgstr ""
msgid "Modified by"
msgstr ""
-#: forms_treatments.py:354 forms_treatments.py:404 models_treatments.py:471
+#: forms_treatments.py:354 forms_treatments.py:404 models_treatments.py:473
msgid "Name"
msgstr ""
@@ -512,9 +512,9 @@ msgstr ""
msgid "Internal ref."
msgstr ""
-#: forms_treatments.py:358 forms_treatments.py:415
-#: templates/ishtar/sheet_find.html:98 templates/ishtar/sheet_find.html:140
-#: templates/ishtar/sheet_find.html:232
+#: forms_treatments.py:358 forms_treatments.py:415 models_treatments.py:91
+#: templates/ishtar/sheet_find.html:86 templates/ishtar/sheet_find.html:128
+#: templates/ishtar/sheet_find.html:227
msgid "Type"
msgstr ""
@@ -522,12 +522,12 @@ msgstr ""
msgid "In charge"
msgstr ""
-#: forms_treatments.py:366 forms_treatments.py:423 models_treatments.py:480
+#: forms_treatments.py:366 forms_treatments.py:423 models_treatments.py:482
#: templates/ishtar/sheet_treatmentfile.html:31
msgid "Applicant"
msgstr ""
-#: forms_treatments.py:372 forms_treatments.py:429 models_treatments.py:484
+#: forms_treatments.py:372 forms_treatments.py:429 models_treatments.py:486
#: templates/ishtar/sheet_treatmentfile.html:38
msgid "Applicant organisation"
msgstr ""
@@ -536,7 +536,7 @@ msgstr ""
msgid "Treatment request search"
msgstr ""
-#: forms_treatments.py:439 models_treatments.py:490
+#: forms_treatments.py:439 models_treatments.py:492
msgid "Reception date"
msgstr ""
@@ -568,8 +568,8 @@ msgstr ""
msgid "Treatment request internal reference"
msgstr ""
-#: forms_treatments.py:508 forms_treatments.py:604 models_treatments.py:449
-#: models_treatments.py:473
+#: forms_treatments.py:508 forms_treatments.py:604 models_treatments.py:451
+#: models_treatments.py:475
msgid "Treatment request type"
msgstr ""
@@ -611,12 +611,12 @@ msgstr ""
msgid "Documentation"
msgstr ""
-#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1070
+#: ishtar_menu.py:133 ishtar_menu.py:214 models_finds.py:1078
msgid "Administrative act"
msgstr ""
-#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:227
-#: templates/ishtar/sheet_find.html:229
+#: ishtar_menu.py:151 ishtar_menu.py:233 templates/ishtar/sheet_find.html:222
+#: templates/ishtar/sheet_find.html:224
msgid "Documents"
msgstr ""
@@ -624,8 +624,8 @@ msgstr ""
msgid "Source"
msgstr ""
-#: ishtar_menu.py:185 models_treatments.py:145 models_treatments.py:281
-#: models_treatments.py:565 templates/ishtar/sheet_treatment.html:5
+#: ishtar_menu.py:185 models_treatments.py:147 models_treatments.py:283
+#: models_treatments.py:567 templates/ishtar/sheet_treatment.html:5
msgid "Treatment"
msgstr ""
@@ -645,7 +645,7 @@ msgstr ""
msgid "Parent material"
msgstr ""
-#: models_finds.py:52 models_finds.py:507 models_finds.py:590
+#: models_finds.py:52 models_finds.py:525 models_finds.py:598
msgid "Material types"
msgstr ""
@@ -677,8 +677,8 @@ msgstr ""
msgid "Remarkability types"
msgstr ""
-#: models_finds.py:98 models_finds.py:586 models_treatments.py:40
-#: models_treatments.py:285
+#: models_finds.py:98 models_finds.py:594 models_treatments.py:40
+#: models_treatments.py:287
msgid "Order"
msgstr ""
@@ -694,12 +694,12 @@ msgstr ""
msgid "Parent"
msgstr ""
-#: models_finds.py:152 models_finds.py:583 models_treatments.py:122
-#: models_treatments.py:469
+#: models_finds.py:152 models_finds.py:591 models_treatments.py:124
+#: models_treatments.py:471
msgid "External ID"
msgstr ""
-#: models_finds.py:154 models_finds.py:585
+#: models_finds.py:154 models_finds.py:593
msgid "External ID is set automatically"
msgstr ""
@@ -739,7 +739,7 @@ msgstr ""
msgid "Cached value - do not edit"
msgstr ""
-#: models_finds.py:197 models_finds.py:581
+#: models_finds.py:197 models_finds.py:589
msgid "Base find"
msgstr ""
@@ -787,109 +787,129 @@ msgstr ""
msgid "Checked and correct"
msgstr ""
-#: models_finds.py:505
-msgid "Periods"
+#: models_finds.py:506
+msgid "Base find - Short ID"
msgstr ""
-#: models_finds.py:506 models_finds.py:614 models_treatments.py:129
-#: models_treatments.py:293 templates/ishtar/sheet_find.html:102
-#: templates/ishtar/sheet_find.html:144
-msgid "Container"
+#: models_finds.py:507
+msgid "Base find - Complete ID"
msgstr ""
-#: models_finds.py:517
-msgid "Base find - Short ID"
+#: models_finds.py:509
+msgid "Operation (code)"
msgstr ""
-#: models_finds.py:518
-msgid "Base find - Complete ID"
+#: models_finds.py:511
+msgid "Town"
msgstr ""
-#: models_finds.py:519
+#: models_finds.py:513
+msgid "Operation (name)"
+msgstr ""
+
+#: models_finds.py:515
+msgid "Parcel"
+msgstr ""
+
+#: models_finds.py:516
+msgid "Batch"
+msgstr ""
+
+#: models_finds.py:517
msgid "Base find - Comment"
msgstr ""
-#: models_finds.py:520
+#: models_finds.py:518
msgid "Base find - Description"
msgstr ""
-#: models_finds.py:521
+#: models_finds.py:519
msgid "Base find - Topographic localisation"
msgstr ""
-#: models_finds.py:523
+#: models_finds.py:521
msgid "Base find - Special interest"
msgstr ""
-#: models_finds.py:524
+#: models_finds.py:522
msgid "Base find - Discovery date"
msgstr ""
-#: models_finds.py:597
+#: models_finds.py:523 models_finds.py:622 models_treatments.py:131
+#: models_treatments.py:295 templates/ishtar/sheet_find.html:90
+#: templates/ishtar/sheet_find.html:132
+msgid "Container"
+msgstr ""
+
+#: models_finds.py:524
+msgid "Periods"
+msgstr ""
+
+#: models_finds.py:605
msgid "Type of preservation to consider"
msgstr ""
-#: models_finds.py:601
+#: models_finds.py:609
msgid "Weight unit"
msgstr ""
-#: models_finds.py:607 templates/ishtar/sheet_find.html:90
+#: models_finds.py:615 templates/ishtar/sheet_find.html:78
msgid "Upstream treatment"
msgstr ""
-#: models_finds.py:610 templates/ishtar/sheet_find.html:132
+#: models_finds.py:618 templates/ishtar/sheet_find.html:120
msgid "Downstream treatment"
msgstr ""
-#: models_finds.py:648
+#: models_finds.py:656
msgid "Collection"
msgstr ""
-#: models_finds.py:650 models_treatments.py:141 models_treatments.py:493
+#: models_finds.py:658 models_treatments.py:143 models_treatments.py:495
msgid "Cached name"
msgstr ""
-#: models_finds.py:659
+#: models_finds.py:667
msgid "Can view all Finds"
msgstr ""
-#: models_finds.py:660
+#: models_finds.py:668
msgid "Can view own Find"
msgstr ""
-#: models_finds.py:661
+#: models_finds.py:669
msgid "Can add own Find"
msgstr ""
-#: models_finds.py:662
+#: models_finds.py:670
msgid "Can change own Find"
msgstr ""
-#: models_finds.py:663
+#: models_finds.py:671
msgid "Can delete own Find"
msgstr ""
-#: models_finds.py:669
+#: models_finds.py:677
msgid "FIND"
msgstr ""
-#: models_finds.py:1057
+#: models_finds.py:1065
msgid "Find documentation"
msgstr ""
-#: models_finds.py:1058
+#: models_finds.py:1066
msgid "Find documentations"
msgstr ""
-#: models_finds.py:1071
+#: models_finds.py:1079
msgid "Person"
msgstr ""
-#: models_finds.py:1077
+#: models_finds.py:1085
msgid "Property"
msgstr ""
-#: models_finds.py:1078
+#: models_finds.py:1086
msgid "Properties"
msgstr ""
@@ -933,125 +953,125 @@ msgstr ""
msgid "Downstream find"
msgstr ""
-#: models_treatments.py:114
+#: models_treatments.py:116
msgid "Location where the treatment is done. Target warehouse for a move."
msgstr ""
-#: models_treatments.py:131
+#: models_treatments.py:133
msgid "Estimated cost"
msgstr ""
-#: models_treatments.py:133
+#: models_treatments.py:135
msgid "Quoted cost"
msgstr ""
-#: models_treatments.py:135
+#: models_treatments.py:137
msgid "Realized cost"
msgstr ""
-#: models_treatments.py:137
+#: models_treatments.py:139
msgid "Insurance cost"
msgstr ""
-#: models_treatments.py:139
+#: models_treatments.py:141
msgid "Target a basket"
msgstr ""
-#: models_treatments.py:146 templates/ishtar/sheet_find.html:87
+#: models_treatments.py:148 templates/ishtar/sheet_find.html:75
#: templates/ishtar/sheet_treatmentfile.html:45
msgid "Treatments"
msgstr ""
-#: models_treatments.py:149
+#: models_treatments.py:151
msgid "Can view all Treatments"
msgstr ""
-#: models_treatments.py:150
+#: models_treatments.py:152
msgid "Can view own Treatment"
msgstr ""
-#: models_treatments.py:151
+#: models_treatments.py:153
msgid "Can add own Treatment"
msgstr ""
-#: models_treatments.py:152
+#: models_treatments.py:154
msgid "Can change own Treatment"
msgstr ""
-#: models_treatments.py:153
+#: models_treatments.py:155
msgid "Can delete own Treatment"
msgstr ""
-#: models_treatments.py:165
+#: models_treatments.py:167
msgid "TREATMENT"
msgstr ""
-#: models_treatments.py:294 templates/ishtar/sheet_find.html:101
-#: templates/ishtar/sheet_find.html:143
+#: models_treatments.py:296 templates/ishtar/sheet_find.html:89
+#: templates/ishtar/sheet_find.html:131
msgid "Doer"
msgstr ""
-#: models_treatments.py:295 models_treatments.py:296
+#: models_treatments.py:297 models_treatments.py:298
msgid "Related finds"
msgstr ""
-#: models_treatments.py:438
+#: models_treatments.py:440
msgid "Is upstream"
msgstr ""
-#: models_treatments.py:450
+#: models_treatments.py:452
msgid "Treatment request types"
msgstr ""
-#: models_treatments.py:467
+#: models_treatments.py:469
msgid "Internal reference"
msgstr ""
-#: models_treatments.py:476
+#: models_treatments.py:478
msgid "Person in charge"
msgstr ""
-#: models_treatments.py:488
+#: models_treatments.py:490
msgid "Creation date"
msgstr ""
-#: models_treatments.py:498
+#: models_treatments.py:500
msgid "Treatment requests"
msgstr ""
-#: models_treatments.py:502
+#: models_treatments.py:504
msgid "Can view all Treatment requests"
msgstr ""
-#: models_treatments.py:504
+#: models_treatments.py:506
msgid "Can view own Treatment request"
msgstr ""
-#: models_treatments.py:506
+#: models_treatments.py:508
msgid "Can add own Treatment request"
msgstr ""
-#: models_treatments.py:508
+#: models_treatments.py:510
msgid "Can change own Treatment request"
msgstr ""
-#: models_treatments.py:510
+#: models_treatments.py:512
msgid "Can delete own Treatment request"
msgstr ""
-#: models_treatments.py:571
+#: models_treatments.py:573
msgid "Treatment documentation"
msgstr ""
-#: models_treatments.py:572
+#: models_treatments.py:574
msgid "Treament documentations"
msgstr ""
-#: models_treatments.py:588
+#: models_treatments.py:590
msgid "Treatment request documentation"
msgstr ""
-#: models_treatments.py:589
+#: models_treatments.py:591
msgid "Treatment request documentations"
msgstr ""
@@ -1179,67 +1199,67 @@ msgstr ""
msgid "Operation"
msgstr ""
-#: templates/ishtar/sheet_find.html:24
-msgid "Creation:"
+#: templates/ishtar/sheet_find.html:25
+msgid "Administrative index"
msgstr ""
-#: templates/ishtar/sheet_find.html:31
-msgid "Modification:"
-msgstr ""
-
-#: templates/ishtar/sheet_find.html:79
+#: templates/ishtar/sheet_find.html:67
msgid "Warehouse"
msgstr ""
-#: templates/ishtar/sheet_find.html:96 templates/ishtar/sheet_find.html:138
+#: templates/ishtar/sheet_find.html:84 templates/ishtar/sheet_find.html:126
msgid "Year - index"
msgstr ""
-#: templates/ishtar/sheet_find.html:100 templates/ishtar/sheet_find.html:142
+#: templates/ishtar/sheet_find.html:88 templates/ishtar/sheet_find.html:130
msgid "Related finds (max. 15 displayed)"
msgstr ""
-#: templates/ishtar/sheet_find.html:128
+#: templates/ishtar/sheet_find.html:116
msgid "Export as CSV"
msgstr ""
-#: templates/ishtar/sheet_find.html:128 templates/ishtar/sheet_find.html:171
+#: templates/ishtar/sheet_find.html:116 templates/ishtar/sheet_find.html:159
msgid "CSV"
msgstr ""
-#: templates/ishtar/sheet_find.html:176
+#: templates/ishtar/sheet_find.html:164
msgid "Associated base finds"
msgstr ""
-#: templates/ishtar/sheet_find.html:208
+#: templates/ishtar/sheet_find.html:171
+msgid "Internal ID"
+msgstr ""
+
+#: templates/ishtar/sheet_find.html:203
msgid "Coordinates:"
msgstr ""
-#: templates/ishtar/sheet_find.html:210
+#: templates/ishtar/sheet_find.html:205
msgid "X:"
msgstr ""
-#: templates/ishtar/sheet_find.html:211
+#: templates/ishtar/sheet_find.html:206
msgid "Y:"
msgstr ""
-#: templates/ishtar/sheet_find.html:212
+#: templates/ishtar/sheet_find.html:207
msgid "Z:"
msgstr ""
-#: templates/ishtar/sheet_find.html:215
+#: templates/ishtar/sheet_find.html:210
msgid "SRID:"
msgstr ""
-#: templates/ishtar/sheet_find.html:231
+#: templates/ishtar/sheet_find.html:226
msgid "Title"
msgstr ""
-#: templates/ishtar/sheet_find.html:233
+#: templates/ishtar/sheet_find.html:228
msgid "Authors"
msgstr ""
-#: templates/ishtar/sheet_find.html:234
+#: templates/ishtar/sheet_find.html:229
msgid "Link"
msgstr ""
@@ -1251,6 +1271,10 @@ msgstr ""
msgid "Find source"
msgstr ""
+#: templates/ishtar/sheet_findsource.html:11
+msgid "Related find"
+msgstr ""
+
#: templates/ishtar/sheet_treatment.html:20
msgctxt "Treatment"
msgid "Closed"
@@ -1283,6 +1307,14 @@ msgstr ""
msgid "Treatment request source"
msgstr ""
+#: templates/ishtar/sheet_treatmentfilesource.html:11
+msgid "Related treatment request"
+msgstr ""
+
#: templates/ishtar/sheet_treatmentsource.html:4
msgid "Treatment source"
msgstr ""
+
+#: templates/ishtar/sheet_treatmentsource.html:11
+msgid "Related treatment"
+msgstr ""
diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot
index 800f6a31e..35facbbf5 100644
--- a/archaeological_operations/locale/django.pot
+++ b/archaeological_operations/locale/django.pot
@@ -9,13 +9,13 @@
msgid ""
msgstr ""
-#: forms.py:69 forms.py:371 forms.py:1009 forms.py:1031 forms.py:1035
-#: models.py:1221 templates/ishtar/sheet_operation.html:156
+#: forms.py:69 forms.py:371 forms.py:1013 forms.py:1035 forms.py:1039
+#: models.py:1241 templates/ishtar/sheet_operation.html:146
#: templates/ishtar/blocks/window_tables/parcels.html:10
msgid "Parcels"
msgstr ""
-#: forms.py:72 forms.py:205 forms.py:985 models.py:1207
+#: forms.py:72 forms.py:205 forms.py:989 models.py:1227
#: templates/ishtar/blocks/window_tables/parcels.html:7
#: templates/ishtar/dashboards/dashboard_operation.html:432
#: templates/ishtar/dashboards/dashboard_operation.html:446
@@ -24,22 +24,22 @@ msgstr ""
msgid "Town"
msgstr ""
-#: forms.py:74 forms.py:455 forms.py:752 forms.py:1255 models.py:272
-#: models.py:1013 models.py:1205
+#: forms.py:74 forms.py:455 forms.py:756 forms.py:1259 models.py:272
+#: models.py:1033 models.py:1225
#: templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Year"
msgstr ""
-#: forms.py:77 models.py:1208
+#: forms.py:77 models.py:1228
#: templates/ishtar/blocks/window_tables/parcels.html:9
msgid "Section"
msgstr ""
-#: forms.py:80 models.py:1210
+#: forms.py:80 models.py:1230
msgid "Parcel number"
msgstr ""
-#: forms.py:82 models.py:1212 models.py:1229 models.py:1278
+#: forms.py:82 models.py:1232 models.py:1249 models.py:1298
msgid "Public domain"
msgstr ""
@@ -75,8 +75,8 @@ msgstr ""
msgid "Relation type"
msgstr ""
-#: forms.py:383 ishtar_menu.py:30 models.py:367 models.py:834 models.py:864
-#: models.py:892 models.py:995 models.py:1204 wizards.py:344 wizards.py:355
+#: forms.py:383 ishtar_menu.py:30 models.py:368 models.py:843 models.py:878
+#: models.py:911 models.py:1015 models.py:1224 wizards.py:344 wizards.py:355
#: templates/ishtar/sheet_operation.html:4
msgid "Operation"
msgstr ""
@@ -85,7 +85,7 @@ msgstr ""
msgid ":"
msgstr ""
-#: forms.py:411 forms.py:605 forms.py:1220
+#: forms.py:411 forms.py:607 forms.py:1224
msgid "You should select an operation."
msgstr ""
@@ -101,19 +101,19 @@ msgstr ""
msgid "Deleted relations"
msgstr ""
-#: forms.py:451 templates/ishtar/sheet_operation.html:95
+#: forms.py:451 templates/ishtar/sheet_operation.html:85
msgid "Relations"
msgstr ""
-#: forms.py:456 forms.py:1226 models.py:273
+#: forms.py:456 forms.py:1230 models.py:273
msgid "Numeric reference"
msgstr ""
-#: forms.py:462 forms.py:1266
+#: forms.py:462 forms.py:1270
msgid "Parcel (section/number/public domain)"
msgstr ""
-#: forms.py:465 forms.py:1269 models.py:835
+#: forms.py:465 forms.py:1273 models.py:844
#: templates/ishtar/dashboards/dashboard_operation.html:390
#: templates/ishtar/dashboards/dashboard_operation.html:411
#: templates/ishtar/dashboards/dashboard_operation.html:643
@@ -122,449 +122,454 @@ msgstr ""
msgid "Department"
msgstr ""
-#: forms.py:466 forms.py:1097 models.py:86
+#: forms.py:466 forms.py:1101 models.py:86
+#: templates/ishtar/sheet_operation.html:22
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8
msgid "Name"
msgstr ""
-#: forms.py:468 forms.py:672 forms.py:750 forms.py:1232 models.py:280
+#: forms.py:468 forms.py:752 models.py:334
+msgid "Address / Locality"
+msgstr ""
+
+#: forms.py:470 forms.py:674 forms.py:754 forms.py:1236 models.py:280
msgid "Operation type"
msgstr ""
-#: forms.py:470
+#: forms.py:472
msgid "Is open?"
msgstr ""
-#: forms.py:478 forms.py:782 models.py:269
+#: forms.py:480 forms.py:786 models.py:269
msgid "In charge"
msgstr ""
-#: forms.py:485 models.py:989
+#: forms.py:487 models.py:1009
msgid "Scientist in charge"
msgstr ""
-#: forms.py:487 forms.py:674 forms.py:772 models.py:267
+#: forms.py:489 forms.py:676 forms.py:776 models.py:267
msgid "Operator"
msgstr ""
-#: forms.py:496 forms.py:1102 models.py:90 models.py:282
+#: forms.py:498 forms.py:1106 models.py:90 models.py:282
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10
msgid "Remains"
msgstr ""
-#: forms.py:497 forms.py:1080 forms.py:1099 models.py:88 models.py:288
+#: forms.py:499 forms.py:1084 forms.py:1103 models.py:88 models.py:288
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9
msgid "Periods"
msgstr ""
-#: forms.py:498
+#: forms.py:500
msgid "Started before"
msgstr ""
-#: forms.py:500
+#: forms.py:502
msgid "Started after"
msgstr ""
-#: forms.py:502
+#: forms.py:504
msgid "Ended before"
msgstr ""
-#: forms.py:504
+#: forms.py:506
msgid "Ended after"
msgstr ""
-#: forms.py:507
+#: forms.py:509
msgid "Search within relations"
msgstr ""
-#: forms.py:509 forms.py:837
+#: forms.py:511 forms.py:841
msgid "Comment"
msgstr ""
-#: forms.py:510
+#: forms.py:512
msgid "Abstract (full text search)"
msgstr ""
-#: forms.py:512 forms.py:840 models.py:336
+#: forms.py:514 forms.py:844 models.py:337
msgid "Comment about scientific documentation"
msgstr ""
-#: forms.py:513 forms.py:842 models.py:348
+#: forms.py:515 forms.py:846 models.py:349
msgid "Record quality"
msgstr ""
-#: forms.py:514 forms.py:807 models.py:300
+#: forms.py:516 forms.py:811 models.py:300
msgid "Report processing"
msgstr ""
-#: forms.py:516 forms.py:845 models.py:343
+#: forms.py:518 forms.py:849 models.py:344
msgid "Virtual operation"
msgstr ""
-#: forms.py:518 forms.py:1142 forms.py:1146 models.py:94
+#: forms.py:520 forms.py:1146 forms.py:1150 models.py:94
msgid "Archaeological site"
msgstr ""
-#: forms.py:524 forms.py:1273
+#: forms.py:526 forms.py:1277
msgid "Created by"
msgstr ""
-#: forms.py:530 forms.py:1279
+#: forms.py:532 forms.py:1283
msgid "Modified by"
msgstr ""
-#: forms.py:537
+#: forms.py:539
msgid "Documentation deadline before"
msgstr ""
-#: forms.py:539
+#: forms.py:541
msgid "Documentation deadline after"
msgstr ""
-#: forms.py:541 forms.py:830 models.py:355
+#: forms.py:543 forms.py:834 models.py:356
msgid "Documentation received"
msgstr ""
-#: forms.py:543
+#: forms.py:545
msgid "Finds deadline before"
msgstr ""
-#: forms.py:545
+#: forms.py:547
msgid "Finds deadline after"
msgstr ""
-#: forms.py:547 forms.py:835 models.py:359
+#: forms.py:549 forms.py:839 models.py:360
msgid "Finds received"
msgstr ""
-#: forms.py:592 forms.py:1218 views.py:168
+#: forms.py:594 forms.py:1222 views.py:168
msgid "Operation search"
msgstr ""
-#: forms.py:636
+#: forms.py:638
msgid "Associated file"
msgstr ""
-#: forms.py:640 forms.py:933 models.py:501 models.py:891 models.py:1000
+#: forms.py:642 forms.py:937 models.py:510 models.py:910 models.py:1020
#: wizards.py:80
msgid "Archaeological file"
msgstr ""
-#: forms.py:647 forms.py:649 models.py:350
+#: forms.py:649 forms.py:651 models.py:351
msgid "Abstract"
msgstr ""
-#: forms.py:652
+#: forms.py:654
msgid "months"
msgstr ""
-#: forms.py:652
+#: forms.py:654
msgid "years"
msgstr ""
-#: forms.py:654 models.py:253
+#: forms.py:656 models.py:253
msgid "Creation date"
msgstr ""
-#: forms.py:655
+#: forms.py:657
msgid "Start of field work"
msgstr ""
-#: forms.py:657
+#: forms.py:659
msgid "All"
msgstr ""
-#: forms.py:658
+#: forms.py:660
msgid "Preventive"
msgstr ""
-#: forms.py:659
+#: forms.py:661
msgid "Research"
msgstr ""
-#: forms.py:663
+#: forms.py:665
msgid "Slicing"
msgstr ""
-#: forms.py:666
+#: forms.py:668
msgid "Department detail"
msgstr ""
-#: forms.py:668
+#: forms.py:670
msgid "Date get from"
msgstr ""
-#: forms.py:670
+#: forms.py:672
msgid "Preventive/Research"
msgstr ""
-#: forms.py:676
+#: forms.py:678
msgid "Date after"
msgstr ""
-#: forms.py:678
+#: forms.py:680
msgid "Date before"
msgstr ""
-#: forms.py:680
+#: forms.py:682
msgid "With reports"
msgstr ""
-#: forms.py:681
+#: forms.py:683
msgid "With finds"
msgstr ""
-#: forms.py:733 forms.py:1327 templates/ishtar/sheet_administrativeact.html:20
-#: templates/ishtar/sheet_operation.html:24
+#: forms.py:735 forms.py:1331 templates/ishtar/sheet_administrativeact.html:20
+#: templates/ishtar/sheet_operation.html:26
msgid "General"
msgstr ""
-#: forms.py:748 models.py:333
+#: forms.py:750 models.py:333
msgid "Generic name"
msgstr ""
-#: forms.py:757 models.py:302
+#: forms.py:761 models.py:302
msgid "Old code"
msgstr ""
-#: forms.py:760
+#: forms.py:764
msgid "Head scientist"
msgstr ""
-#: forms.py:779 models.py:332
+#: forms.py:783 models.py:332
msgid "Operator reference"
msgstr ""
-#: forms.py:793
+#: forms.py:797
msgid "Total surface (m2)"
msgstr ""
-#: forms.py:800 models.py:54 models.py:256 models.py:1417
+#: forms.py:804 models.py:54 models.py:256 models.py:1437
msgid "Start date"
msgstr ""
-#: forms.py:802 models.py:258
+#: forms.py:806 models.py:258
msgid "Excavation end date"
msgstr ""
-#: forms.py:805 models.py:259
+#: forms.py:809 models.py:259
msgid "Report delivery date"
msgstr ""
-#: forms.py:827 models.py:352
+#: forms.py:831 models.py:353
msgid "Deadline for submission of the documentation"
msgstr ""
-#: forms.py:832 models.py:357
+#: forms.py:836 models.py:358
msgid "Deadline for submission of the finds"
msgstr ""
-#: forms.py:847
+#: forms.py:851
msgid "Image"
msgstr ""
-#: forms.py:848
+#: forms.py:852
#, python-format
msgid ""
" Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)."
"p>"
msgstr ""
-#: forms.py:886
+#: forms.py:890
msgid ""
"If you want to set an excavation end date you have to provide a start date."
msgstr ""
-#: forms.py:891
+#: forms.py:895
msgid "The excavation end date cannot be before the start date."
msgstr ""
-#: forms.py:919
+#: forms.py:923
#, python-format
msgid ""
"Operation code already exists for year: %(year)d - use a value bigger than "
"%(last_val)d"
msgstr ""
-#: forms.py:923
+#: forms.py:927
msgid "Bad operation code"
msgstr ""
-#: forms.py:929 models.py:516
+#: forms.py:933 models.py:525 models.py:873
msgid "Operation code"
msgstr ""
-#: forms.py:955
+#: forms.py:959
msgid "Preventive informations - excavation"
msgstr ""
-#: forms.py:956 models.py:286
+#: forms.py:960 models.py:286
#: templates/ishtar/dashboards/dashboard_operation.html:701
msgid "Cost (euros)"
msgstr ""
-#: forms.py:957 models.py:291
+#: forms.py:961 models.py:291
msgid "Scheduled man-days"
msgstr ""
-#: forms.py:959 models.py:294
+#: forms.py:963 models.py:294
msgid "Optional man-days"
msgstr ""
-#: forms.py:961 models.py:297
+#: forms.py:965 models.py:297
msgid "Effective man-days"
msgstr ""
-#: forms.py:971
+#: forms.py:975
msgid "Preventive informations - diagnostic"
msgstr ""
-#: forms.py:974 models.py:316
+#: forms.py:978 models.py:316
msgid "Prescription on zoning"
msgstr ""
-#: forms.py:976 models.py:319
+#: forms.py:980 models.py:319
msgid "Prescription on large area"
msgstr ""
-#: forms.py:979 models.py:321
+#: forms.py:983 models.py:321
msgid "Prescription on geoarchaeological context"
msgstr ""
-#: forms.py:983 forms.py:1005 models.py:284 models.py:1023
+#: forms.py:987 forms.py:1009 models.py:284 models.py:1043
msgid "Towns"
msgstr ""
-#: forms.py:1012 models.py:1220 models.py:1415
+#: forms.py:1016 models.py:1240 models.py:1435
msgid "Parcel"
msgstr ""
-#: forms.py:1064 models.py:46
+#: forms.py:1068 models.py:46
msgid "Remain types"
msgstr ""
-#: forms.py:1068 models.py:45
+#: forms.py:1072 models.py:45
msgid "Remain type"
msgstr ""
-#: forms.py:1084 templates/ishtar/sheet_operation.html:176
-#: templates/ishtar/sheet_operation.html:207
+#: forms.py:1088 templates/ishtar/sheet_operation.html:166
+#: templates/ishtar/sheet_operation.html:197
msgid "Period"
msgstr ""
-#: forms.py:1096 models.py:85
+#: forms.py:1100 models.py:85
msgid "Reference"
msgstr ""
-#: forms.py:1125
+#: forms.py:1129
msgid "This reference already exists."
msgstr ""
-#: forms.py:1157 models.py:95 models.py:340
-#: templates/ishtar/sheet_operation.html:106
+#: forms.py:1161 models.py:95 models.py:341
+#: templates/ishtar/sheet_operation.html:96
msgid "Archaeological sites"
msgstr ""
-#: forms.py:1161
+#: forms.py:1165
msgid "Associated archaeological sites"
msgstr ""
-#: forms.py:1167 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93
+#: forms.py:1171 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93
msgid "Search"
msgstr ""
-#: forms.py:1172
+#: forms.py:1176
msgid "Would you like to close this operation?"
msgstr ""
-#: forms.py:1177
+#: forms.py:1181
msgid "Would you like to delete this operation?"
msgstr ""
-#: forms.py:1186 forms.py:1256 forms.py:1392 models.py:866 models.py:980
+#: forms.py:1190 forms.py:1260 forms.py:1396 models.py:880 models.py:1000
msgid "Index"
msgstr ""
-#: forms.py:1212
+#: forms.py:1216
#, python-format
msgid ""
"Index already exists for operation: %(operation)s - use a value bigger than "
"%(last_val)d"
msgstr ""
-#: forms.py:1224
+#: forms.py:1228
msgid "Operation's year"
msgstr ""
-#: forms.py:1231
+#: forms.py:1235
msgid "Operation's town"
msgstr ""
-#: forms.py:1244
+#: forms.py:1248
msgid "Documentation search"
msgstr ""
-#: forms.py:1246
+#: forms.py:1250
msgid "You should select a document."
msgstr ""
-#: forms.py:1263 forms.py:1330 models.py:905 models.py:974
+#: forms.py:1267 forms.py:1334 models.py:924 models.py:994
msgid "Act type"
msgstr ""
-#: forms.py:1264 forms.py:1462
+#: forms.py:1268 forms.py:1466
msgid "Indexed?"
msgstr ""
-#: forms.py:1270 forms.py:1335 models.py:1014
+#: forms.py:1274 forms.py:1339 models.py:1034
#: templates/ishtar/blocks/window_tables/administrativacts.html:10
msgid "Object"
msgstr ""
-#: forms.py:1307 views.py:333
+#: forms.py:1311 views.py:333
msgid "Administrative act search"
msgstr ""
-#: forms.py:1322 forms.py:1420 forms.py:1487
+#: forms.py:1326 forms.py:1424 forms.py:1491
msgid "You should select an administrative act."
msgstr ""
-#: forms.py:1338 models.py:1011
+#: forms.py:1342 models.py:1031
msgid "Signature date"
msgstr ""
-#: forms.py:1380
+#: forms.py:1384
#, python-format
msgid ""
"This index already exists for year: %(year)d - use a value bigger than "
"%(last_val)d"
msgstr ""
-#: forms.py:1384
+#: forms.py:1388
msgid "Bad index"
msgstr ""
-#: forms.py:1397
+#: forms.py:1401
msgid "Would you like to delete this administrative act?"
msgstr ""
-#: forms.py:1402
+#: forms.py:1406
msgid "Template"
msgstr ""
-#: forms.py:1426 forms.py:1430
+#: forms.py:1430 forms.py:1434
msgid "This document is not intended for this type of act."
msgstr ""
-#: forms.py:1448
+#: forms.py:1452
msgid "Doc generation"
msgstr ""
-#: forms.py:1450
+#: forms.py:1454
msgid "Generate the associated doc?"
msgstr ""
-#: forms.py:1471 ishtar_menu.py:123 views.py:386
+#: forms.py:1475 ishtar_menu.py:123 views.py:386
msgctxt "admin act register"
msgid "Register"
msgstr ""
@@ -585,7 +590,7 @@ msgstr ""
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:59 models.py:1030
+#: ishtar_menu.py:59 models.py:1050
#: templates/ishtar/sheet_administrativeact.html:4
msgid "Administrative act"
msgstr ""
@@ -610,16 +615,16 @@ msgstr ""
msgid "General informations"
msgstr ""
-#: ishtar_menu.py:139 models.py:368
+#: ishtar_menu.py:139 models.py:369
#: templates/ishtar/dashboards/dashboard_operation.html:8
msgid "Operations"
msgstr ""
-#: models.py:53 models.py:71 models.py:1879
+#: models.py:53 models.py:71 models.py:1907
msgid "Order"
msgstr ""
-#: models.py:55 models.py:1418
+#: models.py:55 models.py:1438
msgid "End date"
msgstr ""
@@ -735,7 +740,7 @@ msgstr ""
msgid "In charge scientist"
msgstr ""
-#: models.py:277 models.py:1200
+#: models.py:277 models.py:1220
msgid "File"
msgstr ""
@@ -743,297 +748,305 @@ msgstr ""
msgid "Surface (m2)"
msgstr ""
-#: models.py:334
+#: models.py:335
msgid "General comment"
msgstr ""
-#: models.py:337
+#: models.py:338
msgid "Cached name"
msgstr ""
-#: models.py:345
+#: models.py:346
msgid ""
"If checked, it means that this operation have not been officialy registered."
msgstr ""
-#: models.py:361
+#: models.py:362
msgid "Point"
msgstr ""
-#: models.py:362
+#: models.py:363
msgid "Multi polygon"
msgstr ""
-#: models.py:370
+#: models.py:371
msgid "Can view all Operations"
msgstr ""
-#: models.py:371
+#: models.py:372
msgid "Can view own Operation"
msgstr ""
-#: models.py:372
+#: models.py:373
msgid "Can add own Operation"
msgstr ""
-#: models.py:373
+#: models.py:374
msgid "Can change own Operation"
msgstr ""
-#: models.py:374
+#: models.py:375
msgid "Can delete own Operation"
msgstr ""
-#: models.py:375
+#: models.py:376
msgid "Can close Operation"
msgstr ""
-#: models.py:404
+#: models.py:405
msgid "OPE"
msgstr ""
-#: models.py:470
+#: models.py:479
msgid "Intercommunal"
msgstr ""
-#: models.py:502
+#: models.py:511
msgid "Code patriarche"
msgstr ""
-#: models.py:542
+#: models.py:551
msgid "This operation code already exists for this year"
msgstr ""
-#: models.py:567
+#: models.py:576
msgid "Number of parcels"
msgstr ""
-#: models.py:585
+#: models.py:594
msgid "Number of administrative acts"
msgstr ""
-#: models.py:593
+#: models.py:602
msgid "Number of indexed administrative acts"
msgstr ""
-#: models.py:601
+#: models.py:610
msgid "Number of context records"
msgstr ""
-#: models.py:637
+#: models.py:646
msgid "Number of finds"
msgstr ""
-#: models.py:682
+#: models.py:691
msgid "No type"
msgstr ""
-#: models.py:713
+#: models.py:722
msgid "Number of sources"
msgstr ""
-#: models.py:755 templates/ishtar/dashboards/dashboard_operation.html:309
+#: models.py:764 templates/ishtar/dashboards/dashboard_operation.html:309
#: templates/ishtar/dashboards/dashboard_operation.html:575
#: templates/ishtar/dashboards/dashboard_operation.html:611
msgid "Mean"
msgstr ""
-#: models.py:805
+#: models.py:814
msgid "Inverse relation"
msgstr ""
-#: models.py:809
+#: models.py:818
msgid "Operation relation type"
msgstr ""
-#: models.py:810
+#: models.py:819
msgid "Operation relation types"
msgstr ""
-#: models.py:823
+#: models.py:832
msgid "Operation record relation"
msgstr ""
-#: models.py:824
+#: models.py:833
msgid "Operation record relations"
msgstr ""
-#: models.py:870
+#: models.py:872
+msgid "Operation year"
+msgstr ""
+
+#: models.py:874
+msgid "Document code"
+msgstr ""
+
+#: models.py:884
msgid "Operation documentation"
msgstr ""
-#: models.py:871
+#: models.py:885
msgid "Operation documentations"
msgstr ""
-#: models.py:874
+#: models.py:888
msgid "Can view all Operation sources"
msgstr ""
-#: models.py:876
+#: models.py:890
msgid "Can view own Operation source"
msgstr ""
-#: models.py:878
+#: models.py:892
msgid "Can add own Operation source"
msgstr ""
-#: models.py:880
+#: models.py:894
msgid "Can change own Operation source"
msgstr ""
-#: models.py:882
+#: models.py:896
msgid "Can delete own Operation source"
msgstr ""
-#: models.py:893 models.py:1005
+#: models.py:912 models.py:1025
msgid "Treatment request"
msgstr ""
-#: models.py:894 models.py:1010
+#: models.py:913 models.py:1030
msgid "Treatment"
msgstr ""
-#: models.py:896
+#: models.py:915
msgid "Intended to"
msgstr ""
-#: models.py:898
+#: models.py:917
msgid "Code"
msgstr ""
-#: models.py:901
+#: models.py:920
msgid "Associated template"
msgstr ""
-#: models.py:902
+#: models.py:921
msgid "Indexed"
msgstr ""
-#: models.py:906
+#: models.py:925
msgid "Act types"
msgstr ""
-#: models.py:978
+#: models.py:991 models.py:1071
+#: templates/ishtar/blocks/window_tables/administrativacts.html:7
+#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
+msgid "Ref."
+msgstr ""
+
+#: models.py:998
msgid "Person in charge of the operation"
msgstr ""
-#: models.py:984
+#: models.py:1004
msgid "Archaeological preventive operator"
msgstr ""
-#: models.py:992
+#: models.py:1012
msgid "Signatory"
msgstr ""
-#: models.py:1020
+#: models.py:1040
msgid "Departments"
msgstr ""
-#: models.py:1021
+#: models.py:1041
msgid "Cached values get from associated departments"
msgstr ""
-#: models.py:1024
+#: models.py:1044
msgid "Cached values get from associated towns"
msgstr ""
-#: models.py:1031 templates/ishtar/sheet_operation.html:114
-#: templates/ishtar/sheet_operation.html:150
+#: models.py:1051 templates/ishtar/sheet_operation.html:104
+#: templates/ishtar/sheet_operation.html:140
msgid "Administrative acts"
msgstr ""
-#: models.py:1034
+#: models.py:1054
msgid "Can view all Administrative acts"
msgstr ""
-#: models.py:1036
+#: models.py:1056
msgid "Can view own Administrative act"
msgstr ""
-#: models.py:1038
+#: models.py:1058
msgid "Can add own Administrative act"
msgstr ""
-#: models.py:1040
+#: models.py:1060
msgid "Can change own Administrative act"
msgstr ""
-#: models.py:1042
+#: models.py:1062
msgid "Can delete own Administrative act"
msgstr ""
-#: models.py:1051
-#: templates/ishtar/blocks/window_tables/administrativacts.html:7
-#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
-msgid "Ref."
-msgstr ""
-
-#: models.py:1145
+#: models.py:1165
msgid "This index already exists for this year"
msgstr ""
-#: models.py:1213
+#: models.py:1233
msgid "External ID"
msgstr ""
-#: models.py:1216
+#: models.py:1236
msgid "External ID is set automatically"
msgstr ""
-#: models.py:1217
+#: models.py:1237
msgid "Address - Locality"
msgstr ""
-#: models.py:1413
+#: models.py:1433
msgid "Owner"
msgstr ""
-#: models.py:1421
+#: models.py:1441
msgid "Parcel owner"
msgstr ""
-#: models.py:1422
+#: models.py:1442
msgid "Parcel owners"
msgstr ""
-#: models.py:1448
+#: models.py:1468
msgid "Recorded"
msgstr ""
-#: models.py:1449
+#: models.py:1469
msgid "Effective"
msgstr ""
-#: models.py:1450
+#: models.py:1470
msgid "Active"
msgstr ""
-#: models.py:1451
+#: models.py:1471
msgid "Field completed"
msgstr ""
-#: models.py:1452
+#: models.py:1472
msgid "Associated report"
msgstr ""
-#: models.py:1453
+#: models.py:1473
msgid "Closed"
msgstr ""
-#: models.py:1454
+#: models.py:1474
msgid "Documented and closed"
msgstr ""
-#: models.py:1880
+#: models.py:1908
msgid "Is preventive"
msgstr ""
-#: models.py:1883
+#: models.py:1911
msgid "Operation type old"
msgstr ""
-#: models.py:1884
+#: models.py:1912
msgid "Operation types old"
msgstr ""
@@ -1092,7 +1105,7 @@ msgid ""
msgstr ""
#: templates/ishtar/sheet_administrativeact.html:36
-#: templates/ishtar/sheet_operation.html:50
+#: templates/ishtar/sheet_operation.html:40
msgid "Surface:"
msgstr ""
@@ -1104,96 +1117,96 @@ msgstr ""
msgid "Patriarche OA code not yet recorded!"
msgstr ""
-#: templates/ishtar/sheet_operation.html:27
-msgid "Creation:"
+#: templates/ishtar/sheet_operation.html:23
+msgid "Address"
msgstr ""
-#: templates/ishtar/sheet_operation.html:34
-msgid "Modification:"
+#: templates/ishtar/sheet_operation.html:30
+msgid "Begining date"
msgstr ""
-#: templates/ishtar/sheet_operation.html:46
+#: templates/ishtar/sheet_operation.html:36
msgid "State:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:46
+#: templates/ishtar/sheet_operation.html:36
msgid "Active file"
msgstr ""
-#: templates/ishtar/sheet_operation.html:47
+#: templates/ishtar/sheet_operation.html:37
msgid "Closed operation"
msgstr ""
-#: templates/ishtar/sheet_operation.html:48
+#: templates/ishtar/sheet_operation.html:38
msgid "Closing date:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:48
+#: templates/ishtar/sheet_operation.html:38
msgid "by"
msgstr ""
-#: templates/ishtar/sheet_operation.html:51
+#: templates/ishtar/sheet_operation.html:41
msgid "Cost:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:52
+#: templates/ishtar/sheet_operation.html:42
msgid "Duration:"
msgstr ""
-#: templates/ishtar/sheet_operation.html:52
+#: templates/ishtar/sheet_operation.html:42
msgid "Day"
msgstr ""
-#: templates/ishtar/sheet_operation.html:85
+#: templates/ishtar/sheet_operation.html:75
msgid "Localisation"
msgstr ""
-#: templates/ishtar/sheet_operation.html:110
+#: templates/ishtar/sheet_operation.html:100
msgid "Associated parcels"
msgstr ""
-#: templates/ishtar/sheet_operation.html:118
+#: templates/ishtar/sheet_operation.html:108
msgid "Document from this operation"
msgstr ""
-#: templates/ishtar/sheet_operation.html:124
-#: templates/ishtar/sheet_operation.html:161
+#: templates/ishtar/sheet_operation.html:114
+#: templates/ishtar/sheet_operation.html:151
msgid "Context records"
msgstr ""
-#: templates/ishtar/sheet_operation.html:128
+#: templates/ishtar/sheet_operation.html:118
msgid "Context record relations"
msgstr ""
-#: templates/ishtar/sheet_operation.html:133
+#: templates/ishtar/sheet_operation.html:123
msgid "Documents from associated context records"
msgstr ""
-#: templates/ishtar/sheet_operation.html:138
-#: templates/ishtar/sheet_operation.html:184
+#: templates/ishtar/sheet_operation.html:128
+#: templates/ishtar/sheet_operation.html:174
msgid "Finds"
msgstr ""
-#: templates/ishtar/sheet_operation.html:143
+#: templates/ishtar/sheet_operation.html:133
msgid "Documents from associated finds"
msgstr ""
-#: templates/ishtar/sheet_operation.html:148
+#: templates/ishtar/sheet_operation.html:138
msgid "Statistics"
msgstr ""
-#: templates/ishtar/sheet_operation.html:168
-#: templates/ishtar/sheet_operation.html:222
+#: templates/ishtar/sheet_operation.html:158
+#: templates/ishtar/sheet_operation.html:212
#: templates/ishtar/blocks/window_tables/administrativacts.html:8
msgid "Type"
msgstr ""
-#: templates/ishtar/sheet_operation.html:168
-#: templates/ishtar/sheet_operation.html:176
-#: templates/ishtar/sheet_operation.html:191
-#: templates/ishtar/sheet_operation.html:199
-#: templates/ishtar/sheet_operation.html:207
-#: templates/ishtar/sheet_operation.html:222
+#: templates/ishtar/sheet_operation.html:158
+#: templates/ishtar/sheet_operation.html:166
+#: templates/ishtar/sheet_operation.html:181
+#: templates/ishtar/sheet_operation.html:189
+#: templates/ishtar/sheet_operation.html:197
+#: templates/ishtar/sheet_operation.html:212
#: templates/ishtar/dashboards/dashboard_operation.html:18
#: templates/ishtar/dashboards/dashboard_operation.html:164
#: templates/ishtar/dashboards/dashboard_operation.html:432
@@ -1202,19 +1215,19 @@ msgstr ""
msgid "Number"
msgstr ""
-#: templates/ishtar/sheet_operation.html:191
+#: templates/ishtar/sheet_operation.html:181
msgid "Material type"
msgstr ""
-#: templates/ishtar/sheet_operation.html:199
+#: templates/ishtar/sheet_operation.html:189
msgid "Object type"
msgstr ""
-#: templates/ishtar/sheet_operation.html:215
+#: templates/ishtar/sheet_operation.html:205
msgid "Sources"
msgstr ""
-#: templates/ishtar/sheet_operation.html:231
+#: templates/ishtar/sheet_operation.html:221
msgid "Finds by context records"
msgstr ""
@@ -1222,6 +1235,10 @@ msgstr ""
msgid "Operation source"
msgstr ""
+#: templates/ishtar/sheet_operationsource.html:11
+msgid "Related operation"
+msgstr ""
+
#: templates/ishtar/blocks/window_tables/administrativacts.html:9
msgid "Date"
msgstr ""
diff --git a/archaeological_warehouse/locale/django.pot b/archaeological_warehouse/locale/django.pot
index 5f7ac6fd1..87fedd778 100644
--- a/archaeological_warehouse/locale/django.pot
+++ b/archaeological_warehouse/locale/django.pot
@@ -161,7 +161,7 @@ msgstr ""
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:57 models.py:192 templates/ishtar/sheet_warehouse.html:17
+#: ishtar_menu.py:57 models.py:192 templates/ishtar/sheet_warehouse.html:20
msgid "Containers"
msgstr ""
@@ -210,11 +210,11 @@ msgid "Collection"
msgstr ""
#: models.py:117
-msgid "Warehouse division"
+msgid "Warehouse division type"
msgstr ""
#: models.py:118
-msgid "Warehouse divisions"
+msgid "Warehouse division types"
msgstr ""
#: models.py:138
@@ -297,11 +297,11 @@ msgstr ""
msgid "Container deletion"
msgstr ""
-#: templates/ishtar/sheet_container.html:19
+#: templates/ishtar/sheet_container.html:22
msgid "Content"
msgstr ""
-#: templates/ishtar/sheet_warehouse.html:22
+#: templates/ishtar/sheet_warehouse.html:25
msgid "Attached containers"
msgstr ""
diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot
index c345672b7..d95ccd2f8 100644
--- a/ishtar_common/locale/django.pot
+++ b/ishtar_common/locale/django.pot
@@ -17,7 +17,7 @@ msgstr ""
msgid "email address"
msgstr ""
-#: __init__.py:10
+#: __init__.py:10 templates/ishtar/sheet_source.html:8
msgid "Related item"
msgstr ""
@@ -119,31 +119,31 @@ msgstr ""
msgid "Importer configuration error: field \"{}\" does not exist for {}."
msgstr ""
-#: data_importer.py:1555
+#: data_importer.py:1559
msgid "line"
msgstr ""
-#: data_importer.py:1555
+#: data_importer.py:1559
msgid "col"
msgstr ""
-#: data_importer.py:1555
+#: data_importer.py:1559
msgid "error"
msgstr ""
-#: data_importer.py:1561
+#: data_importer.py:1565
msgid "field"
msgstr ""
-#: data_importer.py:1561
+#: data_importer.py:1565
msgid "source"
msgstr ""
-#: data_importer.py:1561
+#: data_importer.py:1565
msgid "result"
msgstr ""
-#: data_importer.py:1577
+#: data_importer.py:1581
#, python-format
msgid "\"%(value)s\" not in %(values)s"
msgstr ""
@@ -181,7 +181,7 @@ msgid "Template"
msgstr ""
#: forms_common.py:41 forms_common.py:59 forms_common.py:184
-#: forms_common.py:408 models.py:1548 models.py:2986
+#: forms_common.py:408 models.py:1548 models.py:2989
#: templates/blocks/JQueryAdvancedTown.html:19
#: templates/ishtar/sheet_organization.html:13
msgid "Town"
@@ -197,8 +197,8 @@ msgid ""
"french town Saint-Denis in the Seine-Saint-Denis department. Heavy images are resized to: %(width)dx%(height)d (ratio is preserved)."
@@ -126,112 +132,112 @@ msgstr ""
" Les images trop grandes sont retaillées en : %(width)dx%(height)d (le "
"ratio est conservé).
- {{item.history_creation_date|date:"DATETIME_FORMAT"}}
-
-
- {% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}
-
-{% trans "General"%}
-{% field_li "Year" item.year "" "" %}
-{% field_li "Numerical reference" item.numeric_reference "" "" %}
-{% field_li "Other reference" item.internal_reference %}
-{% field_li "Name" item.name %}
- {% field_li "Reception date" item.reception_date|date:"DATE_FORMAT" %}
-
-
- {{item.history_creation_date|date:"DATETIME_FORMAT"}}
-
-
- {% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}
-
-
-{% field_li "Previous ID" item.previous_id %}
-
-
- {{item.history_creation_date|date:"DATETIME_FORMAT"}}
-
-
- {% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}
-
- {% trans "Associated base finds"%}
{% for base_find in item.base_finds.all %}
+
-{% field_li "Complete ID" base_find.complete_id %}
-{% field_li "Short ID" base_find.short_id %}
{% with item.history_creation_date|date:"SHORT_DATETIME_FORMAT" as creation_date %}
{% with item.history_creator.ishtaruser.full_label|add:"
"|add:creation_date|add:"" as creator %}
{% field_li "Created by" creator|safe %}
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index bc2169009..ebe9ae551 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -403,6 +403,10 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms,
def short_class_name(self):
return _(u"OPE")
+ @property
+ def external_id(self):
+ return self.code_patriarche
+
@property
def short_label(self):
if settings.COUNTRY == 'fr':
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index d3eb980c4..3e89c3c39 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -20,10 +20,11 @@
{% trans "General"%}
-{% field_li "Old code" item.old_code %}
+ {% field_li "Old code" item.old_code %}
diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html
index 4a7b2f0b9..94be2fc04 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_container.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_container.html
@@ -6,9 +6,11 @@
{% block content %}
{% window_nav item window_id 'show-container' '' '' '' previous next 1 %}
+
- {% field_li "Reference" item.reference %}
- {% field_li "Container type" item.container_type %}
{% field_li_detail "Responsible warehouse" item.responsible %}
{% field_li_detail "Location (warehouse)" item.location %}
diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
index 9fd022281..410108a52 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
@@ -6,10 +6,13 @@
{% block content %}
{% window_nav item window_id 'show-warehouse' '' '' '' previous next 1 %}
+
- {% field_li "Name" item.name %}
- {% field_li "Warehouse type" item.warehouse_type %}
{% field_li "Person in charge" item.person_in_charge %}
+ {% include "ishtar/blocks/sheet_creation_section.html" %}
{% field "Comment" item.comment "" "
" %}
diff --git a/example_project/settings.py b/example_project/settings.py
index b19867662..efbf0297a 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -214,6 +214,7 @@ APP_NAME = "SRA - Pays de la Loire"
SURFACE_UNIT = 'square-metre'
SURFACE_UNIT_LABEL = u'm²'
JOINT = u" | "
+ISHTAR_FILE_PREFIX = u""
ISHTAR_OPE_PREFIX = u"OA"
ISHTAR_DEF_OPE_PREFIX = u"OP"
# string len of find indexes - i.e: find with index 42 will be 00042
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 2fd56f697..84ef710b2 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -1546,3 +1546,7 @@ table.table-form td input{
display: block;
}
+.external-id{
+ font-family: monospace;
+ font-size: 0.9em;
+}
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html
new file mode 100644
index 000000000..1312cbcd5
--- /dev/null
+++ b/ishtar_common/templates/ishtar/blocks/sheet_creation_section.html
@@ -0,0 +1,19 @@
+{% load i18n link_to_window %}
+{% if item.history_creator.ishtaruser.person %}
+
+ {{item.history_creation_date|date:"DATETIME_FORMAT"}}
+
+
+ {% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}
+
+{% trans "General"%}
{% field_li "Old code" item.old_code %}
-
- {{item.history_creation_date|date:"DATETIME_FORMAT"}}
-
-
- {% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}
-
-
{% field_li_detail "Responsible warehouse" item.responsible %}
+ {% include "ishtar/blocks/sheet_creation_section.html" %}
{% field_li_detail "Location (warehouse)" item.location %}
{% field "Location" item.precise_location %}
diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html
index 0d7f9621b..8d51846b2 100644
--- a/ishtar_common/templates/ishtar/sheet_person.html
+++ b/ishtar_common/templates/ishtar/sheet_person.html
@@ -44,30 +44,33 @@
{% if item.address or item.postal_code or item.town %}
{% trans "Business address" %}
-{% field_li "Address" item.address %}
-{% field_li "Address complement" item.address_complement %}
-{% field_li "Postal code" item.postal_code %}
-{% field_li "Town" item.town %}
-{% endif %}
+
+ {% field_li "Address" item.address %}
+ {% field_li "Address complement" item.address_complement %}
+ {% field_li "Postal code" item.postal_code %}
+ {% field_li "Town" item.town %}
+
{% endif %}
{% if item.alt_address or item.alt_postal_code or item.alt_town %}
{% trans "Other address" %}
-{% field_li "Address" item.alt_address %}
-{% field_li "Address complement" item.alt_address_complement %}
-{% field_li "Postal code" item.alt_postal_code %}
-{% field_li "Town" item.alt_town %}
-{% endif %}
+
+ {% field_li "Address" item.alt_address %}
+ {% field_li "Address complement" item.alt_address_complement %}
+ {% field_li "Postal code" item.alt_postal_code %}
+ {% field_li "Town" item.alt_town %}
+
{% endif %}
{% if item.attached_to %}{% trans "Associated organization"%}
-{% field_li "Name" item.attached_to %}
-{% field_li "Address" item.attached_to.address %}
-{% field_li "Address complement" item.attached_to.address_complement %}
-{% field_li "Postal code" item.attached_to.postal_code %}
-{% field_li "Town" item.attached_to.town %}
-{% field_li "Phone" item.attached_to.phone %}
-{% field_li "Mobile phone" item.attached_to.mobile_phone %}
-{% endif %}
+
+ {% field_li "Name" item.attached_to %}
+ {% field_li "Address" item.attached_to.address %}
+ {% field_li "Address complement" item.attached_to.address_complement %}
+ {% field_li "Postal code" item.attached_to.postal_code %}
+ {% field_li "Town" item.attached_to.town %}
+ {% field_li "Phone" item.attached_to.phone %}
+ {% field_li "Mobile phone" item.attached_to.mobile_phone %}
+
{% endif %}
{% trans "Associated operations as scientist" as ao %}
--
cgit v1.2.3
From ab246c0ba95e5085335642e311dc78d536cdfa49 Mon Sep 17 00:00:00 2001
From: Étienne Loks
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 LerouxPar 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 9afb9759dae2933d5c56ab3f4d0375f142c95510 Mon Sep 17 00:00:00 2001 From: Étienne Loks{{ item.reference|default:"" }}
{{ item.container_type|default:"" }}
diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html index 410108a52..c31fc93b4 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html +++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html @@ -4,7 +4,7 @@ {% block head_title %}{% trans "Warehouse" %}{% endblock %} {% block content %} -{% window_nav item window_id 'show-warehouse' '' '' '' previous next 1 %} +{% window_nav item window_id 'show-warehouse' 'warehouse_modify' '' '' previous next 1 %}{{ item.name|default:"" }}
{{ item.warehouse_type|default:"" }}
diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py index 133d4ae79..e5920606a 100644 --- a/archaeological_warehouse/urls.py +++ b/archaeological_warehouse/urls.py @@ -64,6 +64,9 @@ urlpatterns += patterns( check_rights(['change_warehouse'])( views.warehouse_deletion_wizard), name='warehouse_deletion'), + url(r'warehouse-modify/(?P