Merge branch 'master' into develop

Conflicts:
	version.py

1 files changed, 100 insertions, 100 deletions

diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot
index fafadea13..f8ba1f3a0 100644
--- a/archaeological_operations/locale/django.pot
+++ b/archaeological_operations/locale/django.pot
@@ -10,13 +10,13 @@
 msgid ""
 msgstr ""
 
-#: forms.py:69 forms.py:371 forms.py:1047 forms.py:1069 forms.py:1073
+#: forms.py:69 forms.py:371 forms.py:1055 forms.py:1077 forms.py:1081
 #: models.py:1252 templates/ishtar/sheet_operation.html:153
 #: templates/ishtar/blocks/window_tables/parcels.html:10
 msgid "Parcels"
 msgstr ""
 
-#: forms.py:72 forms.py:205 forms.py:1023 models.py:1238
+#: forms.py:72 forms.py:205 forms.py:1031 models.py:1238
 #: templates/ishtar/blocks/window_tables/parcels.html:7
 #: templates/ishtar/dashboards/dashboard_operation.html:432
 #: templates/ishtar/dashboards/dashboard_operation.html:446
@@ -25,7 +25,7 @@ msgstr ""
 msgid "Town"
 msgstr ""
 
-#: forms.py:74 forms.py:481 forms.py:783 forms.py:1293 models.py:276
+#: forms.py:74 forms.py:481 forms.py:781 forms.py:1301 models.py:276
 #: models.py:1044 models.py:1236
 #: templates/ishtar/blocks/window_tables/parcels.html:8
 msgid "Year"
@@ -86,7 +86,7 @@ msgstr ""
 msgid ":"
 msgstr ""
 
-#: forms.py:414 forms.py:633 forms.py:1258
+#: forms.py:414 forms.py:633 forms.py:1266
 msgid "You should select an operation."
 msgstr ""
 
@@ -110,15 +110,15 @@ msgstr ""
 msgid "Relations"
 msgstr ""
 
-#: forms.py:482 forms.py:1264 models.py:277
+#: forms.py:482 forms.py:1272 models.py:277
 msgid "Numeric reference"
 msgstr ""
 
-#: forms.py:488 forms.py:1304
+#: forms.py:488 forms.py:1312
 msgid "Parcel (section/number/public domain)"
 msgstr ""
 
-#: forms.py:491 forms.py:1307 models.py:848
+#: forms.py:491 forms.py:1315 models.py:848
 #: templates/ishtar/dashboards/dashboard_operation.html:390
 #: templates/ishtar/dashboards/dashboard_operation.html:411
 #: templates/ishtar/dashboards/dashboard_operation.html:643
@@ -127,17 +127,17 @@ msgstr ""
 msgid "Department"
 msgstr ""
 
-#: forms.py:492 forms.py:1135 models.py:86
+#: forms.py:492 forms.py:1143 models.py:86
 #: templates/ishtar/sheet_operation.html:22
 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8
 msgid "Name"
 msgstr ""
 
-#: forms.py:494 forms.py:779 models.py:338
+#: forms.py:494 forms.py:777 models.py:338
 msgid "Address / Locality"
 msgstr ""
 
-#: forms.py:496 forms.py:700 forms.py:781 forms.py:1270 models.py:284
+#: forms.py:496 forms.py:700 forms.py:779 forms.py:1278 models.py:284
 msgid "Operation type"
 msgstr ""
 
@@ -145,7 +145,7 @@ msgstr ""
 msgid "Is open?"
 msgstr ""
 
-#: forms.py:506 forms.py:813 models.py:269
+#: forms.py:506 forms.py:811 models.py:269
 msgid "In charge"
 msgstr ""
 
@@ -153,16 +153,16 @@ msgstr ""
 msgid "Scientist in charge"
 msgstr ""
 
-#: forms.py:515 forms.py:702 forms.py:803 models.py:267
+#: forms.py:515 forms.py:702 forms.py:801 models.py:267
 msgid "Operator"
 msgstr ""
 
-#: forms.py:524 forms.py:1140 models.py:90 models.py:286
+#: forms.py:524 forms.py:1148 models.py:90 models.py:286
 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10
 msgid "Remains"
 msgstr ""
 
-#: forms.py:525 forms.py:1118 forms.py:1137 models.py:88 models.py:292
+#: forms.py:525 forms.py:1126 forms.py:1145 models.py:88 models.py:292
 #: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9
 msgid "Periods"
 msgstr ""
