Merge branch 'master' into develop

1 files changed, 136 insertions, 138 deletions

diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot
index 9a23c8e44..bcbfbc23a 100644
--- a/archaeological_operations/locale/django.pot
+++ b/archaeological_operations/locale/django.pot
@@ -4,27 +4,26 @@
 # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015.
 # Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata
 # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata
-# Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata
 # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata
-# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata
+# Valérie-Emma Leroux <emma@iggdrasil.net>, 2018. #zanata
 msgid ""
 msgstr ""
 
-#: admin.py:91 models.py:371
+#: admin.py:91 models.py:379
 msgid "Point"
 msgstr ""
 
-#: admin.py:93 models.py:372
+#: admin.py:93 models.py:380
 msgid "Multi polygon"
 msgstr ""
 
 #: forms.py:70 forms.py:371 forms.py:1058 forms.py:1073 forms.py:1077
-#: models.py:1293 templates/ishtar/blocks/window_tables/parcels.html:10
+#: models.py:1301 templates/ishtar/blocks/window_tables/parcels.html:10
 #: templates/ishtar/sheet_operation.html:155
 msgid "Parcels"
 msgstr ""
 
-#: forms.py:73 forms.py:206 forms.py:1041 models.py:1279
+#: forms.py:73 forms.py:206 forms.py:1041 models.py:1287
 #: templates/ishtar/blocks/window_tables/parcels.html:7
 #: templates/ishtar/dashboards/dashboard_operation.html:432
 #: templates/ishtar/dashboards/dashboard_operation.html:446
@@ -33,22 +32,22 @@ msgstr ""
 msgid "Town"
 msgstr ""
 
-#: forms.py:75 forms.py:484 forms.py:786 forms.py:1302 models.py:280
-#: models.py:1083 models.py:1277
+#: forms.py:75 forms.py:484 forms.py:786 forms.py:1302 models.py:288
+#: models.py:1091 models.py:1285
 #: templates/ishtar/blocks/window_tables/parcels.html:8
 msgid "Year"
 msgstr ""
 
-#: forms.py:78 models.py:1280
+#: forms.py:78 models.py:1288
 #: templates/ishtar/blocks/window_tables/parcels.html:9
 msgid "Section"
 msgstr ""
 
-#: forms.py:81 models.py:1282
+#: forms.py:81 models.py:1290
 msgid "Parcel number"
 msgstr ""
 
-#: forms.py:83 models.py:1284 models.py:1301 models.py:1350
+#: forms.py:83 models.py:1292 models.py:1309 models.py:1358
 msgid "Public domain"
 msgstr ""
 
@@ -84,8 +83,8 @@ msgstr ""
 msgid "Relation type"
 msgstr ""
 
-#: forms.py:383 ishtar_menu.py:30 models.py:377 models.py:884 models.py:919
-#: models.py:961 models.py:1065 models.py:1276
+#: forms.py:383 ishtar_menu.py:30 models.py:385 models.py:892 models.py:927
+#: models.py:969 models.py:1073 models.py:1284
 #: templates/ishtar/sheet_operation.html:4 wizards.py:351 wizards.py:362
 msgid "Operation"
 msgstr ""
@@ -119,11 +118,10 @@ msgid "Relations"
 msgstr ""
 
 #: forms.py:483
-#| msgid "Abstract (full text search)"
 msgid "Full text search"
 msgstr ""
 
-#: forms.py:485 forms.py:1272 models.py:281
+#: forms.py:485 forms.py:1272 models.py:289
 msgid "Numeric reference"
 msgstr ""
 
@@ -131,7 +129,7 @@ msgstr ""
 msgid "Parcel (section/number/public domain)"
 msgstr ""
 
-#: forms.py:495 forms.py:1317 models.py:885
+#: forms.py:495 forms.py:1317 models.py:893
 #: templates/ishtar/dashboards/dashboard_operation.html:390
 #: templates/ishtar/dashboards/dashboard_operation.html:411
 #: templates/ishtar/dashboards/dashboard_operation.html:643
