summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-15 17:43:28 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-15 17:43:28 +0200
commit5c0212f20e5fc8ac0edc5cc2e70fbc92030e1866 (patch)
treeb7ee5027fa0440e4a3b5fac390009e001747c85c
parentd42116c039828ee9a6c8bd3f762ddd3580ec4c4d (diff)
parent64000a8c56da1872901f89faeb00df60f4994dd1 (diff)
downloadIshtar-5c0212f20e5fc8ac0edc5cc2e70fbc92030e1866.tar.bz2
Ishtar-5c0212f20e5fc8ac0edc5cc2e70fbc92030e1866.zip
Merge branch 'v0.9' into wheezy
-rw-r--r--CHANGES.md14
-rw-r--r--archaeological_finds/forms.py7
-rw-r--r--archaeological_finds/locale/django.pot204
-rw-r--r--archaeological_finds/models.py7
-rw-r--r--archaeological_finds/templates/ishtar/sheet_find.html2
-rw-r--r--archaeological_operations/forms.py5
-rw-r--r--archaeological_operations/locale/django.pot479
-rw-r--r--archaeological_operations/migrations/0010_auto__add_field_historicaloperation_scientific_documentation_comment__.py667
-rw-r--r--archaeological_operations/models.py4
-rw-r--r--archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html4
-rw-r--r--archaeological_operations/templates/ishtar/sheet_operation.html3
-rw-r--r--archaeological_operations/views.py2
-rw-r--r--ishtar_common/templates/blocks/form_flex_snippet.html2
-rw-r--r--translations/fr/archaeological_finds.po212
-rw-r--r--translations/fr/archaeological_operations.po481
-rw-r--r--version.py2
16 files changed, 1409 insertions, 686 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 89cfe55d9..0ac99a8ea 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,20 @@
Ishtar changelog
================
+0.98.3 (2016-09-15)
+-------------------
+
+### Features ###
+
+- Operation: add comment about scientific documentation
+- Finds : rename "Integrity" field into "Integrity / Interest"
+- Searches: 6 to 9 visible fields by default
+- Find search: add operation numeric index
+
+### Bug fixes ###
+
+- Dashboard operation: fix table layout
+
0.98.2 (2016-09-13)
-------------------
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 6c6f41457..216c1ae75 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -114,7 +114,7 @@ class FindForm(ManageOldType, forms.Form):
label=_(u"Preservation type"), choices=[],
widget=forms.CheckboxSelectMultiple, required=False)
integritie = forms.MultipleChoiceField(
- label=_(u"Integrity"), choices=[],
+ label=_(u"Integrity / interest"), choices=[],
widget=forms.CheckboxSelectMultiple, required=False)
remarkabilitie = forms.MultipleChoiceField(
label=_(u"Remarkability"), choices=[],
@@ -219,6 +219,8 @@ class FindSelect(TableSelect):
base_finds__context_record__parcel__town = get_town_field()
base_finds__context_record__operation__year = forms.IntegerField(
label=_(u"Year"))
+ base_finds__context_record__operation__operation_code = forms.IntegerField(
+ label=_(u"Operation's number (index by year)"))
base_finds__context_record__operation__code_patriarche = \
forms.IntegerField(
label=_(u"Code PATRIARCHE"),
@@ -241,7 +243,8 @@ class FindSelect(TableSelect):
choices=[], label=_(u"Preservation type"))
conservatory_state = forms.ChoiceField(label=_(u"Conservatory state"),
choices=[])
- integrities = forms.ChoiceField(label=_(u"Integrity"), choices=[])
+ integrities = forms.ChoiceField(label=_(u"Integrity / interest"),
+ choices=[])
remarkabilities = forms.ChoiceField(label=_(u"Remarkability"),
choices=[])
base_finds__find__description = forms.CharField(label=_(u"Description"))
diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot
index 2a664c9d0..9713ecd3c 100644
--- a/archaeological_finds/locale/django.pot
+++ b/archaeological_finds/locale/django.pot
@@ -12,25 +12,25 @@ msgstr ""
msgid "Context record"
msgstr ""
-#: forms.py:83 ishtar_menu.py:31 models.py:386 models.py:670 models.py:768
-#: models.py:912 templates/ishtar/sheet_find.html:5
+#: forms.py:83 ishtar_menu.py:31 models.py:387 models.py:671 models.py:769
+#: models.py:913 templates/ishtar/sheet_find.html:5
msgid "Find"
msgstr ""
-#: forms.py:94 forms.py:218 forms.py:422 models.py:115 models.py:324
+#: forms.py:94 forms.py:218 forms.py:425 models.py:115 models.py:324
msgid "Free ID"
msgstr ""
-#: forms.py:96 models.py:372
+#: forms.py:96 models.py:373
msgid "Previous ID"
msgstr ""
-#: forms.py:97 forms.py:247 forms.py:588 models.py:119 models.py:325
-#: models.py:702
+#: forms.py:97 forms.py:250 forms.py:591 models.py:119 models.py:325
+#: models.py:703
msgid "Description"
msgstr ""
-#: forms.py:100 forms.py:249 models.py:130
+#: forms.py:100 forms.py:252 models.py:130
msgid "Batch/object"
msgstr ""
@@ -38,11 +38,11 @@ msgstr ""
msgid "Is complete?"
msgstr ""
-#: forms.py:105 forms.py:238 forms.py:426 models.py:50
+#: forms.py:105 forms.py:240 forms.py:429 models.py:50
msgid "Material type"
msgstr ""
-#: forms.py:106 forms.py:242 models.py:60 models.py:329
+#: forms.py:106 forms.py:244 models.py:60 models.py:329
msgid "Conservatory state"
msgstr ""
@@ -54,71 +54,71 @@ msgstr ""
msgid "Object types"
msgstr ""
-#: forms.py:114 forms.py:241 models.py:67
+#: forms.py:114 forms.py:243 models.py:67
msgid "Preservation type"
msgstr ""
-#: forms.py:117 forms.py:244 models.py:358
-msgid "Integrity"
+#: forms.py:117 forms.py:246 models.py:358
+msgid "Integrity / interest"
msgstr ""
-#: forms.py:120 forms.py:245 models.py:360
+#: forms.py:120 forms.py:248 models.py:361
msgid "Remarkability"
msgstr ""
-#: forms.py:122 models.py:362
+#: forms.py:122 models.py:363
msgid "Length (cm)"
msgstr ""
-#: forms.py:123 models.py:363
+#: forms.py:123 models.py:364
msgid "Width (cm)"
msgstr ""
-#: forms.py:124 models.py:364
+#: forms.py:124 models.py:365
msgid "Height (cm)"
msgstr ""
-#: forms.py:125 models.py:365
+#: forms.py:125 models.py:366
msgid "Diameter (cm)"
msgstr ""
-#: forms.py:126 forms.py:427 models.py:336
+#: forms.py:126 forms.py:430 models.py:336
msgid "Volume (l)"
msgstr ""
-#: forms.py:127 forms.py:428 models.py:337
+#: forms.py:127 forms.py:431 models.py:337
msgid "Weight (g)"
msgstr ""
-#: forms.py:129 models.py:366
+#: forms.py:129 models.py:367
msgid "Dimensions comment"
msgstr ""
-#: forms.py:130 forms.py:429 models.py:340
+#: forms.py:130 forms.py:432 models.py:340
msgid "Find number"
msgstr ""
-#: forms.py:131 models.py:368
+#: forms.py:131 models.py:369
msgid "Mark"
msgstr ""
-#: forms.py:132 forms.py:251 models.py:374
+#: forms.py:132 forms.py:254 models.py:375
msgid "Check"
msgstr ""
-#: forms.py:134 models.py:376
+#: forms.py:134 models.py:377
msgid "Check date"
msgstr ""
-#: forms.py:135 models.py:120 models.py:369 models.py:703
+#: forms.py:135 models.py:120 models.py:370 models.py:704
msgid "Comment"
msgstr ""
-#: forms.py:138 models.py:370
+#: forms.py:138 models.py:371
msgid "Comment on dating"
msgstr ""
-#: forms.py:139 models.py:378
+#: forms.py:139 models.py:379
msgid "Estimated value"
msgstr ""
@@ -137,16 +137,16 @@ msgstr ""
msgid "Dating"
msgstr ""
-#: forms.py:186 forms.py:236
+#: forms.py:186 forms.py:238
msgid "Period"
msgstr ""
-#: forms.py:187 forms.py:590 models.py:716 models.py:781 models.py:917
+#: forms.py:187 forms.py:593 models.py:717 models.py:782 models.py:918
#: templates/ishtar/sheet_find.html:85 templates/ishtar/sheet_find.html:114
msgid "Start date"
msgstr ""
-#: forms.py:189 forms.py:592 models.py:717 models.py:782 models.py:918
+#: forms.py:189 forms.py:595 models.py:718 models.py:783 models.py:919
#: templates/ishtar/sheet_find.html:86 templates/ishtar/sheet_find.html:115
msgid "End date"
msgstr ""
@@ -175,132 +175,136 @@ msgstr ""
msgid "Year"
msgstr ""
-#: forms.py:224
+#: forms.py:223
+msgid "Operation's number (index by year)"
+msgstr ""
+
+#: forms.py:226
msgid "Code PATRIARCHE"
msgstr ""
-#: forms.py:228
+#: forms.py:230
msgid "Archaelogical site"
msgstr ""
-#: forms.py:234
+#: forms.py:236
msgid "Search within operation relations"
msgstr ""
-#: forms.py:239 models.py:91
+#: forms.py:241 models.py:91
msgid "Object type"
msgstr ""
-#: forms.py:252
+#: forms.py:255
msgid "Has an image?"
msgstr ""
-#: forms.py:294 forms.py:307 views.py:132
+#: forms.py:297 forms.py:310 views.py:132
msgid "Find search"
msgstr ""
-#: forms.py:321
+#: forms.py:324
msgid "Upstream finds"
msgstr ""
-#: forms.py:323 models.py:387
+#: forms.py:326 models.py:388
msgid "Finds"
msgstr ""
-#: forms.py:333
+#: forms.py:336
msgid "You should at least select one archaeological find."
msgstr ""
-#: forms.py:419
+#: forms.py:422
msgid "Resulting find"
msgstr ""
-#: forms.py:424
+#: forms.py:427
msgid "Precise description"
msgstr ""
-#: forms.py:439
+#: forms.py:442
msgid "Resulting finds"
msgstr ""
-#: forms.py:444
+#: forms.py:447
msgid "Would you like to delete this find?"
msgstr ""
-#: forms.py:448
+#: forms.py:451
msgid "Upstream find"
msgstr ""
-#: forms.py:459
+#: forms.py:462
msgid "Archaeological find search"
msgstr ""
-#: forms.py:461
+#: forms.py:464
msgid "You should select an archaeological find."
msgstr ""
-#: forms.py:466
+#: forms.py:469
msgid "Year of the operation"
msgstr ""
-#: forms.py:468
+#: forms.py:471
msgid "Numeric reference"
msgstr ""
-#: forms.py:475
+#: forms.py:478
msgid "Period of the archaelogical find"
msgstr ""
-#: forms.py:477
+#: forms.py:480
msgid "Material type of the archaelogical find"
msgstr ""
-#: forms.py:479
+#: forms.py:482
msgid "Description of the archaelogical find"
msgstr ""
-#: forms.py:491
+#: forms.py:494
msgid "Documentation search"
msgstr ""
-#: forms.py:493
+#: forms.py:496
msgid "You should select a document."
msgstr ""
-#: forms.py:510
+#: forms.py:513
msgid "Another basket already exist with this name."
msgstr ""
-#: forms.py:520 ishtar_menu.py:60
+#: forms.py:523 ishtar_menu.py:60
msgid "Basket"
msgstr ""
-#: forms.py:570
+#: forms.py:573
msgid "Base treatment"
msgstr ""
-#: forms.py:575 models.py:692 models.py:705 models.py:780
+#: forms.py:578 models.py:693 models.py:706 models.py:781
msgid "Treatment type"
msgstr ""
-#: forms.py:577 models.py:714 models.py:785
+#: forms.py:580 models.py:715 models.py:786
#: templates/ishtar/sheet_find.html:83 templates/ishtar/sheet_find.html:112
msgid "Doer"
msgstr ""
-#: forms.py:583 models.py:707 models.py:783
+#: forms.py:586 models.py:708 models.py:784
msgid "Location"
msgstr ""
-#: forms.py:604
+#: forms.py:607
msgid "Leave it blank if you want to select a single item"
msgstr ""
-#: forms.py:611
+#: forms.py:614
msgid "This treatment type is not available."
msgstr ""
-#: forms.py:615
+#: forms.py:618
msgid "This treatment needs a basket."
msgstr ""
@@ -357,11 +361,11 @@ msgid "Preservation types"
msgstr ""
#: models.py:74
-msgid "Integrity type"
+msgid "Integrity / interest type"
msgstr ""
#: models.py:75
-msgid "Integrity types"
+msgid "Integrity / interest types"
msgstr ""
#: models.py:81
@@ -388,7 +392,7 @@ msgstr ""
msgid "Batch"
msgstr ""
-#: models.py:116 models.py:320 models.py:698
+#: models.py:116 models.py:320 models.py:699
msgid "External ID"
msgstr ""
@@ -508,7 +512,7 @@ msgstr ""
msgid "Base find - Discovery date"
msgstr ""
-#: models.py:323 models.py:774
+#: models.py:323 models.py:775
msgid "Order"
msgstr ""
@@ -528,141 +532,141 @@ msgstr ""
msgid "Downstream treatment"
msgstr ""
-#: models.py:351 models.py:700 models.py:784
+#: models.py:351 models.py:701 models.py:785
#: templates/ishtar/sheet_find.html:84 templates/ishtar/sheet_find.html:113
msgid "Container"
msgstr ""
-#: models.py:380
+#: models.py:381
msgid "Cached name"
msgstr ""
-#: models.py:389
+#: models.py:390
msgid "Can view all Finds"
msgstr ""
-#: models.py:390
+#: models.py:391
msgid "Can view own Find"
msgstr ""
-#: models.py:391
+#: models.py:392
msgid "Can add own Find"
msgstr ""
-#: models.py:392
+#: models.py:393
msgid "Can change own Find"
msgstr ""
-#: models.py:393
+#: models.py:394
msgid "Can delete own Find"
msgstr ""
-#: models.py:399
+#: models.py:400
msgid "FIND"
msgstr ""
-#: models.py:668
+#: models.py:669
msgid "Find documentation"
msgstr ""
-#: models.py:669
+#: models.py:670
msgid "Find documentations"
msgstr ""
-#: models.py:679
+#: models.py:680
msgid "Virtual"
msgstr ""
-#: models.py:681
+#: models.py:682
msgid "Upstream is many"
msgstr ""
-#: models.py:683
+#: models.py:684
msgid "Check this if for this treatment from many finds you'll get one."
msgstr ""
-#: models.py:686
+#: models.py:687
msgid "Downstream is many"
msgstr ""
-#: models.py:688
+#: models.py:689
msgid "Check this if for this treatment from one find you'll get many."
msgstr ""
-#: models.py:693
+#: models.py:694
msgid "Treatment types"
msgstr ""
-#: models.py:709
+#: models.py:710
msgid "Location where the treatment is done. Target warehouse for a move."
msgstr ""
-#: models.py:711
+#: models.py:712
msgid "Other location"
msgstr ""
-#: models.py:721 models.py:770 models.py:904
+#: models.py:722 models.py:771 models.py:905
msgid "Treatment"
msgstr ""
-#: models.py:722 templates/ishtar/sheet_find.html:73
+#: models.py:723 templates/ishtar/sheet_find.html:73
msgid "Treatments"
msgstr ""
-#: models.py:724
+#: models.py:725
msgid "Can view all Treatments"
msgstr ""
-#: models.py:725
+#: models.py:726
msgid "Can view own Treatment"
msgstr ""
-#: models.py:726
+#: models.py:727
msgid "Can add own Treatment"
msgstr ""
-#: models.py:727
+#: models.py:728
msgid "Can change own Treatment"
msgstr ""
-#: models.py:728
+#: models.py:729
msgid "Can delete own Treatment"
msgstr ""
-#: models.py:734
+#: models.py:735
msgid "by"
msgstr ""
-#: models.py:786 models.py:787 templates/ishtar/sheet_find.html:82
+#: models.py:787 models.py:788 templates/ishtar/sheet_find.html:82
#: templates/ishtar/sheet_find.html:111
msgid "Related finds"
msgstr ""
-#: models.py:890
+#: models.py:891
msgid "Is upstream"
msgstr ""
-#: models.py:901
+#: models.py:902
msgid "Treatment documentation"
msgstr ""
-#: models.py:902
+#: models.py:903
msgid "Treament documentations"
msgstr ""
-#: models.py:914
+#: models.py:915
msgid "Administrative act"
msgstr ""
-#: models.py:915
+#: models.py:916
msgid "Person"
msgstr ""
-#: models.py:921
+#: models.py:922
msgid "Property"
msgstr ""
-#: models.py:922
+#: models.py:923
msgid "Properties"
msgstr ""
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py
index 5811ded6e..be9817287 100644
--- a/archaeological_finds/models.py
+++ b/archaeological_finds/models.py
@@ -71,8 +71,8 @@ class PreservationType(GeneralType):
class IntegrityType(GeneralType):
class Meta:
- verbose_name = _(u"Integrity type")
- verbose_name_plural = _(u"Integrity types")
+ verbose_name = _(u"Integrity / interest type")
+ verbose_name_plural = _(u"Integrity / interest types")
ordering = ('label',)
@@ -355,7 +355,8 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
object_types = models.ManyToManyField(
ObjectType, verbose_name=_(u"Object types"), related_name='find')
integrities = models.ManyToManyField(
- IntegrityType, verbose_name=_(u"Integrity"), related_name='find')
+ IntegrityType, verbose_name=_(u"Integrity / interest"),
+ related_name='find')
remarkabilities = models.ManyToManyField(
RemarkabilityType, verbose_name=_(u"Remarkability"),
related_name='find')
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index fbd7cec1a..0cc1616b2 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -57,7 +57,7 @@
{% endif %}
{% field_li_multiple "Type of preservation to consider" item.preservation_to_considers %}
{% field_li_multiple "Object types" item.object_types %}
-{% field_li_multiple "Integrity" item.integrities %}
+{% field_li_multiple "Integrity / interest" item.integrities %}
{% field_li_multiple "Remarkability" item.remarkabilities %}
{% field_li "Estimated value" item.estimated_value|default_if_none:''|intcomma '' ' '|add:CURRENCY %}
{% if item.CHECK_DICT %}
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 15db8be31..fc1003576 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -511,6 +511,8 @@ class OperationSelect(TableSelect):
widget=forms.CheckboxSelectMultiple)
comment = forms.CharField(label=_(u"Comment"), max_length=500)
abstract = forms.CharField(label=_(u"Abstract (full text search)"))
+ scientific_documentation_comment = forms.CharField(
+ label=_(u"Comment about scientific documentation"))
record_quality = forms.ChoiceField(label=_(u"Record quality"))
report_processing = forms.ChoiceField(label=_(u"Report processing"),
choices=[])
@@ -829,6 +831,9 @@ class OperationFormGeneral(ManageOldType, forms.Form):
comment = forms.CharField(label=_(u"Comment"), widget=forms.Textarea,
required=False)
+ scientific_documentation_comment = forms.CharField(
+ label=_(u"Comment about scientific documentation"),
+ widget=forms.Textarea, required=False)
record_quality = forms.ChoiceField(label=_(u"Record quality"),
required=False)
virtual_operation = forms.BooleanField(required=False,
diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot
index 3776789bf..8a60fae78 100644
--- a/archaeological_operations/locale/django.pot
+++ b/archaeological_operations/locale/django.pot
@@ -8,37 +8,37 @@
msgid ""
msgstr ""
-#: forms.py:67 forms.py:369 forms.py:999 forms.py:1021 forms.py:1025
-#: models.py:1035 templates/ishtar/sheet_operation.html:138
+#: forms.py:67 forms.py:369 forms.py:1004 forms.py:1026 forms.py:1030
+#: models.py:1037 templates/ishtar/sheet_operation.html:139
#: templates/ishtar/blocks/window_tables/parcels.html:10
msgid "Parcels"
msgstr ""
-#: forms.py:70 forms.py:203 forms.py:975 models.py:1021
+#: forms.py:70 forms.py:203 forms.py:980 models.py:1023
#: templates/ishtar/blocks/window_tables/parcels.html:7
#: templates/ishtar/dashboards/dashboard_operation.html:432
#: templates/ishtar/dashboards/dashboard_operation.html:446
-#: templates/ishtar/dashboards/dashboard_operation.html:685
-#: templates/ishtar/dashboards/dashboard_operation.html:699
+#: templates/ishtar/dashboards/dashboard_operation.html:687
+#: templates/ishtar/dashboards/dashboard_operation.html:701
msgid "Town"
msgstr ""
-#: forms.py:72 forms.py:459 forms.py:753 forms.py:1245 models.py:197
-#: models.py:838 models.py:1019
+#: forms.py:72 forms.py:459 forms.py:755 forms.py:1250 models.py:197
+#: models.py:840 models.py:1021
#: templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Year"
msgstr ""
-#: forms.py:75 models.py:1022
+#: forms.py:75 models.py:1024
#: templates/ishtar/blocks/window_tables/parcels.html:9
msgid "Section"
msgstr ""
-#: forms.py:78 models.py:1024
+#: forms.py:78 models.py:1026
msgid "Parcel number"
msgstr ""
-#: forms.py:80 models.py:1026 models.py:1043 models.py:1092
+#: forms.py:80 models.py:1028 models.py:1045 models.py:1094
msgid "Public domain"
msgstr ""
@@ -74,8 +74,8 @@ msgstr ""
msgid "Relation type"
msgstr ""
-#: forms.py:381 ishtar_menu.py:30 models.py:289 models.py:738 models.py:763
-#: models.py:779 models.py:830 models.py:1018 wizards.py:339 wizards.py:350
+#: forms.py:381 ishtar_menu.py:30 models.py:291 models.py:740 models.py:765
+#: models.py:781 models.py:832 models.py:1020 wizards.py:339 wizards.py:350
#: templates/ishtar/sheet_operation.html:4
msgid "Operation"
msgstr ""
@@ -84,7 +84,7 @@ msgstr ""
msgid ":"
msgstr ""
-#: forms.py:409 forms.py:606 forms.py:1210
+#: forms.py:409 forms.py:608 forms.py:1215
msgid "You should select an operation."
msgstr ""
@@ -100,32 +100,33 @@ msgstr ""
msgid "Deleted relations"
msgstr ""
-#: forms.py:449 templates/ishtar/sheet_operation.html:82
+#: forms.py:449 templates/ishtar/sheet_operation.html:83
msgid "Relations"
msgstr ""
-#: forms.py:460 forms.py:1216 models.py:198
+#: forms.py:460 forms.py:1221 models.py:198
msgid "Numeric reference"
msgstr ""
-#: forms.py:466 forms.py:1256
+#: forms.py:466 forms.py:1261
msgid "Parcel (section/number/public domain)"
msgstr ""
-#: forms.py:469 forms.py:1259 models.py:739
+#: forms.py:469 forms.py:1264 models.py:741
#: templates/ishtar/dashboards/dashboard_operation.html:390
#: templates/ishtar/dashboards/dashboard_operation.html:411
#: templates/ishtar/dashboards/dashboard_operation.html:643
#: templates/ishtar/dashboards/dashboard_operation.html:664
+#: templates/ishtar/dashboards/dashboard_operation.html:666
msgid "Department"
msgstr ""
-#: forms.py:470 forms.py:1087 models.py:79
+#: forms.py:470 forms.py:1092 models.py:79
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8
msgid "Name"
msgstr ""
-#: forms.py:472 forms.py:673 forms.py:751 forms.py:1222 models.py:205
+#: forms.py:472 forms.py:675 forms.py:753 forms.py:1227 models.py:205
msgid "Operation type"
msgstr ""
@@ -133,24 +134,24 @@ msgstr ""
msgid "Is open?"
msgstr ""
-#: forms.py:483 forms.py:780 models.py:194
+#: forms.py:483 forms.py:782 models.py:194
msgid "In charge"
msgstr ""
-#: forms.py:490 models.py:824
+#: forms.py:490 models.py:826
msgid "Scientist in charge"
msgstr ""
-#: forms.py:492 forms.py:675 forms.py:771 models.py:192
+#: forms.py:492 forms.py:677 forms.py:773 models.py:192
msgid "Operator"
msgstr ""
-#: forms.py:499 forms.py:1092 models.py:83 models.py:207
+#: forms.py:499 forms.py:1097 models.py:83 models.py:207
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10
msgid "Remains"
msgstr ""
-#: forms.py:500 forms.py:1070 forms.py:1089 models.py:81 models.py:212
+#: forms.py:500 forms.py:1075 forms.py:1094 models.py:81 models.py:212
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9
msgid "Periods"
msgstr ""
@@ -175,7 +176,7 @@ msgstr ""
msgid "Search within relations"
msgstr ""
-#: forms.py:512 forms.py:830 models.py:258
+#: forms.py:512 forms.py:832
msgid "Comment"
msgstr ""
@@ -183,385 +184,389 @@ msgstr ""
msgid "Abstract (full text search)"
msgstr ""
-#: forms.py:514 forms.py:832 models.py:270
+#: forms.py:515 forms.py:835 models.py:260
+msgid "Comment about scientific documentation"
+msgstr ""
+
+#: forms.py:516 forms.py:837 models.py:272
msgid "Record quality"
msgstr ""
-#: forms.py:515 forms.py:803 models.py:224
+#: forms.py:517 forms.py:805 models.py:224
msgid "Report processing"
msgstr ""
-#: forms.py:517 forms.py:835 models.py:265
+#: forms.py:519 forms.py:840 models.py:267
msgid "Virtual operation"
msgstr ""
-#: forms.py:519 forms.py:1136
+#: forms.py:521 forms.py:1141
msgid "Archaelogical site"
msgstr ""
-#: forms.py:525 forms.py:1263
+#: forms.py:527 forms.py:1268
msgid "Created by"
msgstr ""
-#: forms.py:531 forms.py:1269
+#: forms.py:533 forms.py:1274
msgid "Modified by"
msgstr ""
-#: forms.py:538
+#: forms.py:540
msgid "Documentation deadline before"
msgstr ""
-#: forms.py:540
+#: forms.py:542
msgid "Documentation deadline after"
msgstr ""
-#: forms.py:542 forms.py:823 models.py:277
+#: forms.py:544 forms.py:825 models.py:279
msgid "Documentation received"
msgstr ""
-#: forms.py:544
+#: forms.py:546
msgid "Finds deadline before"
msgstr ""
-#: forms.py:546
+#: forms.py:548
msgid "Finds deadline after"
msgstr ""
-#: forms.py:548 forms.py:828 models.py:281
+#: forms.py:550 forms.py:830 models.py:283
msgid "Finds received"
msgstr ""
-#: forms.py:593 forms.py:1208 views.py:256
+#: forms.py:595 forms.py:1213 views.py:258
msgid "Operation search"
msgstr ""
-#: forms.py:637
+#: forms.py:639
msgid "Associated file"
msgstr ""
-#: forms.py:641 forms.py:923 models.py:835 wizards.py:76
+#: forms.py:643 forms.py:928 models.py:837 wizards.py:76
msgid "Archaelogical file"
msgstr ""
-#: forms.py:648 forms.py:650 models.py:272
+#: forms.py:650 forms.py:652 models.py:274
msgid "Abstract"
msgstr ""
-#: forms.py:653
+#: forms.py:655
msgid "months"
msgstr ""
-#: forms.py:653
+#: forms.py:655
msgid "years"
msgstr ""
-#: forms.py:655 models.py:178
+#: forms.py:657 models.py:178
msgid "Creation date"
msgstr ""
-#: forms.py:656
+#: forms.py:658
msgid "Start of field work"
msgstr ""
-#: forms.py:658
+#: forms.py:660
msgid "All"
msgstr ""
-#: forms.py:659
+#: forms.py:661
msgid "Preventive"
msgstr ""
-#: forms.py:660
+#: forms.py:662
msgid "Research"
msgstr ""
-#: forms.py:664
+#: forms.py:666
msgid "Slicing"
msgstr ""
-#: forms.py:667
+#: forms.py:669
msgid "Department detail"
msgstr ""
-#: forms.py:669
+#: forms.py:671
msgid "Date get from"
msgstr ""
-#: forms.py:671
+#: forms.py:673
msgid "Preventive/Research"
msgstr ""
-#: forms.py:677
+#: forms.py:679
msgid "Date after"
msgstr ""
-#: forms.py:679
+#: forms.py:681
msgid "Date before"
msgstr ""
-#: forms.py:681
+#: forms.py:683
msgid "With reports"
msgstr ""
-#: forms.py:682
+#: forms.py:684
msgid "With finds"
msgstr ""
-#: forms.py:734 forms.py:1317 templates/ishtar/sheet_administrativeact.html:13
+#: forms.py:736 forms.py:1322 templates/ishtar/sheet_administrativeact.html:13
#: templates/ishtar/sheet_operation.html:20
msgid "General"
msgstr ""
-#: forms.py:749 models.py:257
+#: forms.py:751 models.py:257
msgid "Generic name"
msgstr ""
-#: forms.py:758 models.py:226
+#: forms.py:760 models.py:226
msgid "Old code"
msgstr ""
-#: forms.py:761
+#: forms.py:763
msgid "Head scientist"
msgstr ""
-#: forms.py:777 models.py:256
+#: forms.py:779 models.py:256
msgid "Operator reference"
msgstr ""
-#: forms.py:789
+#: forms.py:791
msgid "Total surface (m2)"
msgstr ""
-#: forms.py:796 models.py:51 models.py:181 models.py:1208
+#: forms.py:798 models.py:51 models.py:181 models.py:1210
msgid "Start date"
msgstr ""
-#: forms.py:798 models.py:183
+#: forms.py:800 models.py:183
msgid "Excavation end date"
msgstr ""
-#: forms.py:801 models.py:184
+#: forms.py:803 models.py:184
msgid "Report delivery date"
msgstr ""
-#: forms.py:820 models.py:274
+#: forms.py:822 models.py:276
msgid "Deadline for submission of the documentation"
msgstr ""
-#: forms.py:825 models.py:279
+#: forms.py:827 models.py:281
msgid "Deadline for submission of the finds"
msgstr ""
-#: forms.py:837
+#: forms.py:842
msgid "Image"
msgstr ""
-#: forms.py:838
+#: forms.py:843
#, python-format
msgid ""
"<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</"
"p>"
msgstr ""
-#: forms.py:876
+#: forms.py:881
msgid ""
"If you want to set an excavation end date you have to provide a start date."
msgstr ""
-#: forms.py:881
+#: forms.py:886
msgid "The excavation end date cannot be before the start date."
msgstr ""
-#: forms.py:909
+#: forms.py:914
#, python-format
msgid ""
"Operation code already exist for year: %(year)d - use a value bigger than "
"%(last_val)d"
msgstr ""
-#: forms.py:913
+#: forms.py:918
msgid "Bad operation code"
msgstr ""
-#: forms.py:919 models.py:422
+#: forms.py:924 models.py:424
msgid "Operation code"
msgstr ""
-#: forms.py:945
+#: forms.py:950
msgid "Preventive informations - excavation"
msgstr ""
-#: forms.py:946 models.py:210
-#: templates/ishtar/dashboards/dashboard_operation.html:699
+#: forms.py:951 models.py:210
+#: templates/ishtar/dashboards/dashboard_operation.html:701
msgid "Cost (euros)"
msgstr ""
-#: forms.py:947 models.py:215
+#: forms.py:952 models.py:215
msgid "Scheduled man-days"
msgstr ""
-#: forms.py:949 models.py:218
+#: forms.py:954 models.py:218
msgid "Optional man-days"
msgstr ""
-#: forms.py:951 models.py:221
+#: forms.py:956 models.py:221
msgid "Effective man-days"
msgstr ""
-#: forms.py:961
+#: forms.py:966
msgid "Preventive informations - diagnostic"
msgstr ""
-#: forms.py:964 models.py:240
+#: forms.py:969 models.py:240
msgid "Prescription on zoning"
msgstr ""
-#: forms.py:966 models.py:243
+#: forms.py:971 models.py:243
msgid "Prescription on large area"
msgstr ""
-#: forms.py:969 models.py:245
+#: forms.py:974 models.py:245
msgid "Prescription on geoarchaeological context"
msgstr ""
-#: forms.py:973 forms.py:995 models.py:209 models.py:848
+#: forms.py:978 forms.py:1000 models.py:209 models.py:850
msgid "Towns"
msgstr ""
-#: forms.py:1002 models.py:1034 models.py:1206
+#: forms.py:1007 models.py:1036 models.py:1208
msgid "Parcel"
msgstr ""
-#: forms.py:1054 models.py:45
+#: forms.py:1059 models.py:45
msgid "Remain types"
msgstr ""
-#: forms.py:1058 models.py:44
+#: forms.py:1063 models.py:44
msgid "Remain type"
msgstr ""
-#: forms.py:1074 templates/ishtar/sheet_operation.html:158
-#: templates/ishtar/sheet_operation.html:189
+#: forms.py:1079 templates/ishtar/sheet_operation.html:159
+#: templates/ishtar/sheet_operation.html:190
msgid "Period"
msgstr ""
-#: forms.py:1086 models.py:78
+#: forms.py:1091 models.py:78
msgid "Reference"
msgstr ""
-#: forms.py:1115
+#: forms.py:1120
msgid "This reference already exists."
msgstr ""
-#: forms.py:1132 models.py:87
+#: forms.py:1137 models.py:87
msgid "Archaeological site"
msgstr ""
-#: forms.py:1147 models.py:88 models.py:262
-#: templates/ishtar/sheet_operation.html:93
+#: forms.py:1152 models.py:88 models.py:264
+#: templates/ishtar/sheet_operation.html:94
msgid "Archaeological sites"
msgstr ""
-#: forms.py:1151
+#: forms.py:1156
msgid "Associated archaelogical sites"
msgstr ""
-#: forms.py:1157 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92
+#: forms.py:1162 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92
msgid "Search"
msgstr ""
-#: forms.py:1162
+#: forms.py:1167
msgid "Would you like to close this operation?"
msgstr ""
-#: forms.py:1167
+#: forms.py:1172
msgid "Would you like to delete this operation?"
msgstr ""
-#: forms.py:1176 forms.py:1246 forms.py:1382 models.py:765 models.py:815
+#: forms.py:1181 forms.py:1251 forms.py:1387 models.py:767 models.py:817
msgid "Index"
msgstr ""
-#: forms.py:1202
+#: forms.py:1207
#, python-format
msgid ""
"Index already exists for operation: %(operation)s - use a value bigger than "
"%(last_val)d"
msgstr ""
-#: forms.py:1214
+#: forms.py:1219
msgid "Operation's year"
msgstr ""
-#: forms.py:1221
+#: forms.py:1226
msgid "Operation's town"
msgstr ""
-#: forms.py:1234
+#: forms.py:1239
msgid "Documentation search"
msgstr ""
-#: forms.py:1236
+#: forms.py:1241
msgid "You should select a document."
msgstr ""
-#: forms.py:1253 forms.py:1320 models.py:790 models.py:809
+#: forms.py:1258 forms.py:1325 models.py:792 models.py:811
msgid "Act type"
msgstr ""
-#: forms.py:1254 forms.py:1452
+#: forms.py:1259 forms.py:1457
msgid "Indexed?"
msgstr ""
-#: forms.py:1260 forms.py:1325 models.py:839
+#: forms.py:1265 forms.py:1330 models.py:841
#: templates/ishtar/blocks/window_tables/administrativacts.html:10
msgid "Object"
msgstr ""
-#: forms.py:1297 views.py:412
+#: forms.py:1302 views.py:414
msgid "Administrative act search"
msgstr ""
-#: forms.py:1312 forms.py:1410 forms.py:1477
+#: forms.py:1317 forms.py:1415 forms.py:1482
msgid "You should select an administrative act."
msgstr ""
-#: forms.py:1328 models.py:836
+#: forms.py:1333 models.py:838
msgid "Signature date"
msgstr ""
-#: forms.py:1370
+#: forms.py:1375
#, python-format
msgid ""
"This index already exist for year: %(year)d - use a value bigger than "
"%(last_val)d"
msgstr ""
-#: forms.py:1374
+#: forms.py:1379
msgid "Bad index"
msgstr ""
-#: forms.py:1387
+#: forms.py:1392
msgid "Would you like to delete this administrative act?"
msgstr ""
-#: forms.py:1392
+#: forms.py:1397
msgid "Template"
msgstr ""
-#: forms.py:1416 forms.py:1420
+#: forms.py:1421 forms.py:1425
msgid "This document is not intended for this type of act."
msgstr ""
-#: forms.py:1438
+#: forms.py:1443
msgid "Doc generation"
msgstr ""
-#: forms.py:1440
+#: forms.py:1445
msgid "Generate the associated doc?"
msgstr ""
-#: forms.py:1461 ishtar_menu.py:121 views.py:465
+#: forms.py:1466 ishtar_menu.py:121 views.py:467
msgctxt "admin act register"
msgid "Register"
msgstr ""
@@ -582,7 +587,7 @@ msgstr ""
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:58 models.py:855
+#: ishtar_menu.py:58 models.py:857
#: templates/ishtar/sheet_administrativeact.html:4
msgid "Administrative act"
msgstr ""
@@ -611,16 +616,16 @@ msgstr ""
msgid "General informations"
msgstr ""
-#: ishtar_menu.py:136 models.py:290
+#: ishtar_menu.py:136 models.py:292
#: templates/ishtar/dashboards/dashboard_operation.html:8
msgid "Operations"
msgstr ""
-#: models.py:50 models.py:66 models.py:1670
+#: models.py:50 models.py:66 models.py:1672
msgid "Order"
msgstr ""
-#: models.py:52 models.py:1209
+#: models.py:52 models.py:1211
msgid "End date"
msgstr ""
@@ -684,7 +689,7 @@ msgstr ""
msgid "In charge scientist"
msgstr ""
-#: models.py:202 models.py:1014
+#: models.py:202 models.py:1016
msgid "File"
msgstr ""
@@ -692,333 +697,337 @@ msgstr ""
msgid "Surface (m2)"
msgstr ""
-#: models.py:259
+#: models.py:258
+msgid "General comment"
+msgstr ""
+
+#: models.py:261
msgid "Cached name"
msgstr ""
-#: models.py:267
+#: models.py:269
msgid ""
"If checked, it means that this operation have not been officialy registered."
msgstr ""
-#: models.py:283
+#: models.py:285
msgid "Point"
msgstr ""
-#: models.py:284
+#: models.py:286
msgid "Multi polygon"
msgstr ""
-#: models.py:292
+#: models.py:294
msgid "Can view all Operations"
msgstr ""
-#: models.py:293
+#: models.py:295
msgid "Can view own Operation"
msgstr ""
-#: models.py:294
+#: models.py:296
msgid "Can add own Operation"
msgstr ""
-#: models.py:295
+#: models.py:297
msgid "Can change own Operation"
msgstr ""
-#: models.py:296
+#: models.py:298
msgid "Can delete own Operation"
msgstr ""
-#: models.py:297
+#: models.py:299
msgid "Can close Operation"
msgstr ""
-#: models.py:324
+#: models.py:326
msgid "OPE"
msgstr ""
-#: models.py:381
+#: models.py:383
msgid "Intercommunal"
msgstr ""
-#: models.py:407 models.py:778
+#: models.py:409 models.py:780
msgid "Archaeological file"
msgstr ""
-#: models.py:408
+#: models.py:410
msgid "Code patriarche"
msgstr ""
-#: models.py:448
+#: models.py:450
msgid "This operation code already exists for this year"
msgstr ""
-#: models.py:481
+#: models.py:483
msgid "Number of parcels"
msgstr ""
-#: models.py:499
+#: models.py:501
msgid "Number of administrative acts"
msgstr ""
-#: models.py:507
+#: models.py:509
msgid "Number of indexed administrative acts"
msgstr ""
-#: models.py:515
+#: models.py:517
msgid "Number of context records"
msgstr ""
-#: models.py:551
+#: models.py:553
msgid "Number of finds"
msgstr ""
-#: models.py:596
+#: models.py:598
msgid "No type"
msgstr ""
-#: models.py:627
+#: models.py:629
msgid "Number of sources"
msgstr ""
-#: models.py:669 templates/ishtar/dashboards/dashboard_operation.html:309
+#: models.py:671 templates/ishtar/dashboards/dashboard_operation.html:309
#: templates/ishtar/dashboards/dashboard_operation.html:575
#: templates/ishtar/dashboards/dashboard_operation.html:611
msgid "Mean"
msgstr ""
-#: models.py:709
+#: models.py:711
msgid "Inverse relation"
msgstr ""
-#: models.py:713
+#: models.py:715
msgid "Operation relation type"
msgstr ""
-#: models.py:714
+#: models.py:716
msgid "Operation relation types"
msgstr ""
-#: models.py:727
+#: models.py:729
msgid "Operation record relation"
msgstr ""
-#: models.py:728
+#: models.py:730
msgid "Operation record relations"
msgstr ""
-#: models.py:749
+#: models.py:751
msgid "Operation documentation"
msgstr ""
-#: models.py:750
+#: models.py:752
msgid "Operation documentations"
msgstr ""
-#: models.py:753
+#: models.py:755
msgid "Can view all Operation sources"
msgstr ""
-#: models.py:755
+#: models.py:757
msgid "Can view own Operation source"
msgstr ""
-#: models.py:757
+#: models.py:759
msgid "Can add own Operation source"
msgstr ""
-#: models.py:759
+#: models.py:761
msgid "Can change own Operation source"
msgstr ""
-#: models.py:761
+#: models.py:763
msgid "Can delete own Operation source"
msgstr ""
-#: models.py:781
+#: models.py:783
msgid "Intended to"
msgstr ""
-#: models.py:783
+#: models.py:785
msgid "Code"
msgstr ""
-#: models.py:786
+#: models.py:788
msgid "Associated template"
msgstr ""
-#: models.py:787
+#: models.py:789
msgid "Indexed"
msgstr ""
-#: models.py:791
+#: models.py:793
msgid "Act types"
msgstr ""
-#: models.py:813
+#: models.py:815
msgid "Person in charge of the operation"
msgstr ""
-#: models.py:819
+#: models.py:821
msgid "Archaeological preventive operator"
msgstr ""
-#: models.py:827
+#: models.py:829
msgid "Signatory"
msgstr ""
-#: models.py:845
+#: models.py:847
msgid "Departments"
msgstr ""
-#: models.py:846
+#: models.py:848
msgid "Cached values get from associated departments"
msgstr ""
-#: models.py:849
+#: models.py:851
msgid "Cached values get from associated towns"
msgstr ""
-#: models.py:856 templates/ishtar/sheet_operation.html:101
-#: templates/ishtar/sheet_operation.html:132
+#: models.py:858 templates/ishtar/sheet_operation.html:102
+#: templates/ishtar/sheet_operation.html:133
msgid "Administrative acts"
msgstr ""
-#: models.py:859
+#: models.py:861
msgid "Can view all Administrative acts"
msgstr ""
-#: models.py:861
+#: models.py:863
msgid "Can view own Administrative act"
msgstr ""
-#: models.py:863
+#: models.py:865
msgid "Can add own Administrative act"
msgstr ""
-#: models.py:865
+#: models.py:867
msgid "Can change own Administrative act"
msgstr ""
-#: models.py:867
+#: models.py:869
msgid "Can delete own Administrative act"
msgstr ""
-#: models.py:876
+#: models.py:878
#: templates/ishtar/blocks/window_tables/administrativacts.html:7
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
msgid "Ref."
msgstr ""
-#: models.py:959
+#: models.py:961
msgid "This index already exists for this year"
msgstr ""
-#: models.py:1027
+#: models.py:1029
msgid "External ID"
msgstr ""
-#: models.py:1030
+#: models.py:1032
msgid "External ID is set automatically"
msgstr ""
-#: models.py:1031
+#: models.py:1033
msgid "Address - Locality"
msgstr ""
-#: models.py:1204
+#: models.py:1206
msgid "Owner"
msgstr ""
-#: models.py:1212
+#: models.py:1214
msgid "Parcel owner"
msgstr ""
-#: models.py:1213
+#: models.py:1215
msgid "Parcel owners"
msgstr ""
-#: models.py:1239
+#: models.py:1241
msgid "Recorded"
msgstr ""
-#: models.py:1240
+#: models.py:1242
msgid "Effective"
msgstr ""
-#: models.py:1241
+#: models.py:1243
msgid "Active"
msgstr ""
-#: models.py:1242
+#: models.py:1244
msgid "Field completed"
msgstr ""
-#: models.py:1243
+#: models.py:1245
msgid "Associated report"
msgstr ""
-#: models.py:1244
+#: models.py:1246
msgid "Closed"
msgstr ""
-#: models.py:1245
+#: models.py:1247
msgid "Documented and closed"
msgstr ""
-#: models.py:1671
+#: models.py:1673
msgid "Is preventive"
msgstr ""
-#: models.py:1674
+#: models.py:1676
msgid "Operation type old"
msgstr ""
-#: models.py:1675
+#: models.py:1677
msgid "Operation types old"
msgstr ""
-#: views.py:302
+#: views.py:304
msgid "New operation"
msgstr ""
-#: views.py:321
+#: views.py:323
msgid "Operation modification"
msgstr ""
-#: views.py:364
+#: views.py:366
msgid "Operation closing"
msgstr ""
-#: views.py:370
+#: views.py:372
msgid "Operation deletion"
msgstr ""
-#: views.py:375
+#: views.py:377
msgid "Operation: source search"
msgstr ""
-#: views.py:383
+#: views.py:385
msgid "Operation: source creation"
msgstr ""
-#: views.py:391
+#: views.py:393
msgid "Operation: source modification"
msgstr ""
-#: views.py:406
+#: views.py:408
msgid "Operation: source deletion"
msgstr ""
-#: views.py:425
+#: views.py:427
msgid "Operation: new administrative act"
msgstr ""
-#: views.py:435
+#: views.py:437
msgid "Operation: administrative act modification"
msgstr ""
-#: views.py:459
+#: views.py:461
msgid "Operation: administrative act deletion"
msgstr ""
@@ -1121,73 +1130,73 @@ msgstr ""
msgid "Day"
msgstr ""
-#: templates/ishtar/sheet_operation.html:72
+#: templates/ishtar/sheet_operation.html:73
msgid "Localisation"
msgstr ""
-#: templates/ishtar/sheet_operation.html:97
+#: templates/ishtar/sheet_operation.html:98
msgid "Associated parcels"
msgstr ""
-#: templates/ishtar/sheet_operation.html:105
+#: templates/ishtar/sheet_operation.html:106
msgid "Document from this operation"
msgstr ""
-#: templates/ishtar/sheet_operation.html:111
-#: templates/ishtar/sheet_operation.html:143
+#: templates/ishtar/sheet_operation.html:112
+#: templates/ishtar/sheet_operation.html:144
msgid "Context records"
msgstr ""
-#: templates/ishtar/sheet_operation.html:115
+#: templates/ishtar/sheet_operation.html:116
msgid "Documents from associated context records"
msgstr ""
-#: templates/ishtar/sheet_operation.html:120
-#: templates/ishtar/sheet_operation.html:166
+#: templates/ishtar/sheet_operation.html:121
+#: templates/ishtar/sheet_operation.html:167
msgid "Finds"
msgstr ""
-#: templates/ishtar/sheet_operation.html:125
+#: templates/ishtar/sheet_operation.html:126
msgid "Documents from associated finds"
msgstr ""
-#: templates/ishtar/sheet_operation.html:130
+#: templates/ishtar/sheet_operation.html:131
msgid "Statistics"
msgstr ""
-#: templates/ishtar/sheet_operation.html:150
-#: templates/ishtar/sheet_operation.html:204
+#: templates/ishtar/sheet_operation.html:151
+#: templates/ishtar/sheet_operation.html:205
#: templates/ishtar/blocks/window_tables/administrativacts.html:8
msgid "Type"
msgstr ""
-#: templates/ishtar/sheet_operation.html:150
-#: templates/ishtar/sheet_operation.html:158
-#: templates/ishtar/sheet_operation.html:173
-#: templates/ishtar/sheet_operation.html:181
-#: templates/ishtar/sheet_operation.html:189
-#: templates/ishtar/sheet_operation.html:204
+#: templates/ishtar/sheet_operation.html:151
+#: templates/ishtar/sheet_operation.html:159
+#: templates/ishtar/sheet_operation.html:174
+#: templates/ishtar/sheet_operation.html:182
+#: templates/ishtar/sheet_operation.html:190
+#: templates/ishtar/sheet_operation.html:205
#: templates/ishtar/dashboards/dashboard_operation.html:18
#: templates/ishtar/dashboards/dashboard_operation.html:164
#: templates/ishtar/dashboards/dashboard_operation.html:432
#: templates/ishtar/dashboards/dashboard_operation.html:463
-#: templates/ishtar/dashboards/dashboard_operation.html:685
+#: templates/ishtar/dashboards/dashboard_operation.html:687
msgid "Number"
msgstr ""
-#: templates/ishtar/sheet_operation.html:173
+#: templates/ishtar/sheet_operation.html:174
msgid "Material type"
msgstr ""
-#: templates/ishtar/sheet_operation.html:181
+#: templates/ishtar/sheet_operation.html:182
msgid "Object type"
msgstr ""
-#: templates/ishtar/sheet_operation.html:197
+#: templates/ishtar/sheet_operation.html:198
msgid "Sources"
msgstr ""
-#: templates/ishtar/sheet_operation.html:213
+#: templates/ishtar/sheet_operation.html:214
msgid "Finds by context records"
msgstr ""
@@ -1355,7 +1364,7 @@ msgstr ""
#: templates/ishtar/dashboards/dashboard_operation.html:569
#: templates/ishtar/dashboards/dashboard_operation.html:605
#: templates/ishtar/dashboards/dashboard_operation.html:645
-#: templates/ishtar/dashboards/dashboard_operation.html:665
+#: templates/ishtar/dashboards/dashboard_operation.html:667
msgid "Sum"
msgstr ""
@@ -1388,12 +1397,12 @@ msgid "effective operation by department"
msgstr ""
#: templates/ishtar/dashboards/dashboard_operation.html:415
-#: templates/ishtar/dashboards/dashboard_operation.html:668
+#: templates/ishtar/dashboards/dashboard_operation.html:670
msgid "Nb."
msgstr ""
#: templates/ishtar/dashboards/dashboard_operation.html:428
-#: templates/ishtar/dashboards/dashboard_operation.html:681
+#: templates/ishtar/dashboards/dashboard_operation.html:683
msgid "main towns by number"
msgstr ""
@@ -1413,15 +1422,15 @@ msgstr ""
msgid "area by organization by realisation year"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_operation.html:668
+#: templates/ishtar/dashboards/dashboard_operation.html:670
msgid "Cost"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_operation.html:668
+#: templates/ishtar/dashboards/dashboard_operation.html:670
msgid "FNAP cost"
msgstr ""
-#: templates/ishtar/dashboards/dashboard_operation.html:695
+#: templates/ishtar/dashboards/dashboard_operation.html:697
msgid "main towns by cost"
msgstr ""
diff --git a/archaeological_operations/migrations/0010_auto__add_field_historicaloperation_scientific_documentation_comment__.py b/archaeological_operations/migrations/0010_auto__add_field_historicaloperation_scientific_documentation_comment__.py
new file mode 100644
index 000000000..76f3e6ac4
--- /dev/null
+++ b/archaeological_operations/migrations/0010_auto__add_field_historicaloperation_scientific_documentation_comment__.py
@@ -0,0 +1,667 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding field 'HistoricalOperation.scientific_documentation_comment'
+ db.add_column('archaeological_operations_historicaloperation', 'scientific_documentation_comment',
+ self.gf('django.db.models.fields.TextField')(null=True, blank=True),
+ keep_default=False)
+
+ # Adding field 'Operation.scientific_documentation_comment'
+ db.add_column('archaeological_operations_operation', 'scientific_documentation_comment',
+ self.gf('django.db.models.fields.TextField')(null=True, blank=True),
+ keep_default=False)
+
+
+ def backwards(self, orm):
+ # Deleting field 'HistoricalOperation.scientific_documentation_comment'
+ db.delete_column('archaeological_operations_historicaloperation', 'scientific_documentation_comment')
+
+ # Deleting field 'Operation.scientific_documentation_comment'
+ db.delete_column('archaeological_operations_operation', 'scientific_documentation_comment')
+
+
+ models = {
+ 'archaeological_files.file': {
+ 'Meta': {'ordering': "('cached_label',)", 'object_name': 'File'},
+ 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'cached_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'cira_advised': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'classified_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'corporation_general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'general_contractor_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today', 'null': 'True', 'blank': 'True'}),
+ 'departments': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}),
+ 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}),
+ 'file_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.FileType']"}),
+ 'general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'general_contractor_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+ 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'imported_line': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_files_file'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+ 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+ 'instruction_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True', 'blank': 'True'}),
+ 'locality': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'main_town': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'file_main'", 'null': 'True', 'to': "orm['ishtar_common.Town']"}),
+ 'mh_listing': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'mh_register': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'name': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'numeric_reference': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'organization': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}),
+ 'permit_reference': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'permit_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.PermitType']", 'null': 'True', 'blank': 'True'}),
+ 'planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'planning_service_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}),
+ 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+ 'protected_area': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'raw_general_contractor': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'raw_town_planning_service': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'reception_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'related_file': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.File']", 'null': 'True', 'blank': 'True'}),
+ 'requested_operation_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.OperationType']"}),
+ 'research_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'responsible_town_planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'responsible_town_planning_service_files'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+ 'saisine_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.SaisineType']", 'null': 'True', 'blank': 'True'}),
+ 'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'scientist'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+ 'total_developed_surface': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+ 'total_surface': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+ 'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'file'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}),
+ 'year': ('django.db.models.fields.IntegerField', [], {'default': '2016'})
+ },
+ 'archaeological_files.filetype': {
+ 'Meta': {'ordering': "('label',)", 'object_name': 'FileType'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'archaeological_files.permittype': {
+ 'Meta': {'ordering': "('label',)", 'object_name': 'PermitType'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'archaeological_files.saisinetype': {
+ 'Meta': {'ordering': "('label',)", 'object_name': 'SaisineType'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'delay': ('django.db.models.fields.IntegerField', [], {'default': '30'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'archaeological_operations.acttype': {
+ 'Meta': {'ordering': "('label',)", 'object_name': 'ActType'},
+ 'associated_template': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'acttypes'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.DocumentTemplate']"}),
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'indexed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'intented_to': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'archaeological_operations.administrativeact': {
+ 'Meta': {'ordering': "('year', 'signature_date', 'index', 'act_type')", 'object_name': 'AdministrativeAct'},
+ 'act_object': ('django.db.models.fields.TextField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+ 'act_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.ActType']"}),
+ 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'administrative_act'", 'null': 'True', 'to': "orm['archaeological_files.File']"}),
+ 'departments_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_administrativeact'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+ 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'adminact_operation_in_charge'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+ 'index': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'operation': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'administrative_act'", 'null': 'True', 'to': "orm['archaeological_operations.Operation']"}),
+ 'operator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'adminact_operator'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}),
+ 'ref_sra': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}),
+ 'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'adminact_scientist'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+ 'signatory': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'signatory'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+ 'signature_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'towns_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'archaeological_operations.archaeologicalsite': {
+ 'Meta': {'object_name': 'ArchaeologicalSite'},
+ 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_archaeologicalsite'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'periods': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}),
+ 'reference': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
+ 'remains': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.RemainType']", 'null': 'True', 'blank': 'True'})
+ },
+ 'archaeological_operations.historicaladministrativeact': {
+ 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalAdministrativeAct'},
+ 'act_object': ('django.db.models.fields.TextField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+ 'act_type_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'associated_file_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'departments_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+ 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}),
+ 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+ 'in_charge_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'index': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'operation_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'operator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'ref_sra': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}),
+ 'scientist_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'signatory_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'signature_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'towns_label': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'archaeological_operations.historicaloperation': {
+ 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalOperation'},
+ 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'associated_file_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'cached_label': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}),
+ 'cira_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'cira_rapporteur_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'code_patriarche': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'common_name': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
+ 'documentation_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'documentation_received': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'eas_number': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+ 'effective_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'excavation_end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'finds_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'finds_received': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'fnap_cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'fnap_financing': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+ 'geoarchaeological_context_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'history_creator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+ 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}),
+ 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'in_charge_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'large_area_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'multi_polygon': ('django.contrib.gis.db.models.fields.MultiPolygonField', [], {'null': 'True', 'blank': 'True'}),
+ 'negative_result': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'old_code': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'operation_code': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'operation_type_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'operator_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'operator_reference': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+ 'optional_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'null': 'True', 'blank': 'True'}),
+ 'record_quality': ('django.db.models.fields.CharField', [], {'max_length': '2', 'null': 'True', 'blank': 'True'}),
+ 'report_delivery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'report_processing_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'scheduled_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'scientific_documentation_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'scientist_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'virtual_operation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'zoning_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'archaeological_operations.operation': {
+ 'Meta': {'ordering': "('cached_label',)", 'object_name': 'Operation'},
+ 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'archaeological_sites': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.ArchaeologicalSite']", 'null': 'True', 'blank': 'True'}),
+ 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operations'", 'null': 'True', 'to': "orm['archaeological_files.File']"}),
+ 'cached_label': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}),
+ 'cira_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'cira_rapporteur': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'cira_rapporteur'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+ 'code_patriarche': ('django.db.models.fields.IntegerField', [], {'unique': 'True', 'null': 'True', 'blank': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'common_name': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
+ 'documentation_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'documentation_received': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'eas_number': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+ 'effective_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'excavation_end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'finds_deadline': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'finds_received': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'fnap_cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'fnap_financing': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+ 'geoarchaeological_context_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_operation'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+ 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+ 'large_area_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'multi_polygon': ('django.contrib.gis.db.models.fields.MultiPolygonField', [], {'null': 'True', 'blank': 'True'}),
+ 'negative_result': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'old_code': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'operation_code': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'operation_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['ishtar_common.OperationType']"}),
+ 'operator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operator'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}),
+ 'operator_reference': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+ 'optional_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'periods': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}),
+ 'point': ('django.contrib.gis.db.models.fields.PointField', [], {'null': 'True', 'blank': 'True'}),
+ 'record_quality': ('django.db.models.fields.CharField', [], {'max_length': '2', 'null': 'True', 'blank': 'True'}),
+ 'remains': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['archaeological_operations.RemainType']", 'null': 'True', 'blank': 'True'}),
+ 'report_delivery_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'report_processing': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.ReportState']", 'null': 'True', 'blank': 'True'}),
+ 'scheduled_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'scientific_documentation_comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'scientist': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operation_scientist_responsability'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Person']"}),
+ 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'towns': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.Town']", 'symmetrical': 'False'}),
+ 'virtual_operation': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'zoning_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'archaeological_operations.operationbydepartment': {
+ 'Meta': {'object_name': 'OperationByDepartment', 'db_table': "'operation_department'", 'managed': 'False'},
+ 'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'operation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Operation']"})
+ },
+ 'archaeological_operations.operationsource': {
+ 'Meta': {'object_name': 'OperationSource'},
+ 'additional_information': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'associated_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'operationsource_related'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Author']"}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'duplicate': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '12', 'null': 'True', 'blank': 'True'}),
+ 'format_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Format']", 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'index': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'item_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+ 'operation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_operations.Operation']"}),
+ 'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'receipt_date_in_documentation': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'reference': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'scale': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+ 'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}),
+ 'support_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SupportType']", 'null': 'True', 'blank': 'True'}),
+ 'thumbnail': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'})
+ },
+ 'archaeological_operations.operationtypeold': {
+ 'Meta': {'ordering': "['-preventive', 'order', 'label']", 'object_name': 'OperationTypeOld'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+ 'preventive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'archaeological_operations.parcel': {
+ 'Meta': {'ordering': "('year', 'section', 'parcel_number')", 'object_name': 'Parcel'},
+ 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parcels'", 'null': 'True', 'to': "orm['archaeological_files.File']"}),
+ 'auto_external_id': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_parcel'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+ 'operation': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parcels'", 'null': 'True', 'to': "orm['archaeological_operations.Operation']"}),
+ 'parcel_number': ('django.db.models.fields.CharField', [], {'max_length': '6', 'null': 'True', 'blank': 'True'}),
+ 'public_domain': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'section': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),
+ 'town': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parcels'", 'to': "orm['ishtar_common.Town']"}),
+ 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'archaeological_operations.parcelowner': {
+ 'Meta': {'object_name': 'ParcelOwner'},
+ 'end_date': ('django.db.models.fields.DateField', [], {}),
+ 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_archaeological_operations_parcelowner'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+ 'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parcel_owner'", 'to': "orm['ishtar_common.Person']"}),
+ 'parcel': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owners'", 'to': "orm['archaeological_operations.Parcel']"}),
+ 'start_date': ('django.db.models.fields.DateField', [], {})
+ },
+ 'archaeological_operations.period': {
+ 'Meta': {'ordering': "('order',)", 'object_name': 'Period'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'end_date': ('django.db.models.fields.IntegerField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {}),
+ 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}),
+ 'start_date': ('django.db.models.fields.IntegerField', [], {}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'archaeological_operations.recordrelations': {
+ 'Meta': {'ordering': "('left_record', 'relation_type')", 'object_name': 'RecordRelations'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'left_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'right_relations'", 'to': "orm['archaeological_operations.Operation']"}),
+ 'relation_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.RelationType']"}),
+ 'right_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'left_relations'", 'to': "orm['archaeological_operations.Operation']"})
+ },
+ 'archaeological_operations.relationtype': {
+ 'Meta': {'ordering': "('order', 'label')", 'object_name': 'RelationType'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'inverse_relation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.RelationType']", 'null': 'True', 'blank': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+ 'symmetrical': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'tiny_label': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'archaeological_operations.remaintype': {
+ 'Meta': {'ordering': "('label',)", 'object_name': 'RemainType'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'archaeological_operations.reportstate': {
+ 'Meta': {'ordering': "('order',)", 'object_name': 'ReportState'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ 'auth.permission': {
+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ 'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'ishtar_common.arrondissement': {
+ 'Meta': {'object_name': 'Arrondissement'},
+ 'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+ },
+ 'ishtar_common.author': {
+ 'Meta': {'object_name': 'Author'},
+ 'author_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.AuthorType']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'author'", 'to': "orm['ishtar_common.Person']"})
+ },
+ 'ishtar_common.authortype': {
+ 'Meta': {'object_name': 'AuthorType'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'ishtar_common.canton': {
+ 'Meta': {'object_name': 'Canton'},
+ 'arrondissement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Arrondissement']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '30'})
+ },
+ 'ishtar_common.department': {
+ 'Meta': {'ordering': "['number']", 'object_name': 'Department'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ 'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'}),
+ 'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.State']", 'null': 'True', 'blank': 'True'})
+ },
+ 'ishtar_common.documenttemplate': {
+ 'Meta': {'ordering': "['associated_object_name', 'name']", 'object_name': 'DocumentTemplate'},
+ 'associated_object_name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'template': ('django.db.models.fields.files.FileField', [], {'max_length': '100'})
+ },
+ 'ishtar_common.format': {
+ 'Meta': {'object_name': 'Format'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'ishtar_common.import': {
+ 'Meta': {'object_name': 'Import'},
+ 'conservative_import': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
+ 'encoding': ('django.db.models.fields.CharField', [], {'default': "'utf-8'", 'max_length': '15'}),
+ 'end_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+ 'error_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'imported_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
+ 'imported_images': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.ImporterType']"}),
+ 'match_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'result_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'seconds_remaining': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'skip_lines': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+ 'state': ('django.db.models.fields.CharField', [], {'default': "'C'", 'max_length': '2'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']"})
+ },
+ 'ishtar_common.importertype': {
+ 'Meta': {'object_name': 'ImporterType'},
+ 'associated_models': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+ 'description': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_template': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+ 'unicity_keys': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}),
+ 'users': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'})
+ },
+ 'ishtar_common.ishtaruser': {
+ 'Meta': {'object_name': 'IshtarUser', '_ormbases': ['auth.User']},
+ 'person': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ishtaruser'", 'unique': 'True', 'to': "orm['ishtar_common.Person']"}),
+ 'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'ishtar_common.operationtype': {
+ 'Meta': {'ordering': "['-preventive', 'order', 'label']", 'object_name': 'OperationType'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+ 'preventive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'ishtar_common.organization': {
+ 'Meta': {'object_name': 'Organization'},
+ 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+ 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+ 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}),
+ 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}),
+ 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+ 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_organization'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+ 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}),
+ 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}),
+ 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '500'}),
+ 'organization_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.OrganizationType']"}),
+ 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+ 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+ 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+ 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+ 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+ 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+ 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+ 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'})
+ },
+ 'ishtar_common.organizationtype': {
+ 'Meta': {'ordering': "('label',)", 'object_name': 'OrganizationType'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'ishtar_common.person': {
+ 'Meta': {'object_name': 'Person'},
+ 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'alt_address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'alt_address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'alt_address_is_prefered': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'alt_country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+ 'alt_postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+ 'alt_town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}),
+ 'archived': ('django.db.models.fields.NullBooleanField', [], {'default': 'False', 'null': 'True', 'blank': 'True'}),
+ 'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'members'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['ishtar_common.Organization']"}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'contact_type': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+ 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+ 'history_creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_person'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+ 'merge_candidate': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_candidate_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),
+ 'merge_exclusion': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'merge_exclusion_rel_+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}),
+ 'merge_key': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'old_title': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'person_types': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.PersonType']", 'symmetrical': 'False'}),
+ 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+ 'phone2': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+ 'phone3': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}),
+ 'phone_desc': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+ 'phone_desc2': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+ 'phone_desc3': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+ 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+ 'raw_name': ('django.db.models.fields.CharField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}),
+ 'raw_phone': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'salutation': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'surname': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.TitleType']", 'null': 'True', 'blank': 'True'}),
+ 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'})
+ },
+ 'ishtar_common.persontype': {
+ 'Meta': {'ordering': "('label',)", 'object_name': 'PersonType'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'ishtar_common.sourcetype': {
+ 'Meta': {'object_name': 'SourceType'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'ishtar_common.state': {
+ 'Meta': {'ordering': "['number']", 'object_name': 'State'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '30'}),
+ 'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'})
+ },
+ 'ishtar_common.supporttype': {
+ 'Meta': {'object_name': 'SupportType'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'ishtar_common.titletype': {
+ 'Meta': {'ordering': "('label',)", 'object_name': 'TitleType'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
+ },
+ 'ishtar_common.town': {
+ 'Meta': {'ordering': "['numero_insee']", 'object_name': 'Town'},
+ 'canton': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Canton']", 'null': 'True', 'blank': 'True'}),
+ 'center': ('django.contrib.gis.db.models.fields.PointField', [], {'srid': '27572', 'null': 'True', 'blank': 'True'}),
+ 'departement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'imports': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'imported_ishtar_common_town'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['ishtar_common.Import']"}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'numero_insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '6'}),
+ 'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+ }
+ }
+
+ complete_apps = ['archaeological_operations'] \ No newline at end of file
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 228e9859e..042cfce2d 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -255,7 +255,9 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms,
operator_reference = models.CharField(
_(u"Operator reference"), max_length=20, null=True, blank=True)
common_name = models.TextField(_(u"Generic name"), null=True, blank=True)
- comment = models.TextField(_(u"Comment"), null=True, blank=True)
+ comment = models.TextField(_(u"General comment"), null=True, blank=True)
+ scientific_documentation_comment = models.TextField(
+ _(u"Comment about scientific documentation"), null=True, blank=True)
cached_label = models.CharField(_(u"Cached name"), max_length=500,
null=True, blank=True)
archaeological_sites = models.ManyToManyField(
diff --git a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html
index eca69b87f..5b435032e 100644
--- a/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html
+++ b/archaeological_operations/templates/ishtar/dashboards/dashboard_operation.html
@@ -662,7 +662,9 @@
{% for yr in dashboard.years %}
{% if forloop.counter0|divisibleby:3 %}
<th rowspan='2' class="sub">{% trans "Department" %}</th>{% endif %}
- <th colspan='3'>{{yr|default_if_none:'-'}}</th>{% endfor %}<th colspan='3'>{% trans "Sum" %}</th>
+ <th colspan='3'>{{yr|default_if_none:'-'}}</th>{% endfor %}
+ <th rowspan='2' class="sub">{% trans "Department" %}</th>
+ <th colspan='3'>{% trans "Sum" %}</th>
</tr>
<tr>
{% for yr in dashboard.years %}<th>{%trans "Nb."%}</th><th>{%trans "Cost"%}</th><th>{%trans "FNAP cost"%}</th>{% endfor %}<th>{%trans "Nb."%}</th><th>{%trans "Cost"%}</th><th>{%trans "FNAP cost"%}</th>
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 6b2030f5e..98a69a5f1 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -64,8 +64,9 @@
{% field_li "General contractor organization" item.associated_file.general_contractor.attached_to.full_address %}
{% endif %}
</ul>
-{% field "Abstract" item.abstract "<pre>" "</pre>" %}
{% field "Comment" item.comment "<pre>" "</pre>" %}
+{% field "Abstract" item.abstract "<pre>" "</pre>" %}
+{% field "Comment about scientific documentation" item.scientific_documentation_comment "<pre>" "</pre>" %}
{% if not next %}
{% if item.towns.count %}
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 6c7fdbd98..84e98010e 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -149,6 +149,8 @@ get_operation = get_item(
extra_request_keys={
'common_name': 'common_name__icontains',
'comment': 'comment__icontains',
+ 'scientific_documentation_comment':
+ 'scientific_documentation_comment__icontains',
'abstract': 'abstract__icontains',
'end_date': 'end_date__isnull',
'year_index': ('year', 'operation_code'),
diff --git a/ishtar_common/templates/blocks/form_flex_snippet.html b/ishtar_common/templates/blocks/form_flex_snippet.html
index 97ac37b44..65c38d36e 100644
--- a/ishtar_common/templates/blocks/form_flex_snippet.html
+++ b/ishtar_common/templates/blocks/form_flex_snippet.html
@@ -7,7 +7,7 @@
{% if forloop.counter0 == 0 %}
<ul class='form-flex head-form'>
{% endif %}
-{% if forloop.counter0 == 6 %}
+{% if forloop.counter0 == 9 %}
</ul>
<p class='center'><a href='#' onclick='show_hide_flex(".tail-form");return false'>{% trans "Show / hide advanced search" %}</a></p>
<ul class='form-flex tail-form hidden'>
diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po
index a25e7bc59..73128481b 100644
--- a/translations/fr/archaeological_finds.po
+++ b/translations/fr/archaeological_finds.po
@@ -10,7 +10,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2016-09-09 11:38-0400\n"
+"PO-Revision-Date: 2016-09-15 10:20-0400\n"
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
@@ -21,25 +21,25 @@ msgstr ""
msgid "Context record"
msgstr "Unité d'Enregistrement"
-#: forms.py:83 ishtar_menu.py:31 models.py:386 models.py:670 models.py:768
-#: models.py:912 templates/ishtar/sheet_find.html:5
+#: forms.py:83 ishtar_menu.py:31 models.py:387 models.py:671 models.py:769
+#: models.py:913 templates/ishtar/sheet_find.html:5
msgid "Find"
msgstr "Mobilier"
-#: forms.py:94 forms.py:218 forms.py:422 models.py:115 models.py:324
+#: forms.py:94 forms.py:218 forms.py:425 models.py:115 models.py:324
msgid "Free ID"
msgstr "ID libre"
-#: forms.py:96 models.py:372
+#: forms.py:96 models.py:373
msgid "Previous ID"
msgstr "Identifiant précédent"
-#: forms.py:97 forms.py:247 forms.py:588 models.py:119 models.py:325
-#: models.py:702
+#: forms.py:97 forms.py:250 forms.py:591 models.py:119 models.py:325
+#: models.py:703
msgid "Description"
msgstr "Description"
-#: forms.py:100 forms.py:249 models.py:130
+#: forms.py:100 forms.py:252 models.py:130
msgid "Batch/object"
msgstr "Lot/objet"
@@ -47,11 +47,11 @@ msgstr "Lot/objet"
msgid "Is complete?"
msgstr "Est complet ?"
-#: forms.py:105 forms.py:238 forms.py:426 models.py:50
+#: forms.py:105 forms.py:240 forms.py:429 models.py:50
msgid "Material type"
msgstr "Type de matériau"
-#: forms.py:106 forms.py:242 models.py:60 models.py:329
+#: forms.py:106 forms.py:244 models.py:60 models.py:329
msgid "Conservatory state"
msgstr "État sanitaire"
@@ -63,71 +63,71 @@ msgstr "Commentaire relatif à la conservation"
msgid "Object types"
msgstr "Types d'objet"
-#: forms.py:114 forms.py:241 models.py:67
+#: forms.py:114 forms.py:243 models.py:67
msgid "Preservation type"
msgstr "Type de conservation"
-#: forms.py:117 forms.py:244 models.py:358
-msgid "Integrity"
-msgstr "Intégrité"
+#: forms.py:117 forms.py:246 models.py:358
+msgid "Integrity / interest"
+msgstr "Intégrité / intérêt"
-#: forms.py:120 forms.py:245 models.py:360
+#: forms.py:120 forms.py:248 models.py:361
msgid "Remarkability"
msgstr "Remarquabilité"
-#: forms.py:122 models.py:362
+#: forms.py:122 models.py:363
msgid "Length (cm)"
msgstr "Longueur (cm)"
-#: forms.py:123 models.py:363
+#: forms.py:123 models.py:364
msgid "Width (cm)"
msgstr "Largeur (cm)"
-#: forms.py:124 models.py:364
+#: forms.py:124 models.py:365
msgid "Height (cm)"
msgstr "Hauteur (cm)"
-#: forms.py:125 models.py:365
+#: forms.py:125 models.py:366
msgid "Diameter (cm)"
msgstr "Diamètre (cm)"
-#: forms.py:126 forms.py:427 models.py:336
+#: forms.py:126 forms.py:430 models.py:336
msgid "Volume (l)"
msgstr "Volume (l)"
-#: forms.py:127 forms.py:428 models.py:337
+#: forms.py:127 forms.py:431 models.py:337
msgid "Weight (g)"
msgstr "Poids (g)"
-#: forms.py:129 models.py:366
+#: forms.py:129 models.py:367
msgid "Dimensions comment"
msgstr "Commentaire concernant les dimensions"
-#: forms.py:130 forms.py:429 models.py:340
+#: forms.py:130 forms.py:432 models.py:340
msgid "Find number"
msgstr "Mobilier (en nombre)"
-#: forms.py:131 models.py:368
+#: forms.py:131 models.py:369
msgid "Mark"
msgstr "Marque"
-#: forms.py:132 forms.py:251 models.py:374
+#: forms.py:132 forms.py:254 models.py:375
msgid "Check"
msgstr "Vérification"
-#: forms.py:134 models.py:376
+#: forms.py:134 models.py:377
msgid "Check date"
msgstr "Date de vérification"
-#: forms.py:135 models.py:120 models.py:369 models.py:703
+#: forms.py:135 models.py:120 models.py:370 models.py:704
msgid "Comment"
msgstr "Commentaires"
-#: forms.py:138 models.py:370
+#: forms.py:138 models.py:371
msgid "Comment on dating"
msgstr "Commentaire général sur les datations"
-#: forms.py:139 models.py:378
+#: forms.py:139 models.py:379
msgid "Estimated value"
msgstr "Valeur estimée"
@@ -148,16 +148,16 @@ msgstr ""
msgid "Dating"
msgstr "Datation"
-#: forms.py:186 forms.py:236
+#: forms.py:186 forms.py:238
msgid "Period"
msgstr "Période"
-#: forms.py:187 forms.py:590 models.py:716 models.py:781 models.py:917
+#: forms.py:187 forms.py:593 models.py:717 models.py:782 models.py:918
#: templates/ishtar/sheet_find.html:85 templates/ishtar/sheet_find.html:114
msgid "Start date"
msgstr "Date de début"
-#: forms.py:189 forms.py:592 models.py:717 models.py:782 models.py:918
+#: forms.py:189 forms.py:595 models.py:718 models.py:783 models.py:919
#: templates/ishtar/sheet_find.html:86 templates/ishtar/sheet_find.html:115
msgid "End date"
msgstr "Date de fin"
@@ -186,132 +186,136 @@ msgstr "ID complet"
msgid "Year"
msgstr "Année"
-#: forms.py:224
+#: forms.py:223
+msgid "Operation's number (index by year)"
+msgstr "Numéro de l'opération (index par année)"
+
+#: forms.py:226
msgid "Code PATRIARCHE"
msgstr "Code PATRIARCHE"
-#: forms.py:228
+#: forms.py:230
msgid "Archaelogical site"
msgstr "Entité Archéologique"
-#: forms.py:234
+#: forms.py:236
msgid "Search within operation relations"
msgstr "Rechercher parmi les opérations reliées"
-#: forms.py:239 models.py:91
+#: forms.py:241 models.py:91
msgid "Object type"
msgstr "Type d'objet"
-#: forms.py:252
+#: forms.py:255
msgid "Has an image?"
msgstr "Dispose d'une image ?"
-#: forms.py:294 forms.py:307 views.py:132
+#: forms.py:297 forms.py:310 views.py:132
msgid "Find search"
msgstr "Recherche de mobilier"
-#: forms.py:321
+#: forms.py:324
msgid "Upstream finds"
msgstr "Mobilier amont"
-#: forms.py:323 models.py:387
+#: forms.py:326 models.py:388
msgid "Finds"
msgstr "Mobilier"
-#: forms.py:333
+#: forms.py:336
msgid "You should at least select one archaeological find."
msgstr "Vous devez sélectionner au moins un mobilier archéologique."
-#: forms.py:419
+#: forms.py:422
msgid "Resulting find"
msgstr "Mobilier résultant"
-#: forms.py:424
+#: forms.py:427
msgid "Precise description"
msgstr "Description précise"
-#: forms.py:439
+#: forms.py:442
msgid "Resulting finds"
msgstr "Mobiliers résultants"
-#: forms.py:444
+#: forms.py:447
msgid "Would you like to delete this find?"
msgstr "Souhaitez vous supprimer ce mobilier ?"
-#: forms.py:448
+#: forms.py:451
msgid "Upstream find"
msgstr "Mobilier amont"
-#: forms.py:459
+#: forms.py:462
msgid "Archaeological find search"
msgstr "Recherche de mobilier"
-#: forms.py:461
+#: forms.py:464
msgid "You should select an archaeological find."
msgstr "Vous devez sélectionner du mobilier."
-#: forms.py:466
+#: forms.py:469
msgid "Year of the operation"
msgstr "Année de l'opération"
-#: forms.py:468
+#: forms.py:471
msgid "Numeric reference"
msgstr "Référence numérique"
-#: forms.py:475
+#: forms.py:478
msgid "Period of the archaelogical find"
msgstr "Période du mobilier"
-#: forms.py:477
+#: forms.py:480
msgid "Material type of the archaelogical find"
msgstr "Type de matériau du mobilier"
-#: forms.py:479
+#: forms.py:482
msgid "Description of the archaelogical find"
msgstr "Description du mobilier"
-#: forms.py:491
+#: forms.py:494
msgid "Documentation search"
msgstr "Recherche de document"
-#: forms.py:493
+#: forms.py:496
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
-#: forms.py:510
+#: forms.py:513
msgid "Another basket already exist with this name."
msgstr "Un autre panier existe déjà avec ce nom."
-#: forms.py:520 ishtar_menu.py:60
+#: forms.py:523 ishtar_menu.py:60
msgid "Basket"
msgstr "Panier"
-#: forms.py:570
+#: forms.py:573
msgid "Base treatment"
msgstr "Traitement de base"
-#: forms.py:575 models.py:692 models.py:705 models.py:780
+#: forms.py:578 models.py:693 models.py:706 models.py:781
msgid "Treatment type"
msgstr "Type de traitement"
-#: forms.py:577 models.py:714 models.py:785
+#: forms.py:580 models.py:715 models.py:786
#: templates/ishtar/sheet_find.html:83 templates/ishtar/sheet_find.html:112
msgid "Doer"
msgstr "Opérateur"
-#: forms.py:583 models.py:707 models.py:783
+#: forms.py:586 models.py:708 models.py:784
msgid "Location"
msgstr "Lieu"
-#: forms.py:604
+#: forms.py:607
msgid "Leave it blank if you want to select a single item"
msgstr "Ne pas modifier si vous voulez sélectionner un seul élément"
-#: forms.py:611
+#: forms.py:614
msgid "This treatment type is not available."
msgstr "Ce type de traitement n'est pas disponible"
-#: forms.py:615
+#: forms.py:618
msgid "This treatment needs a basket."
msgstr "Ce traitement nécessite de sélectionner un panier."
@@ -368,12 +372,12 @@ msgid "Preservation types"
msgstr "Types de conservation"
#: models.py:74
-msgid "Integrity type"
-msgstr "Type d'intégrité"
+msgid "Integrity / interest type"
+msgstr "Type d'intégrité / intérêt"
#: models.py:75
-msgid "Integrity types"
-msgstr "Types d'intégrité"
+msgid "Integrity / interest types"
+msgstr "Types d'intégrité / intérêts"
#: models.py:81
msgid "Remarkability type"
@@ -399,7 +403,7 @@ msgstr "Objet"
msgid "Batch"
msgstr "Lot"
-#: models.py:116 models.py:320 models.py:698
+#: models.py:116 models.py:320 models.py:699
msgid "External ID"
msgstr "ID externe"
@@ -519,7 +523,7 @@ msgstr "Mobilier de base - Intérêt spécifique"
msgid "Base find - Discovery date"
msgstr "Mobilier de base - Date de découverte"
-#: models.py:323 models.py:774
+#: models.py:323 models.py:775
msgid "Order"
msgstr "Ordre"
@@ -539,147 +543,147 @@ msgstr "Traitement amont"
msgid "Downstream treatment"
msgstr "Traitement aval"
-#: models.py:351 models.py:700 models.py:784
+#: models.py:351 models.py:701 models.py:785
#: templates/ishtar/sheet_find.html:84 templates/ishtar/sheet_find.html:113
msgid "Container"
msgstr "Contenant"
-#: models.py:380
+#: models.py:381
msgid "Cached name"
msgstr "Nom en cache"
-#: models.py:389
+#: models.py:390
msgid "Can view all Finds"
msgstr "Peut voir tout le Mobilier"
-#: models.py:390
+#: models.py:391
msgid "Can view own Find"
msgstr "Peut voir son propre Mobilier"
-#: models.py:391
+#: models.py:392
msgid "Can add own Find"
msgstr "Peut ajouter son propre Mobilier"
-#: models.py:392
+#: models.py:393
msgid "Can change own Find"
msgstr "Peut modifier son propre Mobilier"
-#: models.py:393
+#: models.py:394
msgid "Can delete own Find"
msgstr "Peut supprimer son propre Mobilier"
-#: models.py:399
+#: models.py:400
msgid "FIND"
msgstr "MOBILIER"
-#: models.py:668
+#: models.py:669
msgid "Find documentation"
msgstr "Documentation de mobilier"
-#: models.py:669
+#: models.py:670
msgid "Find documentations"
msgstr "Documentations de mobilier"
-#: models.py:679
+#: models.py:680
msgid "Virtual"
msgstr "Virtuel"
-#: models.py:681
+#: models.py:682
msgid "Upstream is many"
msgstr "Les éléments amonts sont multiple"
-#: models.py:683
+#: models.py:684
msgid "Check this if for this treatment from many finds you'll get one."
msgstr ""
"Cochez cela si pour ce traitement depuis plusieurs éléments vous en obtenez "
"un."
-#: models.py:686
+#: models.py:687
msgid "Downstream is many"
msgstr "Les éléments avals sont multiple"
-#: models.py:688
+#: models.py:689
msgid "Check this if for this treatment from one find you'll get many."
msgstr ""
"Cochez cela si pour ce traitement depuis un élément vous en obtenez "
"plusieurs."
-#: models.py:693
+#: models.py:694
msgid "Treatment types"
msgstr "Types de traitement"
-#: models.py:709
+#: models.py:710
msgid "Location where the treatment is done. Target warehouse for a move."
msgstr ""
"Endroit où le traitement est réalisé. Renseignez le dépôt de destination "
"pour un déplacement."
-#: models.py:711
+#: models.py:712
msgid "Other location"
msgstr "Autre lieu"
-#: models.py:721 models.py:770 models.py:904
+#: models.py:722 models.py:771 models.py:905
msgid "Treatment"
msgstr "Traitement"
-#: models.py:722 templates/ishtar/sheet_find.html:73
+#: models.py:723 templates/ishtar/sheet_find.html:73
msgid "Treatments"
msgstr "Traitements"
-#: models.py:724
+#: models.py:725
msgid "Can view all Treatments"
msgstr "Peut voir tous les Traitements"
-#: models.py:725
+#: models.py:726
msgid "Can view own Treatment"
msgstr "Peut voir son propre Traitement"
-#: models.py:726
+#: models.py:727
msgid "Can add own Treatment"
msgstr "Peut ajouter son propre Traitement"
-#: models.py:727
+#: models.py:728
msgid "Can change own Treatment"
msgstr "Peut modifier son propre Traitement"
-#: models.py:728
+#: models.py:729
msgid "Can delete own Treatment"
msgstr "Peut supprimer son propre Traitement"
-#: models.py:734
+#: models.py:735
msgid "by"
msgstr "par"
-#: models.py:786 models.py:787 templates/ishtar/sheet_find.html:82
+#: models.py:787 models.py:788 templates/ishtar/sheet_find.html:82
#: templates/ishtar/sheet_find.html:111
msgid "Related finds"
msgstr "Mobilier associé"
-#: models.py:890
+#: models.py:891
msgid "Is upstream"
msgstr "Est amont"
-#: models.py:901
+#: models.py:902
msgid "Treatment documentation"
msgstr "Documentation d'un traitement"
-#: models.py:902
+#: models.py:903
msgid "Treament documentations"
msgstr "Documentations des traitements"
-#: models.py:914
+#: models.py:915
msgid "Administrative act"
msgstr "Acte administratif"
-#: models.py:915
+#: models.py:916
msgid "Person"
msgstr "Individu"
-#: models.py:921
+#: models.py:922
msgid "Property"
msgstr "Propriété"
-#: models.py:922
+#: models.py:923
msgid "Properties"
msgstr "Propriétés"
diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po
index dd43f70ec..f4f2eb713 100644
--- a/translations/fr/archaeological_operations.po
+++ b/translations/fr/archaeological_operations.po
@@ -10,44 +10,44 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"PO-Revision-Date: 2016-09-09 11:44-0400\n"
+"PO-Revision-Date: 2016-09-15 10:44-0400\n"
"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n"
"Language-Team: \n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
"X-Generator: Zanata 3.9.5\n"
-#: forms.py:67 forms.py:369 forms.py:999 forms.py:1021 forms.py:1025
-#: models.py:1035 templates/ishtar/sheet_operation.html:138
+#: forms.py:67 forms.py:369 forms.py:1004 forms.py:1026 forms.py:1030
+#: models.py:1037 templates/ishtar/sheet_operation.html:139
#: templates/ishtar/blocks/window_tables/parcels.html:10
msgid "Parcels"
msgstr "Parcelles"
-#: forms.py:70 forms.py:203 forms.py:975 models.py:1021
+#: forms.py:70 forms.py:203 forms.py:980 models.py:1023
#: templates/ishtar/blocks/window_tables/parcels.html:7
#: templates/ishtar/dashboards/dashboard_operation.html:432
#: templates/ishtar/dashboards/dashboard_operation.html:446
-#: templates/ishtar/dashboards/dashboard_operation.html:685
-#: templates/ishtar/dashboards/dashboard_operation.html:699
+#: templates/ishtar/dashboards/dashboard_operation.html:687
+#: templates/ishtar/dashboards/dashboard_operation.html:701
msgid "Town"
msgstr "Commune"
-#: forms.py:72 forms.py:459 forms.py:753 forms.py:1245 models.py:197
-#: models.py:838 models.py:1019
+#: forms.py:72 forms.py:459 forms.py:755 forms.py:1250 models.py:197
+#: models.py:840 models.py:1021
#: templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Year"
msgstr "Année"
-#: forms.py:75 models.py:1022
+#: forms.py:75 models.py:1024
#: templates/ishtar/blocks/window_tables/parcels.html:9
msgid "Section"
msgstr "Section"
-#: forms.py:78 models.py:1024
+#: forms.py:78 models.py:1026
msgid "Parcel number"
msgstr "Numéro de parcelle"
-#: forms.py:80 models.py:1026 models.py:1043 models.py:1092
+#: forms.py:80 models.py:1028 models.py:1045 models.py:1094
msgid "Public domain"
msgstr "Domaine public"
@@ -83,8 +83,8 @@ msgstr "Il y a des parcelles identiques."
msgid "Relation type"
msgstr "Type de relation"
-#: forms.py:381 ishtar_menu.py:30 models.py:289 models.py:738 models.py:763
-#: models.py:779 models.py:830 models.py:1018 wizards.py:339 wizards.py:350
+#: forms.py:381 ishtar_menu.py:30 models.py:291 models.py:740 models.py:765
+#: models.py:781 models.py:832 models.py:1020 wizards.py:339 wizards.py:350
#: templates/ishtar/sheet_operation.html:4
msgid "Operation"
msgstr "Opération"
@@ -93,7 +93,7 @@ msgstr "Opération"
msgid ":"
msgstr ": "
-#: forms.py:409 forms.py:606 forms.py:1210
+#: forms.py:409 forms.py:608 forms.py:1215
msgid "You should select an operation."
msgstr "Vous devez sélectionner une opération."
@@ -109,32 +109,33 @@ msgstr "Relations actuelles"
msgid "Deleted relations"
msgstr "Relations supprimées"
-#: forms.py:449 templates/ishtar/sheet_operation.html:82
+#: forms.py:449 templates/ishtar/sheet_operation.html:83
msgid "Relations"
msgstr "Relations"
-#: forms.py:460 forms.py:1216 models.py:198
+#: forms.py:460 forms.py:1221 models.py:198
msgid "Numeric reference"
msgstr "Identifiant numérique"
-#: forms.py:466 forms.py:1256
+#: forms.py:466 forms.py:1261
msgid "Parcel (section/number/public domain)"
msgstr "Parcelle (section/nombre/domaine public)"
-#: forms.py:469 forms.py:1259 models.py:739
+#: forms.py:469 forms.py:1264 models.py:741
#: templates/ishtar/dashboards/dashboard_operation.html:390
#: templates/ishtar/dashboards/dashboard_operation.html:411
#: templates/ishtar/dashboards/dashboard_operation.html:643
#: templates/ishtar/dashboards/dashboard_operation.html:664
+#: templates/ishtar/dashboards/dashboard_operation.html:666
msgid "Department"
msgstr "Département"
-#: forms.py:470 forms.py:1087 models.py:79
+#: forms.py:470 forms.py:1092 models.py:79
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:8
msgid "Name"
msgstr "Nom"
-#: forms.py:472 forms.py:673 forms.py:751 forms.py:1222 models.py:205
+#: forms.py:472 forms.py:675 forms.py:753 forms.py:1227 models.py:205
msgid "Operation type"
msgstr "Type d'opération"
@@ -142,24 +143,24 @@ msgstr "Type d'opération"
msgid "Is open?"
msgstr "Est ouvert ?"
-#: forms.py:483 forms.py:780 models.py:194
+#: forms.py:483 forms.py:782 models.py:194
msgid "In charge"
msgstr "Responsable"
-#: forms.py:490 models.py:824
+#: forms.py:490 models.py:826
msgid "Scientist in charge"
msgstr "Responsable scientifique"
-#: forms.py:492 forms.py:675 forms.py:771 models.py:192
+#: forms.py:492 forms.py:677 forms.py:773 models.py:192
msgid "Operator"
msgstr "Opérateur"
-#: forms.py:499 forms.py:1092 models.py:83 models.py:207
+#: forms.py:499 forms.py:1097 models.py:83 models.py:207
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10
msgid "Remains"
msgstr "Vestiges"
-#: forms.py:500 forms.py:1070 forms.py:1089 models.py:81 models.py:212
+#: forms.py:500 forms.py:1075 forms.py:1094 models.py:81 models.py:212
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9
msgid "Periods"
msgstr "Périodes"
@@ -184,7 +185,7 @@ msgstr "Terminé après"
msgid "Search within relations"
msgstr "Recherche parmi les relations"
-#: forms.py:512 forms.py:830 models.py:258
+#: forms.py:512 forms.py:832
msgid "Comment"
msgstr "Commentaire"
@@ -192,180 +193,184 @@ msgstr "Commentaire"
msgid "Abstract (full text search)"
msgstr "Résumé (recherche texte intégral)"
-#: forms.py:514 forms.py:832 models.py:270
+#: forms.py:515 forms.py:835 models.py:260
+msgid "Comment about scientific documentation"
+msgstr "Commentaire concernant la documentation scientifique"
+
+#: forms.py:516 forms.py:837 models.py:272
msgid "Record quality"
msgstr "Qualité d'enregistrement"
-#: forms.py:515 forms.py:803 models.py:224
+#: forms.py:517 forms.py:805 models.py:224
msgid "Report processing"
msgstr "Traitement du rapport"
-#: forms.py:517 forms.py:835 models.py:265
+#: forms.py:519 forms.py:840 models.py:267
msgid "Virtual operation"
msgstr "Opération virtuelle"
-#: forms.py:519 forms.py:1136
+#: forms.py:521 forms.py:1141
msgid "Archaelogical site"
msgstr "Entité Archéologique"
-#: forms.py:525 forms.py:1263
+#: forms.py:527 forms.py:1268
msgid "Created by"
msgstr "Créé par"
-#: forms.py:531 forms.py:1269
+#: forms.py:533 forms.py:1274
msgid "Modified by"
msgstr "Modifié par"
-#: forms.py:538
+#: forms.py:540
msgid "Documentation deadline before"
msgstr "Date limite de rendu de la documentation avant"
-#: forms.py:540
+#: forms.py:542
msgid "Documentation deadline after"
msgstr "Date limite de rendu de la documentation après"
-#: forms.py:542 forms.py:823 models.py:277
+#: forms.py:544 forms.py:825 models.py:279
msgid "Documentation received"
msgstr "Documentation reçue"
-#: forms.py:544
+#: forms.py:546
msgid "Finds deadline before"
msgstr "Date limite de rendu du mobilier avant"
-#: forms.py:546
+#: forms.py:548
msgid "Finds deadline after"
msgstr "Date limite de rendu du mobilier après"
-#: forms.py:548 forms.py:828 models.py:281
+#: forms.py:550 forms.py:830 models.py:283
msgid "Finds received"
msgstr "Mobilier reçu"
-#: forms.py:593 forms.py:1208 views.py:256
+#: forms.py:595 forms.py:1213 views.py:258
msgid "Operation search"
msgstr "Recherche d'opérations"
-#: forms.py:637
+#: forms.py:639
msgid "Associated file"
msgstr "Dossier associé"
-#: forms.py:641 forms.py:923 models.py:835 wizards.py:76
+#: forms.py:643 forms.py:928 models.py:837 wizards.py:76
msgid "Archaelogical file"
msgstr "Dossier"
-#: forms.py:648 forms.py:650 models.py:272
+#: forms.py:650 forms.py:652 models.py:274
msgid "Abstract"
msgstr "Résumé"
-#: forms.py:653
+#: forms.py:655
msgid "months"
msgstr "mois"
-#: forms.py:653
+#: forms.py:655
msgid "years"
msgstr "années"
-#: forms.py:655 models.py:178
+#: forms.py:657 models.py:178
msgid "Creation date"
msgstr "Date de création"
-#: forms.py:656
+#: forms.py:658
msgid "Start of field work"
msgstr "Début du travail de terrain"
-#: forms.py:658
+#: forms.py:660
msgid "All"
msgstr "Tout"
-#: forms.py:659
+#: forms.py:661
msgid "Preventive"
msgstr "Préventif"
-#: forms.py:660
+#: forms.py:662
msgid "Research"
msgstr "Programmé"
-#: forms.py:664
+#: forms.py:666
msgid "Slicing"
msgstr "Découpage"
-#: forms.py:667
+#: forms.py:669
msgid "Department detail"
msgstr "Détail par département"
-#: forms.py:669
+#: forms.py:671
msgid "Date get from"
msgstr "Date obtenue depuis"
-#: forms.py:671
+#: forms.py:673
msgid "Preventive/Research"
msgstr "Préventif/Programmé"
-#: forms.py:677
+#: forms.py:679
msgid "Date after"
msgstr "Date après"
-#: forms.py:679
+#: forms.py:681
msgid "Date before"
msgstr "Date avant"
-#: forms.py:681
+#: forms.py:683
msgid "With reports"
msgstr "Avec un rapport"
-#: forms.py:682
+#: forms.py:684
msgid "With finds"
msgstr "Avec du mobilier"
-#: forms.py:734 forms.py:1317 templates/ishtar/sheet_administrativeact.html:13
+#: forms.py:736 forms.py:1322 templates/ishtar/sheet_administrativeact.html:13
#: templates/ishtar/sheet_operation.html:20
msgid "General"
msgstr "Général"
-#: forms.py:749 models.py:257
+#: forms.py:751 models.py:257
msgid "Generic name"
msgstr "Nom générique"
-#: forms.py:758 models.py:226
+#: forms.py:760 models.py:226
msgid "Old code"
msgstr "Ancien code"
-#: forms.py:761
+#: forms.py:763
msgid "Head scientist"
msgstr "Responsable scientifique"
-#: forms.py:777 models.py:256
+#: forms.py:779 models.py:256
msgid "Operator reference"
msgstr "Référence de l'opérateur"
-#: forms.py:789
+#: forms.py:791
msgid "Total surface (m2)"
msgstr "Surface totale (m2)"
-#: forms.py:796 models.py:51 models.py:181 models.py:1208
+#: forms.py:798 models.py:51 models.py:181 models.py:1210
msgid "Start date"
msgstr "Date de début"
-#: forms.py:798 models.py:183
+#: forms.py:800 models.py:183
msgid "Excavation end date"
msgstr "Date de fin de chantier"
-#: forms.py:801 models.py:184
+#: forms.py:803 models.py:184
msgid "Report delivery date"
msgstr "Date de livraison du rapport"
-#: forms.py:820 models.py:274
+#: forms.py:822 models.py:276
msgid "Deadline for submission of the documentation"
msgstr "Date limite de rendu de la documentation"
-#: forms.py:825 models.py:279
+#: forms.py:827 models.py:281
msgid "Deadline for submission of the finds"
msgstr "Date limite de rendu du mobilier"
-#: forms.py:837
+#: forms.py:842
msgid "Image"
msgstr "Image"
-#: forms.py:838
+#: forms.py:843
#, python-format
msgid ""
"<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</"
@@ -374,19 +379,19 @@ msgstr ""
"<p>Les images trop grandes sont retaillées en : %(width)dx%(height)d (le "
"ratio est conservé).</p>"
-#: forms.py:876
+#: forms.py:881
msgid ""
"If you want to set an excavation end date you have to provide a start date."
msgstr ""
"Avant de renseigner la date de fin de chantier, il est nécessaire de "
"renseigner une date de début."
-#: forms.py:881
+#: forms.py:886
msgid "The excavation end date cannot be before the start date."
msgstr ""
"La date de fin de chantier ne peut être antérieure à la date de début."
-#: forms.py:909
+#: forms.py:914
#, python-format
msgid ""
"Operation code already exist for year: %(year)d - use a value bigger than "
@@ -395,110 +400,110 @@ msgstr ""
"Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur "
"plus grande que %(last_val)d"
-#: forms.py:913
+#: forms.py:918
msgid "Bad operation code"
msgstr "Mauvais code d'opération"
-#: forms.py:919 models.py:422
+#: forms.py:924 models.py:424
msgid "Operation code"
msgstr "Code de l'opération"
-#: forms.py:945
+#: forms.py:950
msgid "Preventive informations - excavation"
msgstr "Information archéologie préventive - fouille"
-#: forms.py:946 models.py:210
-#: templates/ishtar/dashboards/dashboard_operation.html:699
+#: forms.py:951 models.py:210
+#: templates/ishtar/dashboards/dashboard_operation.html:701
msgid "Cost (euros)"
msgstr "Coût (euros)"
-#: forms.py:947 models.py:215
+#: forms.py:952 models.py:215
msgid "Scheduled man-days"
msgstr "Jours-hommes prévus"
-#: forms.py:949 models.py:218
+#: forms.py:954 models.py:218
msgid "Optional man-days"
msgstr "Jours-hommes optionnels"
-#: forms.py:951 models.py:221
+#: forms.py:956 models.py:221
msgid "Effective man-days"
msgstr "Jours-hommes effectifs"
-#: forms.py:961
+#: forms.py:966
msgid "Preventive informations - diagnostic"
msgstr "Information archéologie préventive - diagnostic"
-#: forms.py:964 models.py:240
+#: forms.py:969 models.py:240
msgid "Prescription on zoning"
msgstr "Prescription sur zonage"
-#: forms.py:966 models.py:243
+#: forms.py:971 models.py:243
msgid "Prescription on large area"
msgstr "Prescription sur une vaste surface"
-#: forms.py:969 models.py:245
+#: forms.py:974 models.py:245
msgid "Prescription on geoarchaeological context"
msgstr "Prescription sur un contexte géoarchéologique"
-#: forms.py:973 forms.py:995 models.py:209 models.py:848
+#: forms.py:978 forms.py:1000 models.py:209 models.py:850
msgid "Towns"
msgstr "Communes"
-#: forms.py:1002 models.py:1034 models.py:1206
+#: forms.py:1007 models.py:1036 models.py:1208
msgid "Parcel"
msgstr "Parcelle"
-#: forms.py:1054 models.py:45
+#: forms.py:1059 models.py:45
msgid "Remain types"
msgstr "Types de vestige"
-#: forms.py:1058 models.py:44
+#: forms.py:1063 models.py:44
msgid "Remain type"
msgstr "Type de vestige"
-#: forms.py:1074 templates/ishtar/sheet_operation.html:158
-#: templates/ishtar/sheet_operation.html:189
+#: forms.py:1079 templates/ishtar/sheet_operation.html:159
+#: templates/ishtar/sheet_operation.html:190
msgid "Period"
msgstr "Période"
-#: forms.py:1086 models.py:78
+#: forms.py:1091 models.py:78
msgid "Reference"
msgstr "Référence"
-#: forms.py:1115
+#: forms.py:1120
msgid "This reference already exists."
msgstr "Cette référence existe déjà."
-#: forms.py:1132 models.py:87
+#: forms.py:1137 models.py:87
msgid "Archaeological site"
msgstr "Entité archéologique"
-#: forms.py:1147 models.py:88 models.py:262
-#: templates/ishtar/sheet_operation.html:93
+#: forms.py:1152 models.py:88 models.py:264
+#: templates/ishtar/sheet_operation.html:94
msgid "Archaeological sites"
msgstr "Entités archéologiques"
-#: forms.py:1151
+#: forms.py:1156
msgid "Associated archaelogical sites"
msgstr "Entités archéologiques associées"
-#: forms.py:1157 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92
+#: forms.py:1162 ishtar_menu.py:33 ishtar_menu.py:63 ishtar_menu.py:92
msgid "Search"
msgstr "Recherche"
-#: forms.py:1162
+#: forms.py:1167
msgid "Would you like to close this operation?"
msgstr "Voulez-vous clore cette opération ?"
-#: forms.py:1167
+#: forms.py:1172
msgid "Would you like to delete this operation?"
msgstr "Voulez-vous supprimer cette opération ?"
-#: forms.py:1176 forms.py:1246 forms.py:1382 models.py:765 models.py:815
+#: forms.py:1181 forms.py:1251 forms.py:1387 models.py:767 models.py:817
msgid "Index"
msgstr "Index"
-#: forms.py:1202
+#: forms.py:1207
#, python-format
msgid ""
"Index already exists for operation: %(operation)s - use a value bigger than "
@@ -507,48 +512,48 @@ msgstr ""
"Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur "
"plus grande que %(last_val)d"
-#: forms.py:1214
+#: forms.py:1219
msgid "Operation's year"
msgstr "Année de l'opération"
-#: forms.py:1221
+#: forms.py:1226
msgid "Operation's town"
msgstr "Commune de l'opération"
-#: forms.py:1234
+#: forms.py:1239
msgid "Documentation search"
msgstr "Recherche de document"
-#: forms.py:1236
+#: forms.py:1241
msgid "You should select a document."
msgstr "Vous devez sélectionner un document."
-#: forms.py:1253 forms.py:1320 models.py:790 models.py:809
+#: forms.py:1258 forms.py:1325 models.py:792 models.py:811
msgid "Act type"
msgstr "Type d'acte"
-#: forms.py:1254 forms.py:1452
+#: forms.py:1259 forms.py:1457
msgid "Indexed?"
msgstr "Indexé ?"
-#: forms.py:1260 forms.py:1325 models.py:839
+#: forms.py:1265 forms.py:1330 models.py:841
#: templates/ishtar/blocks/window_tables/administrativacts.html:10
msgid "Object"
msgstr "Objet"
-#: forms.py:1297 views.py:412
+#: forms.py:1302 views.py:414
msgid "Administrative act search"
msgstr "Recherche d'actes administratifs"
-#: forms.py:1312 forms.py:1410 forms.py:1477
+#: forms.py:1317 forms.py:1415 forms.py:1482
msgid "You should select an administrative act."
msgstr "Vous devez sélectionner un acte administratif."
-#: forms.py:1328 models.py:836
+#: forms.py:1333 models.py:838
msgid "Signature date"
msgstr "Date de signature"
-#: forms.py:1370
+#: forms.py:1375
#, python-format
msgid ""
"This index already exist for year: %(year)d - use a value bigger than "
@@ -557,31 +562,31 @@ msgstr ""
"Cet index existe déjà pour l'année : %(year)d, utilisez une valeur plus "
"grande que %(last_val)d"
-#: forms.py:1374
+#: forms.py:1379
msgid "Bad index"
msgstr "Mauvais index"
-#: forms.py:1387
+#: forms.py:1392
msgid "Would you like to delete this administrative act?"
msgstr "Voulez-vous supprimer cet acte administratif ?"
-#: forms.py:1392
+#: forms.py:1397
msgid "Template"
msgstr "Patron"
-#: forms.py:1416 forms.py:1420
+#: forms.py:1421 forms.py:1425
msgid "This document is not intended for this type of act."
msgstr "Ce document n'est pas destiné à ce type d'acte."
-#: forms.py:1438
+#: forms.py:1443
msgid "Doc generation"
msgstr "Génération de document"
-#: forms.py:1440
+#: forms.py:1445
msgid "Generate the associated doc?"
msgstr "Générer le document associé ?"
-#: forms.py:1461 ishtar_menu.py:121 views.py:465
+#: forms.py:1466 ishtar_menu.py:121 views.py:467
msgctxt "admin act register"
msgid "Register"
msgstr "Registre"
@@ -602,7 +607,7 @@ msgstr "Clôture"
msgid "Deletion"
msgstr "Suppression"
-#: ishtar_menu.py:58 models.py:855
+#: ishtar_menu.py:58 models.py:857
#: templates/ishtar/sheet_administrativeact.html:4
msgid "Administrative act"
msgstr "Acte administratif"
@@ -631,16 +636,16 @@ msgstr "Tableau de bord"
msgid "General informations"
msgstr "Informations générales"
-#: ishtar_menu.py:136 models.py:290
+#: ishtar_menu.py:136 models.py:292
#: templates/ishtar/dashboards/dashboard_operation.html:8
msgid "Operations"
msgstr "Opérations"
-#: models.py:50 models.py:66 models.py:1670
+#: models.py:50 models.py:66 models.py:1672
msgid "Order"
msgstr "Ordre"
-#: models.py:52 models.py:1209
+#: models.py:52 models.py:1211
msgid "End date"
msgstr "Date de fin"
@@ -704,7 +709,7 @@ msgstr "Date de clôture"
msgid "In charge scientist"
msgstr "Responsable scientifique"
-#: models.py:202 models.py:1014
+#: models.py:202 models.py:1016
msgid "File"
msgstr "Dossier"
@@ -712,335 +717,339 @@ msgstr "Dossier"
msgid "Surface (m2)"
msgstr "Surface (m2)"
-#: models.py:259
+#: models.py:258
+msgid "General comment"
+msgstr "Commentaire général"
+
+#: models.py:261
msgid "Cached name"
msgstr "Nom en cache"
-#: models.py:267
+#: models.py:269
msgid ""
"If checked, it means that this operation have not been officialy registered."
msgstr ""
"Si coché, cela signifie que cette opération n'a pas été officiellement "
"enregistrée."
-#: models.py:283
+#: models.py:285
msgid "Point"
msgstr "Point"
-#: models.py:284
+#: models.py:286
msgid "Multi polygon"
msgstr "Polygones multiples"
-#: models.py:292
+#: models.py:294
msgid "Can view all Operations"
msgstr "Peut voir toutes les Opérations"
-#: models.py:293
+#: models.py:295
msgid "Can view own Operation"
msgstr "Peut voir sa propre Opération"
-#: models.py:294
+#: models.py:296
msgid "Can add own Operation"
msgstr "Peut ajouter sa propre Opération"
-#: models.py:295
+#: models.py:297
msgid "Can change own Operation"
msgstr "Peut modifier sa propre Opération"
-#: models.py:296
+#: models.py:298
msgid "Can delete own Operation"
msgstr "Peut supprimer sa propre Opération"
-#: models.py:297
+#: models.py:299
msgid "Can close Operation"
msgstr "Peut fermer une Opération"
-#: models.py:324
+#: models.py:326
msgid "OPE"
msgstr "OPE"
-#: models.py:381
+#: models.py:383
msgid "Intercommunal"
msgstr "Intercommunal"
-#: models.py:407 models.py:778
+#: models.py:409 models.py:780
msgid "Archaeological file"
msgstr "Dossier archéologique"
-#: models.py:408
+#: models.py:410
msgid "Code patriarche"
msgstr "Code patriarche"
-#: models.py:448
+#: models.py:450
msgid "This operation code already exists for this year"
msgstr "Ce code d'opération existe déjà pour cette année."
-#: models.py:481
+#: models.py:483
msgid "Number of parcels"
msgstr "Nombre de parcelles"
-#: models.py:499
+#: models.py:501
msgid "Number of administrative acts"
msgstr "Nombre d'actes administratifs"
-#: models.py:507
+#: models.py:509
msgid "Number of indexed administrative acts"
msgstr "Nombre d'actes administratifs indexés"
-#: models.py:515
+#: models.py:517
msgid "Number of context records"
msgstr "Nombre d'Unités d'Enregistrement"
-#: models.py:551
+#: models.py:553
msgid "Number of finds"
msgstr "Nombre d'élément de mobilier"
-#: models.py:596
+#: models.py:598
msgid "No type"
msgstr "Pas de type"
-#: models.py:627
+#: models.py:629
msgid "Number of sources"
msgstr "Nombre de documents"
-#: models.py:669 templates/ishtar/dashboards/dashboard_operation.html:309
+#: models.py:671 templates/ishtar/dashboards/dashboard_operation.html:309
#: templates/ishtar/dashboards/dashboard_operation.html:575
#: templates/ishtar/dashboards/dashboard_operation.html:611
msgid "Mean"
msgstr "Moyenne"
-#: models.py:709
+#: models.py:711
msgid "Inverse relation"
msgstr "Relation inverse"
-#: models.py:713
+#: models.py:715
msgid "Operation relation type"
msgstr "Type de relation entre opérations"
-#: models.py:714
+#: models.py:716
msgid "Operation relation types"
msgstr "Types de relation entre opérations"
-#: models.py:727
+#: models.py:729
msgid "Operation record relation"
msgstr "Relation entre opérations"
-#: models.py:728
+#: models.py:730
msgid "Operation record relations"
msgstr "Relations entre opérations"
-#: models.py:749
+#: models.py:751
msgid "Operation documentation"
msgstr "Documentation d'une opération"
-#: models.py:750
+#: models.py:752
msgid "Operation documentations"
msgstr "Documentations des opérations"
-#: models.py:753
+#: models.py:755
msgid "Can view all Operation sources"
msgstr "Peut voir toutes les Documentations d'opération"
-#: models.py:755
+#: models.py:757
msgid "Can view own Operation source"
msgstr "Peut voir sa propre Documentation d'opération"
-#: models.py:757
+#: models.py:759
msgid "Can add own Operation source"
msgstr "Peut ajouter sa propre Documentation d'opération"
-#: models.py:759
+#: models.py:761
msgid "Can change own Operation source"
msgstr "Peut modifier sa propre Documentation d'opération"
-#: models.py:761
+#: models.py:763
msgid "Can delete own Operation source"
msgstr "Peut supprimer sa propre Documentation d'opération"
-#: models.py:781
+#: models.py:783
msgid "Intended to"
msgstr "Destiné à"
-#: models.py:783
+#: models.py:785
msgid "Code"
msgstr "Code"
-#: models.py:786
+#: models.py:788
msgid "Associated template"
msgstr "Patron associé"
-#: models.py:787
+#: models.py:789
msgid "Indexed"
msgstr "Indexé"
-#: models.py:791
+#: models.py:793
msgid "Act types"
msgstr "Types d'acte"
-#: models.py:813
+#: models.py:815
msgid "Person in charge of the operation"
msgstr "Responsable d'opération"
-#: models.py:819
+#: models.py:821
msgid "Archaeological preventive operator"
msgstr "Opérateur d'archéologie préventive"
-#: models.py:827
+#: models.py:829
msgid "Signatory"
msgstr "Signataire"
-#: models.py:845
+#: models.py:847
msgid "Departments"
msgstr "Départements"
-#: models.py:846
+#: models.py:848
msgid "Cached values get from associated departments"
msgstr "Valeur en cache des départements associés"
-#: models.py:849
+#: models.py:851
msgid "Cached values get from associated towns"
msgstr "Valeur en cache des communes associées"
-#: models.py:856 templates/ishtar/sheet_operation.html:101
-#: templates/ishtar/sheet_operation.html:132
+#: models.py:858 templates/ishtar/sheet_operation.html:102
+#: templates/ishtar/sheet_operation.html:133
msgid "Administrative acts"
msgstr "Actes administratifs"
-#: models.py:859
+#: models.py:861
msgid "Can view all Administrative acts"
msgstr "Peut voir tous les Actes administratifs"
-#: models.py:861
+#: models.py:863
msgid "Can view own Administrative act"
msgstr "Peut voir son propre Acte administratif"
-#: models.py:863
+#: models.py:865
msgid "Can add own Administrative act"
msgstr "Peut ajouter son propre Acte administratif"
-#: models.py:865
+#: models.py:867
msgid "Can change own Administrative act"
msgstr "Peut modifier son propre Acte administratif"
-#: models.py:867
+#: models.py:869
msgid "Can delete own Administrative act"
msgstr "Peut supprimer son propre Acte administratif"
-#: models.py:876
+#: models.py:878
#: templates/ishtar/blocks/window_tables/administrativacts.html:7
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
msgid "Ref."
msgstr "Réf."
-#: models.py:959
+#: models.py:961
msgid "This index already exists for this year"
msgstr "Cet index existe déjà pour cette année."
-#: models.py:1027
+#: models.py:1029
msgid "External ID"
msgstr "ID externe"
-#: models.py:1030
+#: models.py:1032
msgid "External ID is set automatically"
msgstr "L'identifiant externe est configuré automatiquement"
-#: models.py:1031
+#: models.py:1033
msgid "Address - Locality"
msgstr "Adresse - Lieu-dit"
-#: models.py:1204
+#: models.py:1206
msgid "Owner"
msgstr "Propriétaire"
-#: models.py:1212
+#: models.py:1214
msgid "Parcel owner"
msgstr "Propriétaire de parcelle"
-#: models.py:1213
+#: models.py:1215
msgid "Parcel owners"
msgstr "Propriétaires de parcelle"
-#: models.py:1239
+#: models.py:1241
msgid "Recorded"
msgstr "Enregistré"
-#: models.py:1240
+#: models.py:1242
msgid "Effective"
msgstr "Effectif"
-#: models.py:1241
+#: models.py:1243
msgid "Active"
msgstr "Actif"
-#: models.py:1242
+#: models.py:1244
msgid "Field completed"
msgstr "Terrain achevé"
-#: models.py:1243
+#: models.py:1245
msgid "Associated report"
msgstr "Rapport associé"
-#: models.py:1244
+#: models.py:1246
msgid "Closed"
msgstr "Clos"
-#: models.py:1245
+#: models.py:1247
msgid "Documented and closed"
msgstr "Documenté et clos"
-#: models.py:1671
+#: models.py:1673
msgid "Is preventive"
msgstr "Préventif"
-#: models.py:1674
+#: models.py:1676
msgid "Operation type old"
msgstr "Type d'opération - ancien"
-#: models.py:1675
+#: models.py:1677
msgid "Operation types old"
msgstr "Types d'opération - ancien"
-#: views.py:302
+#: views.py:304
msgid "New operation"
msgstr "Nouvelle opération"
-#: views.py:321
+#: views.py:323
msgid "Operation modification"
msgstr "Modification d'une opération"
-#: views.py:364
+#: views.py:366
msgid "Operation closing"
msgstr "Clôture d'une opération"
-#: views.py:370
+#: views.py:372
msgid "Operation deletion"
msgstr "Suppression d'une opération"
-#: views.py:375
+#: views.py:377
msgid "Operation: source search"
msgstr "Opération : recherche de documentation associée"
-#: views.py:383
+#: views.py:385
msgid "Operation: source creation"
msgstr "Opération : nouvelle documentation associée"
-#: views.py:391
+#: views.py:393
msgid "Operation: source modification"
msgstr "Opération : modification d'une documentation associée"
-#: views.py:406
+#: views.py:408
msgid "Operation: source deletion"
msgstr "Opération : suppression d'une documentation associée"
-#: views.py:425
+#: views.py:427
msgid "Operation: new administrative act"
msgstr "Opération : nouvel acte administratif"
-#: views.py:435
+#: views.py:437
msgid "Operation: administrative act modification"
msgstr "Opération : modification d'un acte administratif"
-#: views.py:459
+#: views.py:461
msgid "Operation: administrative act deletion"
msgstr "Opération : suppression d'un acte administratif"
@@ -1145,73 +1154,73 @@ msgstr "Durée :"
msgid "Day"
msgstr "Jour"
-#: templates/ishtar/sheet_operation.html:72
+#: templates/ishtar/sheet_operation.html:73
msgid "Localisation"
msgstr "Localisation"
-#: templates/ishtar/sheet_operation.html:97
+#: templates/ishtar/sheet_operation.html:98
msgid "Associated parcels"
msgstr "Parcelles associées"
-#: templates/ishtar/sheet_operation.html:105
+#: templates/ishtar/sheet_operation.html:106
msgid "Document from this operation"
msgstr "Documents de cette opération"
-#: templates/ishtar/sheet_operation.html:111
-#: templates/ishtar/sheet_operation.html:143
+#: templates/ishtar/sheet_operation.html:112
+#: templates/ishtar/sheet_operation.html:144
msgid "Context records"
msgstr "Unités d'Enregistrement"
-#: templates/ishtar/sheet_operation.html:115
+#: templates/ishtar/sheet_operation.html:116
msgid "Documents from associated context records"
msgstr "Documents des Unités d'Enregistrement associées"
-#: templates/ishtar/sheet_operation.html:120
-#: templates/ishtar/sheet_operation.html:166
+#: templates/ishtar/sheet_operation.html:121
+#: templates/ishtar/sheet_operation.html:167
msgid "Finds"
msgstr "Mobilier"
-#: templates/ishtar/sheet_operation.html:125
+#: templates/ishtar/sheet_operation.html:126
msgid "Documents from associated finds"
msgstr "Documents du mobilier associé"
-#: templates/ishtar/sheet_operation.html:130
+#: templates/ishtar/sheet_operation.html:131
msgid "Statistics"
msgstr "Statistiques"
-#: templates/ishtar/sheet_operation.html:150
-#: templates/ishtar/sheet_operation.html:204
+#: templates/ishtar/sheet_operation.html:151
+#: templates/ishtar/sheet_operation.html:205
#: templates/ishtar/blocks/window_tables/administrativacts.html:8
msgid "Type"
msgstr "Type"
-#: templates/ishtar/sheet_operation.html:150
-#: templates/ishtar/sheet_operation.html:158
-#: templates/ishtar/sheet_operation.html:173
-#: templates/ishtar/sheet_operation.html:181
-#: templates/ishtar/sheet_operation.html:189
-#: templates/ishtar/sheet_operation.html:204
+#: templates/ishtar/sheet_operation.html:151
+#: templates/ishtar/sheet_operation.html:159
+#: templates/ishtar/sheet_operation.html:174
+#: templates/ishtar/sheet_operation.html:182
+#: templates/ishtar/sheet_operation.html:190
+#: templates/ishtar/sheet_operation.html:205
#: templates/ishtar/dashboards/dashboard_operation.html:18
#: templates/ishtar/dashboards/dashboard_operation.html:164
#: templates/ishtar/dashboards/dashboard_operation.html:432
#: templates/ishtar/dashboards/dashboard_operation.html:463
-#: templates/ishtar/dashboards/dashboard_operation.html:685
+#: templates/ishtar/dashboards/dashboard_operation.html:687
msgid "Number"
msgstr "Nombre"
-#: templates/ishtar/sheet_operation.html:173
+#: templates/ishtar/sheet_operation.html:174
msgid "Material type"
msgstr "Type de matériau"
-#: templates/ishtar/sheet_operation.html:181
+#: templates/ishtar/sheet_operation.html:182
msgid "Object type"
msgstr "Type d'objet"
-#: templates/ishtar/sheet_operation.html:197
+#: templates/ishtar/sheet_operation.html:198
msgid "Sources"
msgstr "Documents"
-#: templates/ishtar/sheet_operation.html:213
+#: templates/ishtar/sheet_operation.html:214
msgid "Finds by context records"
msgstr "Mobilier par Unités d'Enregistrement"
@@ -1381,7 +1390,7 @@ msgstr "surface des opérations effectives (ha)"
#: templates/ishtar/dashboards/dashboard_operation.html:569
#: templates/ishtar/dashboards/dashboard_operation.html:605
#: templates/ishtar/dashboards/dashboard_operation.html:645
-#: templates/ishtar/dashboards/dashboard_operation.html:665
+#: templates/ishtar/dashboards/dashboard_operation.html:667
msgid "Sum"
msgstr "Somme"
@@ -1414,12 +1423,12 @@ msgid "effective operation by department"
msgstr "opérations effectives par département"
#: templates/ishtar/dashboards/dashboard_operation.html:415
-#: templates/ishtar/dashboards/dashboard_operation.html:668
+#: templates/ishtar/dashboards/dashboard_operation.html:670
msgid "Nb."
msgstr "Nb."
#: templates/ishtar/dashboards/dashboard_operation.html:428
-#: templates/ishtar/dashboards/dashboard_operation.html:681
+#: templates/ishtar/dashboards/dashboard_operation.html:683
msgid "main towns by number"
msgstr "communes principales en nombre"
@@ -1439,15 +1448,15 @@ msgstr "Fouilles : informations"
msgid "area by organization by realisation year"
msgstr "surface par organisation et par année de réalisation"
-#: templates/ishtar/dashboards/dashboard_operation.html:668
+#: templates/ishtar/dashboards/dashboard_operation.html:670
msgid "Cost"
msgstr "Coût"
-#: templates/ishtar/dashboards/dashboard_operation.html:668
+#: templates/ishtar/dashboards/dashboard_operation.html:670
msgid "FNAP cost"
msgstr "Coût FNAP"
-#: templates/ishtar/dashboards/dashboard_operation.html:695
+#: templates/ishtar/dashboards/dashboard_operation.html:697
msgid "main towns by cost"
msgstr "communes principales par coût"
diff --git a/version.py b/version.py
index c6a2b2fdb..8c166c1e7 100644
--- a/version.py
+++ b/version.py
@@ -1,4 +1,4 @@
-VERSION = (0, 98, 2)
+VERSION = (0, 98, 3)
def get_version():