@@ -187,7 +187,7 @@ msgstr ""
 msgid "Search within relations"
 msgstr ""
 
-#: forms.py:537 forms.py:867
+#: forms.py:537 forms.py:863
 msgid "Comment"
 msgstr ""
 
@@ -195,31 +195,31 @@ msgstr ""
 msgid "Abstract (full text search)"
 msgstr ""
 
-#: forms.py:540 forms.py:870 models.py:341
+#: forms.py:540 forms.py:866 models.py:341
 msgid "Comment about scientific documentation"
 msgstr ""
 
-#: forms.py:541 forms.py:872 models.py:353
+#: forms.py:541 forms.py:868 models.py:353
 msgid "Record quality"
 msgstr ""
 
-#: forms.py:542 forms.py:837 models.py:304
+#: forms.py:542 forms.py:833 models.py:304
 msgid "Report processing"
 msgstr ""
 
-#: forms.py:544 forms.py:875 models.py:348
+#: forms.py:544 forms.py:871 models.py:348
 msgid "Virtual operation"
 msgstr ""
 
-#: forms.py:546 forms.py:1180 forms.py:1184 models.py:94
+#: forms.py:546 forms.py:1188 forms.py:1192 models.py:94
 msgid "Archaeological site"
 msgstr ""
 
-#: forms.py:552 forms.py:1311
+#: forms.py:552 forms.py:1319
 msgid "Created by"
 msgstr ""
 
-#: forms.py:558 forms.py:1317
+#: forms.py:558 forms.py:1325
 msgid "Modified by"
 msgstr ""
 
@@ -231,7 +231,7 @@ msgstr ""
 msgid "Documentation deadline after"
 msgstr ""
 
-#: forms.py:569 forms.py:860 models.py:360
+#: forms.py:569 forms.py:856 models.py:360
 msgid "Documentation received"
 msgstr ""
 
@@ -243,11 +243,11 @@ msgstr ""
 msgid "Finds deadline after"
 msgstr ""
 
-#: forms.py:575 forms.py:865 models.py:364
+#: forms.py:575 forms.py:861 models.py:364
 msgid "Finds received"
 msgstr ""
 
-#: forms.py:620 forms.py:1256 views.py:168
+#: forms.py:620 forms.py:1264 views.py:168
 msgid "Operation search"
 msgstr ""
 
@@ -255,7 +255,7 @@ msgstr ""
 msgid "Associated file"
 msgstr ""
 
-#: forms.py:668 forms.py:971 models.py:520 models.py:921 models.py:1031
+#: forms.py:668 forms.py:967 models.py:520 models.py:921 models.py:1031
 #: wizards.py:80
 msgid "Archaeological file"
 msgstr ""
@@ -324,261 +324,261 @@ msgstr ""
 msgid "With finds"
 msgstr ""
 
-#: forms.py:761 forms.py:1365 templates/ishtar/sheet_administrativeact.html:20
+#: forms.py:761 forms.py:1373 templates/ishtar/sheet_administrativeact.html:20
 #: templates/ishtar/sheet_operation.html:26
 msgid "General"
 msgstr ""
 
-#: forms.py:777 models.py:337
+#: forms.py:775 models.py:337
 msgid "Generic name"
 msgstr ""
 
-#: forms.py:788 models.py:306
+#: forms.py:786 models.py:306
 msgid "Old code"
 msgstr ""
 
-#: forms.py:791
+#: forms.py:789
 msgid "Head scientist"
 msgstr ""
 
-#: forms.py:810 models.py:336
+#: forms.py:808 models.py:336
 msgid "Operator reference"
 msgstr ""
 
-#: forms.py:823 models.py:273
-msgid "Collaborators"
-msgstr ""
-
-#: forms.py:826
+#: forms.py:822
 msgid "Total surface (m2)"
 msgstr ""
 
-#: forms.py:830 models.py:54 models.py:256 models.py:1448
+#: forms.py:826 models.py:54 models.py:256 models.py:1448
 msgid "Start date"
 msgstr ""
 
-#: forms.py:832 models.py:258
+#: forms.py:828 models.py:258
 msgid "Excavation end date"
 msgstr ""
 
-#: forms.py:835 models.py:259
+#: forms.py:831 models.py:259
 msgid "Report delivery date"
 msgstr ""
 
-#: forms.py:857 models.py:357
+#: forms.py:853 models.py:357
 msgid "Deadline for submission of the documentation"
 msgstr ""
 