@@ -146,11 +144,11 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: forms.py:498 forms.py:782 models.py:343
+#: forms.py:498 forms.py:782 models.py:351
 msgid "Address / Locality"
 msgstr ""
 
-#: forms.py:500 forms.py:704 forms.py:784 forms.py:1279 models.py:288
+#: forms.py:500 forms.py:704 forms.py:784 forms.py:1279 models.py:296
 msgid "Operation type"
 msgstr ""
 
@@ -158,24 +156,24 @@ msgstr ""
 msgid "Is open?"
 msgstr ""
 
-#: forms.py:510 forms.py:816 models.py:273
+#: forms.py:510 forms.py:816 models.py:281
 msgid "In charge"
 msgstr ""
 
-#: forms.py:517 models.py:1059
+#: forms.py:517 models.py:1067
 msgid "Scientist in charge"
 msgstr ""
 
-#: forms.py:519 forms.py:706 forms.py:806 models.py:271
+#: forms.py:519 forms.py:706 forms.py:806 models.py:279
 msgid "Operator"
 msgstr ""
 
-#: forms.py:528 forms.py:1144 models.py:91 models.py:290
+#: forms.py:528 forms.py:1144 models.py:91 models.py:298
 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10
 msgid "Remains"
 msgstr ""
 
-#: forms.py:529 forms.py:1122 forms.py:1141 models.py:89 models.py:296
+#: forms.py:529 forms.py:1122 forms.py:1141 models.py:89 models.py:304
 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9
 msgid "Periods"
 msgstr ""
@@ -208,19 +206,19 @@ msgstr ""
 msgid "Abstract (full text search)"
 msgstr ""
 
-#: forms.py:544 forms.py:871 models.py:346
+#: forms.py:544 forms.py:871 models.py:354
 msgid "Comment about scientific documentation"
 msgstr ""
 
-#: forms.py:545 forms.py:873 models.py:358
+#: forms.py:545 forms.py:873 models.py:366
 msgid "Record quality"
 msgstr ""
 
-#: forms.py:546 forms.py:838 models.py:308
+#: forms.py:546 forms.py:838 models.py:316
 msgid "Report processing"
 msgstr ""
 
-#: forms.py:548 forms.py:876 models.py:353
+#: forms.py:548 forms.py:876 models.py:361
 msgid "Virtual operation"
 msgstr ""
 
@@ -244,7 +242,7 @@ msgstr ""
 msgid "Documentation deadline after"
 msgstr ""
 
-#: forms.py:573 forms.py:861 models.py:365
+#: forms.py:573 forms.py:861 models.py:373
 msgid "Documentation received"
 msgstr ""
 
@@ -256,11 +254,11 @@ msgstr ""
 msgid "Finds deadline after"
 msgstr ""
 
-#: forms.py:579 forms.py:866 models.py:369
+#: forms.py:579 forms.py:866 models.py:377
 msgid "Finds received"
 msgstr ""
 
-#: forms.py:624 forms.py:1264 views.py:167
+#: forms.py:624 forms.py:1264 views.py:163
 msgid "Operation search"
 msgstr ""
 
@@ -268,12 +266,12 @@ msgstr ""
 msgid "Associated file"
 msgstr ""
 
-#: forms.py:672 forms.py:974 models.py:529 models.py:960 models.py:1070
+#: forms.py:672 forms.py:974 models.py:537 models.py:968 models.py:1078
 #: wizards.py:79
 msgid "Archaeological file"
 msgstr ""
 
-#: forms.py:679 forms.py:681 models.py:360
+#: forms.py:679 forms.py:681 models.py:368
 msgid "Abstract"
 msgstr ""
 
@@ -285,7 +283,7 @@ msgstr ""
 msgid "years"
 msgstr ""
 
