From c8f08141fe2978619c0ae3b51c973a9c6626fe37 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 21 Feb 2025 17:09:14 +0100 Subject: 🌐 update localization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locale/de/LC_MESSAGES/django.po | 931 +++++++++++++++++++++------------------ locale/es/LC_MESSAGES/django.po | 923 +++++++++++++++++++++------------------ locale/fr/LC_MESSAGES/django.po | 937 ++++++++++++++++++++++------------------ locale/pt/LC_MESSAGES/django.po | 923 +++++++++++++++++++++------------------ 4 files changed, 2012 insertions(+), 1702 deletions(-) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index da1aeb10a..51c99d5a1 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-18 17:02+0100\n" +"POT-Creation-Date: 2025-02-24 17:56+0100\n" "PO-Revision-Date: 2019-11-01 18:52+0000\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: German \n" "Language-Team: LANGUAGE \n" @@ -82,14 +82,14 @@ msgstr "" #: archaeological_files/forms.py:1092 archaeological_files/forms.py:1128 #: archaeological_finds/forms.py:1703 archaeological_finds/forms.py:2421 #: archaeological_finds/forms_treatments.py:53 -#: archaeological_finds/forms_treatments.py:570 -#: archaeological_finds/forms_treatments.py:645 -#: archaeological_finds/forms_treatments.py:827 -#: archaeological_finds/forms_treatments.py:908 +#: archaeological_finds/forms_treatments.py:618 +#: archaeological_finds/forms_treatments.py:693 +#: archaeological_finds/forms_treatments.py:875 +#: archaeological_finds/forms_treatments.py:956 #: archaeological_operations/forms.py:487 #: archaeological_operations/forms.py:1217 #: archaeological_operations/forms.py:1474 -#: archaeological_warehouse/forms.py:146 archaeological_warehouse/forms.py:513 +#: archaeological_warehouse/forms.py:147 archaeological_warehouse/forms.py:514 #: ishtar_common/forms_common.py:833 ishtar_common/forms_common.py:1028 #: ishtar_common/forms_common.py:1256 ishtar_common/forms_common.py:2457 msgid "Full text search" @@ -108,7 +108,7 @@ msgstr "" #: archaeological_files/models.py:460 archaeological_finds/models_finds.py:1259 #: archaeological_operations/models.py:387 #: archaeological_operations/models.py:1183 -#: archaeological_warehouse/forms.py:152 ishtar_common/admin.py:1677 +#: archaeological_warehouse/forms.py:153 ishtar_common/admin.py:1677 #: ishtar_common/forms_common.py:839 ishtar_common/forms_common.py:1046 #: ishtar_common/forms_common.py:2595 ishtar_common/models.py:2473 #: ishtar_common/templates/ishtar/sheet_area.html:4 @@ -149,11 +149,11 @@ msgstr "" #: archaeological_context_records/forms.py:165 #: archaeological_files/templates/ishtar/sheet_file.html:198 #: archaeological_files/templates/ishtar/sheet_file.html:226 -#: archaeological_finds/forms_treatments.py:652 -#: archaeological_finds/forms_treatments.py:729 -#: archaeological_finds/forms_treatments.py:912 -#: archaeological_finds/forms_treatments.py:950 -#: archaeological_finds/models_treatments.py:197 +#: archaeological_finds/forms_treatments.py:700 +#: archaeological_finds/forms_treatments.py:777 +#: archaeological_finds/forms_treatments.py:960 +#: archaeological_finds/forms_treatments.py:998 +#: archaeological_finds/models_treatments.py:239 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:50 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:119 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:157 @@ -240,13 +240,13 @@ msgstr "" #: archaeological_finds/forms.py:593 archaeological_finds/forms.py:758 #: archaeological_finds/forms.py:760 archaeological_finds/forms.py:986 #: archaeological_finds/forms.py:1086 archaeological_finds/forms.py:1806 -#: archaeological_finds/forms_treatments.py:193 -#: archaeological_finds/forms_treatments.py:921 -#: archaeological_finds/forms_treatments.py:968 +#: archaeological_finds/forms_treatments.py:236 +#: archaeological_finds/forms_treatments.py:969 +#: archaeological_finds/forms_treatments.py:1016 #: archaeological_finds/models_finds.py:566 #: archaeological_finds/models_finds.py:2084 -#: archaeological_finds/models_treatments.py:340 -#: archaeological_finds/models_treatments.py:1585 +#: archaeological_finds/models_treatments.py:418 +#: archaeological_finds/models_treatments.py:1663 #: archaeological_finds/templates/ishtar/sheet_find.html:168 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:116 #: archaeological_operations/forms.py:1238 @@ -365,7 +365,8 @@ msgstr "" #: archaeological_files/forms.py:205 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:60 -#: archaeological_finds/forms_treatments.py:987 +#: archaeological_finds/forms_treatments.py:177 +#: archaeological_finds/forms_treatments.py:1035 #: archaeological_operations/forms.py:681 #: archaeological_operations/forms.py:706 #: archaeological_operations/forms.py:1343 @@ -398,7 +399,7 @@ msgstr "" #: archaeological_operations/forms.py:1039 #: archaeological_operations/models.py:3432 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 -#: archaeological_warehouse/forms.py:151 archaeological_warehouse/models.py:339 +#: archaeological_warehouse/forms.py:152 archaeological_warehouse/models.py:339 #: ishtar_common/forms_common.py:94 ishtar_common/forms_common.py:116 #: ishtar_common/models_common.py:3591 ishtar_common/models_common.py:4398 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 @@ -431,11 +432,6 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:258 #: archaeological_files/models.py:712 #: archaeological_files/templates/ishtar/sheet_file.html:78 -#: archaeological_finds/forms_treatments.py:183 -#: archaeological_finds/forms_treatments.py:673 -#: archaeological_finds/forms_treatments.py:765 -#: archaeological_finds/models_treatments.py:343 -#: archaeological_finds/models_treatments.py:1316 #: archaeological_operations/models.py:1568 #: archaeological_operations/templates/ishtar/sheet_operation.html:211 #: ishtar_common/forms.py:1120 ishtar_common/forms.py:1121 @@ -444,10 +440,11 @@ msgstr "" #: archaeological_context_records/forms.py:361 #: archaeological_context_records/models.py:907 -#: archaeological_finds/forms_treatments.py:152 -#: archaeological_finds/models_treatments.py:304 -#: archaeological_finds/models_treatments.py:930 -#: archaeological_warehouse/forms.py:771 +#: archaeological_finds/forms_treatments.py:74 +#: archaeological_finds/forms_treatments.py:199 +#: archaeological_finds/models_treatments.py:382 +#: archaeological_finds/models_treatments.py:1008 +#: archaeological_warehouse/forms.py:772 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 msgid "Location" msgstr "" @@ -545,11 +542,11 @@ msgstr "" #: archaeological_files/models.py:826 #: archaeological_files/templates/ishtar/sheet_file.html:200 #: archaeological_finds/forms.py:1560 -#: archaeological_finds/forms_treatments.py:181 -#: archaeological_finds/forms_treatments.py:763 +#: archaeological_finds/forms_treatments.py:231 +#: archaeological_finds/forms_treatments.py:811 #: archaeological_finds/models_finds.py:3832 -#: archaeological_finds/models_treatments.py:342 -#: archaeological_finds/models_treatments.py:928 +#: archaeological_finds/models_treatments.py:420 +#: archaeological_finds/models_treatments.py:1006 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:124 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:162 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:205 @@ -566,12 +563,19 @@ msgstr "" #: archaeological_context_records/models.py:112 #: archaeological_files/forms.py:640 archaeological_files/forms.py:756 #: archaeological_files/models.py:81 archaeological_files/models.py:827 -#: archaeological_finds/forms.py:1561 archaeological_finds/models_finds.py:3833 -#: archaeological_finds/models_treatments.py:929 +#: archaeological_finds/forms.py:1561 +#: archaeological_finds/forms_treatments.py:233 +#: archaeological_finds/forms_treatments.py:721 +#: archaeological_finds/forms_treatments.py:813 +#: archaeological_finds/models_finds.py:3833 +#: archaeological_finds/models_treatments.py:421 +#: archaeological_finds/models_treatments.py:1007 +#: archaeological_finds/models_treatments.py:1394 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:125 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:163 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:248 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:206 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:84 #: archaeological_operations/models.py:106 #: archaeological_operations/models.py:3766 #: ishtar_common/models_imports.py:1442 @@ -683,7 +687,7 @@ msgstr "" #: archaeological_finds/models_finds.py:2849 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:100 archaeological_operations/models.py:1947 -#: archaeological_warehouse/forms.py:574 ishtar_common/forms_common.py:2562 +#: archaeological_warehouse/forms.py:575 ishtar_common/forms_common.py:2562 #: ishtar_common/models.py:6030 ishtar_common/views.py:583 msgid "Context record" msgstr "" @@ -841,7 +845,7 @@ msgstr "" #: archaeological_context_records/models.py:131 #: archaeological_context_records/tests.py:935 -#: archaeological_finds/tests.py:1524 archaeological_finds/tests.py:1753 +#: archaeological_finds/tests.py:1528 archaeological_finds/tests.py:1757 msgctxt "key for text search" msgid "datings-period" msgstr "" @@ -882,7 +886,7 @@ msgstr "" #: archaeological_finds/models_finds.py:3734 #: archaeological_finds/models_finds.py:3774 #: archaeological_finds/models_finds.py:3820 -#: archaeological_finds/models_treatments.py:910 +#: archaeological_finds/models_treatments.py:988 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 #: ishtar_common/forms_common.py:2578 ishtar_common/models.py:6031 @@ -901,14 +905,14 @@ msgstr "" #: archaeological_finds/models_finds.py:335 #: archaeological_finds/models_finds.py:406 #: archaeological_finds/models_finds.py:2075 -#: archaeological_finds/models_treatments.py:73 -#: archaeological_finds/models_treatments.py:922 +#: archaeological_finds/models_treatments.py:74 +#: archaeological_finds/models_treatments.py:1000 #: archaeological_operations/models.py:104 #: archaeological_operations/models.py:129 #: archaeological_operations/models.py:186 #: archaeological_operations/models.py:199 #: archaeological_operations/models.py:3792 -#: archaeological_warehouse/forms.py:114 archaeological_warehouse/models.py:759 +#: archaeological_warehouse/forms.py:115 archaeological_warehouse/models.py:759 #: archaeological_warehouse/models.py:791 ishtar_common/models.py:687 #: ishtar_common/models.py:743 ishtar_common/models.py:794 #: ishtar_common/models.py:1874 ishtar_common/models.py:4367 @@ -1091,7 +1095,7 @@ msgstr "" #: archaeological_context_records/models.py:643 #: archaeological_files/models.py:565 archaeological_finds/models_finds.py:1712 -#: archaeological_finds/tests.py:1573 +#: archaeological_finds/tests.py:1577 msgctxt "key for text search" msgid "operation-name" msgstr "" @@ -1204,7 +1208,7 @@ msgid "documentation" msgstr "" #: archaeological_context_records/models.py:705 -#: archaeological_finds/models_finds.py:1471 archaeological_finds/tests.py:1590 +#: archaeological_finds/models_finds.py:1471 archaeological_finds/tests.py:1594 #: archaeological_operations/models.py:497 ishtar_common/models.py:4760 msgctxt "key for text search" msgid "description" @@ -1313,7 +1317,7 @@ msgstr "" #: archaeological_context_records/models.py:852 #: archaeological_files/models.py:649 archaeological_finds/models_finds.py:561 #: archaeological_finds/models_finds.py:2069 -#: archaeological_finds/models_treatments.py:337 +#: archaeological_finds/models_treatments.py:415 #: archaeological_operations/models.py:3440 #: archaeological_warehouse/models.py:461 #: archaeological_warehouse/models.py:1247 ishtar_common/models.py:5005 @@ -1364,9 +1368,9 @@ msgstr "" #: archaeological_context_records/models.py:988 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 #: archaeological_files/models.py:847 archaeological_finds/models_finds.py:2354 -#: archaeological_finds/models_treatments.py:357 -#: archaeological_finds/models_treatments.py:1349 -#: archaeological_finds/models_treatments.py:1596 +#: archaeological_finds/models_treatments.py:435 +#: archaeological_finds/models_treatments.py:1427 +#: archaeological_finds/models_treatments.py:1674 #: archaeological_finds/templates/ishtar/sheet_find.html:64 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:63 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 @@ -1399,9 +1403,9 @@ msgstr "" #: archaeological_context_records/models.py:995 #: archaeological_files/models.py:853 archaeological_finds/models_finds.py:2360 -#: archaeological_finds/models_treatments.py:363 -#: archaeological_finds/models_treatments.py:1356 -#: archaeological_finds/models_treatments.py:1603 +#: archaeological_finds/models_treatments.py:441 +#: archaeological_finds/models_treatments.py:1434 +#: archaeological_finds/models_treatments.py:1681 #: archaeological_operations/models.py:704 #: archaeological_operations/models.py:1702 #: archaeological_operations/models.py:3194 @@ -1691,7 +1695,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_exhibition.html:92 #: archaeological_finds/templates/ishtar/sheet_find.html:265 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:243 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:103 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:98 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:93 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:90 #: archaeological_operations/templates/ishtar/sheet_operation.html:357 @@ -1719,9 +1723,7 @@ msgid "Numerical reference" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:252 -#: archaeological_finds/forms_treatments.py:145 -#: archaeological_finds/models_treatments.py:198 -#: archaeological_finds/models_treatments.py:297 +#: archaeological_finds/models_treatments.py:240 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:120 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:158 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:197 @@ -1836,18 +1838,18 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:224 #: archaeological_finds/forms.py:1718 #: archaeological_finds/forms_treatments.py:59 -#: archaeological_finds/forms_treatments.py:147 -#: archaeological_finds/forms_treatments.py:420 -#: archaeological_finds/forms_treatments.py:574 -#: archaeological_finds/forms_treatments.py:650 -#: archaeological_finds/forms_treatments.py:720 -#: archaeological_finds/forms_treatments.py:831 -#: archaeological_finds/forms_treatments.py:913 -#: archaeological_finds/forms_treatments.py:951 +#: archaeological_finds/forms_treatments.py:187 +#: archaeological_finds/forms_treatments.py:466 +#: archaeological_finds/forms_treatments.py:622 +#: archaeological_finds/forms_treatments.py:698 +#: archaeological_finds/forms_treatments.py:768 +#: archaeological_finds/forms_treatments.py:879 +#: archaeological_finds/forms_treatments.py:961 +#: archaeological_finds/forms_treatments.py:999 #: archaeological_finds/models_finds.py:1258 -#: archaeological_finds/models_treatments.py:282 -#: archaeological_finds/models_treatments.py:1278 -#: archaeological_finds/models_treatments.py:1568 +#: archaeological_finds/models_treatments.py:344 +#: archaeological_finds/models_treatments.py:1356 +#: archaeological_finds/models_treatments.py:1646 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:51 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:489 #: archaeological_operations/forms.py:723 @@ -1943,13 +1945,13 @@ msgstr "" #: archaeological_files/models.py:758 archaeological_finds/forms.py:801 #: archaeological_finds/forms.py:1134 archaeological_finds/forms.py:1419 #: archaeological_finds/forms.py:2472 -#: archaeological_finds/forms_treatments.py:195 -#: archaeological_finds/forms_treatments.py:757 -#: archaeological_finds/forms_treatments.py:922 +#: archaeological_finds/forms_treatments.py:238 +#: archaeological_finds/forms_treatments.py:805 #: archaeological_finds/forms_treatments.py:970 -#: archaeological_finds/models_treatments.py:339 -#: archaeological_finds/models_treatments.py:1345 -#: archaeological_finds/models_treatments.py:1586 +#: archaeological_finds/forms_treatments.py:1018 +#: archaeological_finds/models_treatments.py:417 +#: archaeological_finds/models_treatments.py:1423 +#: archaeological_finds/models_treatments.py:1664 #: archaeological_operations/forms.py:541 #: archaeological_operations/forms.py:737 #: archaeological_operations/forms.py:1240 @@ -1959,8 +1961,8 @@ msgstr "" #: archaeological_operations/models.py:666 #: archaeological_operations/models.py:1691 #: archaeological_operations/models.py:3183 -#: archaeological_warehouse/forms.py:237 archaeological_warehouse/forms.py:385 -#: archaeological_warehouse/forms.py:525 archaeological_warehouse/models.py:440 +#: archaeological_warehouse/forms.py:238 archaeological_warehouse/forms.py:386 +#: archaeological_warehouse/forms.py:526 archaeological_warehouse/models.py:440 #: archaeological_warehouse/models.py:1220 ishtar_common/forms_common.py:2196 #: ishtar_common/forms_common.py:2519 ishtar_common/forms_common.py:3107 #: ishtar_common/models.py:3005 ishtar_common/models.py:4251 @@ -1975,8 +1977,8 @@ msgstr "" #: archaeological_files/forms.py:105 archaeological_files/forms.py:379 #: archaeological_files/forms.py:437 #: archaeological_files/templates/ishtar/sheet_file.html:199 -#: archaeological_finds/forms_treatments.py:655 -#: archaeological_finds/forms_treatments.py:916 +#: archaeological_finds/forms_treatments.py:703 +#: archaeological_finds/forms_treatments.py:964 msgid "In charge" msgstr "" @@ -1996,8 +1998,8 @@ msgid "Created by" msgstr "" #: archaeological_files/forms.py:144 archaeological_files/forms.py:1200 -#: archaeological_finds/forms_treatments.py:591 -#: archaeological_finds/forms_treatments.py:852 +#: archaeological_finds/forms_treatments.py:639 +#: archaeological_finds/forms_treatments.py:900 #: archaeological_operations/forms.py:564 msgid "Modified by" msgstr "" @@ -2012,7 +2014,7 @@ msgstr "" #: archaeological_files/forms.py:218 archaeological_files/models.py:725 #: archaeological_files/templates/ishtar/sheet_file.html:64 -#: archaeological_finds/models_treatments.py:1318 +#: archaeological_finds/models_treatments.py:1396 #: archaeological_operations/models.py:1567 ishtar_common/forms_common.py:2194 #: ishtar_common/forms_common.py:2597 ishtar_common/forms_common.py:2680 #: ishtar_common/models.py:5106 ishtar_common/models_imports.py:1439 @@ -2021,14 +2023,14 @@ msgid "Creation date" msgstr "" #: archaeological_files/forms.py:219 archaeological_files/models.py:727 -#: archaeological_finds/forms_treatments.py:760 -#: archaeological_finds/models_treatments.py:1320 +#: archaeological_finds/forms_treatments.py:808 +#: archaeological_finds/models_treatments.py:1398 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:247 msgid "Reception date" msgstr "" #: archaeological_files/forms.py:220 archaeological_files/models.py:646 -#: archaeological_finds/models_treatments.py:1281 +#: archaeological_finds/models_treatments.py:1359 #: ishtar_common/forms_common.py:2189 ishtar_common/forms_common.py:2473 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" @@ -2104,7 +2106,7 @@ msgid "Number/street" msgstr "" #: archaeological_files/forms.py:307 archaeological_files/forms.py:353 -#: archaeological_warehouse/forms.py:252 ishtar_common/forms_common.py:782 +#: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:782 #: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3846 msgid "Postal code" msgstr "" @@ -2122,7 +2124,7 @@ msgstr "" #: archaeological_operations/models.py:669 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_operations/templates/ishtar/sheet_site.html:90 -#: archaeological_warehouse/forms.py:239 archaeological_warehouse/forms.py:248 +#: archaeological_warehouse/forms.py:240 archaeological_warehouse/forms.py:249 #: ishtar_common/forms_common.py:778 ishtar_common/forms_common.py:1193 #: ishtar_common/models_common.py:3841 ishtar_common/models_common.py:4045 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 @@ -2347,20 +2349,20 @@ msgstr "" #: archaeological_files/forms.py:1100 archaeological_files/forms.py:1136 #: archaeological_files/forms.py:1266 #: archaeological_finds/forms_treatments.py:60 -#: archaeological_finds/forms_treatments.py:360 -#: archaeological_finds/forms_treatments.py:575 -#: archaeological_finds/forms_treatments.py:634 -#: archaeological_finds/forms_treatments.py:651 -#: archaeological_finds/forms_treatments.py:790 -#: archaeological_finds/forms_treatments.py:832 -#: archaeological_finds/forms_treatments.py:896 -#: archaeological_finds/models_treatments.py:283 -#: archaeological_finds/models_treatments.py:1279 +#: archaeological_finds/forms_treatments.py:406 +#: archaeological_finds/forms_treatments.py:623 +#: archaeological_finds/forms_treatments.py:682 +#: archaeological_finds/forms_treatments.py:699 +#: archaeological_finds/forms_treatments.py:838 +#: archaeological_finds/forms_treatments.py:880 +#: archaeological_finds/forms_treatments.py:944 +#: archaeological_finds/models_treatments.py:345 +#: archaeological_finds/models_treatments.py:1357 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:93 #: archaeological_operations/forms.py:1479 #: archaeological_operations/forms.py:1600 #: archaeological_operations/models.py:3108 -#: archaeological_warehouse/forms.py:462 archaeological_warehouse/forms.py:524 +#: archaeological_warehouse/forms.py:463 archaeological_warehouse/forms.py:525 #: archaeological_warehouse/models.py:1235 ishtar_common/admin.py:640 #: ishtar_common/models.py:5004 msgid "Index" @@ -2368,10 +2370,10 @@ msgstr "" #: archaeological_files/forms.py:1102 archaeological_files/forms.py:1138 #: archaeological_files/forms.py:1255 -#: archaeological_finds/forms_treatments.py:576 -#: archaeological_finds/forms_treatments.py:623 -#: archaeological_finds/forms_treatments.py:833 -#: archaeological_finds/forms_treatments.py:885 +#: archaeological_finds/forms_treatments.py:624 +#: archaeological_finds/forms_treatments.py:671 +#: archaeological_finds/forms_treatments.py:881 +#: archaeological_finds/forms_treatments.py:933 #: archaeological_operations/forms.py:1485 #: archaeological_operations/forms.py:1534 #: archaeological_operations/models.py:2831 @@ -2385,16 +2387,16 @@ msgid "Object (full text search)" msgstr "" #: archaeological_files/forms.py:1139 -#: archaeological_finds/forms_treatments.py:577 -#: archaeological_finds/forms_treatments.py:834 +#: archaeological_finds/forms_treatments.py:625 +#: archaeological_finds/forms_treatments.py:882 #: archaeological_operations/forms.py:1486 #: archaeological_operations/forms.py:1670 msgid "Indexed?" msgstr "" #: archaeological_files/forms.py:1146 -#: archaeological_finds/forms_treatments.py:578 -#: archaeological_finds/forms_treatments.py:835 +#: archaeological_finds/forms_treatments.py:626 +#: archaeological_finds/forms_treatments.py:883 #: archaeological_operations/forms.py:1492 #: archaeological_operations/forms.py:1541 #: archaeological_operations/models.py:3167 @@ -2403,8 +2405,8 @@ msgid "Object" msgstr "" #: archaeological_files/forms.py:1148 -#: archaeological_finds/forms_treatments.py:581 -#: archaeological_finds/forms_treatments.py:838 +#: archaeological_finds/forms_treatments.py:629 +#: archaeological_finds/forms_treatments.py:886 #: archaeological_operations/forms.py:1495 #: archaeological_operations/forms.py:1543 #: archaeological_operations/models.py:3165 @@ -2557,7 +2559,7 @@ msgstr "" msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:212 +#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:213 #: archaeological_warehouse/models.py:420 ishtar_common/models.py:3277 #: ishtar_common/models_common.py:179 ishtar_common/models_common.py:210 msgid "Textual ID" @@ -2601,7 +2603,7 @@ msgstr "" msgid "Available" msgstr "" -#: archaeological_files/models.py:266 archaeological_warehouse/forms.py:779 +#: archaeological_files/models.py:266 archaeological_warehouse/forms.py:780 #: ishtar_common/admin.py:1507 ishtar_common/models.py:2455 #: ishtar_common/models_common.py:757 msgid "Parent" @@ -2703,9 +2705,9 @@ msgid "Total developed surface (km²)" msgstr "" #: archaeological_files/models.py:541 archaeological_finds/models_finds.py:1387 -#: archaeological_finds/models_treatments.py:224 -#: archaeological_finds/models_treatments.py:1241 -#: archaeological_finds/tests.py:1612 archaeological_operations/models.py:1336 +#: archaeological_finds/models_treatments.py:266 +#: archaeological_finds/models_treatments.py:1319 +#: archaeological_finds/tests.py:1616 archaeological_operations/models.py:1336 #: archaeological_operations/models.py:2955 #: archaeological_operations/tests.py:3214 #: archaeological_operations/tests.py:3306 @@ -2714,8 +2716,8 @@ msgid "year" msgstr "" #: archaeological_files/models.py:543 -#: archaeological_finds/models_treatments.py:221 -#: archaeological_finds/models_treatments.py:1238 +#: archaeological_finds/models_treatments.py:263 +#: archaeological_finds/models_treatments.py:1316 #: archaeological_operations/models.py:456 #: archaeological_warehouse/models.py:980 ishtar_common/models.py:4752 msgctxt "key for text search" @@ -2733,7 +2735,7 @@ msgid "department" msgstr "" #: archaeological_files/models.py:562 -#: archaeological_finds/models_treatments.py:1235 +#: archaeological_finds/models_treatments.py:1313 #: archaeological_operations/models.py:459 #: archaeological_operations/models.py:1364 #: archaeological_operations/tests.py:3082 @@ -2745,8 +2747,8 @@ msgid "name" msgstr "" #: archaeological_files/models.py:568 -#: archaeological_finds/models_treatments.py:227 -#: archaeological_finds/models_treatments.py:1244 +#: archaeological_finds/models_treatments.py:269 +#: archaeological_finds/models_treatments.py:1322 #: archaeological_operations/models.py:466 #: archaeological_operations/models.py:1370 #: archaeological_operations/models.py:2966 @@ -2790,8 +2792,8 @@ msgid "permit-reference" msgstr "" #: archaeological_files/models.py:599 archaeological_finds/models_finds.py:1700 -#: archaeological_finds/models_treatments.py:1247 -#: archaeological_finds/tests.py:1647 +#: archaeological_finds/models_treatments.py:1325 +#: archaeological_finds/tests.py:1651 msgctxt "key for text search" msgid "in-charge" msgstr "" @@ -2807,12 +2809,12 @@ msgid "general-contractor-organization" msgstr "" #: archaeological_files/models.py:654 -#: archaeological_finds/forms_treatments.py:648 -#: archaeological_finds/forms_treatments.py:718 -#: archaeological_finds/forms_treatments.py:911 -#: archaeological_finds/forms_treatments.py:949 -#: archaeological_finds/models_treatments.py:1286 -#: archaeological_finds/models_treatments.py:1562 +#: archaeological_finds/forms_treatments.py:696 +#: archaeological_finds/forms_treatments.py:766 +#: archaeological_finds/forms_treatments.py:959 +#: archaeological_finds/forms_treatments.py:997 +#: archaeological_finds/models_treatments.py:1364 +#: archaeological_finds/models_treatments.py:1640 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:49 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:243 #: archaeological_operations/forms.py:506 @@ -2823,7 +2825,7 @@ msgstr "" #: archaeological_operations/models.py:638 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:160 -#: archaeological_warehouse/forms.py:149 archaeological_warehouse/forms.py:211 +#: archaeological_warehouse/forms.py:150 archaeological_warehouse/forms.py:212 #: archaeological_warehouse/models.py:419 ishtar_common/forms_common.py:768 #: ishtar_common/forms_common.py:836 ishtar_common/forms_common.py:1031 #: ishtar_common/forms_common.py:1165 ishtar_common/forms_common.py:1260 @@ -2857,10 +2859,10 @@ msgid "Name" msgstr "" #: archaeological_files/models.py:660 -#: archaeological_finds/models_treatments.py:1295 -#: archaeological_finds/models_treatments.py:1575 +#: archaeological_finds/models_treatments.py:1373 +#: archaeological_finds/models_treatments.py:1653 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:244 -#: archaeological_warehouse/forms.py:227 archaeological_warehouse/models.py:428 +#: archaeological_warehouse/forms.py:228 archaeological_warehouse/models.py:428 msgid "Person in charge" msgstr "" @@ -2897,10 +2899,11 @@ msgid "Main address - postal code" msgstr "" #: archaeological_files/models.py:775 -#: archaeological_finds/forms_treatments.py:170 -#: archaeological_finds/forms_treatments.py:431 -#: archaeological_finds/models_treatments.py:330 -#: archaeological_warehouse/forms.py:217 archaeological_warehouse/models.py:437 +#: archaeological_finds/forms_treatments.py:89 +#: archaeological_finds/forms_treatments.py:224 +#: archaeological_finds/forms_treatments.py:477 +#: archaeological_finds/models_treatments.py:408 +#: archaeological_warehouse/forms.py:218 archaeological_warehouse/models.py:437 #: ishtar_common/forms_common.py:760 ishtar_common/forms_common.py:1038 #: ishtar_common/forms_common.py:1103 ishtar_common/forms_common.py:1265 #: ishtar_common/forms_common.py:1454 ishtar_common/ishtar_menu.py:105 @@ -2967,15 +2970,15 @@ msgid "plan" msgstr "" #: archaeological_files/models.py:1614 -#: archaeological_finds/models_treatments.py:496 -#: archaeological_finds/models_treatments.py:1447 +#: archaeological_finds/models_treatments.py:574 +#: archaeological_finds/models_treatments.py:1525 #: archaeological_operations/models.py:2242 msgid "Add associated administrative act" msgstr "" #: archaeological_files/models.py:1616 -#: archaeological_finds/models_treatments.py:498 -#: archaeological_finds/models_treatments.py:1449 +#: archaeological_finds/models_treatments.py:576 +#: archaeological_finds/models_treatments.py:1527 #: archaeological_operations/models.py:2244 msgid "admin. act" msgstr "" @@ -3127,7 +3130,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:188 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:86 #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:149 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:145 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 #: archaeological_operations/models.py:3204 #: archaeological_operations/templates/ishtar/sheet_operation.html:395 @@ -3152,7 +3155,7 @@ msgstr "" #: archaeological_operations/models.py:3238 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 -#: archaeological_warehouse/forms.py:521 archaeological_warehouse/models.py:758 +#: archaeological_warehouse/forms.py:522 archaeological_warehouse/models.py:758 #: ishtar_common/models.py:5006 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." @@ -3175,7 +3178,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:227 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 -#: archaeological_warehouse/forms.py:712 ishtar_common/admin.py:1037 +#: archaeological_warehouse/forms.py:713 ishtar_common/admin.py:1037 #: ishtar_common/models.py:710 ishtar_common/models.py:3409 #: ishtar_common/models_imports.py:1125 msgid "Date" @@ -3796,14 +3799,14 @@ msgstr "" #: archaeological_finds/forms.py:1119 archaeological_finds/forms.py:1499 #: archaeological_finds/forms.py:1902 archaeological_finds/models_finds.py:1273 #: archaeological_finds/models_finds.py:2333 -#: archaeological_warehouse/forms.py:598 +#: archaeological_warehouse/forms.py:599 msgid "Alteration" msgstr "" #: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1505 #: archaeological_finds/forms.py:1903 archaeological_finds/models_finds.py:1274 #: archaeological_finds/models_finds.py:2337 -#: archaeological_warehouse/forms.py:599 +#: archaeological_warehouse/forms.py:600 msgid "Alteration cause" msgstr "" @@ -3817,21 +3820,21 @@ msgstr "" #: archaeological_finds/forms.py:1125 archaeological_finds/forms.py:1517 #: archaeological_finds/forms.py:1907 archaeological_finds/models_finds.py:1275 #: archaeological_finds/models_finds.py:2343 -#: archaeological_warehouse/forms.py:603 +#: archaeological_warehouse/forms.py:604 msgid "Treatment emergency" msgstr "" #: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:1481 #: archaeological_finds/forms.py:1898 archaeological_finds/models_finds.py:1269 #: archaeological_finds/models_finds.py:2194 -#: archaeological_warehouse/forms.py:595 +#: archaeological_warehouse/forms.py:596 msgid "Integrity" msgstr "" #: archaeological_finds/forms.py:1131 archaeological_finds/forms.py:1487 #: archaeological_finds/forms.py:1899 archaeological_finds/models_finds.py:1270 #: archaeological_finds/models_finds.py:2200 -#: archaeological_warehouse/forms.py:596 +#: archaeological_warehouse/forms.py:597 msgid "Remarkability" msgstr "" @@ -4002,19 +4005,19 @@ msgstr "" msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:542 +#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:543 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:550 +#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:551 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1770 archaeological_warehouse/forms.py:553 +#: archaeological_finds/forms.py:1770 archaeological_warehouse/forms.py:554 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1778 archaeological_warehouse/forms.py:561 +#: archaeological_finds/forms.py:1778 archaeological_warehouse/forms.py:562 msgid "Archaeological site name (attached to the context record)" msgstr "" @@ -4038,14 +4041,14 @@ msgstr "" #: archaeological_finds/models_finds.py:94 #: archaeological_finds/models_finds.py:1265 #: archaeological_operations/templates/ishtar/sheet_operation.html:580 -#: archaeological_warehouse/forms.py:584 +#: archaeological_warehouse/forms.py:585 msgid "Material type" msgstr "" #: archaeological_finds/forms.py:1832 archaeological_finds/models_finds.py:274 #: archaeological_finds/models_finds.py:1266 #: archaeological_operations/templates/ishtar/sheet_operation.html:590 -#: archaeological_warehouse/forms.py:590 ishtar_common/models_imports.py:1097 +#: archaeological_warehouse/forms.py:591 ishtar_common/models_imports.py:1097 msgid "Object type" msgstr "" @@ -4180,8 +4183,8 @@ msgid "Find search" msgstr "" #: archaeological_finds/forms.py:2216 archaeological_finds/forms.py:2379 -#: archaeological_finds/models_treatments.py:486 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:119 +#: archaeological_finds/models_treatments.py:564 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:115 msgid "Upstream finds" msgstr "" @@ -4212,8 +4215,9 @@ msgstr "" #: archaeological_finds/forms.py:2468 #: archaeological_finds/forms_treatments.py:57 -#: archaeological_finds/forms_treatments.py:175 -#: archaeological_finds/models_treatments.py:278 +#: archaeological_finds/forms_treatments.py:67 +#: archaeological_finds/forms_treatments.py:191 +#: archaeological_finds/models_treatments.py:340 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:118 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:156 @@ -4238,20 +4242,21 @@ msgid "Treatment - 001 - Search" msgstr "" #: archaeological_finds/forms_treatments.py:58 -#: archaeological_finds/forms_treatments.py:178 -#: archaeological_finds/forms_treatments.py:914 -#: archaeological_finds/forms_treatments.py:956 +#: archaeological_finds/forms_treatments.py:70 +#: archaeological_finds/forms_treatments.py:194 +#: archaeological_finds/forms_treatments.py:962 +#: archaeological_finds/forms_treatments.py:1004 #: archaeological_finds/models_finds.py:3761 -#: archaeological_finds/models_treatments.py:280 -#: archaeological_finds/models_treatments.py:1284 -#: archaeological_finds/models_treatments.py:1570 +#: archaeological_finds/models_treatments.py:342 +#: archaeological_finds/models_treatments.py:1362 +#: archaeological_finds/models_treatments.py:1648 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:230 #: archaeological_operations/forms.py:1122 #: archaeological_operations/forms.py:1219 #: archaeological_operations/forms.py:1362 #: archaeological_operations/forms.py:1838 #: archaeological_operations/models.py:636 -#: archaeological_warehouse/forms.py:342 +#: archaeological_warehouse/forms.py:343 #: archaeological_warehouse/models.py:2159 ishtar_common/forms_common.py:2184 #: ishtar_common/forms_common.py:2472 ishtar_common/forms_common.py:2718 #: ishtar_common/models.py:2450 @@ -4260,36 +4265,66 @@ msgid "Reference" msgstr "" #: archaeological_finds/forms_treatments.py:65 -#: archaeological_finds/forms_treatments.py:158 -#: archaeological_finds/models_treatments.py:201 -#: archaeological_finds/models_treatments.py:322 +#: archaeological_finds/forms_treatments.py:79 +#: archaeological_finds/forms_treatments.py:212 +#: archaeological_finds/models_treatments.py:243 +#: archaeological_finds/models_treatments.py:400 msgid "Scientific monitoring manager" msgstr "" #: archaeological_finds/forms_treatments.py:66 -#: archaeological_finds/forms_treatments.py:143 -#: archaeological_finds/forms_treatments.py:417 -#: archaeological_finds/forms_treatments.py:588 +#: archaeological_finds/forms_treatments.py:185 +#: archaeological_finds/forms_treatments.py:463 +#: archaeological_finds/forms_treatments.py:636 #: archaeological_finds/models_finds.py:181 -#: archaeological_finds/models_treatments.py:293 -#: archaeological_finds/models_treatments.py:927 +#: archaeological_finds/models_treatments.py:355 +#: archaeological_finds/models_treatments.py:1005 #: ishtar_common/models_imports.py:1092 msgid "Treatment type" msgstr "" -#: archaeological_finds/forms_treatments.py:78 +#: archaeological_finds/forms_treatments.py:71 +#: archaeological_finds/forms_treatments.py:195 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:76 +#: ishtar_common/templates/ishtar/import_table.html:41 +#: ishtar_common/templates/ishtar/sheet_ishtaruser.html:58 +msgid "Status" +msgstr "" + +#: archaeological_finds/forms_treatments.py:72 +#: archaeological_finds/forms_treatments.py:196 +#: archaeological_finds/models_treatments.py:366 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:100 +msgid "Input status" +msgstr "" + +#: archaeological_finds/forms_treatments.py:84 +#: archaeological_finds/forms_treatments.py:218 +#: archaeological_finds/models_treatments.py:241 +#: archaeological_finds/models_treatments.py:392 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:81 +msgid "Responsible of the treatment" +msgstr "" + +#: archaeological_finds/forms_treatments.py:110 #: archaeological_finds/views.py:693 msgid "Treatment search" msgstr "" -#: archaeological_finds/forms_treatments.py:102 -msgid "Once validated, this state is not reversible." +#: archaeological_finds/forms_treatments.py:133 +msgid "Once validated, this input status is not reversible." +msgstr "" + +#: archaeological_finds/forms_treatments.py:135 +msgid "" +"Depending on the type of treatment, container change and find separation/" +"grouping will be carried out on a database basis." msgstr "" -#: archaeological_finds/forms_treatments.py:127 +#: archaeological_finds/forms_treatments.py:162 #: archaeological_finds/ishtar_menu.py:233 -#: archaeological_finds/models_treatments.py:375 -#: archaeological_finds/models_treatments.py:916 +#: archaeological_finds/models_treatments.py:453 +#: archaeological_finds/models_treatments.py:994 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 #: archaeological_operations/models.py:2817 @@ -4297,141 +4332,146 @@ msgstr "" msgid "Treatment" msgstr "" -#: archaeological_finds/forms_treatments.py:128 +#: archaeological_finds/forms_treatments.py:163 msgid "Treatment - 020 - General" msgstr "" -#: archaeological_finds/forms_treatments.py:164 -#: archaeological_finds/forms_treatments.py:425 -#: archaeological_finds/forms_treatments.py:731 -#: archaeological_finds/forms_treatments.py:958 -#: archaeological_finds/models_treatments.py:199 -#: archaeological_finds/models_treatments.py:314 -#: archaeological_finds/templates/ishtar/sheet_exhibition.html:52 -msgid "Responsible" +#: archaeological_finds/forms_treatments.py:178 +msgid "Location/responsability" msgstr "" -#: archaeological_finds/forms_treatments.py:185 +#: archaeological_finds/forms_treatments.py:179 +msgid "Details" +msgstr "" + +#: archaeological_finds/forms_treatments.py:205 msgid "Destination container (relevant for treatment that change location)" msgstr "" -#: archaeological_finds/forms_treatments.py:191 -#: archaeological_finds/models_treatments.py:341 +#: archaeological_finds/forms_treatments.py:234 +#: archaeological_finds/models_treatments.py:419 msgid "Goal" msgstr "" -#: archaeological_finds/forms_treatments.py:197 +#: archaeological_finds/forms_treatments.py:240 #, python-brace-format msgid "Estimated cost ({currency})" msgstr "" -#: archaeological_finds/forms_treatments.py:199 +#: archaeological_finds/forms_treatments.py:242 #, python-brace-format msgid "Quoted cost ({currency})" msgstr "" -#: archaeological_finds/forms_treatments.py:201 +#: archaeological_finds/forms_treatments.py:244 #, python-brace-format msgid "Realized cost ({currency})" msgstr "" -#: archaeological_finds/forms_treatments.py:203 +#: archaeological_finds/forms_treatments.py:246 #, python-brace-format msgid "Insurance cost ({currency})" msgstr "" -#: archaeological_finds/forms_treatments.py:276 +#: archaeological_finds/forms_treatments.py:320 msgid "Unknow treatment type" msgstr "" -#: archaeological_finds/forms_treatments.py:296 -#: archaeological_finds/forms_treatments.py:305 +#: archaeological_finds/forms_treatments.py:340 +#: archaeological_finds/forms_treatments.py:349 msgid "{} is not compatible with {} treatment(s)." msgstr "" -#: archaeological_finds/forms_treatments.py:316 +#: archaeological_finds/forms_treatments.py:360 msgid "" "The container field is attached to the treatment but no treatment with " "container change is defined." msgstr "" -#: archaeological_finds/forms_treatments.py:321 +#: archaeological_finds/forms_treatments.py:365 msgid "" "A treatment with location change is defined, the container field must be " "filled." msgstr "" -#: archaeological_finds/forms_treatments.py:325 +#: archaeological_finds/forms_treatments.py:369 msgid "A responsible or an organization must be defined." msgstr "" -#: archaeological_finds/forms_treatments.py:331 +#: archaeological_finds/forms_treatments.py:375 msgid "Treatment n-1 - 020 - General" msgstr "" -#: archaeological_finds/forms_treatments.py:346 +#: archaeological_finds/forms_treatments.py:391 msgid "Treatment 1-n - 020 - General" msgstr "" -#: archaeological_finds/forms_treatments.py:384 +#: archaeological_finds/forms_treatments.py:430 msgid "Another treatment with this index exists for {}." msgstr "" -#: archaeological_finds/forms_treatments.py:390 -#: archaeological_finds/models_treatments.py:290 +#: archaeological_finds/forms_treatments.py:436 +#: archaeological_finds/models_treatments.py:352 msgid "Associated request" msgstr "" -#: archaeological_finds/forms_treatments.py:391 +#: archaeological_finds/forms_treatments.py:437 msgid "Treatment - 010 - Request choice" msgstr "" -#: archaeological_finds/forms_treatments.py:396 -#: archaeological_finds/forms_treatments.py:710 +#: archaeological_finds/forms_treatments.py:442 +#: archaeological_finds/forms_treatments.py:758 #: archaeological_finds/ishtar_menu.py:136 -#: archaeological_finds/models_treatments.py:1368 -#: archaeological_finds/models_treatments.py:1420 +#: archaeological_finds/models_treatments.py:1446 +#: archaeological_finds/models_treatments.py:1498 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 #: archaeological_finds/wizards.py:580 archaeological_operations/models.py:2816 #: archaeological_operations/models.py:3154 ishtar_common/views.py:589 msgid "Treatment request" msgstr "" -#: archaeological_finds/forms_treatments.py:405 +#: archaeological_finds/forms_treatments.py:451 msgid "" "Are you sure you want to delete this treatment? All changes made to the " "associated finds since this treatment record will be lost!" msgstr "" -#: archaeological_finds/forms_treatments.py:408 +#: archaeological_finds/forms_treatments.py:454 msgid "Would you like to delete this treatment?" msgstr "" -#: archaeological_finds/forms_treatments.py:413 +#: archaeological_finds/forms_treatments.py:459 msgid "Create a treatment" msgstr "" -#: archaeological_finds/forms_treatments.py:423 +#: archaeological_finds/forms_treatments.py:469 msgid "Precise date" msgstr "" -#: archaeological_finds/forms_treatments.py:502 +#: archaeological_finds/forms_treatments.py:471 +#: archaeological_finds/forms_treatments.py:779 +#: archaeological_finds/forms_treatments.py:1006 +#: archaeological_finds/templates/ishtar/sheet_exhibition.html:52 +msgid "Responsible" +msgstr "" + +#: archaeological_finds/forms_treatments.py:548 msgid "At least a year is required." msgstr "" -#: archaeological_finds/forms_treatments.py:504 +#: archaeological_finds/forms_treatments.py:550 msgid "Treatment type is required." msgstr "" -#: archaeological_finds/forms_treatments.py:511 +#: archaeological_finds/forms_treatments.py:557 #: archaeological_finds/models_finds.py:2146 #: archaeological_finds/models_finds.py:3741 -#: archaeological_finds/models_treatments.py:347 -#: archaeological_finds/models_treatments.py:931 +#: archaeological_finds/models_treatments.py:425 +#: archaeological_finds/models_treatments.py:1009 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:123 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:161 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:200 -#: archaeological_warehouse/forms.py:332 archaeological_warehouse/models.py:860 +#: archaeological_warehouse/forms.py:333 archaeological_warehouse/models.py:860 #: archaeological_warehouse/models.py:1273 #: archaeological_warehouse/models.py:2152 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 @@ -4440,97 +4480,97 @@ msgstr "" msgid "Container" msgstr "" -#: archaeological_finds/forms_treatments.py:517 +#: archaeological_finds/forms_treatments.py:563 #: ishtar_common/forms_common.py:2791 msgid "Change " msgstr "" -#: archaeological_finds/forms_treatments.py:519 +#: archaeological_finds/forms_treatments.py:565 msgid "reference and current containers" msgstr "" -#: archaeological_finds/forms_treatments.py:520 +#: archaeological_finds/forms_treatments.py:566 #: ishtar_common/forms_common.py:2795 msgid "the reference container" msgstr "" -#: archaeological_finds/forms_treatments.py:521 +#: archaeological_finds/forms_treatments.py:567 #: ishtar_common/forms_common.py:2796 msgid "the current container" msgstr "" -#: archaeological_finds/forms_treatments.py:583 +#: archaeological_finds/forms_treatments.py:631 msgid "Treatment name" msgstr "" -#: archaeological_finds/forms_treatments.py:584 +#: archaeological_finds/forms_treatments.py:632 msgid "Treatment year" msgstr "" -#: archaeological_finds/forms_treatments.py:585 +#: archaeological_finds/forms_treatments.py:633 msgid "Treatment index" msgstr "" -#: archaeological_finds/forms_treatments.py:587 +#: archaeological_finds/forms_treatments.py:635 msgid "Treatment reference" msgstr "" -#: archaeological_finds/forms_treatments.py:621 +#: archaeological_finds/forms_treatments.py:669 msgid "Treatment - Administrative act - General" msgstr "" -#: archaeological_finds/forms_treatments.py:641 +#: archaeological_finds/forms_treatments.py:689 msgid "Treatment file - 001 - Search" msgstr "" -#: archaeological_finds/forms_treatments.py:649 -#: archaeological_finds/forms_treatments.py:725 ishtar_common/models.py:5007 +#: archaeological_finds/forms_treatments.py:697 +#: archaeological_finds/forms_treatments.py:773 ishtar_common/models.py:5007 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" -#: archaeological_finds/forms_treatments.py:661 -#: archaeological_finds/forms_treatments.py:737 -#: archaeological_finds/models_treatments.py:1303 +#: archaeological_finds/forms_treatments.py:709 +#: archaeological_finds/forms_treatments.py:785 +#: archaeological_finds/models_treatments.py:1381 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:245 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 msgid "Applicant" msgstr "" -#: archaeological_finds/forms_treatments.py:667 -#: archaeological_finds/forms_treatments.py:743 -#: archaeological_finds/models_treatments.py:1311 +#: archaeological_finds/forms_treatments.py:715 +#: archaeological_finds/forms_treatments.py:791 +#: archaeological_finds/models_treatments.py:1389 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:246 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 msgid "Applicant organisation" msgstr "" -#: archaeological_finds/forms_treatments.py:674 -#: archaeological_finds/forms_treatments.py:755 -#: archaeological_finds/forms_treatments.py:1023 -#: archaeological_finds/models_treatments.py:1324 +#: archaeological_finds/forms_treatments.py:722 +#: archaeological_finds/forms_treatments.py:803 +#: archaeological_finds/forms_treatments.py:1071 +#: archaeological_finds/models_treatments.py:1402 msgid "Exhibition start date" msgstr "" -#: archaeological_finds/forms_treatments.py:675 -#: archaeological_finds/forms_treatments.py:756 -#: archaeological_finds/forms_treatments.py:1024 -#: archaeological_finds/models_treatments.py:1327 +#: archaeological_finds/forms_treatments.py:723 +#: archaeological_finds/forms_treatments.py:804 +#: archaeological_finds/forms_treatments.py:1072 +#: archaeological_finds/models_treatments.py:1405 msgid "Exhibition end date" msgstr "" -#: archaeological_finds/forms_treatments.py:685 -#: archaeological_finds/forms_treatments.py:697 +#: archaeological_finds/forms_treatments.py:733 +#: archaeological_finds/forms_treatments.py:745 #: archaeological_finds/views.py:1058 msgid "Treatment request search" msgstr "" -#: archaeological_finds/forms_treatments.py:727 +#: archaeological_finds/forms_treatments.py:775 msgid "External ref." msgstr "" -#: archaeological_finds/forms_treatments.py:749 -#: archaeological_finds/forms_treatments.py:964 +#: archaeological_finds/forms_treatments.py:797 +#: archaeological_finds/forms_treatments.py:1012 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:63 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:65 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:121 @@ -4538,61 +4578,61 @@ msgstr "" msgid "Associated basket" msgstr "" -#: archaeological_finds/forms_treatments.py:753 -#: archaeological_finds/models_treatments.py:1322 +#: archaeological_finds/forms_treatments.py:801 +#: archaeological_finds/models_treatments.py:1400 msgid "Exhibition name" msgstr "" -#: archaeological_finds/forms_treatments.py:813 +#: archaeological_finds/forms_treatments.py:861 msgid "Another treatment request with this index exists for {}." msgstr "" -#: archaeological_finds/forms_treatments.py:819 +#: archaeological_finds/forms_treatments.py:867 msgid "Are you sure you want to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:820 +#: archaeological_finds/forms_treatments.py:868 msgid "Would you like to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:841 +#: archaeological_finds/forms_treatments.py:889 msgid "Treatment request name" msgstr "" -#: archaeological_finds/forms_treatments.py:843 +#: archaeological_finds/forms_treatments.py:891 msgid "Treatment request year" msgstr "" -#: archaeological_finds/forms_treatments.py:845 +#: archaeological_finds/forms_treatments.py:893 msgid "Treatment request index" msgstr "" -#: archaeological_finds/forms_treatments.py:847 +#: archaeological_finds/forms_treatments.py:895 msgid "Treatment request internal reference" msgstr "" -#: archaeological_finds/forms_treatments.py:849 -#: archaeological_finds/models_treatments.py:1174 -#: archaeological_finds/models_treatments.py:1289 -#: archaeological_finds/models_treatments.py:1530 +#: archaeological_finds/forms_treatments.py:897 +#: archaeological_finds/models_treatments.py:1252 +#: archaeological_finds/models_treatments.py:1367 +#: archaeological_finds/models_treatments.py:1608 msgid "Treatment request type" msgstr "" -#: archaeological_finds/forms_treatments.py:883 +#: archaeological_finds/forms_treatments.py:931 msgid "Treatment request - Administrative act - General" msgstr "" -#: archaeological_finds/forms_treatments.py:904 +#: archaeological_finds/forms_treatments.py:952 msgid "Exhibition - 001 - Search" msgstr "" -#: archaeological_finds/forms_treatments.py:930 +#: archaeological_finds/forms_treatments.py:978 msgid "Exhibition search" msgstr "" -#: archaeological_finds/forms_treatments.py:943 +#: archaeological_finds/forms_treatments.py:991 #: archaeological_finds/ishtar_menu.py:142 -#: archaeological_finds/models_treatments.py:1616 +#: archaeological_finds/models_treatments.py:1694 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:4 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:22 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:52 @@ -4600,37 +4640,37 @@ msgstr "" msgid "Exhibition" msgstr "" -#: archaeological_finds/forms_treatments.py:944 +#: archaeological_finds/forms_treatments.py:992 msgid "Exhibition - 020 - Main form" msgstr "" -#: archaeological_finds/forms_treatments.py:1026 +#: archaeological_finds/forms_treatments.py:1074 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:116 msgid "Beneficiary of the loan" msgstr "" -#: archaeological_finds/forms_treatments.py:1033 +#: archaeological_finds/forms_treatments.py:1081 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:117 msgid "Scientific manager of the exhibition" msgstr "" -#: archaeological_finds/forms_treatments.py:1040 -#: archaeological_finds/models_treatments.py:1331 +#: archaeological_finds/forms_treatments.py:1088 +#: archaeological_finds/models_treatments.py:1409 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:118 msgid "Exhibition location" msgstr "" -#: archaeological_finds/forms_treatments.py:1046 +#: archaeological_finds/forms_treatments.py:1094 msgid "The exhibition location must have an organization attached." msgstr "" -#: archaeological_finds/forms_treatments.py:1049 -#: archaeological_finds/models_treatments.py:1339 +#: archaeological_finds/forms_treatments.py:1097 +#: archaeological_finds/models_treatments.py:1417 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:119 msgid "Insurance provider" msgstr "" -#: archaeological_finds/forms_treatments.py:1069 +#: archaeological_finds/forms_treatments.py:1117 msgid "Cannot create loan when no basket is associated to this exhibition." msgstr "" @@ -4652,7 +4692,7 @@ msgstr "" #: archaeological_finds/models_finds.py:90 #: archaeological_operations/models.py:2821 -#: archaeological_warehouse/forms.py:343 archaeological_warehouse/forms.py:522 +#: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:523 #: archaeological_warehouse/models.py:1219 ishtar_common/models.py:4465 msgid "Code" msgstr "" @@ -4737,19 +4777,21 @@ msgid "" msgstr "" #: archaeological_finds/models_finds.py:182 -#: archaeological_finds/models_treatments.py:466 +#: archaeological_finds/models_treatments.py:544 msgid "Treatment types" msgstr "" #: archaeological_finds/models_finds.py:187 #: archaeological_finds/models_finds.py:2366 -#: archaeological_finds/models_treatments.py:82 -#: archaeological_finds/models_treatments.py:376 -#: archaeological_finds/models_treatments.py:387 -#: archaeological_finds/models_treatments.py:1177 -#: archaeological_finds/models_treatments.py:1380 -#: archaeological_finds/models_treatments.py:1538 -#: archaeological_finds/models_treatments.py:1628 +#: archaeological_finds/models_treatments.py:83 +#: archaeological_finds/models_treatments.py:100 +#: archaeological_finds/models_treatments.py:131 +#: archaeological_finds/models_treatments.py:454 +#: archaeological_finds/models_treatments.py:465 +#: archaeological_finds/models_treatments.py:1255 +#: archaeological_finds/models_treatments.py:1458 +#: archaeological_finds/models_treatments.py:1616 +#: archaeological_finds/models_treatments.py:1706 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 #: ishtar_common/templates/ishtar/sheet_document.html:128 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:136 @@ -5072,8 +5114,8 @@ msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1395 archaeological_finds/tests.py:1541 -#: archaeological_finds/tests.py:1754 archaeological_warehouse/models.py:1006 +#: archaeological_finds/models_finds.py:1395 archaeological_finds/tests.py:1545 +#: archaeological_finds/tests.py:1758 archaeological_warehouse/models.py:1006 msgctxt "key for text search" msgid "code-patriarche" msgstr "" @@ -5125,8 +5167,8 @@ msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1446 archaeological_finds/tests.py:1448 -#: archaeological_finds/tests.py:1752 archaeological_warehouse/models.py:1041 +#: archaeological_finds/models_finds.py:1446 archaeological_finds/tests.py:1452 +#: archaeological_finds/tests.py:1756 archaeological_warehouse/models.py:1041 msgctxt "key for text search" msgid "material" msgstr "" @@ -5142,7 +5184,7 @@ msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1459 archaeological_finds/tests.py:1695 +#: archaeological_finds/models_finds.py:1459 archaeological_finds/tests.py:1699 #: archaeological_warehouse/models.py:1053 msgctxt "key for text search" msgid "conservatory" @@ -5177,6 +5219,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1486 #: archaeological_finds/models_finds.py:1979 +#: archaeological_finds/models_treatments.py:286 #: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "location" @@ -5209,7 +5252,7 @@ msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1512 archaeological_finds/tests.py:1774 +#: archaeological_finds/models_finds.py:1512 archaeological_finds/tests.py:1778 msgctxt "key for text search" msgid "loan" msgstr "" @@ -5452,7 +5495,7 @@ msgctxt "key for text search" msgid "technical-process" msgstr "" -#: archaeological_finds/models_finds.py:1696 archaeological_finds/tests.py:1635 +#: archaeological_finds/models_finds.py:1696 archaeological_finds/tests.py:1639 msgctxt "key for text search" msgid "operation-address" msgstr "" @@ -5463,7 +5506,7 @@ msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1708 archaeological_finds/tests.py:1561 +#: archaeological_finds/models_finds.py:1708 archaeological_finds/tests.py:1565 #: archaeological_operations/models.py:1387 #: archaeological_operations/tests.py:3020 #: archaeological_operations/tests.py:3688 @@ -5605,7 +5648,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1948 #: archaeological_finds/models_finds.py:2786 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 -#: archaeological_finds/views.py:1342 archaeological_warehouse/forms.py:698 +#: archaeological_finds/views.py:1342 archaeological_warehouse/forms.py:699 #: archaeological_warehouse/views.py:292 ishtar_common/models.py:4986 #: ishtar_common/models.py:5368 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 @@ -5769,171 +5812,221 @@ msgstr "" msgid "Properties" msgstr "" -#: archaeological_finds/models_treatments.py:72 +#: archaeological_finds/models_treatments.py:73 +#: archaeological_finds/models_treatments.py:91 msgid "Treatment is executed" msgstr "" -#: archaeological_finds/models_treatments.py:76 -msgid "Treatment state type" +#: archaeological_finds/models_treatments.py:77 +msgid "Treatment state type - deprecated" +msgstr "" + +#: archaeological_finds/models_treatments.py:78 +msgid "Treatment state types - deprecated" msgstr "" -#: archaeological_finds/models_treatments.py:77 -msgid "Treatment state types" +#: archaeological_finds/models_treatments.py:94 +msgid "Treatment - Input status type" +msgstr "" + +#: archaeological_finds/models_treatments.py:95 +msgid "Treatment - Input status types" +msgstr "" + +#: archaeological_finds/models_treatments.py:114 +msgid "Validated" +msgstr "" + +#: archaeological_finds/models_treatments.py:125 +msgid "Treatment - Treatment status type" msgstr "" -#: archaeological_finds/models_treatments.py:96 +#: archaeological_finds/models_treatments.py:126 +msgid "Treatment - Treatment status types" +msgstr "" + +#: archaeological_finds/models_treatments.py:138 msgid "Completed" msgstr "" -#: archaeological_finds/models_treatments.py:195 +#: archaeological_finds/models_treatments.py:237 msgid "Downstream find" msgstr "" -#: archaeological_finds/models_treatments.py:196 +#: archaeological_finds/models_treatments.py:238 msgid "Upstream find" msgstr "" -#: archaeological_finds/models_treatments.py:218 +#: archaeological_finds/models_treatments.py:260 msgctxt "key for text search" msgid "label" msgstr "" -#: archaeological_finds/models_treatments.py:225 -#: archaeological_finds/models_treatments.py:1242 +#: archaeological_finds/models_treatments.py:267 +#: archaeological_finds/models_treatments.py:1320 #: archaeological_operations/models.py:2957 #: archaeological_warehouse/models.py:990 msgctxt "key for text search" msgid "index" msgstr "" -#: archaeological_finds/models_treatments.py:231 +#: archaeological_finds/models_treatments.py:273 msgctxt "key for text search" msgid "scientific-manager" msgstr "" -#: archaeological_finds/models_treatments.py:301 +#: archaeological_finds/models_treatments.py:278 +msgctxt "key for text search" +msgid "input-status" +msgstr "" + +#: archaeological_finds/models_treatments.py:282 +msgctxt "key for text search" +msgid "treatment-status" +msgstr "" + +#: archaeological_finds/models_treatments.py:290 +msgctxt "key for text search" +msgid "responsible-of-treatment" +msgstr "" + +#: archaeological_finds/models_treatments.py:294 ishtar_common/models.py:2950 +#: ishtar_common/models.py:3969 +msgctxt "key for text search" +msgid "organization" +msgstr "" + +#: archaeological_finds/models_treatments.py:359 +msgid "State - deprecated use input_status and treatment_status" +msgstr "" + +#: archaeological_finds/models_treatments.py:374 +msgid "Treatment status" +msgstr "" + +#: archaeological_finds/models_treatments.py:379 msgid "Treatment have been executed" msgstr "" -#: archaeological_finds/models_treatments.py:309 +#: archaeological_finds/models_treatments.py:387 msgid "Location where the treatment is done. Target warehouse for a move." msgstr "" -#: archaeological_finds/models_treatments.py:352 +#: archaeological_finds/models_treatments.py:430 msgid "Estimated cost" msgstr "" -#: archaeological_finds/models_treatments.py:353 +#: archaeological_finds/models_treatments.py:431 msgid "Quoted cost" msgstr "" -#: archaeological_finds/models_treatments.py:354 +#: archaeological_finds/models_treatments.py:432 msgid "Realized cost" msgstr "" -#: archaeological_finds/models_treatments.py:355 +#: archaeological_finds/models_treatments.py:433 msgid "Insurance cost" msgstr "" -#: archaeological_finds/models_treatments.py:369 -#: archaeological_finds/models_treatments.py:1362 -#: archaeological_finds/models_treatments.py:1582 +#: archaeological_finds/models_treatments.py:447 +#: archaeological_finds/models_treatments.py:1440 +#: archaeological_finds/models_treatments.py:1660 msgid "Basket ID" msgstr "" -#: archaeological_finds/models_treatments.py:394 +#: archaeological_finds/models_treatments.py:472 msgid "TREATMENT" msgstr "" -#: archaeological_finds/models_treatments.py:476 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:124 +#: archaeological_finds/models_treatments.py:554 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:120 msgid "Downstream finds" msgstr "" -#: archaeological_finds/models_treatments.py:932 +#: archaeological_finds/models_treatments.py:1010 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:122 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:160 msgid "Doer" msgstr "" -#: archaeological_finds/models_treatments.py:933 -#: archaeological_finds/models_treatments.py:934 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:114 +#: archaeological_finds/models_treatments.py:1011 +#: archaeological_finds/models_treatments.py:1012 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:110 msgid "Related finds" msgstr "" -#: archaeological_finds/models_treatments.py:1158 +#: archaeological_finds/models_treatments.py:1236 msgid "Is upstream" msgstr "" -#: archaeological_finds/models_treatments.py:1171 +#: archaeological_finds/models_treatments.py:1249 msgid "Is an exhibition" msgstr "" -#: archaeological_finds/models_treatments.py:1175 +#: archaeological_finds/models_treatments.py:1253 msgid "Treatment request types" msgstr "" -#: archaeological_finds/models_treatments.py:1251 +#: archaeological_finds/models_treatments.py:1329 msgctxt "key for text search" msgid "applicant" msgstr "" -#: archaeological_finds/models_treatments.py:1256 +#: archaeological_finds/models_treatments.py:1334 msgctxt "key for text search" msgid "applicant-organisation" msgstr "" -#: archaeological_finds/models_treatments.py:1261 +#: archaeological_finds/models_treatments.py:1339 msgctxt "key for text search" msgid "end-date" msgstr "" -#: archaeological_finds/models_treatments.py:1265 +#: archaeological_finds/models_treatments.py:1343 msgctxt "key for text search" msgid "exhibition-start" msgstr "" -#: archaeological_finds/models_treatments.py:1269 +#: archaeological_finds/models_treatments.py:1347 msgctxt "key for text search" msgid "exhibition-end" msgstr "" -#: archaeological_finds/models_treatments.py:1369 +#: archaeological_finds/models_treatments.py:1447 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:237 msgid "Treatment requests" msgstr "" -#: archaeological_finds/models_treatments.py:1469 +#: archaeological_finds/models_treatments.py:1547 msgid "Add associated treatment" msgstr "" -#: archaeological_finds/models_treatments.py:1535 -#: archaeological_finds/models_treatments.py:1565 +#: archaeological_finds/models_treatments.py:1613 +#: archaeological_finds/models_treatments.py:1643 msgid "Exhibition type" msgstr "" -#: archaeological_finds/models_treatments.py:1536 +#: archaeological_finds/models_treatments.py:1614 msgid "Exhibition types" msgstr "" -#: archaeological_finds/models_treatments.py:1583 +#: archaeological_finds/models_treatments.py:1661 msgid "Reference basket" msgstr "" -#: archaeological_finds/models_treatments.py:1590 +#: archaeological_finds/models_treatments.py:1668 msgid "Loans" msgstr "" -#: archaeological_finds/models_treatments.py:1617 +#: archaeological_finds/models_treatments.py:1695 msgid "Exhibitions" msgstr "" -#: archaeological_finds/models_treatments.py:1645 +#: archaeological_finds/models_treatments.py:1723 msgid "Add exhibition loan" msgstr "" -#: archaeological_finds/models_treatments.py:1647 +#: archaeological_finds/models_treatments.py:1725 msgid "exhibition loan" msgstr "" @@ -5999,7 +6092,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_exhibition.html:81 #: archaeological_finds/templates/ishtar/sheet_find.html:283 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:307 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:141 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:137 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 #: ishtar_common/templates/ishtar/sheet_document.html:139 msgid "Associated documents" @@ -6132,16 +6225,6 @@ msgstr "" msgid "Archaeological context" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_treatment.html:70 -msgctxt "Treatment" -msgid "Closed" -msgstr "" - -#: archaeological_finds/templates/ishtar/sheet_treatment.html:72 -msgctxt "Treatment" -msgid "Active" -msgstr "" - #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:27 msgctxt "Treatment request" msgid "Closed" @@ -6205,16 +6288,16 @@ msgstr "" msgid "Treatment informations:" msgstr "" -#: archaeological_finds/tests.py:721 ishtar_common/forms_common.py:414 +#: archaeological_finds/tests.py:725 ishtar_common/forms_common.py:414 msgid "This importer need a document archive." msgstr "" -#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1740 +#: archaeological_finds/tests.py:995 archaeological_warehouse/models.py:1740 msgid "The division {} {} do not exist for the location {}." msgstr "" -#: archaeological_finds/tests.py:1777 archaeological_finds/tests.py:1803 -#: archaeological_finds/tests.py:1813 archaeological_operations/tests.py:3293 +#: archaeological_finds/tests.py:1781 archaeological_finds/tests.py:1807 +#: archaeological_finds/tests.py:1817 archaeological_operations/tests.py:3293 #: ishtar_common/forms.py:1288 ishtar_common/forms.py:1367 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 @@ -6223,8 +6306,8 @@ msgstr "" msgid "Yes" msgstr "" -#: archaeological_finds/tests.py:1778 archaeological_finds/tests.py:1804 -#: archaeological_finds/tests.py:1814 ishtar_common/forms.py:1289 +#: archaeological_finds/tests.py:1782 archaeological_finds/tests.py:1808 +#: archaeological_finds/tests.py:1818 ishtar_common/forms.py:1289 #: ishtar_common/forms.py:1369 ishtar_common/templatetags/window_field.py:24 #: ishtar_common/wizards.py:509 msgid "No" @@ -7947,8 +8030,8 @@ msgid "" "the first step." msgstr "" -#: archaeological_warehouse/forms.py:90 archaeological_warehouse/forms.py:198 -#: archaeological_warehouse/forms.py:516 archaeological_warehouse/forms.py:738 +#: archaeological_warehouse/forms.py:91 archaeological_warehouse/forms.py:199 +#: archaeological_warehouse/forms.py:517 archaeological_warehouse/forms.py:739 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:479 #: archaeological_warehouse/models.py:956 @@ -7958,60 +8041,60 @@ msgstr "" msgid "Warehouse" msgstr "" -#: archaeological_warehouse/forms.py:103 +#: archaeological_warehouse/forms.py:104 msgid "Default divisions" msgstr "" -#: archaeological_warehouse/forms.py:110 +#: archaeological_warehouse/forms.py:111 msgid "Division type" msgstr "" -#: archaeological_warehouse/forms.py:126 +#: archaeological_warehouse/forms.py:127 msgid "There are identical divisions." msgstr "" -#: archaeological_warehouse/forms.py:128 +#: archaeological_warehouse/forms.py:129 msgid "Order fields must be different." msgstr "" -#: archaeological_warehouse/forms.py:135 archaeological_warehouse/models.py:443 +#: archaeological_warehouse/forms.py:136 archaeological_warehouse/models.py:443 #: archaeological_warehouse/templates/ishtar/sheet_container.html:190 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 msgid "Divisions" msgstr "" -#: archaeological_warehouse/forms.py:136 +#: archaeological_warehouse/forms.py:137 msgid "Warehouse - 020 - Divisions" msgstr "" -#: archaeological_warehouse/forms.py:142 +#: archaeological_warehouse/forms.py:143 msgid "Warehouse - 001 - Search" msgstr "" -#: archaeological_warehouse/forms.py:150 archaeological_warehouse/forms.py:215 -#: archaeological_warehouse/forms.py:322 archaeological_warehouse/models.py:263 +#: archaeological_warehouse/forms.py:151 archaeological_warehouse/forms.py:216 +#: archaeological_warehouse/forms.py:323 archaeological_warehouse/models.py:263 #: archaeological_warehouse/models.py:422 ishtar_common/models_imports.py:1091 msgid "Warehouse type" msgstr "" -#: archaeological_warehouse/forms.py:161 archaeological_warehouse/forms.py:179 +#: archaeological_warehouse/forms.py:162 archaeological_warehouse/forms.py:180 #: archaeological_warehouse/views.py:298 msgid "Warehouse search" msgstr "" -#: archaeological_warehouse/forms.py:199 +#: archaeological_warehouse/forms.py:200 msgid "Warehouse - 010 - General" msgstr "" -#: archaeological_warehouse/forms.py:214 +#: archaeological_warehouse/forms.py:215 msgid "Auto filled if kept empty." msgstr "" -#: archaeological_warehouse/forms.py:235 +#: archaeological_warehouse/forms.py:236 msgid "Create a new organization from this warehouse" msgstr "" -#: archaeological_warehouse/forms.py:242 +#: archaeological_warehouse/forms.py:243 msgid "" "Only fill the following fields if no organization is provided or if the " "address of the warehouse is different from the one of the organization. If a " @@ -8019,23 +8102,23 @@ msgid "" "used for the organization." msgstr "" -#: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:780 +#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:780 #: ishtar_common/forms_common.py:1195 ishtar_common/models_common.py:3843 #: ishtar_common/models_common.py:4050 msgid "Address complement" msgstr "" -#: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:783 +#: archaeological_warehouse/forms.py:254 ishtar_common/forms_common.py:783 #: ishtar_common/forms_common.py:1198 ishtar_common/models_common.py:3848 msgid "Town (freeform)" msgstr "" -#: archaeological_warehouse/forms.py:255 ishtar_common/forms_common.py:785 +#: archaeological_warehouse/forms.py:256 ishtar_common/forms_common.py:785 #: ishtar_common/forms_common.py:1200 ishtar_common/models_common.py:3854 msgid "Country" msgstr "" -#: archaeological_warehouse/forms.py:256 +#: archaeological_warehouse/forms.py:257 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:787 ishtar_common/forms_common.py:1171 #: ishtar_common/models_common.py:3868 ishtar_common/models_common.py:4062 @@ -8044,7 +8127,7 @@ msgstr "" msgid "Phone" msgstr "" -#: archaeological_warehouse/forms.py:258 +#: archaeological_warehouse/forms.py:259 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:789 ishtar_common/forms_common.py:1181 #: ishtar_common/models_common.py:3884 @@ -8053,29 +8136,29 @@ msgstr "" msgid "Mobile phone" msgstr "" -#: archaeological_warehouse/forms.py:277 +#: archaeological_warehouse/forms.py:278 msgid "A new organization is not created if an organization is selected." msgstr "" -#: archaeological_warehouse/forms.py:310 archaeological_warehouse/forms.py:311 +#: archaeological_warehouse/forms.py:311 archaeological_warehouse/forms.py:312 msgid "Would you like to delete this warehouse?" msgstr "" -#: archaeological_warehouse/forms.py:315 +#: archaeological_warehouse/forms.py:316 msgid "Context record - Quick action -Modify" msgstr "" -#: archaeological_warehouse/forms.py:333 +#: archaeological_warehouse/forms.py:334 msgid "Container - 010 - General" msgstr "" -#: archaeological_warehouse/forms.py:345 archaeological_warehouse/forms.py:523 +#: archaeological_warehouse/forms.py:346 archaeological_warehouse/forms.py:524 #: archaeological_warehouse/models.py:1246 msgid "Old reference" msgstr "" -#: archaeological_warehouse/forms.py:347 archaeological_warehouse/forms.py:520 -#: archaeological_warehouse/forms.py:743 archaeological_warehouse/models.py:762 +#: archaeological_warehouse/forms.py:348 archaeological_warehouse/forms.py:521 +#: archaeological_warehouse/forms.py:744 archaeological_warehouse/models.py:762 #: archaeological_warehouse/models.py:926 #: archaeological_warehouse/models.py:1214 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 @@ -8083,136 +8166,136 @@ msgstr "" msgid "Container type" msgstr "" -#: archaeological_warehouse/forms.py:349 +#: archaeological_warehouse/forms.py:350 msgid "Current location (warehouse)" msgstr "" -#: archaeological_warehouse/forms.py:358 archaeological_warehouse/forms.py:531 +#: archaeological_warehouse/forms.py:359 archaeological_warehouse/forms.py:532 #: archaeological_warehouse/models.py:1229 msgid "Parent container" msgstr "" -#: archaeological_warehouse/forms.py:368 archaeological_warehouse/forms.py:746 +#: archaeological_warehouse/forms.py:369 archaeological_warehouse/forms.py:747 #: archaeological_warehouse/models.py:1205 msgid "Responsibility" msgstr "" -#: archaeological_warehouse/forms.py:376 +#: archaeological_warehouse/forms.py:377 msgid "Automatically attached to the current warehouse if not filled." msgstr "" -#: archaeological_warehouse/forms.py:381 +#: archaeological_warehouse/forms.py:382 #: archaeological_warehouse/models.py:1236 msgid "Measured weight (g)" msgstr "" -#: archaeological_warehouse/forms.py:407 +#: archaeological_warehouse/forms.py:408 msgid "The parent container is not attached to the same warehouse." msgstr "" -#: archaeological_warehouse/forms.py:430 +#: archaeological_warehouse/forms.py:431 msgid "This reference/code already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:438 archaeological_warehouse/forms.py:821 +#: archaeological_warehouse/forms.py:439 archaeological_warehouse/forms.py:822 msgid "A container cannot be a parent of himself." msgstr "" -#: archaeological_warehouse/forms.py:502 +#: archaeological_warehouse/forms.py:503 msgid "This ID already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:509 +#: archaeological_warehouse/forms.py:510 msgid "Container - 001 - Search" msgstr "" -#: archaeological_warehouse/forms.py:517 +#: archaeological_warehouse/forms.py:518 msgid "Warehouse (responsibility)" msgstr "" -#: archaeological_warehouse/forms.py:518 +#: archaeological_warehouse/forms.py:519 msgid "Warehouse - Town" msgstr "" -#: archaeological_warehouse/forms.py:519 +#: archaeological_warehouse/forms.py:520 msgid "Warehouse - Area" msgstr "" -#: archaeological_warehouse/forms.py:526 +#: archaeological_warehouse/forms.py:527 msgid "Contain containers" msgstr "" -#: archaeological_warehouse/forms.py:529 +#: archaeological_warehouse/forms.py:530 msgid "Is stationary" msgstr "" -#: archaeological_warehouse/forms.py:564 +#: archaeological_warehouse/forms.py:565 msgid "Operation - Code PATRIARCHE" msgstr "" -#: archaeological_warehouse/forms.py:566 +#: archaeological_warehouse/forms.py:567 msgid "Operation - town" msgstr "" -#: archaeological_warehouse/forms.py:571 +#: archaeological_warehouse/forms.py:572 msgid "Operation - Scientist" msgstr "" -#: archaeological_warehouse/forms.py:580 +#: archaeological_warehouse/forms.py:581 msgid "Find - Label" msgstr "" -#: archaeological_warehouse/forms.py:581 +#: archaeological_warehouse/forms.py:582 msgid "Find - Denomination" msgstr "" -#: archaeological_warehouse/forms.py:582 +#: archaeological_warehouse/forms.py:583 msgid "Find - Description" msgstr "" -#: archaeological_warehouse/forms.py:597 ishtar_common/models_imports.py:1088 +#: archaeological_warehouse/forms.py:598 ishtar_common/models_imports.py:1088 msgid "Conservatory state" msgstr "" -#: archaeological_warehouse/forms.py:601 +#: archaeological_warehouse/forms.py:602 msgid "Preservation type" msgstr "" -#: archaeological_warehouse/forms.py:626 archaeological_warehouse/forms.py:639 -#: archaeological_warehouse/forms.py:653 archaeological_warehouse/views.py:368 +#: archaeological_warehouse/forms.py:627 archaeological_warehouse/forms.py:640 +#: archaeological_warehouse/forms.py:654 archaeological_warehouse/views.py:368 msgid "Container search" msgstr "" -#: archaeological_warehouse/forms.py:631 archaeological_warehouse/forms.py:644 -#: archaeological_warehouse/forms.py:658 +#: archaeological_warehouse/forms.py:632 archaeological_warehouse/forms.py:645 +#: archaeological_warehouse/forms.py:659 msgid "You should select a container." msgstr "" -#: archaeological_warehouse/forms.py:633 +#: archaeological_warehouse/forms.py:634 msgid "Add a new container" msgstr "" -#: archaeological_warehouse/forms.py:678 +#: archaeological_warehouse/forms.py:679 msgid "Container to merge" msgstr "" -#: archaeological_warehouse/forms.py:706 +#: archaeological_warehouse/forms.py:707 msgid "Packager" msgstr "" -#: archaeological_warehouse/forms.py:716 +#: archaeological_warehouse/forms.py:717 msgid "Packaged finds" msgstr "" -#: archaeological_warehouse/forms.py:720 archaeological_warehouse/forms.py:721 +#: archaeological_warehouse/forms.py:721 archaeological_warehouse/forms.py:722 msgid "Would you like to delete this container?" msgstr "" -#: archaeological_warehouse/forms.py:726 +#: archaeological_warehouse/forms.py:727 msgid "Container - Quick action - Modify" msgstr "" -#: archaeological_warehouse/forms.py:842 +#: archaeological_warehouse/forms.py:843 msgid "" "Cannot do this changes because it would generate many containers with " "location: {}, container type: {}, parent: {} {} and reference: {}. Merge " @@ -9694,7 +9777,7 @@ msgstr "" msgid "You put either a file or a download link for media but not both." msgstr "" -#: ishtar_common/forms_common.py:405 ishtar_common/tests.py:3048 +#: ishtar_common/forms_common.py:405 ishtar_common/tests.py:3050 msgid "\"Associated images\" field must be a valid zip file." msgstr "" @@ -11675,11 +11758,6 @@ msgctxt "key for text search" msgid "salutation" msgstr "" -#: ishtar_common/models.py:2950 ishtar_common/models.py:3969 -msgctxt "key for text search" -msgid "organization" -msgstr "" - #: ishtar_common/models.py:2955 msgctxt "key for text search" msgid "has-account" @@ -14720,11 +14798,6 @@ msgstr "" msgid "No pending imports." msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:41 -#: ishtar_common/templates/ishtar/sheet_ishtaruser.html:58 -msgid "Status" -msgstr "" - #: ishtar_common/templates/ishtar/import_table.html:43 msgctxt "file" msgid "Files" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index c51874144..3b420cb5f 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-02-18 17:02+0100\n" +"POT-Creation-Date: 2025-02-24 17:56+0100\n" "PO-Revision-Date: 2022-07-08 13:04+0000\n" "Last-Translator: Étienne Loks \n" "Language-Team: French \n" "Language-Team: LANGUAGE \n" @@ -82,14 +82,14 @@ msgstr "" #: archaeological_files/forms.py:1092 archaeological_files/forms.py:1128 #: archaeological_finds/forms.py:1703 archaeological_finds/forms.py:2421 #: archaeological_finds/forms_treatments.py:53 -#: archaeological_finds/forms_treatments.py:570 -#: archaeological_finds/forms_treatments.py:645 -#: archaeological_finds/forms_treatments.py:827 -#: archaeological_finds/forms_treatments.py:908 +#: archaeological_finds/forms_treatments.py:618 +#: archaeological_finds/forms_treatments.py:693 +#: archaeological_finds/forms_treatments.py:875 +#: archaeological_finds/forms_treatments.py:956 #: archaeological_operations/forms.py:487 #: archaeological_operations/forms.py:1217 #: archaeological_operations/forms.py:1474 -#: archaeological_warehouse/forms.py:146 archaeological_warehouse/forms.py:513 +#: archaeological_warehouse/forms.py:147 archaeological_warehouse/forms.py:514 #: ishtar_common/forms_common.py:833 ishtar_common/forms_common.py:1028 #: ishtar_common/forms_common.py:1256 ishtar_common/forms_common.py:2457 msgid "Full text search" @@ -108,7 +108,7 @@ msgstr "" #: archaeological_files/models.py:460 archaeological_finds/models_finds.py:1259 #: archaeological_operations/models.py:387 #: archaeological_operations/models.py:1183 -#: archaeological_warehouse/forms.py:152 ishtar_common/admin.py:1677 +#: archaeological_warehouse/forms.py:153 ishtar_common/admin.py:1677 #: ishtar_common/forms_common.py:839 ishtar_common/forms_common.py:1046 #: ishtar_common/forms_common.py:2595 ishtar_common/models.py:2473 #: ishtar_common/templates/ishtar/sheet_area.html:4 @@ -149,11 +149,11 @@ msgstr "" #: archaeological_context_records/forms.py:165 #: archaeological_files/templates/ishtar/sheet_file.html:198 #: archaeological_files/templates/ishtar/sheet_file.html:226 -#: archaeological_finds/forms_treatments.py:652 -#: archaeological_finds/forms_treatments.py:729 -#: archaeological_finds/forms_treatments.py:912 -#: archaeological_finds/forms_treatments.py:950 -#: archaeological_finds/models_treatments.py:197 +#: archaeological_finds/forms_treatments.py:700 +#: archaeological_finds/forms_treatments.py:777 +#: archaeological_finds/forms_treatments.py:960 +#: archaeological_finds/forms_treatments.py:998 +#: archaeological_finds/models_treatments.py:239 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:50 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:119 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:157 @@ -240,13 +240,13 @@ msgstr "" #: archaeological_finds/forms.py:593 archaeological_finds/forms.py:758 #: archaeological_finds/forms.py:760 archaeological_finds/forms.py:986 #: archaeological_finds/forms.py:1086 archaeological_finds/forms.py:1806 -#: archaeological_finds/forms_treatments.py:193 -#: archaeological_finds/forms_treatments.py:921 -#: archaeological_finds/forms_treatments.py:968 +#: archaeological_finds/forms_treatments.py:236 +#: archaeological_finds/forms_treatments.py:969 +#: archaeological_finds/forms_treatments.py:1016 #: archaeological_finds/models_finds.py:566 #: archaeological_finds/models_finds.py:2084 -#: archaeological_finds/models_treatments.py:340 -#: archaeological_finds/models_treatments.py:1585 +#: archaeological_finds/models_treatments.py:418 +#: archaeological_finds/models_treatments.py:1663 #: archaeological_finds/templates/ishtar/sheet_find.html:168 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:116 #: archaeological_operations/forms.py:1238 @@ -365,7 +365,8 @@ msgstr "" #: archaeological_files/forms.py:205 #: archaeological_files/templates/ishtar/sheet_file.html:22 #: archaeological_files/templates/ishtar/sheet_file.html:60 -#: archaeological_finds/forms_treatments.py:987 +#: archaeological_finds/forms_treatments.py:177 +#: archaeological_finds/forms_treatments.py:1035 #: archaeological_operations/forms.py:681 #: archaeological_operations/forms.py:706 #: archaeological_operations/forms.py:1343 @@ -398,7 +399,7 @@ msgstr "" #: archaeological_operations/forms.py:1039 #: archaeological_operations/models.py:3432 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:6 -#: archaeological_warehouse/forms.py:151 archaeological_warehouse/models.py:339 +#: archaeological_warehouse/forms.py:152 archaeological_warehouse/models.py:339 #: ishtar_common/forms_common.py:94 ishtar_common/forms_common.py:116 #: ishtar_common/models_common.py:3591 ishtar_common/models_common.py:4398 #: ishtar_common/templates/blocks/JQueryAdvancedTown.html:19 @@ -431,11 +432,6 @@ msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:258 #: archaeological_files/models.py:712 #: archaeological_files/templates/ishtar/sheet_file.html:78 -#: archaeological_finds/forms_treatments.py:183 -#: archaeological_finds/forms_treatments.py:673 -#: archaeological_finds/forms_treatments.py:765 -#: archaeological_finds/models_treatments.py:343 -#: archaeological_finds/models_treatments.py:1316 #: archaeological_operations/models.py:1568 #: archaeological_operations/templates/ishtar/sheet_operation.html:211 #: ishtar_common/forms.py:1120 ishtar_common/forms.py:1121 @@ -444,10 +440,11 @@ msgstr "" #: archaeological_context_records/forms.py:361 #: archaeological_context_records/models.py:907 -#: archaeological_finds/forms_treatments.py:152 -#: archaeological_finds/models_treatments.py:304 -#: archaeological_finds/models_treatments.py:930 -#: archaeological_warehouse/forms.py:771 +#: archaeological_finds/forms_treatments.py:74 +#: archaeological_finds/forms_treatments.py:199 +#: archaeological_finds/models_treatments.py:382 +#: archaeological_finds/models_treatments.py:1008 +#: archaeological_warehouse/forms.py:772 #: archaeological_warehouse/templates/ishtar/sheet_container.html:94 msgid "Location" msgstr "" @@ -545,11 +542,11 @@ msgstr "" #: archaeological_files/models.py:826 #: archaeological_files/templates/ishtar/sheet_file.html:200 #: archaeological_finds/forms.py:1560 -#: archaeological_finds/forms_treatments.py:181 -#: archaeological_finds/forms_treatments.py:763 +#: archaeological_finds/forms_treatments.py:231 +#: archaeological_finds/forms_treatments.py:811 #: archaeological_finds/models_finds.py:3832 -#: archaeological_finds/models_treatments.py:342 -#: archaeological_finds/models_treatments.py:928 +#: archaeological_finds/models_treatments.py:420 +#: archaeological_finds/models_treatments.py:1006 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:124 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:162 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:205 @@ -566,12 +563,19 @@ msgstr "" #: archaeological_context_records/models.py:112 #: archaeological_files/forms.py:640 archaeological_files/forms.py:756 #: archaeological_files/models.py:81 archaeological_files/models.py:827 -#: archaeological_finds/forms.py:1561 archaeological_finds/models_finds.py:3833 -#: archaeological_finds/models_treatments.py:929 +#: archaeological_finds/forms.py:1561 +#: archaeological_finds/forms_treatments.py:233 +#: archaeological_finds/forms_treatments.py:721 +#: archaeological_finds/forms_treatments.py:813 +#: archaeological_finds/models_finds.py:3833 +#: archaeological_finds/models_treatments.py:421 +#: archaeological_finds/models_treatments.py:1007 +#: archaeological_finds/models_treatments.py:1394 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:125 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:163 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:248 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:206 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:84 #: archaeological_operations/models.py:106 #: archaeological_operations/models.py:3766 #: ishtar_common/models_imports.py:1442 @@ -683,7 +687,7 @@ msgstr "" #: archaeological_finds/models_finds.py:2849 #: archaeological_finds/templates/ishtar/forms/qa_find_duplicate.html:22 #: archaeological_finds/wizards.py:100 archaeological_operations/models.py:1947 -#: archaeological_warehouse/forms.py:574 ishtar_common/forms_common.py:2562 +#: archaeological_warehouse/forms.py:575 ishtar_common/forms_common.py:2562 #: ishtar_common/models.py:6030 ishtar_common/views.py:583 msgid "Context record" msgstr "" @@ -841,7 +845,7 @@ msgstr "" #: archaeological_context_records/models.py:131 #: archaeological_context_records/tests.py:935 -#: archaeological_finds/tests.py:1524 archaeological_finds/tests.py:1753 +#: archaeological_finds/tests.py:1528 archaeological_finds/tests.py:1757 msgctxt "key for text search" msgid "datings-period" msgstr "" @@ -882,7 +886,7 @@ msgstr "" #: archaeological_finds/models_finds.py:3734 #: archaeological_finds/models_finds.py:3774 #: archaeological_finds/models_finds.py:3820 -#: archaeological_finds/models_treatments.py:910 +#: archaeological_finds/models_treatments.py:988 #: archaeological_finds/templates/ishtar/sheet_find.html:4 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:4 #: ishtar_common/forms_common.py:2578 ishtar_common/models.py:6031 @@ -901,14 +905,14 @@ msgstr "" #: archaeological_finds/models_finds.py:335 #: archaeological_finds/models_finds.py:406 #: archaeological_finds/models_finds.py:2075 -#: archaeological_finds/models_treatments.py:73 -#: archaeological_finds/models_treatments.py:922 +#: archaeological_finds/models_treatments.py:74 +#: archaeological_finds/models_treatments.py:1000 #: archaeological_operations/models.py:104 #: archaeological_operations/models.py:129 #: archaeological_operations/models.py:186 #: archaeological_operations/models.py:199 #: archaeological_operations/models.py:3792 -#: archaeological_warehouse/forms.py:114 archaeological_warehouse/models.py:759 +#: archaeological_warehouse/forms.py:115 archaeological_warehouse/models.py:759 #: archaeological_warehouse/models.py:791 ishtar_common/models.py:687 #: ishtar_common/models.py:743 ishtar_common/models.py:794 #: ishtar_common/models.py:1874 ishtar_common/models.py:4367 @@ -1091,7 +1095,7 @@ msgstr "" #: archaeological_context_records/models.py:643 #: archaeological_files/models.py:565 archaeological_finds/models_finds.py:1712 -#: archaeological_finds/tests.py:1573 +#: archaeological_finds/tests.py:1577 msgctxt "key for text search" msgid "operation-name" msgstr "" @@ -1204,7 +1208,7 @@ msgid "documentation" msgstr "" #: archaeological_context_records/models.py:705 -#: archaeological_finds/models_finds.py:1471 archaeological_finds/tests.py:1590 +#: archaeological_finds/models_finds.py:1471 archaeological_finds/tests.py:1594 #: archaeological_operations/models.py:497 ishtar_common/models.py:4760 msgctxt "key for text search" msgid "description" @@ -1313,7 +1317,7 @@ msgstr "" #: archaeological_context_records/models.py:852 #: archaeological_files/models.py:649 archaeological_finds/models_finds.py:561 #: archaeological_finds/models_finds.py:2069 -#: archaeological_finds/models_treatments.py:337 +#: archaeological_finds/models_treatments.py:415 #: archaeological_operations/models.py:3440 #: archaeological_warehouse/models.py:461 #: archaeological_warehouse/models.py:1247 ishtar_common/models.py:5005 @@ -1364,9 +1368,9 @@ msgstr "" #: archaeological_context_records/models.py:988 #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:92 #: archaeological_files/models.py:847 archaeological_finds/models_finds.py:2354 -#: archaeological_finds/models_treatments.py:357 -#: archaeological_finds/models_treatments.py:1349 -#: archaeological_finds/models_treatments.py:1596 +#: archaeological_finds/models_treatments.py:435 +#: archaeological_finds/models_treatments.py:1427 +#: archaeological_finds/models_treatments.py:1674 #: archaeological_finds/templates/ishtar/sheet_find.html:64 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:63 #: archaeological_finds/templates/ishtar/sheet_treatment.html:32 @@ -1399,9 +1403,9 @@ msgstr "" #: archaeological_context_records/models.py:995 #: archaeological_files/models.py:853 archaeological_finds/models_finds.py:2360 -#: archaeological_finds/models_treatments.py:363 -#: archaeological_finds/models_treatments.py:1356 -#: archaeological_finds/models_treatments.py:1603 +#: archaeological_finds/models_treatments.py:441 +#: archaeological_finds/models_treatments.py:1434 +#: archaeological_finds/models_treatments.py:1681 #: archaeological_operations/models.py:704 #: archaeological_operations/models.py:1702 #: archaeological_operations/models.py:3194 @@ -1691,7 +1695,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_exhibition.html:92 #: archaeological_finds/templates/ishtar/sheet_find.html:265 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:243 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:103 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:98 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:93 #: archaeological_operations/templates/ishtar/sheet_administrativeact.html:90 #: archaeological_operations/templates/ishtar/sheet_operation.html:357 @@ -1719,9 +1723,7 @@ msgid "Numerical reference" msgstr "" #: archaeological_context_records/templates/ishtar/sheet_contextrecord.html:252 -#: archaeological_finds/forms_treatments.py:145 -#: archaeological_finds/models_treatments.py:198 -#: archaeological_finds/models_treatments.py:297 +#: archaeological_finds/models_treatments.py:240 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:120 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:158 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:197 @@ -1836,18 +1838,18 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:224 #: archaeological_finds/forms.py:1718 #: archaeological_finds/forms_treatments.py:59 -#: archaeological_finds/forms_treatments.py:147 -#: archaeological_finds/forms_treatments.py:420 -#: archaeological_finds/forms_treatments.py:574 -#: archaeological_finds/forms_treatments.py:650 -#: archaeological_finds/forms_treatments.py:720 -#: archaeological_finds/forms_treatments.py:831 -#: archaeological_finds/forms_treatments.py:913 -#: archaeological_finds/forms_treatments.py:951 +#: archaeological_finds/forms_treatments.py:187 +#: archaeological_finds/forms_treatments.py:466 +#: archaeological_finds/forms_treatments.py:622 +#: archaeological_finds/forms_treatments.py:698 +#: archaeological_finds/forms_treatments.py:768 +#: archaeological_finds/forms_treatments.py:879 +#: archaeological_finds/forms_treatments.py:961 +#: archaeological_finds/forms_treatments.py:999 #: archaeological_finds/models_finds.py:1258 -#: archaeological_finds/models_treatments.py:282 -#: archaeological_finds/models_treatments.py:1278 -#: archaeological_finds/models_treatments.py:1568 +#: archaeological_finds/models_treatments.py:344 +#: archaeological_finds/models_treatments.py:1356 +#: archaeological_finds/models_treatments.py:1646 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:51 #: archaeological_operations/forms.py:73 archaeological_operations/forms.py:489 #: archaeological_operations/forms.py:723 @@ -1943,13 +1945,13 @@ msgstr "" #: archaeological_files/models.py:758 archaeological_finds/forms.py:801 #: archaeological_finds/forms.py:1134 archaeological_finds/forms.py:1419 #: archaeological_finds/forms.py:2472 -#: archaeological_finds/forms_treatments.py:195 -#: archaeological_finds/forms_treatments.py:757 -#: archaeological_finds/forms_treatments.py:922 +#: archaeological_finds/forms_treatments.py:238 +#: archaeological_finds/forms_treatments.py:805 #: archaeological_finds/forms_treatments.py:970 -#: archaeological_finds/models_treatments.py:339 -#: archaeological_finds/models_treatments.py:1345 -#: archaeological_finds/models_treatments.py:1586 +#: archaeological_finds/forms_treatments.py:1018 +#: archaeological_finds/models_treatments.py:417 +#: archaeological_finds/models_treatments.py:1423 +#: archaeological_finds/models_treatments.py:1664 #: archaeological_operations/forms.py:541 #: archaeological_operations/forms.py:737 #: archaeological_operations/forms.py:1240 @@ -1959,8 +1961,8 @@ msgstr "" #: archaeological_operations/models.py:666 #: archaeological_operations/models.py:1691 #: archaeological_operations/models.py:3183 -#: archaeological_warehouse/forms.py:237 archaeological_warehouse/forms.py:385 -#: archaeological_warehouse/forms.py:525 archaeological_warehouse/models.py:440 +#: archaeological_warehouse/forms.py:238 archaeological_warehouse/forms.py:386 +#: archaeological_warehouse/forms.py:526 archaeological_warehouse/models.py:440 #: archaeological_warehouse/models.py:1220 ishtar_common/forms_common.py:2196 #: ishtar_common/forms_common.py:2519 ishtar_common/forms_common.py:3107 #: ishtar_common/models.py:3005 ishtar_common/models.py:4251 @@ -1975,8 +1977,8 @@ msgstr "" #: archaeological_files/forms.py:105 archaeological_files/forms.py:379 #: archaeological_files/forms.py:437 #: archaeological_files/templates/ishtar/sheet_file.html:199 -#: archaeological_finds/forms_treatments.py:655 -#: archaeological_finds/forms_treatments.py:916 +#: archaeological_finds/forms_treatments.py:703 +#: archaeological_finds/forms_treatments.py:964 msgid "In charge" msgstr "" @@ -1996,8 +1998,8 @@ msgid "Created by" msgstr "" #: archaeological_files/forms.py:144 archaeological_files/forms.py:1200 -#: archaeological_finds/forms_treatments.py:591 -#: archaeological_finds/forms_treatments.py:852 +#: archaeological_finds/forms_treatments.py:639 +#: archaeological_finds/forms_treatments.py:900 #: archaeological_operations/forms.py:564 msgid "Modified by" msgstr "" @@ -2012,7 +2014,7 @@ msgstr "" #: archaeological_files/forms.py:218 archaeological_files/models.py:725 #: archaeological_files/templates/ishtar/sheet_file.html:64 -#: archaeological_finds/models_treatments.py:1318 +#: archaeological_finds/models_treatments.py:1396 #: archaeological_operations/models.py:1567 ishtar_common/forms_common.py:2194 #: ishtar_common/forms_common.py:2597 ishtar_common/forms_common.py:2680 #: ishtar_common/models.py:5106 ishtar_common/models_imports.py:1439 @@ -2021,14 +2023,14 @@ msgid "Creation date" msgstr "" #: archaeological_files/forms.py:219 archaeological_files/models.py:727 -#: archaeological_finds/forms_treatments.py:760 -#: archaeological_finds/models_treatments.py:1320 +#: archaeological_finds/forms_treatments.py:808 +#: archaeological_finds/models_treatments.py:1398 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:247 msgid "Reception date" msgstr "" #: archaeological_files/forms.py:220 archaeological_files/models.py:646 -#: archaeological_finds/models_treatments.py:1281 +#: archaeological_finds/models_treatments.py:1359 #: ishtar_common/forms_common.py:2189 ishtar_common/forms_common.py:2473 #: ishtar_common/templates/ishtar/sheet_document.html:42 msgid "Internal reference" @@ -2104,7 +2106,7 @@ msgid "Number/street" msgstr "" #: archaeological_files/forms.py:307 archaeological_files/forms.py:353 -#: archaeological_warehouse/forms.py:252 ishtar_common/forms_common.py:782 +#: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:782 #: ishtar_common/forms_common.py:1197 ishtar_common/models_common.py:3846 msgid "Postal code" msgstr "" @@ -2122,7 +2124,7 @@ msgstr "" #: archaeological_operations/models.py:669 #: archaeological_operations/templates/ishtar/blocks/window_tables/parcels.html:10 #: archaeological_operations/templates/ishtar/sheet_site.html:90 -#: archaeological_warehouse/forms.py:239 archaeological_warehouse/forms.py:248 +#: archaeological_warehouse/forms.py:240 archaeological_warehouse/forms.py:249 #: ishtar_common/forms_common.py:778 ishtar_common/forms_common.py:1193 #: ishtar_common/models_common.py:3841 ishtar_common/models_common.py:4045 #: ishtar_common/templates/ishtar/blocks/sheet_address_section.html:4 @@ -2347,20 +2349,20 @@ msgstr "" #: archaeological_files/forms.py:1100 archaeological_files/forms.py:1136 #: archaeological_files/forms.py:1266 #: archaeological_finds/forms_treatments.py:60 -#: archaeological_finds/forms_treatments.py:360 -#: archaeological_finds/forms_treatments.py:575 -#: archaeological_finds/forms_treatments.py:634 -#: archaeological_finds/forms_treatments.py:651 -#: archaeological_finds/forms_treatments.py:790 -#: archaeological_finds/forms_treatments.py:832 -#: archaeological_finds/forms_treatments.py:896 -#: archaeological_finds/models_treatments.py:283 -#: archaeological_finds/models_treatments.py:1279 +#: archaeological_finds/forms_treatments.py:406 +#: archaeological_finds/forms_treatments.py:623 +#: archaeological_finds/forms_treatments.py:682 +#: archaeological_finds/forms_treatments.py:699 +#: archaeological_finds/forms_treatments.py:838 +#: archaeological_finds/forms_treatments.py:880 +#: archaeological_finds/forms_treatments.py:944 +#: archaeological_finds/models_treatments.py:345 +#: archaeological_finds/models_treatments.py:1357 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:93 #: archaeological_operations/forms.py:1479 #: archaeological_operations/forms.py:1600 #: archaeological_operations/models.py:3108 -#: archaeological_warehouse/forms.py:462 archaeological_warehouse/forms.py:524 +#: archaeological_warehouse/forms.py:463 archaeological_warehouse/forms.py:525 #: archaeological_warehouse/models.py:1235 ishtar_common/admin.py:640 #: ishtar_common/models.py:5004 msgid "Index" @@ -2368,10 +2370,10 @@ msgstr "" #: archaeological_files/forms.py:1102 archaeological_files/forms.py:1138 #: archaeological_files/forms.py:1255 -#: archaeological_finds/forms_treatments.py:576 -#: archaeological_finds/forms_treatments.py:623 -#: archaeological_finds/forms_treatments.py:833 -#: archaeological_finds/forms_treatments.py:885 +#: archaeological_finds/forms_treatments.py:624 +#: archaeological_finds/forms_treatments.py:671 +#: archaeological_finds/forms_treatments.py:881 +#: archaeological_finds/forms_treatments.py:933 #: archaeological_operations/forms.py:1485 #: archaeological_operations/forms.py:1534 #: archaeological_operations/models.py:2831 @@ -2385,16 +2387,16 @@ msgid "Object (full text search)" msgstr "" #: archaeological_files/forms.py:1139 -#: archaeological_finds/forms_treatments.py:577 -#: archaeological_finds/forms_treatments.py:834 +#: archaeological_finds/forms_treatments.py:625 +#: archaeological_finds/forms_treatments.py:882 #: archaeological_operations/forms.py:1486 #: archaeological_operations/forms.py:1670 msgid "Indexed?" msgstr "" #: archaeological_files/forms.py:1146 -#: archaeological_finds/forms_treatments.py:578 -#: archaeological_finds/forms_treatments.py:835 +#: archaeological_finds/forms_treatments.py:626 +#: archaeological_finds/forms_treatments.py:883 #: archaeological_operations/forms.py:1492 #: archaeological_operations/forms.py:1541 #: archaeological_operations/models.py:3167 @@ -2403,8 +2405,8 @@ msgid "Object" msgstr "" #: archaeological_files/forms.py:1148 -#: archaeological_finds/forms_treatments.py:581 -#: archaeological_finds/forms_treatments.py:838 +#: archaeological_finds/forms_treatments.py:629 +#: archaeological_finds/forms_treatments.py:886 #: archaeological_operations/forms.py:1495 #: archaeological_operations/forms.py:1543 #: archaeological_operations/models.py:3165 @@ -2557,7 +2559,7 @@ msgstr "" msgid "Equipment/Service" msgstr "" -#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:212 +#: archaeological_files/models.py:237 archaeological_warehouse/forms.py:213 #: archaeological_warehouse/models.py:420 ishtar_common/models.py:3277 #: ishtar_common/models_common.py:179 ishtar_common/models_common.py:210 msgid "Textual ID" @@ -2601,7 +2603,7 @@ msgstr "" msgid "Available" msgstr "" -#: archaeological_files/models.py:266 archaeological_warehouse/forms.py:779 +#: archaeological_files/models.py:266 archaeological_warehouse/forms.py:780 #: ishtar_common/admin.py:1507 ishtar_common/models.py:2455 #: ishtar_common/models_common.py:757 msgid "Parent" @@ -2703,9 +2705,9 @@ msgid "Total developed surface (km²)" msgstr "" #: archaeological_files/models.py:541 archaeological_finds/models_finds.py:1387 -#: archaeological_finds/models_treatments.py:224 -#: archaeological_finds/models_treatments.py:1241 -#: archaeological_finds/tests.py:1612 archaeological_operations/models.py:1336 +#: archaeological_finds/models_treatments.py:266 +#: archaeological_finds/models_treatments.py:1319 +#: archaeological_finds/tests.py:1616 archaeological_operations/models.py:1336 #: archaeological_operations/models.py:2955 #: archaeological_operations/tests.py:3214 #: archaeological_operations/tests.py:3306 @@ -2714,8 +2716,8 @@ msgid "year" msgstr "" #: archaeological_files/models.py:543 -#: archaeological_finds/models_treatments.py:221 -#: archaeological_finds/models_treatments.py:1238 +#: archaeological_finds/models_treatments.py:263 +#: archaeological_finds/models_treatments.py:1316 #: archaeological_operations/models.py:456 #: archaeological_warehouse/models.py:980 ishtar_common/models.py:4752 msgctxt "key for text search" @@ -2733,7 +2735,7 @@ msgid "department" msgstr "" #: archaeological_files/models.py:562 -#: archaeological_finds/models_treatments.py:1235 +#: archaeological_finds/models_treatments.py:1313 #: archaeological_operations/models.py:459 #: archaeological_operations/models.py:1364 #: archaeological_operations/tests.py:3082 @@ -2745,8 +2747,8 @@ msgid "name" msgstr "" #: archaeological_files/models.py:568 -#: archaeological_finds/models_treatments.py:227 -#: archaeological_finds/models_treatments.py:1244 +#: archaeological_finds/models_treatments.py:269 +#: archaeological_finds/models_treatments.py:1322 #: archaeological_operations/models.py:466 #: archaeological_operations/models.py:1370 #: archaeological_operations/models.py:2966 @@ -2790,8 +2792,8 @@ msgid "permit-reference" msgstr "" #: archaeological_files/models.py:599 archaeological_finds/models_finds.py:1700 -#: archaeological_finds/models_treatments.py:1247 -#: archaeological_finds/tests.py:1647 +#: archaeological_finds/models_treatments.py:1325 +#: archaeological_finds/tests.py:1651 msgctxt "key for text search" msgid "in-charge" msgstr "" @@ -2807,12 +2809,12 @@ msgid "general-contractor-organization" msgstr "" #: archaeological_files/models.py:654 -#: archaeological_finds/forms_treatments.py:648 -#: archaeological_finds/forms_treatments.py:718 -#: archaeological_finds/forms_treatments.py:911 -#: archaeological_finds/forms_treatments.py:949 -#: archaeological_finds/models_treatments.py:1286 -#: archaeological_finds/models_treatments.py:1562 +#: archaeological_finds/forms_treatments.py:696 +#: archaeological_finds/forms_treatments.py:766 +#: archaeological_finds/forms_treatments.py:959 +#: archaeological_finds/forms_treatments.py:997 +#: archaeological_finds/models_treatments.py:1364 +#: archaeological_finds/models_treatments.py:1640 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:49 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:243 #: archaeological_operations/forms.py:506 @@ -2823,7 +2825,7 @@ msgstr "" #: archaeological_operations/models.py:638 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:7 #: archaeological_operations/templates/ishtar/sheet_operation.html:160 -#: archaeological_warehouse/forms.py:149 archaeological_warehouse/forms.py:211 +#: archaeological_warehouse/forms.py:150 archaeological_warehouse/forms.py:212 #: archaeological_warehouse/models.py:419 ishtar_common/forms_common.py:768 #: ishtar_common/forms_common.py:836 ishtar_common/forms_common.py:1031 #: ishtar_common/forms_common.py:1165 ishtar_common/forms_common.py:1260 @@ -2857,10 +2859,10 @@ msgid "Name" msgstr "" #: archaeological_files/models.py:660 -#: archaeological_finds/models_treatments.py:1295 -#: archaeological_finds/models_treatments.py:1575 +#: archaeological_finds/models_treatments.py:1373 +#: archaeological_finds/models_treatments.py:1653 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:244 -#: archaeological_warehouse/forms.py:227 archaeological_warehouse/models.py:428 +#: archaeological_warehouse/forms.py:228 archaeological_warehouse/models.py:428 msgid "Person in charge" msgstr "" @@ -2897,10 +2899,11 @@ msgid "Main address - postal code" msgstr "" #: archaeological_files/models.py:775 -#: archaeological_finds/forms_treatments.py:170 -#: archaeological_finds/forms_treatments.py:431 -#: archaeological_finds/models_treatments.py:330 -#: archaeological_warehouse/forms.py:217 archaeological_warehouse/models.py:437 +#: archaeological_finds/forms_treatments.py:89 +#: archaeological_finds/forms_treatments.py:224 +#: archaeological_finds/forms_treatments.py:477 +#: archaeological_finds/models_treatments.py:408 +#: archaeological_warehouse/forms.py:218 archaeological_warehouse/models.py:437 #: ishtar_common/forms_common.py:760 ishtar_common/forms_common.py:1038 #: ishtar_common/forms_common.py:1103 ishtar_common/forms_common.py:1265 #: ishtar_common/forms_common.py:1454 ishtar_common/ishtar_menu.py:105 @@ -2967,15 +2970,15 @@ msgid "plan" msgstr "" #: archaeological_files/models.py:1614 -#: archaeological_finds/models_treatments.py:496 -#: archaeological_finds/models_treatments.py:1447 +#: archaeological_finds/models_treatments.py:574 +#: archaeological_finds/models_treatments.py:1525 #: archaeological_operations/models.py:2242 msgid "Add associated administrative act" msgstr "" #: archaeological_files/models.py:1616 -#: archaeological_finds/models_treatments.py:498 -#: archaeological_finds/models_treatments.py:1449 +#: archaeological_finds/models_treatments.py:576 +#: archaeological_finds/models_treatments.py:1527 #: archaeological_operations/models.py:2244 msgid "admin. act" msgstr "" @@ -3127,7 +3130,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:188 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:86 #: archaeological_finds/templates/ishtar/sheet_treatment.html:41 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:149 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:145 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:87 #: archaeological_operations/models.py:3204 #: archaeological_operations/templates/ishtar/sheet_operation.html:395 @@ -3152,7 +3155,7 @@ msgstr "" #: archaeological_operations/models.py:3238 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:7 #: archaeological_operations/templates/ishtar/blocks/window_tables/archaeologicalsites.html:6 -#: archaeological_warehouse/forms.py:521 archaeological_warehouse/models.py:758 +#: archaeological_warehouse/forms.py:522 archaeological_warehouse/models.py:758 #: ishtar_common/models.py:5006 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:34 msgid "Ref." @@ -3175,7 +3178,7 @@ msgstr "" #: archaeological_files/templates/ishtar/sheet_file.html:227 #: archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html:9 -#: archaeological_warehouse/forms.py:712 ishtar_common/admin.py:1037 +#: archaeological_warehouse/forms.py:713 ishtar_common/admin.py:1037 #: ishtar_common/models.py:710 ishtar_common/models.py:3409 #: ishtar_common/models_imports.py:1125 msgid "Date" @@ -3796,14 +3799,14 @@ msgstr "" #: archaeological_finds/forms.py:1119 archaeological_finds/forms.py:1499 #: archaeological_finds/forms.py:1902 archaeological_finds/models_finds.py:1273 #: archaeological_finds/models_finds.py:2333 -#: archaeological_warehouse/forms.py:598 +#: archaeological_warehouse/forms.py:599 msgid "Alteration" msgstr "" #: archaeological_finds/forms.py:1121 archaeological_finds/forms.py:1505 #: archaeological_finds/forms.py:1903 archaeological_finds/models_finds.py:1274 #: archaeological_finds/models_finds.py:2337 -#: archaeological_warehouse/forms.py:599 +#: archaeological_warehouse/forms.py:600 msgid "Alteration cause" msgstr "" @@ -3817,21 +3820,21 @@ msgstr "" #: archaeological_finds/forms.py:1125 archaeological_finds/forms.py:1517 #: archaeological_finds/forms.py:1907 archaeological_finds/models_finds.py:1275 #: archaeological_finds/models_finds.py:2343 -#: archaeological_warehouse/forms.py:603 +#: archaeological_warehouse/forms.py:604 msgid "Treatment emergency" msgstr "" #: archaeological_finds/forms.py:1128 archaeological_finds/forms.py:1481 #: archaeological_finds/forms.py:1898 archaeological_finds/models_finds.py:1269 #: archaeological_finds/models_finds.py:2194 -#: archaeological_warehouse/forms.py:595 +#: archaeological_warehouse/forms.py:596 msgid "Integrity" msgstr "" #: archaeological_finds/forms.py:1131 archaeological_finds/forms.py:1487 #: archaeological_finds/forms.py:1899 archaeological_finds/models_finds.py:1270 #: archaeological_finds/models_finds.py:2200 -#: archaeological_warehouse/forms.py:596 +#: archaeological_warehouse/forms.py:597 msgid "Remarkability" msgstr "" @@ -4002,19 +4005,19 @@ msgstr "" msgid "Areas" msgstr "" -#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:542 +#: archaeological_finds/forms.py:1759 archaeological_warehouse/forms.py:543 msgid "Archaeological site (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:550 +#: archaeological_finds/forms.py:1767 archaeological_warehouse/forms.py:551 msgid "Archaeological site name (attached to the operation)" msgstr "" -#: archaeological_finds/forms.py:1770 archaeological_warehouse/forms.py:553 +#: archaeological_finds/forms.py:1770 archaeological_warehouse/forms.py:554 msgid "Archaeological site (attached to the context record)" msgstr "" -#: archaeological_finds/forms.py:1778 archaeological_warehouse/forms.py:561 +#: archaeological_finds/forms.py:1778 archaeological_warehouse/forms.py:562 msgid "Archaeological site name (attached to the context record)" msgstr "" @@ -4038,14 +4041,14 @@ msgstr "" #: archaeological_finds/models_finds.py:94 #: archaeological_finds/models_finds.py:1265 #: archaeological_operations/templates/ishtar/sheet_operation.html:580 -#: archaeological_warehouse/forms.py:584 +#: archaeological_warehouse/forms.py:585 msgid "Material type" msgstr "" #: archaeological_finds/forms.py:1832 archaeological_finds/models_finds.py:274 #: archaeological_finds/models_finds.py:1266 #: archaeological_operations/templates/ishtar/sheet_operation.html:590 -#: archaeological_warehouse/forms.py:590 ishtar_common/models_imports.py:1097 +#: archaeological_warehouse/forms.py:591 ishtar_common/models_imports.py:1097 msgid "Object type" msgstr "" @@ -4180,8 +4183,8 @@ msgid "Find search" msgstr "" #: archaeological_finds/forms.py:2216 archaeological_finds/forms.py:2379 -#: archaeological_finds/models_treatments.py:486 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:119 +#: archaeological_finds/models_treatments.py:564 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:115 msgid "Upstream finds" msgstr "" @@ -4212,8 +4215,9 @@ msgstr "" #: archaeological_finds/forms.py:2468 #: archaeological_finds/forms_treatments.py:57 -#: archaeological_finds/forms_treatments.py:175 -#: archaeological_finds/models_treatments.py:278 +#: archaeological_finds/forms_treatments.py:67 +#: archaeological_finds/forms_treatments.py:191 +#: archaeological_finds/models_treatments.py:340 #: archaeological_finds/templates/ishtar/forms/qa_findbasket_duplicate.html:15 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:118 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:156 @@ -4238,20 +4242,21 @@ msgid "Treatment - 001 - Search" msgstr "" #: archaeological_finds/forms_treatments.py:58 -#: archaeological_finds/forms_treatments.py:178 -#: archaeological_finds/forms_treatments.py:914 -#: archaeological_finds/forms_treatments.py:956 +#: archaeological_finds/forms_treatments.py:70 +#: archaeological_finds/forms_treatments.py:194 +#: archaeological_finds/forms_treatments.py:962 +#: archaeological_finds/forms_treatments.py:1004 #: archaeological_finds/models_finds.py:3761 -#: archaeological_finds/models_treatments.py:280 -#: archaeological_finds/models_treatments.py:1284 -#: archaeological_finds/models_treatments.py:1570 +#: archaeological_finds/models_treatments.py:342 +#: archaeological_finds/models_treatments.py:1362 +#: archaeological_finds/models_treatments.py:1648 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:230 #: archaeological_operations/forms.py:1122 #: archaeological_operations/forms.py:1219 #: archaeological_operations/forms.py:1362 #: archaeological_operations/forms.py:1838 #: archaeological_operations/models.py:636 -#: archaeological_warehouse/forms.py:342 +#: archaeological_warehouse/forms.py:343 #: archaeological_warehouse/models.py:2159 ishtar_common/forms_common.py:2184 #: ishtar_common/forms_common.py:2472 ishtar_common/forms_common.py:2718 #: ishtar_common/models.py:2450 @@ -4260,36 +4265,66 @@ msgid "Reference" msgstr "" #: archaeological_finds/forms_treatments.py:65 -#: archaeological_finds/forms_treatments.py:158 -#: archaeological_finds/models_treatments.py:201 -#: archaeological_finds/models_treatments.py:322 +#: archaeological_finds/forms_treatments.py:79 +#: archaeological_finds/forms_treatments.py:212 +#: archaeological_finds/models_treatments.py:243 +#: archaeological_finds/models_treatments.py:400 msgid "Scientific monitoring manager" msgstr "" #: archaeological_finds/forms_treatments.py:66 -#: archaeological_finds/forms_treatments.py:143 -#: archaeological_finds/forms_treatments.py:417 -#: archaeological_finds/forms_treatments.py:588 +#: archaeological_finds/forms_treatments.py:185 +#: archaeological_finds/forms_treatments.py:463 +#: archaeological_finds/forms_treatments.py:636 #: archaeological_finds/models_finds.py:181 -#: archaeological_finds/models_treatments.py:293 -#: archaeological_finds/models_treatments.py:927 +#: archaeological_finds/models_treatments.py:355 +#: archaeological_finds/models_treatments.py:1005 #: ishtar_common/models_imports.py:1092 msgid "Treatment type" msgstr "" -#: archaeological_finds/forms_treatments.py:78 +#: archaeological_finds/forms_treatments.py:71 +#: archaeological_finds/forms_treatments.py:195 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:76 +#: ishtar_common/templates/ishtar/import_table.html:41 +#: ishtar_common/templates/ishtar/sheet_ishtaruser.html:58 +msgid "Status" +msgstr "" + +#: archaeological_finds/forms_treatments.py:72 +#: archaeological_finds/forms_treatments.py:196 +#: archaeological_finds/models_treatments.py:366 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:100 +msgid "Input status" +msgstr "" + +#: archaeological_finds/forms_treatments.py:84 +#: archaeological_finds/forms_treatments.py:218 +#: archaeological_finds/models_treatments.py:241 +#: archaeological_finds/models_treatments.py:392 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:81 +msgid "Responsible of the treatment" +msgstr "" + +#: archaeological_finds/forms_treatments.py:110 #: archaeological_finds/views.py:693 msgid "Treatment search" msgstr "" -#: archaeological_finds/forms_treatments.py:102 -msgid "Once validated, this state is not reversible." +#: archaeological_finds/forms_treatments.py:133 +msgid "Once validated, this input status is not reversible." +msgstr "" + +#: archaeological_finds/forms_treatments.py:135 +msgid "" +"Depending on the type of treatment, container change and find separation/" +"grouping will be carried out on a database basis." msgstr "" -#: archaeological_finds/forms_treatments.py:127 +#: archaeological_finds/forms_treatments.py:162 #: archaeological_finds/ishtar_menu.py:233 -#: archaeological_finds/models_treatments.py:375 -#: archaeological_finds/models_treatments.py:916 +#: archaeological_finds/models_treatments.py:453 +#: archaeological_finds/models_treatments.py:994 #: archaeological_finds/templates/ishtar/sheet_treatment.html:4 #: archaeological_finds/templates/ishtar/sheet_treatment.html:17 #: archaeological_operations/models.py:2817 @@ -4297,141 +4332,146 @@ msgstr "" msgid "Treatment" msgstr "" -#: archaeological_finds/forms_treatments.py:128 +#: archaeological_finds/forms_treatments.py:163 msgid "Treatment - 020 - General" msgstr "" -#: archaeological_finds/forms_treatments.py:164 -#: archaeological_finds/forms_treatments.py:425 -#: archaeological_finds/forms_treatments.py:731 -#: archaeological_finds/forms_treatments.py:958 -#: archaeological_finds/models_treatments.py:199 -#: archaeological_finds/models_treatments.py:314 -#: archaeological_finds/templates/ishtar/sheet_exhibition.html:52 -msgid "Responsible" +#: archaeological_finds/forms_treatments.py:178 +msgid "Location/responsability" msgstr "" -#: archaeological_finds/forms_treatments.py:185 +#: archaeological_finds/forms_treatments.py:179 +msgid "Details" +msgstr "" + +#: archaeological_finds/forms_treatments.py:205 msgid "Destination container (relevant for treatment that change location)" msgstr "" -#: archaeological_finds/forms_treatments.py:191 -#: archaeological_finds/models_treatments.py:341 +#: archaeological_finds/forms_treatments.py:234 +#: archaeological_finds/models_treatments.py:419 msgid "Goal" msgstr "" -#: archaeological_finds/forms_treatments.py:197 +#: archaeological_finds/forms_treatments.py:240 #, python-brace-format msgid "Estimated cost ({currency})" msgstr "" -#: archaeological_finds/forms_treatments.py:199 +#: archaeological_finds/forms_treatments.py:242 #, python-brace-format msgid "Quoted cost ({currency})" msgstr "" -#: archaeological_finds/forms_treatments.py:201 +#: archaeological_finds/forms_treatments.py:244 #, python-brace-format msgid "Realized cost ({currency})" msgstr "" -#: archaeological_finds/forms_treatments.py:203 +#: archaeological_finds/forms_treatments.py:246 #, python-brace-format msgid "Insurance cost ({currency})" msgstr "" -#: archaeological_finds/forms_treatments.py:276 +#: archaeological_finds/forms_treatments.py:320 msgid "Unknow treatment type" msgstr "" -#: archaeological_finds/forms_treatments.py:296 -#: archaeological_finds/forms_treatments.py:305 +#: archaeological_finds/forms_treatments.py:340 +#: archaeological_finds/forms_treatments.py:349 msgid "{} is not compatible with {} treatment(s)." msgstr "" -#: archaeological_finds/forms_treatments.py:316 +#: archaeological_finds/forms_treatments.py:360 msgid "" "The container field is attached to the treatment but no treatment with " "container change is defined." msgstr "" -#: archaeological_finds/forms_treatments.py:321 +#: archaeological_finds/forms_treatments.py:365 msgid "" "A treatment with location change is defined, the container field must be " "filled." msgstr "" -#: archaeological_finds/forms_treatments.py:325 +#: archaeological_finds/forms_treatments.py:369 msgid "A responsible or an organization must be defined." msgstr "" -#: archaeological_finds/forms_treatments.py:331 +#: archaeological_finds/forms_treatments.py:375 msgid "Treatment n-1 - 020 - General" msgstr "" -#: archaeological_finds/forms_treatments.py:346 +#: archaeological_finds/forms_treatments.py:391 msgid "Treatment 1-n - 020 - General" msgstr "" -#: archaeological_finds/forms_treatments.py:384 +#: archaeological_finds/forms_treatments.py:430 msgid "Another treatment with this index exists for {}." msgstr "" -#: archaeological_finds/forms_treatments.py:390 -#: archaeological_finds/models_treatments.py:290 +#: archaeological_finds/forms_treatments.py:436 +#: archaeological_finds/models_treatments.py:352 msgid "Associated request" msgstr "" -#: archaeological_finds/forms_treatments.py:391 +#: archaeological_finds/forms_treatments.py:437 msgid "Treatment - 010 - Request choice" msgstr "" -#: archaeological_finds/forms_treatments.py:396 -#: archaeological_finds/forms_treatments.py:710 +#: archaeological_finds/forms_treatments.py:442 +#: archaeological_finds/forms_treatments.py:758 #: archaeological_finds/ishtar_menu.py:136 -#: archaeological_finds/models_treatments.py:1368 -#: archaeological_finds/models_treatments.py:1420 +#: archaeological_finds/models_treatments.py:1446 +#: archaeological_finds/models_treatments.py:1498 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:4 #: archaeological_finds/wizards.py:580 archaeological_operations/models.py:2816 #: archaeological_operations/models.py:3154 ishtar_common/views.py:589 msgid "Treatment request" msgstr "" -#: archaeological_finds/forms_treatments.py:405 +#: archaeological_finds/forms_treatments.py:451 msgid "" "Are you sure you want to delete this treatment? All changes made to the " "associated finds since this treatment record will be lost!" msgstr "" -#: archaeological_finds/forms_treatments.py:408 +#: archaeological_finds/forms_treatments.py:454 msgid "Would you like to delete this treatment?" msgstr "" -#: archaeological_finds/forms_treatments.py:413 +#: archaeological_finds/forms_treatments.py:459 msgid "Create a treatment" msgstr "" -#: archaeological_finds/forms_treatments.py:423 +#: archaeological_finds/forms_treatments.py:469 msgid "Precise date" msgstr "" -#: archaeological_finds/forms_treatments.py:502 +#: archaeological_finds/forms_treatments.py:471 +#: archaeological_finds/forms_treatments.py:779 +#: archaeological_finds/forms_treatments.py:1006 +#: archaeological_finds/templates/ishtar/sheet_exhibition.html:52 +msgid "Responsible" +msgstr "" + +#: archaeological_finds/forms_treatments.py:548 msgid "At least a year is required." msgstr "" -#: archaeological_finds/forms_treatments.py:504 +#: archaeological_finds/forms_treatments.py:550 msgid "Treatment type is required." msgstr "" -#: archaeological_finds/forms_treatments.py:511 +#: archaeological_finds/forms_treatments.py:557 #: archaeological_finds/models_finds.py:2146 #: archaeological_finds/models_finds.py:3741 -#: archaeological_finds/models_treatments.py:347 -#: archaeological_finds/models_treatments.py:931 +#: archaeological_finds/models_treatments.py:425 +#: archaeological_finds/models_treatments.py:1009 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:123 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:161 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:200 -#: archaeological_warehouse/forms.py:332 archaeological_warehouse/models.py:860 +#: archaeological_warehouse/forms.py:333 archaeological_warehouse/models.py:860 #: archaeological_warehouse/models.py:1273 #: archaeological_warehouse/models.py:2152 #: archaeological_warehouse/templates/ishtar/sheet_container.html:4 @@ -4440,97 +4480,97 @@ msgstr "" msgid "Container" msgstr "" -#: archaeological_finds/forms_treatments.py:517 +#: archaeological_finds/forms_treatments.py:563 #: ishtar_common/forms_common.py:2791 msgid "Change " msgstr "" -#: archaeological_finds/forms_treatments.py:519 +#: archaeological_finds/forms_treatments.py:565 msgid "reference and current containers" msgstr "" -#: archaeological_finds/forms_treatments.py:520 +#: archaeological_finds/forms_treatments.py:566 #: ishtar_common/forms_common.py:2795 msgid "the reference container" msgstr "" -#: archaeological_finds/forms_treatments.py:521 +#: archaeological_finds/forms_treatments.py:567 #: ishtar_common/forms_common.py:2796 msgid "the current container" msgstr "" -#: archaeological_finds/forms_treatments.py:583 +#: archaeological_finds/forms_treatments.py:631 msgid "Treatment name" msgstr "" -#: archaeological_finds/forms_treatments.py:584 +#: archaeological_finds/forms_treatments.py:632 msgid "Treatment year" msgstr "" -#: archaeological_finds/forms_treatments.py:585 +#: archaeological_finds/forms_treatments.py:633 msgid "Treatment index" msgstr "" -#: archaeological_finds/forms_treatments.py:587 +#: archaeological_finds/forms_treatments.py:635 msgid "Treatment reference" msgstr "" -#: archaeological_finds/forms_treatments.py:621 +#: archaeological_finds/forms_treatments.py:669 msgid "Treatment - Administrative act - General" msgstr "" -#: archaeological_finds/forms_treatments.py:641 +#: archaeological_finds/forms_treatments.py:689 msgid "Treatment file - 001 - Search" msgstr "" -#: archaeological_finds/forms_treatments.py:649 -#: archaeological_finds/forms_treatments.py:725 ishtar_common/models.py:5007 +#: archaeological_finds/forms_treatments.py:697 +#: archaeological_finds/forms_treatments.py:773 ishtar_common/models.py:5007 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:44 msgid "Internal ref." msgstr "" -#: archaeological_finds/forms_treatments.py:661 -#: archaeological_finds/forms_treatments.py:737 -#: archaeological_finds/models_treatments.py:1303 +#: archaeological_finds/forms_treatments.py:709 +#: archaeological_finds/forms_treatments.py:785 +#: archaeological_finds/models_treatments.py:1381 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:245 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:61 msgid "Applicant" msgstr "" -#: archaeological_finds/forms_treatments.py:667 -#: archaeological_finds/forms_treatments.py:743 -#: archaeological_finds/models_treatments.py:1311 +#: archaeological_finds/forms_treatments.py:715 +#: archaeological_finds/forms_treatments.py:791 +#: archaeological_finds/models_treatments.py:1389 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:246 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:69 msgid "Applicant organisation" msgstr "" -#: archaeological_finds/forms_treatments.py:674 -#: archaeological_finds/forms_treatments.py:755 -#: archaeological_finds/forms_treatments.py:1023 -#: archaeological_finds/models_treatments.py:1324 +#: archaeological_finds/forms_treatments.py:722 +#: archaeological_finds/forms_treatments.py:803 +#: archaeological_finds/forms_treatments.py:1071 +#: archaeological_finds/models_treatments.py:1402 msgid "Exhibition start date" msgstr "" -#: archaeological_finds/forms_treatments.py:675 -#: archaeological_finds/forms_treatments.py:756 -#: archaeological_finds/forms_treatments.py:1024 -#: archaeological_finds/models_treatments.py:1327 +#: archaeological_finds/forms_treatments.py:723 +#: archaeological_finds/forms_treatments.py:804 +#: archaeological_finds/forms_treatments.py:1072 +#: archaeological_finds/models_treatments.py:1405 msgid "Exhibition end date" msgstr "" -#: archaeological_finds/forms_treatments.py:685 -#: archaeological_finds/forms_treatments.py:697 +#: archaeological_finds/forms_treatments.py:733 +#: archaeological_finds/forms_treatments.py:745 #: archaeological_finds/views.py:1058 msgid "Treatment request search" msgstr "" -#: archaeological_finds/forms_treatments.py:727 +#: archaeological_finds/forms_treatments.py:775 msgid "External ref." msgstr "" -#: archaeological_finds/forms_treatments.py:749 -#: archaeological_finds/forms_treatments.py:964 +#: archaeological_finds/forms_treatments.py:797 +#: archaeological_finds/forms_treatments.py:1012 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:63 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:65 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:121 @@ -4538,61 +4578,61 @@ msgstr "" msgid "Associated basket" msgstr "" -#: archaeological_finds/forms_treatments.py:753 -#: archaeological_finds/models_treatments.py:1322 +#: archaeological_finds/forms_treatments.py:801 +#: archaeological_finds/models_treatments.py:1400 msgid "Exhibition name" msgstr "" -#: archaeological_finds/forms_treatments.py:813 +#: archaeological_finds/forms_treatments.py:861 msgid "Another treatment request with this index exists for {}." msgstr "" -#: archaeological_finds/forms_treatments.py:819 +#: archaeological_finds/forms_treatments.py:867 msgid "Are you sure you want to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:820 +#: archaeological_finds/forms_treatments.py:868 msgid "Would you like to delete this treatment request?" msgstr "" -#: archaeological_finds/forms_treatments.py:841 +#: archaeological_finds/forms_treatments.py:889 msgid "Treatment request name" msgstr "" -#: archaeological_finds/forms_treatments.py:843 +#: archaeological_finds/forms_treatments.py:891 msgid "Treatment request year" msgstr "" -#: archaeological_finds/forms_treatments.py:845 +#: archaeological_finds/forms_treatments.py:893 msgid "Treatment request index" msgstr "" -#: archaeological_finds/forms_treatments.py:847 +#: archaeological_finds/forms_treatments.py:895 msgid "Treatment request internal reference" msgstr "" -#: archaeological_finds/forms_treatments.py:849 -#: archaeological_finds/models_treatments.py:1174 -#: archaeological_finds/models_treatments.py:1289 -#: archaeological_finds/models_treatments.py:1530 +#: archaeological_finds/forms_treatments.py:897 +#: archaeological_finds/models_treatments.py:1252 +#: archaeological_finds/models_treatments.py:1367 +#: archaeological_finds/models_treatments.py:1608 msgid "Treatment request type" msgstr "" -#: archaeological_finds/forms_treatments.py:883 +#: archaeological_finds/forms_treatments.py:931 msgid "Treatment request - Administrative act - General" msgstr "" -#: archaeological_finds/forms_treatments.py:904 +#: archaeological_finds/forms_treatments.py:952 msgid "Exhibition - 001 - Search" msgstr "" -#: archaeological_finds/forms_treatments.py:930 +#: archaeological_finds/forms_treatments.py:978 msgid "Exhibition search" msgstr "" -#: archaeological_finds/forms_treatments.py:943 +#: archaeological_finds/forms_treatments.py:991 #: archaeological_finds/ishtar_menu.py:142 -#: archaeological_finds/models_treatments.py:1616 +#: archaeological_finds/models_treatments.py:1694 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:4 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:22 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:52 @@ -4600,37 +4640,37 @@ msgstr "" msgid "Exhibition" msgstr "" -#: archaeological_finds/forms_treatments.py:944 +#: archaeological_finds/forms_treatments.py:992 msgid "Exhibition - 020 - Main form" msgstr "" -#: archaeological_finds/forms_treatments.py:1026 +#: archaeological_finds/forms_treatments.py:1074 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:116 msgid "Beneficiary of the loan" msgstr "" -#: archaeological_finds/forms_treatments.py:1033 +#: archaeological_finds/forms_treatments.py:1081 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:117 msgid "Scientific manager of the exhibition" msgstr "" -#: archaeological_finds/forms_treatments.py:1040 -#: archaeological_finds/models_treatments.py:1331 +#: archaeological_finds/forms_treatments.py:1088 +#: archaeological_finds/models_treatments.py:1409 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:118 msgid "Exhibition location" msgstr "" -#: archaeological_finds/forms_treatments.py:1046 +#: archaeological_finds/forms_treatments.py:1094 msgid "The exhibition location must have an organization attached." msgstr "" -#: archaeological_finds/forms_treatments.py:1049 -#: archaeological_finds/models_treatments.py:1339 +#: archaeological_finds/forms_treatments.py:1097 +#: archaeological_finds/models_treatments.py:1417 #: archaeological_finds/templates/ishtar/sheet_exhibition.html:119 msgid "Insurance provider" msgstr "" -#: archaeological_finds/forms_treatments.py:1069 +#: archaeological_finds/forms_treatments.py:1117 msgid "Cannot create loan when no basket is associated to this exhibition." msgstr "" @@ -4652,7 +4692,7 @@ msgstr "" #: archaeological_finds/models_finds.py:90 #: archaeological_operations/models.py:2821 -#: archaeological_warehouse/forms.py:343 archaeological_warehouse/forms.py:522 +#: archaeological_warehouse/forms.py:344 archaeological_warehouse/forms.py:523 #: archaeological_warehouse/models.py:1219 ishtar_common/models.py:4465 msgid "Code" msgstr "" @@ -4737,19 +4777,21 @@ msgid "" msgstr "" #: archaeological_finds/models_finds.py:182 -#: archaeological_finds/models_treatments.py:466 +#: archaeological_finds/models_treatments.py:544 msgid "Treatment types" msgstr "" #: archaeological_finds/models_finds.py:187 #: archaeological_finds/models_finds.py:2366 -#: archaeological_finds/models_treatments.py:82 -#: archaeological_finds/models_treatments.py:376 -#: archaeological_finds/models_treatments.py:387 -#: archaeological_finds/models_treatments.py:1177 -#: archaeological_finds/models_treatments.py:1380 -#: archaeological_finds/models_treatments.py:1538 -#: archaeological_finds/models_treatments.py:1628 +#: archaeological_finds/models_treatments.py:83 +#: archaeological_finds/models_treatments.py:100 +#: archaeological_finds/models_treatments.py:131 +#: archaeological_finds/models_treatments.py:454 +#: archaeological_finds/models_treatments.py:465 +#: archaeological_finds/models_treatments.py:1255 +#: archaeological_finds/models_treatments.py:1458 +#: archaeological_finds/models_treatments.py:1616 +#: archaeological_finds/models_treatments.py:1706 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:77 #: ishtar_common/templates/ishtar/sheet_document.html:128 #: ishtar_common/templates/ishtar/sheet_ishtaruser.html:136 @@ -5072,8 +5114,8 @@ msgctxt "key for text search" msgid "denomination" msgstr "" -#: archaeological_finds/models_finds.py:1395 archaeological_finds/tests.py:1541 -#: archaeological_finds/tests.py:1754 archaeological_warehouse/models.py:1006 +#: archaeological_finds/models_finds.py:1395 archaeological_finds/tests.py:1545 +#: archaeological_finds/tests.py:1758 archaeological_warehouse/models.py:1006 msgctxt "key for text search" msgid "code-patriarche" msgstr "" @@ -5125,8 +5167,8 @@ msgctxt "key for text search" msgid "context-record-relation-type" msgstr "" -#: archaeological_finds/models_finds.py:1446 archaeological_finds/tests.py:1448 -#: archaeological_finds/tests.py:1752 archaeological_warehouse/models.py:1041 +#: archaeological_finds/models_finds.py:1446 archaeological_finds/tests.py:1452 +#: archaeological_finds/tests.py:1756 archaeological_warehouse/models.py:1041 msgctxt "key for text search" msgid "material" msgstr "" @@ -5142,7 +5184,7 @@ msgctxt "key for text search" msgid "recommended-treatments" msgstr "" -#: archaeological_finds/models_finds.py:1459 archaeological_finds/tests.py:1695 +#: archaeological_finds/models_finds.py:1459 archaeological_finds/tests.py:1699 #: archaeological_warehouse/models.py:1053 msgctxt "key for text search" msgid "conservatory" @@ -5177,6 +5219,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1486 #: archaeological_finds/models_finds.py:1979 +#: archaeological_finds/models_treatments.py:286 #: archaeological_warehouse/models.py:969 msgctxt "key for text search" msgid "location" @@ -5209,7 +5252,7 @@ msgctxt "key for text search" msgid "created-by" msgstr "" -#: archaeological_finds/models_finds.py:1512 archaeological_finds/tests.py:1774 +#: archaeological_finds/models_finds.py:1512 archaeological_finds/tests.py:1778 msgctxt "key for text search" msgid "loan" msgstr "" @@ -5452,7 +5495,7 @@ msgctxt "key for text search" msgid "technical-process" msgstr "" -#: archaeological_finds/models_finds.py:1696 archaeological_finds/tests.py:1635 +#: archaeological_finds/models_finds.py:1696 archaeological_finds/tests.py:1639 msgctxt "key for text search" msgid "operation-address" msgstr "" @@ -5463,7 +5506,7 @@ msgctxt "key for text search" msgid "scientist" msgstr "" -#: archaeological_finds/models_finds.py:1708 archaeological_finds/tests.py:1561 +#: archaeological_finds/models_finds.py:1708 archaeological_finds/tests.py:1565 #: archaeological_operations/models.py:1387 #: archaeological_operations/tests.py:3020 #: archaeological_operations/tests.py:3688 @@ -5605,7 +5648,7 @@ msgstr "" #: archaeological_finds/models_finds.py:1948 #: archaeological_finds/models_finds.py:2786 #: archaeological_finds/templates/ishtar/forms/qa_find_treatment.html:16 -#: archaeological_finds/views.py:1342 archaeological_warehouse/forms.py:698 +#: archaeological_finds/views.py:1342 archaeological_warehouse/forms.py:699 #: archaeological_warehouse/views.py:292 ishtar_common/models.py:4986 #: ishtar_common/models.py:5368 #: ishtar_common/templates/ishtar/forms/qa_document_packaging.html:16 @@ -5769,171 +5812,221 @@ msgstr "" msgid "Properties" msgstr "" -#: archaeological_finds/models_treatments.py:72 +#: archaeological_finds/models_treatments.py:73 +#: archaeological_finds/models_treatments.py:91 msgid "Treatment is executed" msgstr "" -#: archaeological_finds/models_treatments.py:76 -msgid "Treatment state type" +#: archaeological_finds/models_treatments.py:77 +msgid "Treatment state type - deprecated" +msgstr "" + +#: archaeological_finds/models_treatments.py:78 +msgid "Treatment state types - deprecated" msgstr "" -#: archaeological_finds/models_treatments.py:77 -msgid "Treatment state types" +#: archaeological_finds/models_treatments.py:94 +msgid "Treatment - Input status type" +msgstr "" + +#: archaeological_finds/models_treatments.py:95 +msgid "Treatment - Input status types" +msgstr "" + +#: archaeological_finds/models_treatments.py:114 +msgid "Validated" +msgstr "" + +#: archaeological_finds/models_treatments.py:125 +msgid "Treatment - Treatment status type" msgstr "" -#: archaeological_finds/models_treatments.py:96 +#: archaeological_finds/models_treatments.py:126 +msgid "Treatment - Treatment status types" +msgstr "" + +#: archaeological_finds/models_treatments.py:138 msgid "Completed" msgstr "" -#: archaeological_finds/models_treatments.py:195 +#: archaeological_finds/models_treatments.py:237 msgid "Downstream find" msgstr "" -#: archaeological_finds/models_treatments.py:196 +#: archaeological_finds/models_treatments.py:238 msgid "Upstream find" msgstr "" -#: archaeological_finds/models_treatments.py:218 +#: archaeological_finds/models_treatments.py:260 msgctxt "key for text search" msgid "label" msgstr "" -#: archaeological_finds/models_treatments.py:225 -#: archaeological_finds/models_treatments.py:1242 +#: archaeological_finds/models_treatments.py:267 +#: archaeological_finds/models_treatments.py:1320 #: archaeological_operations/models.py:2957 #: archaeological_warehouse/models.py:990 msgctxt "key for text search" msgid "index" msgstr "" -#: archaeological_finds/models_treatments.py:231 +#: archaeological_finds/models_treatments.py:273 msgctxt "key for text search" msgid "scientific-manager" msgstr "" -#: archaeological_finds/models_treatments.py:301 +#: archaeological_finds/models_treatments.py:278 +msgctxt "key for text search" +msgid "input-status" +msgstr "" + +#: archaeological_finds/models_treatments.py:282 +msgctxt "key for text search" +msgid "treatment-status" +msgstr "" + +#: archaeological_finds/models_treatments.py:290 +msgctxt "key for text search" +msgid "responsible-of-treatment" +msgstr "" + +#: archaeological_finds/models_treatments.py:294 ishtar_common/models.py:2950 +#: ishtar_common/models.py:3969 +msgctxt "key for text search" +msgid "organization" +msgstr "" + +#: archaeological_finds/models_treatments.py:359 +msgid "State - deprecated use input_status and treatment_status" +msgstr "" + +#: archaeological_finds/models_treatments.py:374 +msgid "Treatment status" +msgstr "" + +#: archaeological_finds/models_treatments.py:379 msgid "Treatment have been executed" msgstr "" -#: archaeological_finds/models_treatments.py:309 +#: archaeological_finds/models_treatments.py:387 msgid "Location where the treatment is done. Target warehouse for a move." msgstr "" -#: archaeological_finds/models_treatments.py:352 +#: archaeological_finds/models_treatments.py:430 msgid "Estimated cost" msgstr "" -#: archaeological_finds/models_treatments.py:353 +#: archaeological_finds/models_treatments.py:431 msgid "Quoted cost" msgstr "" -#: archaeological_finds/models_treatments.py:354 +#: archaeological_finds/models_treatments.py:432 msgid "Realized cost" msgstr "" -#: archaeological_finds/models_treatments.py:355 +#: archaeological_finds/models_treatments.py:433 msgid "Insurance cost" msgstr "" -#: archaeological_finds/models_treatments.py:369 -#: archaeological_finds/models_treatments.py:1362 -#: archaeological_finds/models_treatments.py:1582 +#: archaeological_finds/models_treatments.py:447 +#: archaeological_finds/models_treatments.py:1440 +#: archaeological_finds/models_treatments.py:1660 msgid "Basket ID" msgstr "" -#: archaeological_finds/models_treatments.py:394 +#: archaeological_finds/models_treatments.py:472 msgid "TREATMENT" msgstr "" -#: archaeological_finds/models_treatments.py:476 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:124 +#: archaeological_finds/models_treatments.py:554 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:120 msgid "Downstream finds" msgstr "" -#: archaeological_finds/models_treatments.py:932 +#: archaeological_finds/models_treatments.py:1010 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:122 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:160 msgid "Doer" msgstr "" -#: archaeological_finds/models_treatments.py:933 -#: archaeological_finds/models_treatments.py:934 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:114 +#: archaeological_finds/models_treatments.py:1011 +#: archaeological_finds/models_treatments.py:1012 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:110 msgid "Related finds" msgstr "" -#: archaeological_finds/models_treatments.py:1158 +#: archaeological_finds/models_treatments.py:1236 msgid "Is upstream" msgstr "" -#: archaeological_finds/models_treatments.py:1171 +#: archaeological_finds/models_treatments.py:1249 msgid "Is an exhibition" msgstr "" -#: archaeological_finds/models_treatments.py:1175 +#: archaeological_finds/models_treatments.py:1253 msgid "Treatment request types" msgstr "" -#: archaeological_finds/models_treatments.py:1251 +#: archaeological_finds/models_treatments.py:1329 msgctxt "key for text search" msgid "applicant" msgstr "" -#: archaeological_finds/models_treatments.py:1256 +#: archaeological_finds/models_treatments.py:1334 msgctxt "key for text search" msgid "applicant-organisation" msgstr "" -#: archaeological_finds/models_treatments.py:1261 +#: archaeological_finds/models_treatments.py:1339 msgctxt "key for text search" msgid "end-date" msgstr "" -#: archaeological_finds/models_treatments.py:1265 +#: archaeological_finds/models_treatments.py:1343 msgctxt "key for text search" msgid "exhibition-start" msgstr "" -#: archaeological_finds/models_treatments.py:1269 +#: archaeological_finds/models_treatments.py:1347 msgctxt "key for text search" msgid "exhibition-end" msgstr "" -#: archaeological_finds/models_treatments.py:1369 +#: archaeological_finds/models_treatments.py:1447 #: archaeological_finds/templates/ishtar/sheet_find_treatments.html:237 msgid "Treatment requests" msgstr "" -#: archaeological_finds/models_treatments.py:1469 +#: archaeological_finds/models_treatments.py:1547 msgid "Add associated treatment" msgstr "" -#: archaeological_finds/models_treatments.py:1535 -#: archaeological_finds/models_treatments.py:1565 +#: archaeological_finds/models_treatments.py:1613 +#: archaeological_finds/models_treatments.py:1643 msgid "Exhibition type" msgstr "" -#: archaeological_finds/models_treatments.py:1536 +#: archaeological_finds/models_treatments.py:1614 msgid "Exhibition types" msgstr "" -#: archaeological_finds/models_treatments.py:1583 +#: archaeological_finds/models_treatments.py:1661 msgid "Reference basket" msgstr "" -#: archaeological_finds/models_treatments.py:1590 +#: archaeological_finds/models_treatments.py:1668 msgid "Loans" msgstr "" -#: archaeological_finds/models_treatments.py:1617 +#: archaeological_finds/models_treatments.py:1695 msgid "Exhibitions" msgstr "" -#: archaeological_finds/models_treatments.py:1645 +#: archaeological_finds/models_treatments.py:1723 msgid "Add exhibition loan" msgstr "" -#: archaeological_finds/models_treatments.py:1647 +#: archaeological_finds/models_treatments.py:1725 msgid "exhibition loan" msgstr "" @@ -5999,7 +6092,7 @@ msgstr "" #: archaeological_finds/templates/ishtar/sheet_exhibition.html:81 #: archaeological_finds/templates/ishtar/sheet_find.html:283 #: archaeological_finds/templates/ishtar/sheet_museum_find.html:307 -#: archaeological_finds/templates/ishtar/sheet_treatment.html:141 +#: archaeological_finds/templates/ishtar/sheet_treatment.html:137 #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:82 #: ishtar_common/templates/ishtar/sheet_document.html:139 msgid "Associated documents" @@ -6132,16 +6225,6 @@ msgstr "" msgid "Archaeological context" msgstr "" -#: archaeological_finds/templates/ishtar/sheet_treatment.html:70 -msgctxt "Treatment" -msgid "Closed" -msgstr "" - -#: archaeological_finds/templates/ishtar/sheet_treatment.html:72 -msgctxt "Treatment" -msgid "Active" -msgstr "" - #: archaeological_finds/templates/ishtar/sheet_treatmentfile.html:27 msgctxt "Treatment request" msgid "Closed" @@ -6205,16 +6288,16 @@ msgstr "" msgid "Treatment informations:" msgstr "" -#: archaeological_finds/tests.py:721 ishtar_common/forms_common.py:414 +#: archaeological_finds/tests.py:725 ishtar_common/forms_common.py:414 msgid "This importer need a document archive." msgstr "" -#: archaeological_finds/tests.py:991 archaeological_warehouse/models.py:1740 +#: archaeological_finds/tests.py:995 archaeological_warehouse/models.py:1740 msgid "The division {} {} do not exist for the location {}." msgstr "" -#: archaeological_finds/tests.py:1777 archaeological_finds/tests.py:1803 -#: archaeological_finds/tests.py:1813 archaeological_operations/tests.py:3293 +#: archaeological_finds/tests.py:1781 archaeological_finds/tests.py:1807 +#: archaeological_finds/tests.py:1817 archaeological_operations/tests.py:3293 #: ishtar_common/forms.py:1288 ishtar_common/forms.py:1367 #: ishtar_common/templates/ishtar/blocks/window_image_detail.html:111 #: ishtar_common/templatetags/window_field.py:19 @@ -6223,8 +6306,8 @@ msgstr "" msgid "Yes" msgstr "" -#: archaeological_finds/tests.py:1778 archaeological_finds/tests.py:1804 -#: archaeological_finds/tests.py:1814 ishtar_common/forms.py:1289 +#: archaeological_finds/tests.py:1782 archaeological_finds/tests.py:1808 +#: archaeological_finds/tests.py:1818 ishtar_common/forms.py:1289 #: ishtar_common/forms.py:1369 ishtar_common/templatetags/window_field.py:24 #: ishtar_common/wizards.py:509 msgid "No" @@ -7947,8 +8030,8 @@ msgid "" "the first step." msgstr "" -#: archaeological_warehouse/forms.py:90 archaeological_warehouse/forms.py:198 -#: archaeological_warehouse/forms.py:516 archaeological_warehouse/forms.py:738 +#: archaeological_warehouse/forms.py:91 archaeological_warehouse/forms.py:199 +#: archaeological_warehouse/forms.py:517 archaeological_warehouse/forms.py:739 #: archaeological_warehouse/ishtar_menu.py:34 #: archaeological_warehouse/models.py:479 #: archaeological_warehouse/models.py:956 @@ -7958,60 +8041,60 @@ msgstr "" msgid "Warehouse" msgstr "" -#: archaeological_warehouse/forms.py:103 +#: archaeological_warehouse/forms.py:104 msgid "Default divisions" msgstr "" -#: archaeological_warehouse/forms.py:110 +#: archaeological_warehouse/forms.py:111 msgid "Division type" msgstr "" -#: archaeological_warehouse/forms.py:126 +#: archaeological_warehouse/forms.py:127 msgid "There are identical divisions." msgstr "" -#: archaeological_warehouse/forms.py:128 +#: archaeological_warehouse/forms.py:129 msgid "Order fields must be different." msgstr "" -#: archaeological_warehouse/forms.py:135 archaeological_warehouse/models.py:443 +#: archaeological_warehouse/forms.py:136 archaeological_warehouse/models.py:443 #: archaeological_warehouse/templates/ishtar/sheet_container.html:190 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:142 msgid "Divisions" msgstr "" -#: archaeological_warehouse/forms.py:136 +#: archaeological_warehouse/forms.py:137 msgid "Warehouse - 020 - Divisions" msgstr "" -#: archaeological_warehouse/forms.py:142 +#: archaeological_warehouse/forms.py:143 msgid "Warehouse - 001 - Search" msgstr "" -#: archaeological_warehouse/forms.py:150 archaeological_warehouse/forms.py:215 -#: archaeological_warehouse/forms.py:322 archaeological_warehouse/models.py:263 +#: archaeological_warehouse/forms.py:151 archaeological_warehouse/forms.py:216 +#: archaeological_warehouse/forms.py:323 archaeological_warehouse/models.py:263 #: archaeological_warehouse/models.py:422 ishtar_common/models_imports.py:1091 msgid "Warehouse type" msgstr "" -#: archaeological_warehouse/forms.py:161 archaeological_warehouse/forms.py:179 +#: archaeological_warehouse/forms.py:162 archaeological_warehouse/forms.py:180 #: archaeological_warehouse/views.py:298 msgid "Warehouse search" msgstr "" -#: archaeological_warehouse/forms.py:199 +#: archaeological_warehouse/forms.py:200 msgid "Warehouse - 010 - General" msgstr "" -#: archaeological_warehouse/forms.py:214 +#: archaeological_warehouse/forms.py:215 msgid "Auto filled if kept empty." msgstr "" -#: archaeological_warehouse/forms.py:235 +#: archaeological_warehouse/forms.py:236 msgid "Create a new organization from this warehouse" msgstr "" -#: archaeological_warehouse/forms.py:242 +#: archaeological_warehouse/forms.py:243 msgid "" "Only fill the following fields if no organization is provided or if the " "address of the warehouse is different from the one of the organization. If a " @@ -8019,23 +8102,23 @@ msgid "" "used for the organization." msgstr "" -#: archaeological_warehouse/forms.py:250 ishtar_common/forms_common.py:780 +#: archaeological_warehouse/forms.py:251 ishtar_common/forms_common.py:780 #: ishtar_common/forms_common.py:1195 ishtar_common/models_common.py:3843 #: ishtar_common/models_common.py:4050 msgid "Address complement" msgstr "" -#: archaeological_warehouse/forms.py:253 ishtar_common/forms_common.py:783 +#: archaeological_warehouse/forms.py:254 ishtar_common/forms_common.py:783 #: ishtar_common/forms_common.py:1198 ishtar_common/models_common.py:3848 msgid "Town (freeform)" msgstr "" -#: archaeological_warehouse/forms.py:255 ishtar_common/forms_common.py:785 +#: archaeological_warehouse/forms.py:256 ishtar_common/forms_common.py:785 #: ishtar_common/forms_common.py:1200 ishtar_common/models_common.py:3854 msgid "Country" msgstr "" -#: archaeological_warehouse/forms.py:256 +#: archaeological_warehouse/forms.py:257 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:124 #: ishtar_common/forms_common.py:787 ishtar_common/forms_common.py:1171 #: ishtar_common/models_common.py:3868 ishtar_common/models_common.py:4062 @@ -8044,7 +8127,7 @@ msgstr "" msgid "Phone" msgstr "" -#: archaeological_warehouse/forms.py:258 +#: archaeological_warehouse/forms.py:259 #: archaeological_warehouse/templates/ishtar/sheet_warehouse.html:125 #: ishtar_common/forms_common.py:789 ishtar_common/forms_common.py:1181 #: ishtar_common/models_common.py:3884 @@ -8053,29 +8136,29 @@ msgstr "" msgid "Mobile phone" msgstr "" -#: archaeological_warehouse/forms.py:277 +#: archaeological_warehouse/forms.py:278 msgid "A new organization is not created if an organization is selected." msgstr "" -#: archaeological_warehouse/forms.py:310 archaeological_warehouse/forms.py:311 +#: archaeological_warehouse/forms.py:311 archaeological_warehouse/forms.py:312 msgid "Would you like to delete this warehouse?" msgstr "" -#: archaeological_warehouse/forms.py:315 +#: archaeological_warehouse/forms.py:316 msgid "Context record - Quick action -Modify" msgstr "" -#: archaeological_warehouse/forms.py:333 +#: archaeological_warehouse/forms.py:334 msgid "Container - 010 - General" msgstr "" -#: archaeological_warehouse/forms.py:345 archaeological_warehouse/forms.py:523 +#: archaeological_warehouse/forms.py:346 archaeological_warehouse/forms.py:524 #: archaeological_warehouse/models.py:1246 msgid "Old reference" msgstr "" -#: archaeological_warehouse/forms.py:347 archaeological_warehouse/forms.py:520 -#: archaeological_warehouse/forms.py:743 archaeological_warehouse/models.py:762 +#: archaeological_warehouse/forms.py:348 archaeological_warehouse/forms.py:521 +#: archaeological_warehouse/forms.py:744 archaeological_warehouse/models.py:762 #: archaeological_warehouse/models.py:926 #: archaeological_warehouse/models.py:1214 #: archaeological_warehouse/templates/ishtar/sheet_container.html:154 @@ -8083,136 +8166,136 @@ msgstr "" msgid "Container type" msgstr "" -#: archaeological_warehouse/forms.py:349 +#: archaeological_warehouse/forms.py:350 msgid "Current location (warehouse)" msgstr "" -#: archaeological_warehouse/forms.py:358 archaeological_warehouse/forms.py:531 +#: archaeological_warehouse/forms.py:359 archaeological_warehouse/forms.py:532 #: archaeological_warehouse/models.py:1229 msgid "Parent container" msgstr "" -#: archaeological_warehouse/forms.py:368 archaeological_warehouse/forms.py:746 +#: archaeological_warehouse/forms.py:369 archaeological_warehouse/forms.py:747 #: archaeological_warehouse/models.py:1205 msgid "Responsibility" msgstr "" -#: archaeological_warehouse/forms.py:376 +#: archaeological_warehouse/forms.py:377 msgid "Automatically attached to the current warehouse if not filled." msgstr "" -#: archaeological_warehouse/forms.py:381 +#: archaeological_warehouse/forms.py:382 #: archaeological_warehouse/models.py:1236 msgid "Measured weight (g)" msgstr "" -#: archaeological_warehouse/forms.py:407 +#: archaeological_warehouse/forms.py:408 msgid "The parent container is not attached to the same warehouse." msgstr "" -#: archaeological_warehouse/forms.py:430 +#: archaeological_warehouse/forms.py:431 msgid "This reference/code already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:438 archaeological_warehouse/forms.py:821 +#: archaeological_warehouse/forms.py:439 archaeological_warehouse/forms.py:822 msgid "A container cannot be a parent of himself." msgstr "" -#: archaeological_warehouse/forms.py:502 +#: archaeological_warehouse/forms.py:503 msgid "This ID already exists for this warehouse." msgstr "" -#: archaeological_warehouse/forms.py:509 +#: archaeological_warehouse/forms.py:510 msgid "Container - 001 - Search" msgstr "" -#: archaeological_warehouse/forms.py:517 +#: archaeological_warehouse/forms.py:518 msgid "Warehouse (responsibility)" msgstr "" -#: archaeological_warehouse/forms.py:518 +#: archaeological_warehouse/forms.py:519 msgid "Warehouse - Town" msgstr "" -#: archaeological_warehouse/forms.py:519 +#: archaeological_warehouse/forms.py:520 msgid "Warehouse - Area" msgstr "" -#: archaeological_warehouse/forms.py:526 +#: archaeological_warehouse/forms.py:527 msgid "Contain containers" msgstr "" -#: archaeological_warehouse/forms.py:529 +#: archaeological_warehouse/forms.py:530 msgid "Is stationary" msgstr "" -#: archaeological_warehouse/forms.py:564 +#: archaeological_warehouse/forms.py:565 msgid "Operation - Code PATRIARCHE" msgstr "" -#: archaeological_warehouse/forms.py:566 +#: archaeological_warehouse/forms.py:567 msgid "Operation - town" msgstr "" -#: archaeological_warehouse/forms.py:571 +#: archaeological_warehouse/forms.py:572 msgid "Operation - Scientist" msgstr "" -#: archaeological_warehouse/forms.py:580 +#: archaeological_warehouse/forms.py:581 msgid "Find - Label" msgstr "" -#: archaeological_warehouse/forms.py:581 +#: archaeological_warehouse/forms.py:582 msgid "Find - Denomination" msgstr "" -#: archaeological_warehouse/forms.py:582 +#: archaeological_warehouse/forms.py:583 msgid "Find - Description" msgstr "" -#: archaeological_warehouse/forms.py:597 ishtar_common/models_imports.py:1088 +#: archaeological_warehouse/forms.py:598 ishtar_common/models_imports.py:1088 msgid "Conservatory state" msgstr "" -#: archaeological_warehouse/forms.py:601 +#: archaeological_warehouse/forms.py:602 msgid "Preservation type" msgstr "" -#: archaeological_warehouse/forms.py:626 archaeological_warehouse/forms.py:639 -#: archaeological_warehouse/forms.py:653 archaeological_warehouse/views.py:368 +#: archaeological_warehouse/forms.py:627 archaeological_warehouse/forms.py:640 +#: archaeological_warehouse/forms.py:654 archaeological_warehouse/views.py:368 msgid "Container search" msgstr "" -#: archaeological_warehouse/forms.py:631 archaeological_warehouse/forms.py:644 -#: archaeological_warehouse/forms.py:658 +#: archaeological_warehouse/forms.py:632 archaeological_warehouse/forms.py:645 +#: archaeological_warehouse/forms.py:659 msgid "You should select a container." msgstr "" -#: archaeological_warehouse/forms.py:633 +#: archaeological_warehouse/forms.py:634 msgid "Add a new container" msgstr "" -#: archaeological_warehouse/forms.py:678 +#: archaeological_warehouse/forms.py:679 msgid "Container to merge" msgstr "" -#: archaeological_warehouse/forms.py:706 +#: archaeological_warehouse/forms.py:707 msgid "Packager" msgstr "" -#: archaeological_warehouse/forms.py:716 +#: archaeological_warehouse/forms.py:717 msgid "Packaged finds" msgstr "" -#: archaeological_warehouse/forms.py:720 archaeological_warehouse/forms.py:721 +#: archaeological_warehouse/forms.py:721 archaeological_warehouse/forms.py:722 msgid "Would you like to delete this container?" msgstr "" -#: archaeological_warehouse/forms.py:726 +#: archaeological_warehouse/forms.py:727 msgid "Container - Quick action - Modify" msgstr "" -#: archaeological_warehouse/forms.py:842 +#: archaeological_warehouse/forms.py:843 msgid "" "Cannot do this changes because it would generate many containers with " "location: {}, container type: {}, parent: {} {} and reference: {}. Merge " @@ -9694,7 +9777,7 @@ msgstr "" msgid "You put either a file or a download link for media but not both." msgstr "" -#: ishtar_common/forms_common.py:405 ishtar_common/tests.py:3048 +#: ishtar_common/forms_common.py:405 ishtar_common/tests.py:3050 msgid "\"Associated images\" field must be a valid zip file." msgstr "" @@ -11675,11 +11758,6 @@ msgctxt "key for text search" msgid "salutation" msgstr "" -#: ishtar_common/models.py:2950 ishtar_common/models.py:3969 -msgctxt "key for text search" -msgid "organization" -msgstr "" - #: ishtar_common/models.py:2955 msgctxt "key for text search" msgid "has-account" @@ -14720,11 +14798,6 @@ msgstr "" msgid "No pending imports." msgstr "" -#: ishtar_common/templates/ishtar/import_table.html:41 -#: ishtar_common/templates/ishtar/sheet_ishtaruser.html:58 -msgid "Status" -msgstr "" - #: ishtar_common/templates/ishtar/import_table.html:43 msgctxt "file" msgid "Files" -- cgit v1.2.3