summaryrefslogtreecommitdiff
path: root/archaeological_operations
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-10-22 13:41:02 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-10-22 13:41:02 +0200
commitdafc5d16f3095bad00356b6198afcd5bbeab61d6 (patch)
tree7040d1fd325ba67b890122059a8f50a3857e332a /archaeological_operations
parent64bb69c03ce1688c72b3f7ebd0e1550cd941aa69 (diff)
parent0ecd905165193897129a71a1e8203232f0b2b68c (diff)
downloadIshtar-dafc5d16f3095bad00356b6198afcd5bbeab61d6.tar.bz2
Ishtar-dafc5d16f3095bad00356b6198afcd5bbeab61d6.zip
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_operations')
-rw-r--r--archaeological_operations/fixtures/initial_data-fr.json1613
-rw-r--r--archaeological_operations/forms.py6
-rw-r--r--archaeological_operations/locale/django.pot286
-rw-r--r--archaeological_operations/migrations/0061_regenerate_cached_label.py661
-rw-r--r--archaeological_operations/migrations/0062_auto__chg_field_operationsource_image__chg_field_operationsource_thumb.py688
-rw-r--r--archaeological_operations/models.py140
-rw-r--r--archaeological_operations/templates/ishtar/sheet_operation.html8
-rw-r--r--archaeological_operations/views.py105
8 files changed, 3214 insertions, 293 deletions
diff --git a/archaeological_operations/fixtures/initial_data-fr.json b/archaeological_operations/fixtures/initial_data-fr.json
index 03d331789..9e9fd2bf7 100644
--- a/archaeological_operations/fixtures/initial_data-fr.json
+++ b/archaeological_operations/fixtures/initial_data-fr.json
@@ -1302,6 +1302,296 @@
}
},
{
+ "pk": 160,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "aile",
+ "label": "aile"
+ }
+ },
+ {
+ "pk": 161,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "aire-de-battage",
+ "label": "aire de battage"
+ }
+ },
+ {
+ "pk": 162,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "amas",
+ "label": "amas"
+ }
+ },
+ {
+ "pk": 163,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "amas-coquillier",
+ "label": "amas coquillier"
+ }
+ },
+ {
+ "pk": 164,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "amas-de-debitage",
+ "label": "amas de d\u00e9bitage"
+ }
+ },
+ {
+ "pk": 165,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "amenagement-indetermine",
+ "label": "am\u00e9nagement ind\u00e9termin\u00e9"
+ }
+ },
+ {
+ "pk": 166,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "anomalie",
+ "label": "anomalie"
+ }
+ },
+ {
+ "pk": 167,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "arc",
+ "label": "arc"
+ }
+ },
+ {
+ "pk": 168,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "arcasse",
+ "label": "arcasse"
+ }
+ },
+ {
+ "pk": 169,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "arche",
+ "label": "arche"
+ }
+ },
+ {
+ "pk": 170,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "aula",
+ "label": "aula"
+ }
+ },
+ {
+ "pk": 171,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "autel",
+ "label": "autel"
+ }
+ },
+ {
+ "pk": 172,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "banquette",
+ "label": "banquette"
+ }
+ },
+ {
+ "pk": 173,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "barbacane",
+ "label": "barbacane"
+ }
+ },
+ {
+ "pk": 174,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "barrot",
+ "label": "barrot"
+ }
+ },
+ {
+ "pk": 175,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "basse-cour",
+ "label": "basse-cour"
+ }
+ },
+ {
+ "pk": 176,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "bassin",
+ "label": "bassin"
+ }
+ },
+ {
+ "pk": 177,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "bastion",
+ "label": "bastion"
+ }
+ },
+ {
+ "pk": 178,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "batiment",
+ "label": "b\u00e2timent"
+ }
+ },
+ {
+ "pk": 179,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "bloc",
+ "label": "bloc"
+ }
+ },
+ {
+ "pk": 180,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "bloc-orne",
+ "label": "bloc orn\u00e9"
+ }
+ },
+ {
+ "pk": 181,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "bloc-ouvrage",
+ "label": "bloc ouvrag\u00e9"
+ }
+ },
+ {
+ "pk": 182,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "boisage",
+ "label": "boisage"
+ }
+ },
+ {
+ "pk": 183,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "boniferie",
+ "label": "boniferie"
+ }
+ },
+ {
+ "pk": 184,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "borde",
+ "label": "bord\u00e9"
+ }
+ },
+ {
+ "pk": 185,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "borde-a-clin",
+ "label": "bord\u00e9 \u00e0 clin"
+ }
+ },
+ {
+ "pk": 186,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "borde-a-franc-bord",
+ "label": "bord\u00e9 \u00e0 franc-bord"
+ }
+ },
+ {
+ "pk": 187,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "borne",
+ "label": "borne"
+ }
+ },
+ {
+ "pk": 188,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "butte",
+ "label": "butte"
+ }
+ },
+ {
"pk": 5,
"model": "archaeological_operations.remaintype",
"fields": {
@@ -1312,6 +1602,306 @@
}
},
{
+ "pk": 189,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "calage",
+ "label": "calage"
+ }
+ },
+ {
+ "pk": 190,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "calfatage",
+ "label": "calfatage"
+ }
+ },
+ {
+ "pk": 191,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "calvaire",
+ "label": "calvaire"
+ }
+ },
+ {
+ "pk": 192,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "canalisation",
+ "label": "canalisation"
+ }
+ },
+ {
+ "pk": 193,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "cargaison",
+ "label": "cargaison"
+ }
+ },
+ {
+ "pk": 194,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "cave",
+ "label": "cave"
+ }
+ },
+ {
+ "pk": 195,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "cercueil",
+ "label": "cercueil"
+ }
+ },
+ {
+ "pk": 196,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "charpente",
+ "label": "charpente"
+ }
+ },
+ {
+ "pk": 9,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": "",
+ "available": true,
+ "txt_idx": "castle",
+ "label": "ch\u00e2teau"
+ }
+ },
+ {
+ "pk": 197,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "cloitre",
+ "label": "clo\u00eetre"
+ }
+ },
+ {
+ "pk": 198,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "cockpit",
+ "label": "cockpit"
+ }
+ },
+ {
+ "pk": 199,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "colonnade",
+ "label": "colonnade"
+ }
+ },
+ {
+ "pk": 200,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "colonne-element-de",
+ "label": "colonne (\u00e9l\u00e9ment de)"
+ }
+ },
+ {
+ "pk": 201,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "construction",
+ "label": "construction"
+ }
+ },
+ {
+ "pk": 202,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "coque",
+ "label": "coque"
+ }
+ },
+ {
+ "pk": 203,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "coque-borde-premier",
+ "label": "coque bord\u00e9-premier"
+ }
+ },
+ {
+ "pk": 204,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "coque-membrure-premiere",
+ "label": "coque membrure-premi\u00e8re"
+ }
+ },
+ {
+ "pk": 205,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "couple",
+ "label": "couple"
+ }
+ },
+ {
+ "pk": 206,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "cour",
+ "label": "cour"
+ }
+ },
+ {
+ "pk": 207,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "courtine",
+ "label": "courtine"
+ }
+ },
+ {
+ "pk": 208,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "croix",
+ "label": "croix"
+ }
+ },
+ {
+ "pk": 209,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "crypte",
+ "label": "crypte"
+ }
+ },
+ {
+ "pk": 210,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "cryptoportique",
+ "label": "cryptoportique"
+ }
+ },
+ {
+ "pk": 211,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "cuve",
+ "label": "cuve"
+ }
+ },
+ {
+ "pk": 212,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "cuvelage",
+ "label": "cuvelage"
+ }
+ },
+ {
+ "pk": 213,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "dallage",
+ "label": "dallage"
+ }
+ },
+ {
+ "pk": 214,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "demi-lune",
+ "label": "demi-lune"
+ }
+ },
+ {
+ "pk": 215,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "depotoir",
+ "label": "d\u00e9potoir"
+ }
+ },
+ {
+ "pk": 216,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "derive",
+ "label": "d\u00e9rive"
+ }
+ },
+ {
+ "pk": 217,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "doublage",
+ "label": "doublage"
+ }
+ },
+ {
"pk": 3,
"model": "archaeological_operations.remaintype",
"fields": {
@@ -1322,6 +1912,46 @@
}
},
{
+ "pk": 218,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "empierrement",
+ "label": "empierrement"
+ }
+ },
+ {
+ "pk": 219,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "emplanture",
+ "label": "emplanture"
+ }
+ },
+ {
+ "pk": 220,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "empreinte",
+ "label": "empreinte"
+ }
+ },
+ {
+ "pk": 221,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "enclos",
+ "label": "enclos"
+ }
+ },
+ {
"pk": 2,
"model": "archaeological_operations.remaintype",
"fields": {
@@ -1332,6 +1962,106 @@
}
},
{
+ "pk": 222,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "enclos-systeme-d",
+ "label": "enclos (syst\u00e8me d')"
+ }
+ },
+ {
+ "pk": 223,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "entree-amenagee",
+ "label": "entr\u00e9e am\u00e9nag\u00e9e"
+ }
+ },
+ {
+ "pk": 224,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "escalier",
+ "label": "escalier"
+ }
+ },
+ {
+ "pk": 225,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "etambot",
+ "label": "\u00e9tambot"
+ }
+ },
+ {
+ "pk": 226,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "etrave",
+ "label": "\u00e9trave"
+ }
+ },
+ {
+ "pk": 227,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "etrave-a-eperon",
+ "label": "\u00e9trave \u00e0 \u00e9peron"
+ }
+ },
+ {
+ "pk": 228,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "etuve",
+ "label": "\u00e9tuve"
+ }
+ },
+ {
+ "pk": 229,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "ferrier",
+ "label": "ferrier"
+ }
+ },
+ {
+ "pk": 230,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "fondation",
+ "label": "fondation"
+ }
+ },
+ {
+ "pk": 231,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "fosse",
+ "label": "fosse"
+ }
+ },
+ {
"pk": 4,
"model": "archaeological_operations.remaintype",
"fields": {
@@ -1352,6 +2082,26 @@
}
},
{
+ "pk": 232,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "fosses-reseau-de",
+ "label": "foss\u00e9s (r\u00e9seau de)"
+ }
+ },
+ {
+ "pk": 233,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "four",
+ "label": "four"
+ }
+ },
+ {
"pk": 8,
"model": "archaeological_operations.remaintype",
"fields": {
@@ -1362,6 +2112,716 @@
}
},
{
+ "pk": 234,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "foyer",
+ "label": "foyer"
+ }
+ },
+ {
+ "pk": 235,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "foyer-vidange-de",
+ "label": "foyer (vidange de)"
+ }
+ },
+ {
+ "pk": 236,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "front-de-taille",
+ "label": "front de taille"
+ }
+ },
+ {
+ "pk": 237,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "fuselage",
+ "label": "fuselage"
+ }
+ },
+ {
+ "pk": 238,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "galerie",
+ "label": "galerie"
+ }
+ },
+ {
+ "pk": 239,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "garenne",
+ "label": "garenne"
+ }
+ },
+ {
+ "pk": 240,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "glaciere",
+ "label": "glaci\u00e8re"
+ }
+ },
+ {
+ "pk": 241,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "gouvernail",
+ "label": "gouvernail"
+ }
+ },
+ {
+ "pk": 242,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "gradins",
+ "label": "gradins"
+ }
+ },
+ {
+ "pk": 243,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "grange",
+ "label": "grange"
+ }
+ },
+ {
+ "pk": 244,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "grenier",
+ "label": "grenier"
+ }
+ },
+ {
+ "pk": 245,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "helice",
+ "label": "h\u00e9lice"
+ }
+ },
+ {
+ "pk": 246,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "hypocauste",
+ "label": "hypocauste"
+ }
+ },
+ {
+ "pk": 247,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "incineration",
+ "label": "incin\u00e9ration"
+ }
+ },
+ {
+ "pk": 248,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "inhumation",
+ "label": "inhumation"
+ }
+ },
+ {
+ "pk": 249,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "inscription",
+ "label": "inscription"
+ }
+ },
+ {
+ "pk": 250,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "jardin",
+ "label": "jardin"
+ }
+ },
+ {
+ "pk": 251,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "laraire",
+ "label": "laraire"
+ }
+ },
+ {
+ "pk": 252,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "latrines",
+ "label": "latrines"
+ }
+ },
+ {
+ "pk": 253,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "lest",
+ "label": "lest"
+ }
+ },
+ {
+ "pk": 254,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "levee",
+ "label": "lev\u00e9e"
+ }
+ },
+ {
+ "pk": 255,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "mat",
+ "label": "m\u00e2t"
+ }
+ },
+ {
+ "pk": 256,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "membrure",
+ "label": "membrure"
+ }
+ },
+ {
+ "pk": 11,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": "",
+ "available": true,
+ "txt_idx": "menhir",
+ "label": "menhir"
+ }
+ },
+ {
+ "pk": 257,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "meule-fixe",
+ "label": "meule fixe"
+ }
+ },
+ {
+ "pk": 258,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "mosaique",
+ "label": "mosa\u00efque"
+ }
+ },
+ {
+ "pk": 259,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "moteur",
+ "label": "moteur"
+ }
+ },
+ {
+ "pk": 10,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": "",
+ "available": true,
+ "txt_idx": "castral_thing",
+ "label": "motte castrale"
+ }
+ },
+ {
+ "pk": 260,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "moule-a-cloches",
+ "label": "moule \u00e0 cloches"
+ }
+ },
+ {
+ "pk": 261,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "mur",
+ "label": "mur"
+ }
+ },
+ {
+ "pk": 263,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "niche",
+ "label": "niche"
+ }
+ },
+ {
+ "pk": 264,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "niveau-doccupation",
+ "label": "niveau d'occupation"
+ }
+ },
+ {
+ "pk": 265,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "oratoire",
+ "label": "oratoire"
+ }
+ },
+ {
+ "pk": 266,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "orniere",
+ "label": "orni\u00e8re"
+ }
+ },
+ {
+ "pk": 267,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "ouvrage-avance",
+ "label": "ouvrage avanc\u00e9"
+ }
+ },
+ {
+ "pk": 268,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "palissade",
+ "label": "palissade"
+ }
+ },
+ {
+ "pk": 269,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "paroi-ornee",
+ "label": "paroi orn\u00e9e"
+ }
+ },
+ {
+ "pk": 270,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "pavage",
+ "label": "pavage"
+ }
+ },
+ {
+ "pk": 271,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "pieu",
+ "label": "pieu"
+ }
+ },
+ {
+ "pk": 272,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "pigeonnier",
+ "label": "pigeonnier"
+ }
+ },
+ {
+ "pk": 273,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "pile",
+ "label": "pile"
+ }
+ },
+ {
+ "pk": 274,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "plafond",
+ "label": "plafond"
+ }
+ },
+ {
+ "pk": 275,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "plancher",
+ "label": "plancher"
+ }
+ },
+ {
+ "pk": 276,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "polissoir-fixe",
+ "label": "polissoir fixe"
+ }
+ },
+ {
+ "pk": 277,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "pont-de-bateau",
+ "label": "pont de bateau"
+ }
+ },
+ {
+ "pk": 278,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "porte",
+ "label": "porte"
+ }
+ },
+ {
+ "pk": 279,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "portique",
+ "label": "portique"
+ }
+ },
+ {
+ "pk": 280,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "preceinte",
+ "label": "pr\u00e9ceinte"
+ }
+ },
+ {
+ "pk": 281,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "pressoir",
+ "label": "pressoir"
+ }
+ },
+ {
+ "pk": 282,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "puits",
+ "label": "puits"
+ }
+ },
+ {
+ "pk": 283,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "purgerie",
+ "label": "purgerie"
+ }
+ },
+ {
+ "pk": 284,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "quille",
+ "label": "quille"
+ }
+ },
+ {
+ "pk": 285,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "recipient-fixe",
+ "label": "r\u00e9cipient fixe"
+ }
+ },
+ {
+ "pk": 286,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "rempart",
+ "label": "rempart"
+ }
+ },
+ {
+ "pk": 287,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "sarcophage",
+ "label": "sarcophage"
+ }
+ },
+ {
+ "pk": 288,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "silo",
+ "label": "silo"
+ }
+ },
+ {
+ "pk": 289,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "sol-doccupation",
+ "label": "sol d'occupation"
+ }
+ },
+ {
+ "pk": 290,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "sol-orne",
+ "label": "sol orn\u00e9"
+ }
+ },
+ {
+ "pk": 291,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "source-amenagee",
+ "label": "source am\u00e9nag\u00e9e"
+ }
+ },
+ {
+ "pk": 292,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "souterrain",
+ "label": "souterrain"
+ }
+ },
+ {
+ "pk": 293,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "statue",
+ "label": "statue"
+ }
+ },
+ {
+ "pk": 294,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "statue-menhir",
+ "label": "statue-menhir"
+ }
+ },
+ {
+ "pk": 295,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "stele",
+ "label": "st\u00e8le"
+ }
+ },
+ {
+ "pk": 296,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "talus",
+ "label": "talus"
+ }
+ },
+ {
+ "pk": 297,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "tour",
+ "label": "tour"
+ }
+ },
+ {
+ "pk": 298,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "trace-agraire",
+ "label": "trace agraire"
+ }
+ },
+ {
+ "pk": 299,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "train-datterrissage",
+ "label": "train d'atterrissage"
+ }
+ },
+ {
+ "pk": 300,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "tranchee-dextraction",
+ "label": "tranch\u00e9e d'extraction"
+ }
+ },
+ {
+ "pk": 301,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "trou-de-jauge",
+ "label": "trou de jauge"
+ }
+ },
+ {
+ "pk": 302,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "trou-de-poteau",
+ "label": "trou de poteau"
+ }
+ },
+ {
+ "pk": 303,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "trous-de-poteau-ensemble-de",
+ "label": "trous de poteau (ensemble de)"
+ }
+ },
+ {
"pk": 7,
"model": "archaeological_operations.remaintype",
"fields": {
@@ -1372,6 +2832,46 @@
}
},
{
+ "pk": 304,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "tunnel",
+ "label": "tunnel"
+ }
+ },
+ {
+ "pk": 305,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "urne",
+ "label": "urne"
+ }
+ },
+ {
+ "pk": 306,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "vaigre",
+ "label": "vaigre"
+ }
+ },
+ {
+ "pk": 307,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "verriere",
+ "label": "verri\u00e8re"
+ }
+ },
+ {
"pk": 1,
"model": "archaeological_operations.remaintype",
"fields": {
@@ -1382,16 +2882,23 @@
}
},
{
- "pk": 2,
- "model": "archaeological_operations.relationtype",
+ "pk": 308,
+ "model": "archaeological_operations.remaintype",
"fields": {
- "comment": "",
+ "comment": null,
"available": true,
- "label": "Est compris dans",
- "symmetrical": false,
- "inverse_relation": 1,
- "order": 1,
- "txt_idx": "is_in"
+ "txt_idx": "virure",
+ "label": "virure"
+ }
+ },
+ {
+ "pk": 309,
+ "model": "archaeological_operations.remaintype",
+ "fields": {
+ "comment": null,
+ "available": true,
+ "txt_idx": "zone-de-rejet",
+ "label": "zone de rejet"
}
},
{
@@ -1400,6 +2907,7 @@
"fields": {
"comment": "",
"available": true,
+ "tiny_label": null,
"label": "Comprend",
"symmetrical": false,
"inverse_relation": 2,
@@ -1408,10 +2916,38 @@
}
},
{
- "pk": 1,
+ "pk": 3,
+ "model": "archaeological_operations.relationtype",
+ "fields": {
+ "comment": "",
+ "available": true,
+ "tiny_label": null,
+ "label": "en relation vague avec",
+ "symmetrical": true,
+ "inverse_relation": null,
+ "order": 1,
+ "txt_idx": "fuzzy_relation"
+ }
+ },
+ {
+ "pk": 2,
+ "model": "archaeological_operations.relationtype",
+ "fields": {
+ "comment": "",
+ "available": true,
+ "tiny_label": null,
+ "label": "Est compris dans",
+ "symmetrical": false,
+ "inverse_relation": 1,
+ "order": 1,
+ "txt_idx": "is_in"
+ }
+ },
+ {
+ "pk": 3,
"model": "archaeological_operations.reportstate",
"fields": {
- "comment": "Le rapport est attendu mais non re\u00e7u",
+ "comment": "Ce rapport n'a pas encore \u00e9t\u00e9 re\u00e7u",
"available": true,
"txt_idx": "not_received",
"order": 1,
@@ -1419,69 +2955,80 @@
}
},
{
- "pk": 2,
+ "pk": 1,
"model": "archaeological_operations.reportstate",
"fields": {
- "comment": "Rapport re\u00e7u et non encore d\u00e9pouill\u00e9",
+ "comment": "Rapport re\u00e7u non d\u00e9pouill\u00e9",
"available": true,
- "txt_idx": "received_not_processed",
+ "txt_idx": "received",
"order": 2,
"label": "Re\u00e7u et non d\u00e9pouill\u00e9"
}
},
{
- "pk": 3,
+ "pk": 2,
+ "model": "archaeological_operations.reportstate",
+ "fields": {
+ "comment": "",
+ "available": true,
+ "txt_idx": "no_report",
+ "order": 2,
+ "label": "Rapport inexistant"
+ }
+ },
+ {
+ "pk": 7,
"model": "archaeological_operations.reportstate",
"fields": {
"comment": "Plusieurs rapports re\u00e7us et non d\u00e9pouill\u00e9s",
"available": true,
- "txt_idx": "received_not_processed_S",
+ "txt_idx": "received__not_processed",
"order": 3,
- "label": "Re\u00e7us et non d\u00e9pouill\u00e9s"
+ "label": "Re\u00e7us et NON d\u00e9pouill\u00e9s"
}
},
{
- "pk": 4,
+ "pk": 10,
"model": "archaeological_operations.reportstate",
"fields": {
- "comment": "Il n'existe pas de rapport pour cette op\u00e9ration",
+ "comment": "Les rapports ont \u00e9t\u00e9 re\u00e7us et d\u00e9pouill\u00e9s partiellement",
"available": true,
- "txt_idx": "no_report",
+ "txt_idx": "reports_received_partially_processed",
"order": 4,
- "label": "Rapport inexistant"
+ "label": "Re\u00e7us, un rapport d\u00e9pouill\u00e9, un autre non d\u00e9pouill\u00e9"
}
},
{
- "pk": 6,
+ "pk": 4,
"model": "archaeological_operations.reportstate",
"fields": {
- "comment": "Rapport unique re\u00e7u et d\u00e9pouill\u00e9",
+ "comment": "Il n'existe pas de rapport pour cette op\u00e9ration",
"available": true,
- "txt_idx": "received_and_processed",
+ "txt_idx": "no-report",
"order": 4,
- "label": "Re\u00e7u et d\u00e9pouill\u00e9"
+ "label": "Rapport inexistant"
}
},
{
- "pk": 5,
+ "pk": 8,
"model": "archaeological_operations.reportstate",
"fields": {
- "comment": "Tous les rapports ont \u00e9t\u00e9 re\u00e7us et d\u00e9pouill\u00e9s",
+ "comment": "Tous les rapports ont \u00e9t\u00e9 re\u00e7us et n'ont pas \u00e9t\u00e9 encore d\u00e9pouill\u00e9s",
"available": true,
- "txt_idx": "received_and_processed_S",
- "order": 5,
+ "txt_idx": "received_and_processed",
+ "order": 4,
"label": "Re\u00e7us et d\u00e9pouill\u00e9s"
}
},
{
- "pk": 7,
+ "pk": 9,
"model": "archaeological_operations.reportstate",
"fields": {
- "comment": "Les rapports ont \u00e9t\u00e9 re\u00e7us et d\u00e9pouill\u00e9s partiellement",
+ "comment": "Rapport unique re\u00e7u et d\u00e9pouill\u00e9",
"available": true,
- "txt_idx": "received_and_partially_processed",
- "order": 7,
- "label": "Re\u00e7us, un rapport d\u00e9pouill\u00e9, un autre non d\u00e9pouill\u00e9"
+ "txt_idx": "one_report_received_and_processed",
+ "order": 4,
+ "label": "Re\u00e7u et d\u00e9pouill\u00e9"
}
}
]
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index fc1003576..a12f245cb 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -261,8 +261,8 @@ class ParcelFormSet(FormSet):
except models.Parcel.DoesNotExist:
continue
ordering_keys[number] = [
- parcel.town, parcel.year, parcel.section,
- parcel.parcel_number]
+ parcel.public_domain, parcel.town, parcel.year,
+ parcel.section, parcel.parcel_number]
continue
if number not in ordering_keys:
ordering_keys[number] = ['', '', '', '', '']
@@ -844,7 +844,7 @@ class OperationFormGeneral(ManageOldType, forms.Form):
u"(ratio is preserved).</p>") % {
'width': settings.IMAGE_MAX_SIZE[0],
'height': settings.IMAGE_MAX_SIZE[1]}),
- required=False, widget=widgets.ImageFileInput())
+ max_length=255, required=False, widget=widgets.ImageFileInput())
def __init__(self, *args, **kwargs):
super(OperationFormGeneral, self).__init__(*args, **kwargs)
diff --git a/archaeological_operations/locale/django.pot b/archaeological_operations/locale/django.pot
index 69480db9b..0e55c760b 100644
--- a/archaeological_operations/locale/django.pot
+++ b/archaeological_operations/locale/django.pot
@@ -9,12 +9,12 @@ msgid ""
msgstr ""
#: forms.py:67 forms.py:369 forms.py:1004 forms.py:1026 forms.py:1030
-#: models.py:1052 templates/ishtar/sheet_operation.html:144
+#: models.py:1168 templates/ishtar/sheet_operation.html:144
#: templates/ishtar/blocks/window_tables/parcels.html:10
msgid "Parcels"
msgstr ""
-#: forms.py:70 forms.py:203 forms.py:980 models.py:1038
+#: forms.py:70 forms.py:203 forms.py:980 models.py:1154
#: templates/ishtar/blocks/window_tables/parcels.html:7
#: templates/ishtar/dashboards/dashboard_operation.html:432
#: templates/ishtar/dashboards/dashboard_operation.html:446
@@ -23,22 +23,22 @@ msgstr ""
msgid "Town"
msgstr ""
-#: forms.py:72 forms.py:459 forms.py:755 forms.py:1250 models.py:203
-#: models.py:855 models.py:1036
+#: forms.py:72 forms.py:459 forms.py:755 forms.py:1250 models.py:249
+#: models.py:971 models.py:1152
#: templates/ishtar/blocks/window_tables/parcels.html:8
msgid "Year"
msgstr ""
-#: forms.py:75 models.py:1039
+#: forms.py:75 models.py:1155
#: templates/ishtar/blocks/window_tables/parcels.html:9
msgid "Section"
msgstr ""
-#: forms.py:78 models.py:1041
+#: forms.py:78 models.py:1157
msgid "Parcel number"
msgstr ""
-#: forms.py:80 models.py:1043 models.py:1060 models.py:1109
+#: forms.py:80 models.py:1159 models.py:1176 models.py:1225
msgid "Public domain"
msgstr ""
@@ -74,8 +74,8 @@ msgstr ""
msgid "Relation type"
msgstr ""
-#: forms.py:381 ishtar_menu.py:30 models.py:298 models.py:753 models.py:778
-#: models.py:794 models.py:847 models.py:1035 wizards.py:339 wizards.py:350
+#: forms.py:381 ishtar_menu.py:30 models.py:344 models.py:804 models.py:834
+#: models.py:862 models.py:963 models.py:1151 wizards.py:339 wizards.py:350
#: templates/ishtar/sheet_operation.html:4
msgid "Operation"
msgstr ""
@@ -104,7 +104,7 @@ msgstr ""
msgid "Relations"
msgstr ""
-#: forms.py:460 forms.py:1221 models.py:204
+#: forms.py:460 forms.py:1221 models.py:250
msgid "Numeric reference"
msgstr ""
@@ -112,7 +112,7 @@ msgstr ""
msgid "Parcel (section/number/public domain)"
msgstr ""
-#: forms.py:469 forms.py:1264 models.py:754
+#: forms.py:469 forms.py:1264 models.py:805
#: templates/ishtar/dashboards/dashboard_operation.html:390
#: templates/ishtar/dashboards/dashboard_operation.html:411
#: templates/ishtar/dashboards/dashboard_operation.html:643
@@ -126,7 +126,7 @@ msgstr ""
msgid "Name"
msgstr ""
-#: forms.py:472 forms.py:675 forms.py:753 forms.py:1227 models.py:211
+#: forms.py:472 forms.py:675 forms.py:753 forms.py:1227 models.py:257
msgid "Operation type"
msgstr ""
@@ -134,24 +134,24 @@ msgstr ""
msgid "Is open?"
msgstr ""
-#: forms.py:483 forms.py:782 models.py:200
+#: forms.py:483 forms.py:782 models.py:246
msgid "In charge"
msgstr ""
-#: forms.py:490 models.py:841
+#: forms.py:490 models.py:957
msgid "Scientist in charge"
msgstr ""
-#: forms.py:492 forms.py:677 forms.py:773 models.py:198
+#: forms.py:492 forms.py:677 forms.py:773 models.py:244
msgid "Operator"
msgstr ""
-#: forms.py:499 forms.py:1097 models.py:89 models.py:213
+#: forms.py:499 forms.py:1097 models.py:89 models.py:259
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:10
msgid "Remains"
msgstr ""
-#: forms.py:500 forms.py:1075 forms.py:1094 models.py:87 models.py:219
+#: forms.py:500 forms.py:1075 forms.py:1094 models.py:87 models.py:265
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:9
msgid "Periods"
msgstr ""
@@ -184,19 +184,19 @@ msgstr ""
msgid "Abstract (full text search)"
msgstr ""
-#: forms.py:515 forms.py:835 models.py:267
+#: forms.py:515 forms.py:835 models.py:313
msgid "Comment about scientific documentation"
msgstr ""
-#: forms.py:516 forms.py:837 models.py:279
+#: forms.py:516 forms.py:837 models.py:325
msgid "Record quality"
msgstr ""
-#: forms.py:517 forms.py:805 models.py:231
+#: forms.py:517 forms.py:805 models.py:277
msgid "Report processing"
msgstr ""
-#: forms.py:519 forms.py:840 models.py:274
+#: forms.py:519 forms.py:840 models.py:320
msgid "Virtual operation"
msgstr ""
@@ -220,7 +220,7 @@ msgstr ""
msgid "Documentation deadline after"
msgstr ""
-#: forms.py:544 forms.py:825 models.py:286
+#: forms.py:544 forms.py:825 models.py:332
msgid "Documentation received"
msgstr ""
@@ -232,11 +232,11 @@ msgstr ""
msgid "Finds deadline after"
msgstr ""
-#: forms.py:550 forms.py:830 models.py:290
+#: forms.py:550 forms.py:830 models.py:336
msgid "Finds received"
msgstr ""
-#: forms.py:595 forms.py:1213 views.py:259
+#: forms.py:595 forms.py:1213 views.py:168
msgid "Operation search"
msgstr ""
@@ -244,11 +244,11 @@ msgstr ""
msgid "Associated file"
msgstr ""
-#: forms.py:643 forms.py:928 models.py:852 wizards.py:76
+#: forms.py:643 forms.py:928 models.py:968 wizards.py:76
msgid "Archaelogical file"
msgstr ""
-#: forms.py:650 forms.py:652 models.py:281
+#: forms.py:650 forms.py:652 models.py:327
msgid "Abstract"
msgstr ""
@@ -260,7 +260,7 @@ msgstr ""
msgid "years"
msgstr ""
-#: forms.py:657 models.py:184
+#: forms.py:657 models.py:230
msgid "Creation date"
msgstr ""
@@ -313,15 +313,15 @@ msgid "With finds"
msgstr ""
#: forms.py:736 forms.py:1322 templates/ishtar/sheet_administrativeact.html:13
-#: templates/ishtar/sheet_operation.html:20
+#: templates/ishtar/sheet_operation.html:24
msgid "General"
msgstr ""
-#: forms.py:751 models.py:264
+#: forms.py:751 models.py:310
msgid "Generic name"
msgstr ""
-#: forms.py:760 models.py:233
+#: forms.py:760 models.py:279
msgid "Old code"
msgstr ""
@@ -329,7 +329,7 @@ msgstr ""
msgid "Head scientist"
msgstr ""
-#: forms.py:779 models.py:263
+#: forms.py:779 models.py:309
msgid "Operator reference"
msgstr ""
@@ -337,23 +337,23 @@ msgstr ""
msgid "Total surface (m2)"
msgstr ""
-#: forms.py:798 models.py:53 models.py:187 models.py:1225
+#: forms.py:798 models.py:53 models.py:233 models.py:1341
msgid "Start date"
msgstr ""
-#: forms.py:800 models.py:189
+#: forms.py:800 models.py:235
msgid "Excavation end date"
msgstr ""
-#: forms.py:803 models.py:190
+#: forms.py:803 models.py:236
msgid "Report delivery date"
msgstr ""
-#: forms.py:822 models.py:283
+#: forms.py:822 models.py:329
msgid "Deadline for submission of the documentation"
msgstr ""
-#: forms.py:827 models.py:288
+#: forms.py:827 models.py:334
msgid "Deadline for submission of the finds"
msgstr ""
@@ -388,7 +388,7 @@ msgstr ""
msgid "Bad operation code"
msgstr ""
-#: forms.py:924 models.py:437
+#: forms.py:924 models.py:486
msgid "Operation code"
msgstr ""
@@ -396,20 +396,20 @@ msgstr ""
msgid "Preventive informations - excavation"
msgstr ""
-#: forms.py:951 models.py:217
+#: forms.py:951 models.py:263
#: templates/ishtar/dashboards/dashboard_operation.html:701
msgid "Cost (euros)"
msgstr ""
-#: forms.py:952 models.py:222
+#: forms.py:952 models.py:268
msgid "Scheduled man-days"
msgstr ""
-#: forms.py:954 models.py:225
+#: forms.py:954 models.py:271
msgid "Optional man-days"
msgstr ""
-#: forms.py:956 models.py:228
+#: forms.py:956 models.py:274
msgid "Effective man-days"
msgstr ""
@@ -417,23 +417,23 @@ msgstr ""
msgid "Preventive informations - diagnostic"
msgstr ""
-#: forms.py:969 models.py:247
+#: forms.py:969 models.py:293
msgid "Prescription on zoning"
msgstr ""
-#: forms.py:971 models.py:250
+#: forms.py:971 models.py:296
msgid "Prescription on large area"
msgstr ""
-#: forms.py:974 models.py:252
+#: forms.py:974 models.py:298
msgid "Prescription on geoarchaeological context"
msgstr ""
-#: forms.py:978 forms.py:1000 models.py:215 models.py:865
+#: forms.py:978 forms.py:1000 models.py:261 models.py:981
msgid "Towns"
msgstr ""
-#: forms.py:1007 models.py:1051 models.py:1223
+#: forms.py:1007 models.py:1167 models.py:1339
msgid "Parcel"
msgstr ""
@@ -462,7 +462,7 @@ msgstr ""
msgid "Archaeological site"
msgstr ""
-#: forms.py:1152 models.py:94 models.py:271
+#: forms.py:1152 models.py:94 models.py:317
#: templates/ishtar/sheet_operation.html:94
msgid "Archaeological sites"
msgstr ""
@@ -483,7 +483,7 @@ msgstr ""
msgid "Would you like to delete this operation?"
msgstr ""
-#: forms.py:1181 forms.py:1251 forms.py:1387 models.py:780 models.py:832
+#: forms.py:1181 forms.py:1251 forms.py:1387 models.py:836 models.py:948
msgid "Index"
msgstr ""
@@ -510,7 +510,7 @@ msgstr ""
msgid "You should select a document."
msgstr ""
-#: forms.py:1258 forms.py:1325 models.py:805 models.py:826
+#: forms.py:1258 forms.py:1325 models.py:873 models.py:942
msgid "Act type"
msgstr ""
@@ -518,12 +518,12 @@ msgstr ""
msgid "Indexed?"
msgstr ""
-#: forms.py:1265 forms.py:1330 models.py:856
+#: forms.py:1265 forms.py:1330 models.py:972
#: templates/ishtar/blocks/window_tables/administrativacts.html:10
msgid "Object"
msgstr ""
-#: forms.py:1302 views.py:415
+#: forms.py:1302 views.py:324
msgid "Administrative act search"
msgstr ""
@@ -531,7 +531,7 @@ msgstr ""
msgid "You should select an administrative act."
msgstr ""
-#: forms.py:1333 models.py:853
+#: forms.py:1333 models.py:969
msgid "Signature date"
msgstr ""
@@ -566,7 +566,7 @@ msgstr ""
msgid "Generate the associated doc?"
msgstr ""
-#: forms.py:1466 ishtar_menu.py:121 views.py:468
+#: forms.py:1466 ishtar_menu.py:121 views.py:377
msgctxt "admin act register"
msgid "Register"
msgstr ""
@@ -587,7 +587,7 @@ msgstr ""
msgid "Deletion"
msgstr ""
-#: ishtar_menu.py:58 models.py:872
+#: ishtar_menu.py:58 models.py:988
#: templates/ishtar/sheet_administrativeact.html:4
msgid "Administrative act"
msgstr ""
@@ -616,16 +616,16 @@ msgstr ""
msgid "General informations"
msgstr ""
-#: ishtar_menu.py:136 models.py:299
+#: ishtar_menu.py:136 models.py:345
#: templates/ishtar/dashboards/dashboard_operation.html:8
msgid "Operations"
msgstr ""
-#: models.py:52 models.py:70 models.py:1687
+#: models.py:52 models.py:70 models.py:1803
msgid "Order"
msgstr ""
-#: models.py:54 models.py:1226
+#: models.py:54 models.py:1342
msgid "End date"
msgstr ""
@@ -681,353 +681,353 @@ msgstr ""
msgid "Reliable"
msgstr ""
-#: models.py:186
+#: models.py:232
msgid "Closing date"
msgstr ""
-#: models.py:193
+#: models.py:239
msgid "In charge scientist"
msgstr ""
-#: models.py:208 models.py:1031
+#: models.py:254 models.py:1147
msgid "File"
msgstr ""
-#: models.py:212
+#: models.py:258
msgid "Surface (m2)"
msgstr ""
-#: models.py:265
+#: models.py:311
msgid "General comment"
msgstr ""
-#: models.py:268
+#: models.py:314
msgid "Cached name"
msgstr ""
-#: models.py:276
+#: models.py:322
msgid ""
"If checked, it means that this operation have not been officialy registered."
msgstr ""
-#: models.py:292
+#: models.py:338
msgid "Point"
msgstr ""
-#: models.py:293
+#: models.py:339
msgid "Multi polygon"
msgstr ""
-#: models.py:301
+#: models.py:347
msgid "Can view all Operations"
msgstr ""
-#: models.py:302
+#: models.py:348
msgid "Can view own Operation"
msgstr ""
-#: models.py:303
+#: models.py:349
msgid "Can add own Operation"
msgstr ""
-#: models.py:304
+#: models.py:350
msgid "Can change own Operation"
msgstr ""
-#: models.py:305
+#: models.py:351
msgid "Can delete own Operation"
msgstr ""
-#: models.py:306
+#: models.py:352
msgid "Can close Operation"
msgstr ""
-#: models.py:334
+#: models.py:380
msgid "OPE"
msgstr ""
-#: models.py:391
+#: models.py:440
msgid "Intercommunal"
msgstr ""
-#: models.py:422 models.py:793
+#: models.py:471 models.py:861
msgid "Archaeological file"
msgstr ""
-#: models.py:423
+#: models.py:472
msgid "Code patriarche"
msgstr ""
-#: models.py:463
+#: models.py:512
msgid "This operation code already exists for this year"
msgstr ""
-#: models.py:496
+#: models.py:545
msgid "Number of parcels"
msgstr ""
-#: models.py:514
+#: models.py:563
msgid "Number of administrative acts"
msgstr ""
-#: models.py:522
+#: models.py:571
msgid "Number of indexed administrative acts"
msgstr ""
-#: models.py:530
+#: models.py:579
msgid "Number of context records"
msgstr ""
-#: models.py:566
+#: models.py:615
msgid "Number of finds"
msgstr ""
-#: models.py:611
+#: models.py:660
msgid "No type"
msgstr ""
-#: models.py:642
+#: models.py:691
msgid "Number of sources"
msgstr ""
-#: models.py:684 templates/ishtar/dashboards/dashboard_operation.html:309
+#: models.py:733 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:724
+#: models.py:775
msgid "Inverse relation"
msgstr ""
-#: models.py:728
+#: models.py:779
msgid "Operation relation type"
msgstr ""
-#: models.py:729
+#: models.py:780
msgid "Operation relation types"
msgstr ""
-#: models.py:742
+#: models.py:793
msgid "Operation record relation"
msgstr ""
-#: models.py:743
+#: models.py:794
msgid "Operation record relations"
msgstr ""
-#: models.py:764
+#: models.py:840
msgid "Operation documentation"
msgstr ""
-#: models.py:765
+#: models.py:841
msgid "Operation documentations"
msgstr ""
-#: models.py:768
+#: models.py:844
msgid "Can view all Operation sources"
msgstr ""
-#: models.py:770
+#: models.py:846
msgid "Can view own Operation source"
msgstr ""
-#: models.py:772
+#: models.py:848
msgid "Can add own Operation source"
msgstr ""
-#: models.py:774
+#: models.py:850
msgid "Can change own Operation source"
msgstr ""
-#: models.py:776
+#: models.py:852
msgid "Can delete own Operation source"
msgstr ""
-#: models.py:796
+#: models.py:864
msgid "Intended to"
msgstr ""
-#: models.py:798
+#: models.py:866
msgid "Code"
msgstr ""
-#: models.py:801
+#: models.py:869
msgid "Associated template"
msgstr ""
-#: models.py:802
+#: models.py:870
msgid "Indexed"
msgstr ""
-#: models.py:806
+#: models.py:874
msgid "Act types"
msgstr ""
-#: models.py:830
+#: models.py:946
msgid "Person in charge of the operation"
msgstr ""
-#: models.py:836
+#: models.py:952
msgid "Archaeological preventive operator"
msgstr ""
-#: models.py:844
+#: models.py:960
msgid "Signatory"
msgstr ""
-#: models.py:862
+#: models.py:978
msgid "Departments"
msgstr ""
-#: models.py:863
+#: models.py:979
msgid "Cached values get from associated departments"
msgstr ""
-#: models.py:866
+#: models.py:982
msgid "Cached values get from associated towns"
msgstr ""
-#: models.py:873 templates/ishtar/sheet_operation.html:102
+#: models.py:989 templates/ishtar/sheet_operation.html:102
#: templates/ishtar/sheet_operation.html:138
msgid "Administrative acts"
msgstr ""
-#: models.py:876
+#: models.py:992
msgid "Can view all Administrative acts"
msgstr ""
-#: models.py:878
+#: models.py:994
msgid "Can view own Administrative act"
msgstr ""
-#: models.py:880
+#: models.py:996
msgid "Can add own Administrative act"
msgstr ""
-#: models.py:882
+#: models.py:998
msgid "Can change own Administrative act"
msgstr ""
-#: models.py:884
+#: models.py:1000
msgid "Can delete own Administrative act"
msgstr ""
-#: models.py:893
+#: models.py:1009
#: templates/ishtar/blocks/window_tables/administrativacts.html:7
#: templates/ishtar/blocks/window_tables/archaeologicalsites.html:7
msgid "Ref."
msgstr ""
-#: models.py:976
+#: models.py:1092
msgid "This index already exists for this year"
msgstr ""
-#: models.py:1044
+#: models.py:1160
msgid "External ID"
msgstr ""
-#: models.py:1047
+#: models.py:1163
msgid "External ID is set automatically"
msgstr ""
-#: models.py:1048
+#: models.py:1164
msgid "Address - Locality"
msgstr ""
-#: models.py:1221
+#: models.py:1337
msgid "Owner"
msgstr ""
-#: models.py:1229
+#: models.py:1345
msgid "Parcel owner"
msgstr ""
-#: models.py:1230
+#: models.py:1346
msgid "Parcel owners"
msgstr ""
-#: models.py:1256
+#: models.py:1372
msgid "Recorded"
msgstr ""
-#: models.py:1257
+#: models.py:1373
msgid "Effective"
msgstr ""
-#: models.py:1258
+#: models.py:1374
msgid "Active"
msgstr ""
-#: models.py:1259
+#: models.py:1375
msgid "Field completed"
msgstr ""
-#: models.py:1260
+#: models.py:1376
msgid "Associated report"
msgstr ""
-#: models.py:1261
+#: models.py:1377
msgid "Closed"
msgstr ""
-#: models.py:1262
+#: models.py:1378
msgid "Documented and closed"
msgstr ""
-#: models.py:1688
+#: models.py:1804
msgid "Is preventive"
msgstr ""
-#: models.py:1691
+#: models.py:1807
msgid "Operation type old"
msgstr ""
-#: models.py:1692
+#: models.py:1808
msgid "Operation types old"
msgstr ""
-#: views.py:305
+#: views.py:214
msgid "New operation"
msgstr ""
-#: views.py:324
+#: views.py:233
msgid "Operation modification"
msgstr ""
-#: views.py:367
+#: views.py:276
msgid "Operation closing"
msgstr ""
-#: views.py:373
+#: views.py:282
msgid "Operation deletion"
msgstr ""
-#: views.py:378
+#: views.py:287
msgid "Operation: source search"
msgstr ""
-#: views.py:386
+#: views.py:295
msgid "Operation: source creation"
msgstr ""
-#: views.py:394
+#: views.py:303
msgid "Operation: source modification"
msgstr ""
-#: views.py:409
+#: views.py:318
msgid "Operation: source deletion"
msgstr ""
-#: views.py:428
+#: views.py:337
msgid "Operation: new administrative act"
msgstr ""
-#: views.py:438
+#: views.py:347
msgid "Operation: administrative act modification"
msgstr ""
-#: views.py:462
+#: views.py:371
msgid "Operation: administrative act deletion"
msgstr ""
diff --git a/archaeological_operations/migrations/0061_regenerate_cached_label.py b/archaeological_operations/migrations/0061_regenerate_cached_label.py
new file mode 100644
index 000000000..50a2b43fe
--- /dev/null
+++ b/archaeological_operations/migrations/0061_regenerate_cached_label.py
@@ -0,0 +1,661 @@
+# -*- coding: utf-8 -*-
+import sys
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ from archaeological_operations.models import Operation
+ q = Operation.objects
+ nb = q.count()
+ sys.stdout.write("Force regenerating cache...\n")
+ for idx, ope in enumerate(q.all()):
+ sys.stdout.write("\r{}/{}".format(idx + 1, nb))
+ sys.stdout.flush()
+ ope.skip_history_when_saving = True
+ ope.save()
+
+ def backwards(self, orm):
+ pass
+
+ 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', [], {'related_name': "'operations'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}),
+ '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']},
+ 'advanced_shortcut_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ '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']
diff --git a/archaeological_operations/migrations/0062_auto__chg_field_operationsource_image__chg_field_operationsource_thumb.py b/archaeological_operations/migrations/0062_auto__chg_field_operationsource_image__chg_field_operationsource_thumb.py
new file mode 100644
index 000000000..528a6533b
--- /dev/null
+++ b/archaeological_operations/migrations/0062_auto__chg_field_operationsource_image__chg_field_operationsource_thumb.py
@@ -0,0 +1,688 @@
+# -*- 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):
+
+ # Changing field 'OperationSource.image'
+ db.alter_column('archaeological_operations_operationsource', 'image', self.gf('django.db.models.fields.files.ImageField')(max_length=255, null=True))
+
+ # Changing field 'OperationSource.thumbnail'
+ db.alter_column('archaeological_operations_operationsource', 'thumbnail', self.gf('django.db.models.fields.files.ImageField')(max_length=255, null=True))
+
+ # Changing field 'HistoricalOperation.thumbnail'
+ db.alter_column('archaeological_operations_historicaloperation', 'thumbnail', self.gf('django.db.models.fields.files.ImageField')(max_length=255, null=True))
+
+ # Changing field 'HistoricalOperation.image'
+ db.alter_column('archaeological_operations_historicaloperation', 'image', self.gf('django.db.models.fields.files.ImageField')(max_length=255, null=True))
+
+ # Changing field 'Operation.image'
+ db.alter_column('archaeological_operations_operation', 'image', self.gf('django.db.models.fields.files.ImageField')(max_length=255, null=True))
+
+ # Changing field 'Operation.thumbnail'
+ db.alter_column('archaeological_operations_operation', 'thumbnail', self.gf('django.db.models.fields.files.ImageField')(max_length=255, null=True))
+
+ def backwards(self, orm):
+
+ # Changing field 'OperationSource.image'
+ db.alter_column('archaeological_operations_operationsource', 'image', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True))
+
+ # Changing field 'OperationSource.thumbnail'
+ db.alter_column('archaeological_operations_operationsource', 'thumbnail', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True))
+
+ # Changing field 'HistoricalOperation.thumbnail'
+ db.alter_column('archaeological_operations_historicaloperation', 'thumbnail', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True))
+
+ # Changing field 'HistoricalOperation.image'
+ db.alter_column('archaeological_operations_historicaloperation', 'image', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True))
+
+ # Changing field 'Operation.image'
+ db.alter_column('archaeological_operations_operation', 'image', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True))
+
+ # Changing field 'Operation.thumbnail'
+ db.alter_column('archaeological_operations_operation', 'thumbnail', self.gf('django.db.models.fields.files.ImageField')(max_length=100, null=True))
+
+ 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': '255', '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': '255', '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': '255', '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': '255', 'null': 'True', 'blank': 'True'}),
+ 'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'operations'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}),
+ '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': '255', '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': '255', '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']},
+ 'advanced_shortcut_menu': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ '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 d64936c90..14e5e1f7e 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -177,10 +177,56 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms,
QUALITY_DICT = dict(QUALITY)
SHOW_URL = 'show-operation'
TABLE_COLS = ['year_index', 'operation_type', 'remains', 'towns',
- 'start_date', 'excavation_end_date']
- TABLE_COLS.insert(4, 'associated_file_short_label')
+ 'associated_file_short_label', 'start_date',
+ 'excavation_end_date']
IMAGE_PREFIX = 'operations/'
SLUG = 'operation'
+
+ # search parameters
+ BOOL_FIELDS = ['end_date__isnull', 'virtual_operation',
+ 'documentation_received', 'finds_received']
+ DATED_FIELDS = [
+ 'start_date__lte', 'start_date__gte', 'excavation_end_date__lte',
+ 'excavation_end_date__gte', 'documentation_deadline__lte',
+ 'documentation_deadline__gte', 'finds_deadline__lte',
+ 'finds_deadline__gte']
+ RELATIVE_SESSION_NAMES = [('file', 'associated_file__pk')]
+ EXTRA_REQUEST_KEYS = {
+ 'common_name': 'common_name__icontains',
+ 'cached_label': 'cached_label__icontains',
+ 'comment': 'comment__icontains',
+ 'scientific_documentation_comment':
+ 'scientific_documentation_comment__icontains',
+ 'abstract': 'abstract__icontains',
+ 'end_date': 'end_date__isnull',
+ 'year_index': ('year', 'operation_code'),
+ 'start_before': 'start_date__lte',
+ 'start_after': 'start_date__gte',
+ 'end_before': 'excavation_end_date__lte',
+ 'end_after': 'excavation_end_date__gte',
+ 'towns__numero_insee__startswith':
+ 'towns__numero_insee__startswith',
+ 'parcel_0': ('parcels__section',
+ 'associated_file__parcels__section'),
+ 'parcel_1': (
+ 'parcels__parcel_number',
+ 'associated_file__parcels__parcel_number'),
+ 'parcel_2': (
+ 'parcels__public_domain',
+ 'associated_file__parcels__public_domain'),
+ 'history_creator':
+ 'history_creator__ishtaruser__person__pk',
+ 'history_modifier':
+ 'history_modifier__ishtaruser__person__pk',
+ 'archaeological_sites':
+ 'archaeological_sites__pk',
+ 'documentation_deadline_before': 'documentation_deadline__lte',
+ 'documentation_deadline_after': 'documentation_deadline__gte',
+ 'finds_deadline_before': 'finds_deadline__lte',
+ 'finds_deadline_after': 'finds_deadline__gte',
+ }
+
+ # fields definition
creation_date = models.DateField(_(u"Creation date"),
default=datetime.date.today)
end_date = models.DateField(_(u"Closing date"), null=True, blank=True)
@@ -387,6 +433,9 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms,
cached_label = settings.JOINT.join(items)
return cached_label
+ def _get_associated_cached_labels(self):
+ return list(self.context_record.all())
+
def get_town_label(self):
lbl = unicode(_('Intercommunal'))
if self.towns.count() == 1:
@@ -701,6 +750,7 @@ def operation_post_save(sender, **kwargs):
if not kwargs['instance']:
return
operation = kwargs['instance']
+ operation.skip_history_when_saving = True
if operation.fnap_financing and operation.cost:
fnap_cost = int(float(operation.cost) / 100 * operation.fnap_financing)
if not operation.fnap_cost or operation.fnap_cost != fnap_cost:
@@ -708,8 +758,9 @@ def operation_post_save(sender, **kwargs):
operation.save()
elif operation.fnap_cost and operation.cost:
fnap_percent = float(operation.fnap_cost) * 100 / operation.cost
- operation.fnap_financing = fnap_percent
- operation.save()
+ if operation.fnap_financing != fnap_percent:
+ operation.fnap_financing = fnap_percent
+ operation.save()
cached_label_changed(sender, **kwargs)
if operation.associated_file:
operation.associated_file.update_short_menu_class()
@@ -760,6 +811,31 @@ class OperationByDepartment(models.Model):
class OperationSource(Source):
+ SHOW_URL = 'show-operationsource'
+ MODIFY_URL = 'operation_source_modify'
+ TABLE_COLS = ['operation.year', 'operation.operation_code', 'index'] + \
+ Source.TABLE_COLS
+
+ # search parameters
+ BOOL_FIELDS = ['duplicate']
+ EXTRA_REQUEST_KEYS = {
+ 'title': 'title__icontains',
+ 'description': 'description__icontains',
+ 'comment': 'comment__icontains',
+ 'additional_information': 'additional_information__icontains',
+ 'person': 'authors__person__pk',
+ 'operation__towns': 'operation__towns__pk',
+ 'operation__operation_code': 'operation__operation_code',
+ 'operation__code_patriarche': 'operation__code_patriarche',
+ 'operation__operation_type': 'operation__operation_type__pk',
+ 'operation__year': 'operation__year'}
+
+ # fields
+ operation = models.ForeignKey(Operation, verbose_name=_(u"Operation"),
+ related_name="source")
+ index = models.IntegerField(verbose_name=_(u"Index"), blank=True,
+ null=True)
+
class Meta:
verbose_name = _(u"Operation documentation")
verbose_name_plural = _(u"Operation documentations")
@@ -775,14 +851,6 @@ class OperationSource(Source):
("delete_own_operationsource",
ugettext(u"Can delete own Operation source")),
)
- operation = models.ForeignKey(Operation, verbose_name=_(u"Operation"),
- related_name="source")
- index = models.IntegerField(verbose_name=_(u"Index"), blank=True,
- null=True)
- TABLE_COLS = ['operation.year', 'operation.operation_code', 'index'] + \
- Source.TABLE_COLS
- SHOW_URL = 'show-operationsource'
- MODIFY_URL = 'operation_source_modify'
@property
def owner(self):
@@ -823,6 +891,54 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter):
TABLE_COLS.append('departments_label')
TABLE_COLS_FILE.append('departments_label')
TABLE_COLS_OPE.append('departments_label')
+
+ # search parameters
+ DATED_FIELDS = ['signature_date__lte', 'signature_date__gte']
+ ASSOCIATED_MODELS = [
+ ('File', 'associated_file'),
+ (Person, 'associated_file__general_contractor')]
+ EXTRA_REQUEST_KEYS = {
+ 'act_object': 'act_object__icontains',
+ 'act_type__intented_to': 'act_type__intented_to',
+ 'associated_file__general_contractor__attached_to':
+ 'associated_file__general_contractor__attached_to__pk',
+ 'associated_file__name': 'associated_file__name__icontains',
+ 'associated_file__operations__code_patriarche':
+ 'associated_file__operations__code_patriarche',
+ 'associated_file__permit_reference':
+ 'associated_file__permit_reference__icontains',
+ 'associated_file__towns': 'associated_file__towns__pk',
+ 'associated_file__towns__numero_insee__startswith':
+ 'associated_file__towns__numero_insee__startswith',
+ 'indexed': 'index__isnull',
+ 'history_creator':
+ 'history_creator__ishtaruser__person__pk',
+ 'history_modifier':
+ 'history_modifier__ishtaruser__person__pk',
+ 'operation__code_patriarche': 'operation__code_patriarche',
+ 'operation__towns': 'operation__towns__pk',
+ 'operation__towns__numero_insee__startswith':
+ 'operation__towns__numero_insee__startswith',
+ 'parcel_0': ('associated_file__parcels__section',
+ 'operation__parcels__section',
+ 'operation__associated_file__parcels__section'),
+ 'parcel_1': (
+ 'associated_file__parcels__parcel_number'
+ 'operation__parcels__parcel_number',
+ 'operation__associated_file__parcels__parcel_number'),
+ 'parcel_2': (
+ 'associated_file__parcels__public_domain',
+ 'operation__parcels__public_domain',
+ 'operation__associated_file__parcels__public_domain'),
+ 'signature_date_before': 'signature_date__lte',
+ 'signature_date_after': 'signature_date__gte',
+ 'year': 'signature_date__year',
+ }
+ REVERSED_BOOL_FIELDS = ['index__isnull']
+ RELATIVE_SESSION_NAMES = [('operation', 'operation__pk'),
+ ('file', 'associated_file__pk')]
+
+ # fields
act_type = models.ForeignKey(ActType, verbose_name=_(u"Act type"))
in_charge = models.ForeignKey(
Person, blank=True, null=True,
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 07f8d8ab0..daddb42d6 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -17,12 +17,12 @@
<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {%trans "Patriarche OA code not yet recorded!"%}</p>
{% endif %}
+<p class='window-refs'>{% if item.year or item.operation_code %}{{item.year|default:''}}-{{item.operation_code|default:''}}{% endif %}{% if item.code_patriarche %} &ndash; OA{{item.code_patriarche}}{% endif %}
+</p>
+<p class='window-refs'>{{item.common_name|default:''}}</p>
+
<h3>{% trans "General"%}</h3>
<ul class='form-flex'>
-{% field_li "Name" item.common_name %}
-{% field_li "Year" item.year %}
-{% field_li "Numeric reference" item.operation_code %}
-{% field_li "Code patriarche" item.code_patriarche 'OA' %}
{% field_li "Old code" item.old_code %}
<li><label>{%trans "Last modification date:"%}</label> <span class='value'>{% if item.history_date %}{{ item.history_date }}{% else %}{{ item.history.all.0.history_date }}{% endif %}</span></li> <!-- date = now -->
{% field_li "Created by" item.history_creator.ishtaruser.full_label %}
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index ae82e9e89..18d57e617 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -136,112 +136,21 @@ def get_available_operation_code(request, year=None):
models.Operation.get_available_operation_code(year)})
return HttpResponse(data, mimetype='text/plain')
-get_operation = get_item(
- models.Operation, 'get_operation', 'operation',
- bool_fields=['end_date__isnull', 'virtual_operation',
- 'documentation_received', 'finds_received'],
- dated_fields=['start_date__lte', 'start_date__gte',
- 'excavation_end_date__lte', 'excavation_end_date__gte',
- 'documentation_deadline__lte', 'documentation_deadline__gte',
- 'finds_deadline__lte', 'finds_deadline__gte',
- ],
- relative_session_names=[('file', 'associated_file__pk')],
- extra_request_keys={
- 'common_name': 'common_name__icontains',
- 'cached_label': 'cached_label__icontains',
- 'comment': 'comment__icontains',
- 'scientific_documentation_comment':
- 'scientific_documentation_comment__icontains',
- 'abstract': 'abstract__icontains',
- 'end_date': 'end_date__isnull',
- 'year_index': ('year', 'operation_code'),
- 'start_before': 'start_date__lte',
- 'start_after': 'start_date__gte',
- 'end_before': 'excavation_end_date__lte',
- 'end_after': 'excavation_end_date__gte',
- 'towns__numero_insee__startswith':
- 'towns__numero_insee__startswith',
- 'parcel_0': ('parcels__section',
- 'associated_file__parcels__section'),
- 'parcel_1': (
- 'parcels__parcel_number',
- 'associated_file__parcels__parcel_number'),
- 'parcel_2': (
- 'parcels__public_domain',
- 'associated_file__parcels__public_domain'),
- 'history_creator':
- 'history_creator__ishtaruser__person__pk',
- 'history_modifier':
- 'history_modifier__ishtaruser__person__pk',
- 'archaeological_sites':
- 'archaeological_sites__pk',
- 'documentation_deadline_before': 'documentation_deadline__lte',
- 'documentation_deadline_after': 'documentation_deadline__gte',
- 'finds_deadline_before': 'finds_deadline__lte',
- 'finds_deadline_after': 'finds_deadline__gte',
- },
-)
+get_operation = get_item(models.Operation, 'get_operation', 'operation')
+
show_operation = show_item(models.Operation, 'operation')
revert_operation = revert_item(models.Operation)
show_operationsource = show_item(models.OperationSource, 'operationsource')
-get_operationsource = get_item(
- models.OperationSource,
- 'get_operationsource', 'operationsource',
- bool_fields=['duplicate'],
- extra_request_keys={
- 'title': 'title__icontains',
- 'description': 'description__icontains',
- 'comment': 'comment__icontains',
- 'additional_information': 'additional_information__icontains',
- 'person': 'authors__person__pk',
- 'operation__towns': 'operation__towns__pk',
- 'operation__operation_code': 'operation__operation_code',
- 'operation__code_patriarche': 'operation__code_patriarche',
- 'operation__operation_type': 'operation__operation_type__pk',
- 'operation__year': 'operation__year'})
+get_operationsource = get_item(models.OperationSource, 'get_operationsource',
+ 'operationsource')
get_administrativeactop = get_item(
- models.AdministrativeAct,
- 'get_administrativeactop', 'administrativeactop',
- extra_request_keys={
- 'associated_file__towns': 'associated_file__towns__pk',
- 'operation__towns': 'operation__towns__pk',
- 'operation__code_patriarche': 'operation__code_patriarche',
- 'act_type__intented_to': 'act_type__intented_to',
- 'year': 'signature_date__year',
- 'act_object': 'act_object__icontains',
- 'history_creator':
- 'history_creator__ishtaruser__person__pk',
- 'history_modifier':
- 'history_modifier__ishtaruser__person__pk',
- 'operation__towns__numero_insee__startswith':
- 'operation__towns__numero_insee__startswith',
- 'indexed': 'index__isnull',
- 'parcel_0': ('operation__parcels__section',
- 'operation__associated_file__parcels__section'),
- 'parcel_1': (
- 'operation__parcels__parcel_number',
- 'operation__associated_file__parcels__parcel_number'),
- 'parcel_2': (
- 'operation__parcels__public_domain',
- 'operation__associated_file__parcels__public_domain'),
- },
- reversed_bool_fields=['index__isnull'],
- relative_session_names=[('operation', 'operation__pk')])
+ models.AdministrativeAct, 'get_administrativeactop', 'administrativeactop')
get_administrativeact = get_item(
- models.AdministrativeAct,
- 'get_administrativeact', 'administrativeact',
- extra_request_keys={'year': 'signature_date__year',
- 'indexed': 'index__isnull',
- 'history_creator':
- 'history_creator__ishtaruser__person__pk',
- 'act_object': 'act_object__icontains',
- 'operation__towns__numero_insee__startswith':
- 'operation__towns__numero_insee__startswith',
- 'operation__towns': 'operation__towns__pk'},
- reversed_bool_fields=['index__isnull'],)
+ models.AdministrativeAct, 'get_administrativeact', 'administrativeact')
+
show_administrativeact = show_item(models.AdministrativeAct,
'administrativeact')