-#: forms.py:686 models.py:257
+#: forms.py:686 models.py:265
 msgid "Creation date"
 msgstr ""
 
@@ -342,11 +340,11 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: forms.py:780 models.py:342
+#: forms.py:780 models.py:350
 msgid "Generic name"
 msgstr ""
 
-#: forms.py:791 models.py:310
+#: forms.py:791 models.py:318
 msgid "Old code"
 msgstr ""
 
@@ -354,7 +352,7 @@ msgstr ""
 msgid "Head scientist"
 msgstr ""
 
-#: forms.py:813 models.py:341
+#: forms.py:813 models.py:349
 msgid "Operator reference"
 msgstr ""
 
@@ -362,23 +360,23 @@ msgstr ""
 msgid "Total surface (m2)"
 msgstr ""
 
-#: forms.py:831 models.py:55 models.py:260 models.py:1492
+#: forms.py:831 models.py:55 models.py:268 models.py:1500
 msgid "Start date"
 msgstr ""
 
-#: forms.py:833 models.py:262
+#: forms.py:833 models.py:270
 msgid "Excavation end date"
 msgstr ""
 
-#: forms.py:836 models.py:263
+#: forms.py:836 models.py:271
 msgid "Report delivery date"
 msgstr ""
 
-#: forms.py:858 models.py:362
+#: forms.py:858 models.py:370
 msgid "Deadline for submission of the documentation"
 msgstr ""
 
-#: forms.py:863 models.py:367
+#: forms.py:863 models.py:375
 msgid "Deadline for submission of the finds"
 msgstr ""
 
@@ -413,11 +411,11 @@ msgstr ""
 msgid "Bad operation code"
 msgstr ""
 
-#: forms.py:970 models.py:544 models.py:914
+#: forms.py:970 models.py:552 models.py:922
 msgid "Operation code"
 msgstr ""
 
-#: forms.py:999 forms.py:1003 models.py:277
+#: forms.py:999 forms.py:1003 models.py:285
 msgid "Collaborators"
 msgstr ""
 
@@ -425,20 +423,20 @@ msgstr ""
 msgid "Preventive informations - excavation"
 msgstr ""
 
-#: forms.py:1012 models.py:294
+#: forms.py:1012 models.py:302
 #: templates/ishtar/dashboards/dashboard_operation.html:701
 msgid "Cost (euros)"
 msgstr ""
 
-#: forms.py:1013 models.py:299
+#: forms.py:1013 models.py:307
 msgid "Scheduled man-days"
 msgstr ""
 
-#: forms.py:1015 models.py:302
+#: forms.py:1015 models.py:310
 msgid "Optional man-days"
 msgstr ""
 
-#: forms.py:1017 models.py:305
+#: forms.py:1017 models.py:313
 msgid "Effective man-days"
 msgstr ""
 
@@ -446,23 +444,23 @@ msgstr ""
 msgid "Preventive informations - diagnostic"
 msgstr ""
 
-#: forms.py:1030 models.py:325
+#: forms.py:1030 models.py:333
 msgid "Prescription on zoning"
 msgstr ""
 
-#: forms.py:1032 models.py:328
+#: forms.py:1032 models.py:336
 msgid "Prescription on large area"
 msgstr ""
 
-#: forms.py:1035 models.py:330
+#: forms.py:1035 models.py:338
 msgid "Prescription on geoarchaeological context"
 msgstr ""
 
-#: forms.py:1039 forms.py:1054 models.py:292 models.py:1093
+#: forms.py:1039 forms.py:1054 models.py:300 models.py:1101
 msgid "Towns"
 msgstr ""
 
-#: forms.py:1061 models.py:1292 models.py:1490
+#: forms.py:1061 models.py:1300 models.py:1498
 msgid "Parcel"
 msgstr ""
 