-#: forms.py:862 models.py:362
+#: forms.py:858 models.py:362
 msgid "Deadline for submission of the finds"
 msgstr ""
 
-#: forms.py:877
+#: forms.py:873
 msgid "Image"
 msgstr ""
 
-#: forms.py:878
+#: forms.py:874
 #, python-format
 msgid ""
 "<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</"
 "p>"
 msgstr ""
 
-#: forms.py:924
+#: forms.py:920
 msgid ""
 "If you want to set an excavation end date you have to provide a start date."
 msgstr ""
 
-#: forms.py:929
+#: forms.py:925
 msgid "The excavation end date cannot be before the start date."
 msgstr ""
 
-#: forms.py:957
+#: forms.py:953
 #, python-format
 msgid ""
 "Operation code already exists for year: %(year)d - use a value bigger than "
 "%(last_val)d"
 msgstr ""
 
-#: forms.py:961
+#: forms.py:957
 msgid "Bad operation code"
 msgstr ""
 
-#: forms.py:967 models.py:535 models.py:877
+#: forms.py:963 models.py:535 models.py:877
 msgid "Operation code"
 msgstr ""
 
-#: forms.py:993
+#: forms.py:989 forms.py:993 models.py:273
+msgid "Collaborators"
+msgstr ""
+
+#: forms.py:1001
 msgid "Preventive informations - excavation"
 msgstr ""
 
-#: forms.py:994 models.py:290
+#: forms.py:1002 models.py:290
 #: templates/ishtar/dashboards/dashboard_operation.html:701
 msgid "Cost (euros)"
 msgstr ""
 
-#: forms.py:995 models.py:295
+#: forms.py:1003 models.py:295
 msgid "Scheduled man-days"
 msgstr ""
 
-#: forms.py:997 models.py:298
+#: forms.py:1005 models.py:298
 msgid "Optional man-days"
 msgstr ""
 
-#: forms.py:999 models.py:301
+#: forms.py:1007 models.py:301
 msgid "Effective man-days"
 msgstr ""
 
-#: forms.py:1009
+#: forms.py:1017
 msgid "Preventive informations - diagnostic"
 msgstr ""
 
-#: forms.py:1012 models.py:320
+#: forms.py:1020 models.py:320
 msgid "Prescription on zoning"
 msgstr ""
 
-#: forms.py:1014 models.py:323
+#: forms.py:1022 models.py:323
 msgid "Prescription on large area"
 msgstr ""
 
-#: forms.py:1017 models.py:325
+#: forms.py:1025 models.py:325
 msgid "Prescription on geoarchaeological context"
 msgstr ""
 
-#: forms.py:1021 forms.py:1043 models.py:288 models.py:1054
+#: forms.py:1029 forms.py:1051 models.py:288 models.py:1054
 msgid "Towns"
 msgstr ""
 
-#: forms.py:1050 models.py:1251 models.py:1446
+#: forms.py:1058 models.py:1251 models.py:1446
 msgid "Parcel"
 msgstr ""
 
-#: forms.py:1102 models.py:46
+#: forms.py:1110 models.py:46
 msgid "Remain types"
 msgstr ""
 
-#: forms.py:1106 models.py:45
+#: forms.py:1114 models.py:45
 msgid "Remain type"
 msgstr ""
 
-#: forms.py:1122 templates/ishtar/sheet_operation.html:173
+#: forms.py:1130 templates/ishtar/sheet_operation.html:173
 #: templates/ishtar/sheet_operation.html:204
 msgid "Period"
 msgstr ""
 
-#: forms.py:1134 models.py:85
+#: forms.py:1142 models.py:85
 msgid "Reference"
 msgstr ""
 
-#: forms.py:1163
+#: forms.py:1171
 msgid "This reference already exists."
 msgstr ""
 
-#: forms.py:1195 models.py:95 models.py:345
+#: forms.py:1203 models.py:95 models.py:345
 #: templates/ishtar/sheet_operation.html:97
 msgid "Archaeological sites"
 msgstr ""
 
-#: forms.py:1199
+#: forms.py:1207
 msgid "Associated archaeological sites"
 msgstr ""
 
-#: forms.py:1205 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93
+#: forms.py:1213 ishtar_menu.py:34 ishtar_menu.py:64 ishtar_menu.py:93
 msgid "Search"
 msgstr ""
 
-#: forms.py:1210
+#: forms.py:1218
 msgid "Would you like to close this operation?"
 msgstr ""
 
-#: forms.py:1215
+#: forms.py:1223
 msgid "Would you like to delete this operation?"
 msgstr ""
 