@@ -487,7 +485,7 @@ msgstr ""
 msgid "This reference already exists."
 msgstr ""
 
-#: forms.py:1199 models.py:96 models.py:350
+#: forms.py:1199 models.py:96 models.py:358
 #: templates/ishtar/sheet_operation.html:99
 msgid "Archaeological sites"
 msgstr ""
@@ -508,7 +506,7 @@ msgstr ""
 msgid "Would you like to delete this operation?"
 msgstr ""
 
-#: forms.py:1228 forms.py:1303 forms.py:1442 models.py:921 models.py:1050
+#: forms.py:1228 forms.py:1303 forms.py:1442 models.py:929 models.py:1058
 msgid "Index"
 msgstr ""
 
@@ -535,7 +533,7 @@ msgstr ""
 msgid "You should select a document."
 msgstr ""
 
-#: forms.py:1311 forms.py:1378 models.py:974 models.py:1044
+#: forms.py:1311 forms.py:1378 models.py:982 models.py:1052
 msgid "Act type"
 msgstr ""
 
@@ -543,12 +541,12 @@ msgstr ""
 msgid "Indexed?"
 msgstr ""
 
-#: forms.py:1318 forms.py:1383 models.py:1084
+#: forms.py:1318 forms.py:1383 models.py:1092
 #: templates/ishtar/blocks/window_tables/administrativacts.html:10
 msgid "Object"
 msgstr ""
 
-#: forms.py:1355 views.py:353
+#: forms.py:1355 views.py:349
 msgid "Administrative act search"
 msgstr ""
 
@@ -556,7 +554,7 @@ msgstr ""
 msgid "You should select an administrative act."
 msgstr ""
 
-#: forms.py:1386 models.py:1081
+#: forms.py:1386 models.py:1089
 msgid "Signature date"
 msgstr ""
 
@@ -591,7 +589,7 @@ msgstr ""
 msgid "Generate the associated doc?"
 msgstr ""
 
-#: forms.py:1521 ishtar_menu.py:123 views.py:406
+#: forms.py:1521 ishtar_menu.py:123 views.py:402
 msgctxt "admin act register"
 msgid "Register"
 msgstr ""
@@ -612,7 +610,7 @@ msgstr ""
 msgid "Deletion"
 msgstr ""
 
-#: ishtar_menu.py:59 models.py:1100
+#: ishtar_menu.py:59 models.py:1108
 #: templates/ishtar/sheet_administrativeact.html:4
 msgid "Administrative act"
 msgstr ""
@@ -637,16 +635,16 @@ msgstr ""
 msgid "General informations"
 msgstr ""
 
-#: ishtar_menu.py:139 models.py:378
+#: ishtar_menu.py:139 models.py:386
 #: templates/ishtar/dashboards/dashboard_operation.html:8
 msgid "Operations"
 msgstr ""
 
-#: models.py:54 models.py:72 models.py:1970
+#: models.py:54 models.py:72 models.py:1978
 msgid "Order"
 msgstr ""
 
-#: models.py:56 models.py:1493
+#: models.py:56 models.py:1501
 msgid "End date"
 msgstr ""
 
@@ -734,265 +732,265 @@ msgstr ""
 msgid "Archaeological sites (reference)"
 msgstr ""
 
-#: models.py:259 templates/ishtar/sheet_operation.html:39
+#: models.py:267 templates/ishtar/sheet_operation.html:39
 msgid "Closing date"
 msgstr ""
 
-#: models.py:266
+#: models.py:274
 msgid "In charge scientist"
 msgstr ""
 
-#: models.py:285 models.py:1272
+#: models.py:293 models.py:1280
 msgid "File"
 msgstr ""
 
-#: models.py:289
+#: models.py:297
 msgid "Surface (m2)"
 msgstr ""
 
-#: models.py:344
+#: models.py:352
 msgid "General comment"
 msgstr ""
 
-#: models.py:347
+#: models.py:355
 msgid "Cached name"
 msgstr ""
 
-#: models.py:355
+#: models.py:363
 msgid ""
 "If checked, it means that this operation have not been officialy registered."
 msgstr ""
 
-#: models.py:414
+#: models.py:422
 msgid "OPE"
 msgstr ""
 
-#: models.py:492
+#: models.py:500
 msgid "Intercommunal"
 msgstr ""
 
-#: models.py:530
+#: models.py:538
 msgid "Code patriarche"
 msgstr ""
 
-#: models.py:570
+#: models.py:578
 msgid "This operation code already exists for this year"
 msgstr ""
 
-#: models.py:597
+#: models.py:605
 msgid "Number of parcels"
 msgstr ""
 
-#: models.py:607
+#: models.py:615
 msgid "Number of administrative acts"
 msgstr ""
 
-#: models.py:615
+#: models.py:623
 msgid "Number of indexed administrative acts"
 msgstr ""
 
-#: models.py:623
+#: models.py:631
 msgid "Number of context records"
 msgstr ""
 
-#: models.py:659
+#: models.py:667
 msgid "Number of finds"
 msgstr ""
 
-#: models.py:704
+#: models.py:712
 msgid "No type"
 msgstr ""
 
-#: models.py:735
+#: models.py:743
 msgid "Number of sources"
 msgstr ""
 
-#: models.py:777 templates/ishtar/dashboards/dashboard_operation.html:309
+#: models.py:785 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:839
+#: models.py:847
 msgid "Operation relation type"
 msgstr ""
 
-#: models.py:840
+#: models.py:848
 msgid "Operation relation types"
 msgstr ""
 
-#: models.py:853
+#: models.py:861
 msgid "Operation record relation"
 msgstr ""
 
-#: models.py:854
+#: models.py:862
 msgid "Operation record relations"
 msgstr ""
 
-#: models.py:913
+#: models.py:921
 msgid "Operation year"
 msgstr ""
 
-#: models.py:915
+#: models.py:923
 msgid "Document code"
 msgstr ""
 
-#: models.py:925
+#: models.py:933
 msgid "Operation documentation"
 msgstr ""
 
-#: models.py:926
+#: models.py:934
 msgid "Operation documentations"
 msgstr ""
 
-#: models.py:929
+#: models.py:937
 msgid "Can view all Operation sources"
 msgstr ""
 
-#: models.py:931
+#: models.py:939
 msgid "Can view own Operation source"
 msgstr ""
 
-#: models.py:933
+#: models.py:941
 msgid "Can add own Operation source"
 msgstr ""
 
-#: models.py:935
+#: models.py:943
 msgid "Can change own Operation source"
 msgstr ""
 
-#: models.py:937
+#: models.py:945
 msgid "Can delete own Operation source"
 msgstr ""
 
-#: models.py:962 models.py:1075
+#: models.py:970 models.py:1083
 msgid "Treatment request"
 msgstr ""
 
-#: models.py:963 models.py:1080
+#: models.py:971 models.py:1088
 msgid "Treatment"
 msgstr ""
 
-#: models.py:965
+#: models.py:973
 msgid "Intended to"
 msgstr ""
 
-#: models.py:967
+#: models.py:975
 msgid "Code"
 msgstr ""
 
-#: models.py:970
+#: models.py:978
 msgid "Associated template"
 msgstr ""
 
-#: models.py:971
+#: models.py:979
 msgid "Indexed"
 msgstr ""
 
-#: models.py:975
+#: models.py:983
 msgid "Act types"
 msgstr ""
 
-#: models.py:1041 models.py:1121
+#: models.py:1049 models.py:1129
 #: templates/ishtar/blocks/window_tables/administrativacts.html:7
 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
 msgid "Ref."
 msgstr ""
 
-#: models.py:1048
+#: models.py:1056
 msgid "Person in charge of the operation"
 msgstr ""
 