-#: forms.py:1224 forms.py:1294 forms.py:1430 models.py:884 models.py:1011
+#: forms.py:1232 forms.py:1302 forms.py:1438 models.py:884 models.py:1011
 msgid "Index"
 msgstr ""
 
-#: forms.py:1250
+#: forms.py:1258
 #, python-format
 msgid ""
 "Index already exists for operation: %(operation)s - use a value bigger than "
 "%(last_val)d"
 msgstr ""
 
-#: forms.py:1262
+#: forms.py:1270
 msgid "Operation's year"
 msgstr ""
 
-#: forms.py:1269
+#: forms.py:1277
 msgid "Operation's town"
 msgstr ""
 
-#: forms.py:1282
+#: forms.py:1290
 msgid "Documentation search"
 msgstr ""
 
-#: forms.py:1284
+#: forms.py:1292
 msgid "You should select a document."
 msgstr ""
 
-#: forms.py:1301 forms.py:1368 models.py:935 models.py:1005
+#: forms.py:1309 forms.py:1376 models.py:935 models.py:1005
 msgid "Act type"
 msgstr ""
 
-#: forms.py:1302 forms.py:1500
+#: forms.py:1310 forms.py:1508
 msgid "Indexed?"
 msgstr ""
 
-#: forms.py:1308 forms.py:1373 models.py:1045
+#: forms.py:1316 forms.py:1381 models.py:1045
 #: templates/ishtar/blocks/window_tables/administrativacts.html:10
 msgid "Object"
 msgstr ""
 
-#: forms.py:1345 views.py:348
+#: forms.py:1353 views.py:350
 msgid "Administrative act search"
 msgstr ""
 
-#: forms.py:1360 forms.py:1458 forms.py:1525
+#: forms.py:1368 forms.py:1466 forms.py:1533
 msgid "You should select an administrative act."
 msgstr ""
 
-#: forms.py:1376 models.py:1042
+#: forms.py:1384 models.py:1042
 msgid "Signature date"
 msgstr ""
 
-#: forms.py:1418
+#: forms.py:1426
 #, python-format
 msgid ""
 "This index already exists for year: %(year)d - use a value bigger than "
 "%(last_val)d"
 msgstr ""
 
-#: forms.py:1422
+#: forms.py:1430
 msgid "Bad index"
 msgstr ""
 
-#: forms.py:1435
+#: forms.py:1443
 msgid "Would you like to delete this administrative act?"
 msgstr ""
 
-#: forms.py:1440
+#: forms.py:1448
 msgid "Template"
 msgstr ""
 
-#: forms.py:1464 forms.py:1468
+#: forms.py:1472 forms.py:1476
 msgid "This document is not intended for this type of act."
 msgstr ""
 
-#: forms.py:1486
+#: forms.py:1494
 msgid "Doc generation"
 msgstr ""
 
-#: forms.py:1488
+#: forms.py:1496
 msgid "Generate the associated doc?"
 msgstr ""
 
-#: forms.py:1509 ishtar_menu.py:123 views.py:401
+#: forms.py:1517 ishtar_menu.py:123 views.py:403
 msgctxt "admin act register"
 msgid "Register"
 msgstr ""
@@ -1059,47 +1059,47 @@ msgstr ""
 msgid "Operation types old"
 msgstr ""
 
-#: views.py:223
+#: views.py:224
 msgid "New operation"
 msgstr ""
 
-#: views.py:267
+#: views.py:269
 msgid "Operation modification"
 msgstr ""
 
-#: views.py:295
+#: views.py:297
 msgid "Operation closing"
 msgstr ""
 
-#: views.py:306
+#: views.py:308
 msgid "Operation deletion"
 msgstr ""
 
-#: views.py:311
+#: views.py:313
 msgid "Operation: source search"
 msgstr ""
 
-#: views.py:319
+#: views.py:321
 msgid "Operation: source creation"
 msgstr ""
 
-#: views.py:327
+#: views.py:329
 msgid "Operation: source modification"
 msgstr ""
 
-#: views.py:342
+#: views.py:344
 msgid "Operation: source deletion"
 msgstr ""
 
-#: views.py:361
+#: views.py:363
 msgid "Operation: new administrative act"
 msgstr ""
 
-#: views.py:371
+#: views.py:373
 msgid "Operation: administrative act modification"
 msgstr ""
 
-#: views.py:395
+#: views.py:397
 msgid "Operation: administrative act deletion"
 msgstr ""