-#: models.py:1054
+#: models.py:1062
 msgid "Archaeological preventive operator"
 msgstr ""
 
-#: models.py:1062
+#: models.py:1070
 msgid "Signatory"
 msgstr ""
 
-#: models.py:1090
+#: models.py:1098
 msgid "Departments"
 msgstr ""
 
-#: models.py:1091
+#: models.py:1099
 msgid "Cached values get from associated departments"
 msgstr ""
 
-#: models.py:1094
+#: models.py:1102
 msgid "Cached values get from associated towns"
 msgstr ""
 
-#: models.py:1101 templates/ishtar/sheet_operation.html:107
+#: models.py:1109 templates/ishtar/sheet_operation.html:107
 #: templates/ishtar/sheet_operation.html:149
 msgid "Administrative acts"
 msgstr ""
 
-#: models.py:1215
+#: models.py:1223
 msgid "This index already exists for this year"
 msgstr ""
 
-#: models.py:1285
+#: models.py:1293
 msgid "External ID"
 msgstr ""
 
-#: models.py:1288
+#: models.py:1296
 msgid "External ID is set automatically"
 msgstr ""
 
-#: models.py:1289
+#: models.py:1297
 msgid "Address - Locality"
 msgstr ""
 
-#: models.py:1488
+#: models.py:1496
 msgid "Owner"
 msgstr ""
 
-#: models.py:1496
+#: models.py:1504
 msgid "Parcel owner"
 msgstr ""
 
-#: models.py:1497
+#: models.py:1505
 msgid "Parcel owners"
 msgstr ""
 
-#: models.py:1531
+#: models.py:1539
 msgid "Recorded"
 msgstr ""
 
-#: models.py:1532
+#: models.py:1540
 msgid "Effective"
 msgstr ""
 
-#: models.py:1533
+#: models.py:1541
 msgid "Active"
 msgstr ""
 
-#: models.py:1534
+#: models.py:1542
 msgid "Field completed"
 msgstr ""
 
-#: models.py:1535
+#: models.py:1543
 msgid "Associated report"
 msgstr ""
 
-#: models.py:1536
+#: models.py:1544
 msgid "Closed"
 msgstr ""
 
-#: models.py:1537
+#: models.py:1545
 msgid "Documented and closed"
 msgstr ""
 
-#: models.py:1971
+#: models.py:1979
 msgid "Is preventive"
 msgstr ""
 
-#: models.py:1974
+#: models.py:1982
 msgid "Operation type old"
 msgstr ""
 
-#: models.py:1975
+#: models.py:1983
 msgid "Operation types old"
 msgstr ""
 
@@ -1366,47 +1364,47 @@ msgstr ""
 msgid "This act is indexed!"
 msgstr ""
 
-#: views.py:223
+#: views.py:219
 msgid "New operation"
 msgstr ""
 
-#: views.py:268
+#: views.py:264
 msgid "Operation modification"
 msgstr ""
 
-#: views.py:296
+#: views.py:292
 msgid "Operation closing"
 msgstr ""
 
-#: views.py:307
+#: views.py:303
 msgid "Operation deletion"
 msgstr ""
 
-#: views.py:312
+#: views.py:308
 msgid "Operation: source search"
 msgstr ""
 
-#: views.py:320
+#: views.py:316
 msgid "Operation: source creation"
 msgstr ""
 
-#: views.py:332
+#: views.py:328
 msgid "Operation: source modification"
 msgstr ""
 
-#: views.py:347
+#: views.py:343
 msgid "Operation: source deletion"
 msgstr ""
 
-#: views.py:366
+#: views.py:362
 msgid "Operation: new administrative act"
 msgstr ""
 
-#: views.py:376
+#: views.py:372
 msgid "Operation: administrative act modification"
 msgstr ""
 
-#: views.py:400
+#: views.py:396
 msgid "Operation: administrative act deletion"
 msgstr ""