diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/context_processors.py | 6 | ||||
| -rw-r--r-- | ishtar_common/fixtures/initial_importtypes-fr.json | 843 | ||||
| -rw-r--r-- | ishtar_common/locale/django.pot | 688 | ||||
| -rw-r--r-- | ishtar_common/migrations/0069_auto__chg_field_import_error_file__chg_field_import_match_file__chg_fi.py | 507 | ||||
| -rw-r--r-- | ishtar_common/models.py | 14 | ||||
| -rw-r--r-- | ishtar_common/static/media/style.css | 2 | ||||
| -rw-r--r-- | ishtar_common/templates/base.html | 7 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/footer.html | 3 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/wizard/default_wizard.html | 5 | ||||
| -rw-r--r-- | ishtar_common/tests.py | 24 | ||||
| -rw-r--r-- | ishtar_common/views.py | 4 |
11 files changed, 1368 insertions, 735 deletions
diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py index 47cbac02d..8e14d8506 100644 --- a/ishtar_common/context_processors.py +++ b/ishtar_common/context_processors.py @@ -20,7 +20,7 @@ from django.conf import settings from django.contrib.sites.models import Site -from ishtar_common.version import VERSION +from ishtar_common.version import __version__ from ishtar_common.models import get_current_profile from menus import Menu @@ -54,9 +54,9 @@ def get_base_context(request): dct['JQUERY_URL'] = settings.JQUERY_URL dct['JQUERY_UI_URL'] = settings.JQUERY_UI_URL dct['COUNTRY'] = settings.COUNTRY - dct['VERSION'] = u".".join([unicode(n) for n in VERSION]) + dct['VERSION'] = __version__ if settings.EXTRA_VERSION: - dct['VERSION'] += unicode(settings.EXTRA_VERSION) + dct['VERSION'] += "-" + unicode(settings.EXTRA_VERSION) profile = get_current_profile() if profile: dct['raw_css'] = profile.get_raw_css() diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index 90b6fa225..a8a7c8935 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -2533,7 +2533,7 @@ "description": "Index (num\u00e9ro par ann\u00e9e), le couple ann\u00e9e + index doit \u00eatre unique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Index (num\u00e9ro par ann\u00e9e)", "importer_type": 17 } }, @@ -2545,7 +2545,7 @@ "description": "Type d'op\u00e9ration (parmi une liste)", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Type d'op\u00e9ration", "importer_type": 17 } }, @@ -2569,7 +2569,7 @@ "description": "R\u00e9f\u00e9rence du dossier administratif associ\u00e9 \u00e0 l'op\u00e9ration sous la forme ANNEE-INDEX. Exemple : \"2002-4\".", "regexp_pre_filter": null, "required": false, - "label": "", + "label": "R\u00e9f\u00e9rence du dossier administratif", "importer_type": 17 } }, @@ -2581,7 +2581,7 @@ "description": "Identifiants des sites (entit\u00e9s arch\u00e9ologiques) concern\u00e9es par l'op\u00e9ration, s\u00e9par\u00e9es par \u00ab\u00a0&\u00a0\u00bb. \r\nExemple : \"44 125 0028 & 44 125 0029\"", "regexp_pre_filter": null, "required": false, - "label": "", + "label": "Identifiants des sites (EAs)", "importer_type": 17 } }, @@ -2593,7 +2593,7 @@ "description": "Types de vestiges (s\u00e9par\u00e9s par un \u00ab\u00a0&\u00a0\u00bb)\r\nExemple : \"four & fosses & villa\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Types de vestiges", "importer_type": 17 } }, @@ -2605,7 +2605,7 @@ "description": "P\u00e9riodes concern\u00e9es (s\u00e9par\u00e9es par un \u00ab\u00a0&\u00a0\u00bb). \r\nExemple : \"Gallo-romain & Fer & Med\".", "regexp_pre_filter": null, "required": false, - "label": "", + "label": "P\u00e9riodes", "importer_type": 17 } }, @@ -2614,10 +2614,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 11, - "description": "Titre (M., Mme), du responsable d'op\u00e9ration (RO)", + "description": "Titre (M., Mme, etc.) du responsable scientifique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Titre du responsable scientifique", "importer_type": 17 } }, @@ -2626,10 +2626,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 12, - "description": "Pr\u00e9nom du Responsable scientifique (responsable d'op\u00e9ration)", + "description": "Pr\u00e9nom du responsable scientifique (responsable d'op\u00e9ration)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Pr\u00e9nom du responsable scientifique", "importer_type": 17 } }, @@ -2638,10 +2638,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 13, - "description": "Nom du Responsable scientifique (responsable d'op\u00e9ration)", + "description": "Nom du responsable scientifique (responsable d'op\u00e9ration)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nom du responsable scientifique", "importer_type": 17 } }, @@ -2650,10 +2650,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 14, - "description": "Rattachement du Responsable scientifique (responsable d'op\u00e9ration)\r\nExemple : \"INRAP\" ou plus pr\u00e9cis \"INRAP Direction interr\u00e9gionale Grand Ouest\" selon votre degr\u00e9 de pr\u00e9cision dans la gestion des rattachements et des organisations.", + "description": "Rattachement du responsable scientifique (responsable d'op\u00e9ration)\r\nExemple : \"INRAP\" ou plus pr\u00e9cis \"INRAP Direction interr\u00e9gionale Grand Ouest\" selon votre degr\u00e9 de pr\u00e9cision dans la gestion des rattachements et des organisations.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Rattachement du responsable scientifique", "importer_type": 17 } }, @@ -2665,7 +2665,7 @@ "description": "Nom de l'op\u00e9rateur (organisation). Peut \u00eatre diff\u00e9rent de l'organisation de rattachement du responsable d'op\u00e9ration.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nom de l'op\u00e9rateur", "importer_type": 17 } }, @@ -2677,7 +2677,7 @@ "description": "R\u00e9f\u00e9rence de l'op\u00e9rateur (code ou autre r\u00e9f\u00e9rence interne de l'op\u00e9rateur)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "R\u00e9f\u00e9rence de l'op\u00e9rateur", "importer_type": 17 } }, @@ -2686,10 +2686,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 17, - "description": "Titre (M., Mme), du responsable du suivi scientifique", + "description": "Titre (M., Mme, etc.) du responsable du suivi scientifique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Titre du responsable du suivi scientifique", "importer_type": 17 } }, @@ -2701,7 +2701,7 @@ "description": "Pr\u00e9nom du responsable du suivi scientifique (ex\u00a0: resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Pr\u00e9nom du responsable du suivi scientifique", "importer_type": 17 } }, @@ -2713,7 +2713,7 @@ "description": "Nom du responsable du suivi scientifique (ex : resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nom du responsable du suivi scientifique", "importer_type": 17 } }, @@ -2725,7 +2725,7 @@ "description": "Rattachement du resp. du suivi scientifique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Rattachement du responsable du suivi scientifique", "importer_type": 17 } }, @@ -2737,7 +2737,7 @@ "description": "Surface couverte par l'op\u00e9ration (m2)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Surface couverte par l'op\u00e9ration", "importer_type": 17 } }, @@ -2749,7 +2749,7 @@ "description": "Date de d\u00e9but de l'op\u00e9ration (d\u00e9but du terrain d'ordinaire mais vous pouvez utiliser autre chose)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date de d\u00e9but de l'op\u00e9ration", "importer_type": 17 } }, @@ -2761,7 +2761,7 @@ "description": "Date de fin de l'op\u00e9ration (fin du terrain d'ordinaire mais vous pouvez utiliser autre chose)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date de fin de l'op\u00e9ration", "importer_type": 17 } }, @@ -2773,7 +2773,7 @@ "description": "Date de cl\u00f4ture (peut-\u00eatre la date de rendu de la documentation, la fin de la recherche associ\u00e9e ou autre) d\u2019ordinaire cela repr\u00e9sente la date \u00e0 partir de laquelle la documentation issue de l'op\u00e9ration n'est plus du ressort du responsable d'op\u00e9ration, mais vous pouvez utiliser autre chose.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date de cl\u00f4ture", "importer_type": 17 } }, @@ -2785,7 +2785,7 @@ "description": "Date d'avis (ex\u00a0: avis de CIRA ou autre selon votre usage)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date d'avis", "importer_type": 17 } }, @@ -2797,7 +2797,7 @@ "description": "R\u00e9sultats consid\u00e9r\u00e9s comme n\u00e9gatif (d\u2019ordinaire utilis\u00e9 pour les diagnostics n\u00e9gatifs)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "R\u00e9sultats consid\u00e9r\u00e9s comme n\u00e9gatif", "importer_type": 17 } }, @@ -2809,7 +2809,7 @@ "description": "Pr\u00e9nom du rapporteur (CIRA ou autre selon votre usage de la notion d'avis)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Pr\u00e9nom du rapporteur", "importer_type": 17 } }, @@ -2821,7 +2821,7 @@ "description": "Nom du rapporteur (CIRA ou autre selon votre usage de la notion d'avis)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nom du rapporteur", "importer_type": 17 } }, @@ -2833,7 +2833,7 @@ "description": "Rattachement rapporteur (organisation)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Rattachement du rapporteur", "importer_type": 17 } }, @@ -2845,7 +2845,7 @@ "description": "Date limite pr\u00e9vue pour le rendu de la documentation scientifique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date limite pour le rendu de la documentation", "importer_type": 17 } }, @@ -2857,7 +2857,7 @@ "description": "Documentation re\u00e7ue", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Documentation re\u00e7ue", "importer_type": 17 } }, @@ -2869,7 +2869,7 @@ "description": "Date limite pr\u00e9vue pour le rendu du mobilier", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date limite rendu du mobilier", "importer_type": 17 } }, @@ -2881,7 +2881,7 @@ "description": "Mobilier re\u00e7u ou livr\u00e9 selon vos usages et proc\u00e9dures", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Mobilier re\u00e7u", "importer_type": 17 } }, @@ -2893,7 +2893,7 @@ "description": "Commentaire g\u00e9n\u00e9ral", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire g\u00e9n\u00e9ral", "importer_type": 17 } }, @@ -2905,7 +2905,7 @@ "description": "Date de livraison du rapport", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date de livraison du rapport", "importer_type": 17 } }, @@ -2917,7 +2917,7 @@ "description": "\u00c9tat de traitement du rapport", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "\u00c9tat de traitement du rapport", "importer_type": 17 } }, @@ -2929,7 +2929,7 @@ "description": "Commentaire sur la documentation scientifique (y compris mobilier)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire sur la documentation", "importer_type": 17 } }, @@ -2941,7 +2941,7 @@ "description": "Nom du fichier image (jpg ou png), exemple \"IMG_5023.jpg\"\r\nLes fichiers images doivent \u00eatre joints \u00e0 l'import dans un fichier ZIP", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Image", "importer_type": 17 } }, @@ -2998,7 +2998,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 5, - "description": "Label / Identifiant (externe) de l'UE, ex: \"US 145\", \"Tranch\u00e9e 145\", \"145\", \"St 17\" etc.\r\nDoit \u00eatre unique pour une parcelle donn\u00e9e", + "description": "Label / Identifiant (externe) de l'UE, ex: \"US 145\", \"Tranch\u00e9e 145\", \"145\", \"St 17\" etc.\r\nDoit \u00eatre unique pour une parcelle donn\u00e9e. Maximum 200 caract\u00e8res.", "regexp_pre_filter": null, "required": true, "label": "Label UE", @@ -3022,7 +3022,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 7, - "description": "Description (texte, 1000 carac. max.)", + "description": "Description.", "regexp_pre_filter": null, "required": false, "label": "Description", @@ -3034,10 +3034,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 8, - "description": "Commentaire g\u00e9n\u00e9ral (1000 carac. max.)", + "description": "Commentaire g\u00e9n\u00e9ral.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire g\u00e9n\u00e9ral", "importer_type": 18 } }, @@ -3049,7 +3049,7 @@ "description": "Taille ou longueur (en m\u00e8tre), exemple \"1.2\", \"12\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Taille ou longueur", "importer_type": 18 } }, @@ -3061,7 +3061,7 @@ "description": "Largeur (en m\u00e8tre), exemple \"1.2\", \"12\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Largeur", "importer_type": 18 } }, @@ -3073,7 +3073,7 @@ "description": "\u00c9paisseur (en m\u00e8tre), exemple \"0.2\", \"2\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "\u00c9paisseur", "importer_type": 18 } }, @@ -3085,7 +3085,7 @@ "description": "Profondeur (en m\u00e8tre), exemple \"0.2\", \"2\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Profondeur", "importer_type": 18 } }, @@ -3097,7 +3097,7 @@ "description": "Lieu, description textuelle de la localisation exemple : \"Au pied de l'arbre du P\u00e8re Jahouen\", \"En limite nord de la parcelle\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Lieu, localisation", "importer_type": 18 } }, @@ -3109,7 +3109,7 @@ "description": "Contient ou non du mobilier (oui/non)", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Contient du mobilier", "importer_type": 18 } }, @@ -3121,7 +3121,7 @@ "description": "Nom du fichier image (jpg ou png), exemple \"IMG_5023.jpg\".\r\nLes fichiers images doivent \u00eatre joints \u00e0 l'import dans un fichier ZIP", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Image", "importer_type": 18 } }, @@ -3142,10 +3142,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 17, - "description": "Commentaire sur les datations (texte 1000 carac. max.), exemple : \"IIe - IIIe s.\", \"fin XVe ou plus tard\", etc.", + "description": "Commentaire sur les datations, exemple : \"IIe - IIIe s.\", \"fin XVe ou plus tard\", etc.", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire sur les datations", "importer_type": 18 } }, @@ -3154,10 +3154,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 18, - "description": "Description du remplissage, 1000 carac. max. exemple \"Limons argileux brun riche en charbons\"", + "description": "Description du remplissage. exemple \"Limons argileux brun riche en charbons\"", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Description du remplissage", "importer_type": 18 } }, @@ -3166,7 +3166,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 19, - "description": "Interpr\u00e9tation, texte 1000 carac. max., exemple \"Mur de cl\u00f4ture\", \"Sol couvert d'une mosa\u00efque, \"Pal\u00e9osol du d\u00e9but de l'Holoc\u00e8ne\", \"Four de r\u00e9duction de minerai de fer\", \"TP\", etc.", + "description": "Interpr\u00e9tation., exemple \"Mur de cl\u00f4ture\", \"Sol couvert d'une mosa\u00efque, \"Pal\u00e9osol du d\u00e9but de l'Holoc\u00e8ne\", \"Four de r\u00e9duction de minerai de fer\", \"TP\", etc.", "regexp_pre_filter": null, "required": false, "label": "Interpr\u00e9tation", @@ -3418,7 +3418,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 7, - "description": "R\u00e9f\u00e9rence du point topo, d'ordinaire un entier mais peut \u00eatre autre chose. Champ texte, max. 120 caract\u00e8res. Exemple : \"7220\", \"pt. 72\", etc.\r\n", + "description": "R\u00e9f\u00e9rence du point topo, d'ordinaire un entier mais peut \u00eatre autre chose. Champ texte, max. 120 caract\u00e8res. Exemple : \"7220\", \"pt. 72\", etc.", "regexp_pre_filter": null, "required": false, "label": "Ref. point topo", @@ -3442,7 +3442,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 9, - "description": "D\u00e9finit si on enregistre ici un objet seul (parfois appel\u00e9 Isolation) ou un lot d'objets. Exemple : \"lot\", \"objet\", \"Iso\", \"vrac\", etc.\r\nEst ici traduit en binaire : \"objet\" ou \"lot\".", + "description": "D\u00e9finit si on enregistre ici un objet seul (parfois appel\u00e9 Isolation) ou un lot d'objets. Exemple : \"lot\", \"objet\", \"Iso\", \"vrac\", etc.\r\nEst ici traduit en binaire (est seul ?) : \"objet\" (vrai) ou \"lot\" (faux).", "regexp_pre_filter": null, "required": false, "label": "Lot ou objet", @@ -3454,7 +3454,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 10, - "description": "D\u00e9finit si un objet est complet ou non. Exemple : \"complet\", \"est complet\", \"incomplet\".\r\nEst ici traduit en binaire : \"complet\" ou \"incomplet\". ", + "description": "D\u00e9finit si un objet est complet ou non. Exemple : \"complet\", \"est complet\", \"incomplet\".\r\nEst ici traduit en binaire : \"complet\" (vrai) ou \"incomplet\" (faux). ", "regexp_pre_filter": null, "required": false, "label": "Compl\u00e9tude", @@ -3502,7 +3502,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 14, - "description": "Type(s) d'objet(s), s\u00e9par\u00e9s par des \"&\". Exemple : \"tesson & charbon\", \"vase\", \"scapula\", \"fibule & bague\", \"lame & lamelle\", \"\u00e9clat & nucl\u00e9us\", etc.", + "description": "Type(s) d'objet(s), s\u00e9par\u00e9s par des \"&\". Exemple : \"tesson & charbon\", \"os & m\u00e9tal\", \"faune\", \"fibule & bague\", \"lame & lamelle\", \"\u00e9clat & nucl\u00e9us\", etc.", "regexp_pre_filter": null, "required": false, "label": "Type(s) d'objet(s)", @@ -3622,7 +3622,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 24, - "description": "Marquage visible sur le mobilier. Champ texte, max. 1000 caract\u00e8res. Exemple : \"id1234 la Roche aux F\u00e9es\", \"MTX-45\", etc.\r\nCeci reproduit d'ordinaire un marquage r\u00e9alis\u00e9 par un arch\u00e9ologue. Il ne s'agit pas ici de reproduire une \u00e9pigraphie ou tout autre inscription arch\u00e9ologique (graffito, d\u00e9dicaces, defixio, etc.) , mais vous pouvez l'utiliser pour cela si vous n'avez pas \u00e0 utiliser de marquage arch\u00e9ologique.", + "description": "Marquage visible sur le mobilier. Champ texte. Exemple : \"id1234 la Roche aux F\u00e9es\", \"MTX-45\", etc.\r\nCeci reproduit d'ordinaire un marquage r\u00e9alis\u00e9 par un arch\u00e9ologue. Il ne s'agit pas ici de reproduire une \u00e9pigraphie ou tout autre inscription arch\u00e9ologique (graffito, d\u00e9dicaces, defixio, etc.) , mais vous pouvez l'utiliser pour cela si vous n'avez pas \u00e0 utiliser de marquage arch\u00e9ologique.", "regexp_pre_filter": null, "required": false, "label": "Marque", @@ -3634,7 +3634,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 25, - "description": "Commentaire g\u00e9n\u00e9ral libre. Champ texte, max. 2000 caract\u00e8res. Exemple : \"habillage en nid d'abeille, poli g\u00e9n\u00e9ralis\u00e9, encoche emmanchement lat\u00e9ral ouvert sur la face sup\u00e9rieure\", \"1 bord + bec tubulaire\", \"fibule de Langton Down\", etc.", + "description": "Commentaire g\u00e9n\u00e9ral libre. Champ texte. Exemple : \"habillage en nid d'abeille, poli g\u00e9n\u00e9ralis\u00e9, encoche emmanchement lat\u00e9ral ouvert sur la face sup\u00e9rieure\", \"1 bord + bec tubulaire\", \"fibule de Langton Down\", etc.", "regexp_pre_filter": null, "required": false, "label": "Commentaire g\u00e9n\u00e9ral", @@ -3646,7 +3646,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 26, - "description": "Commentaire g\u00e9n\u00e9ral sur les datations, si besoin. Champ texte, max. 1000 caract\u00e8res. Exemple : \"plut\u00f4t fin IIe s. ou d\u00e9but IIIe s.\", \"Datation \u00e0 pr\u00e9ciser avant publication\", \" Datation rapide faite par M. Dupont\", etc.", + "description": "Commentaire g\u00e9n\u00e9ral sur les datations, si besoin. Champ texte. Exemple : \"plut\u00f4t fin IIe s. ou d\u00e9but IIIe s.\", \"Datation \u00e0 pr\u00e9ciser avant publication\", \" Datation rapide faite par M. Dupont\", etc.", "regexp_pre_filter": null, "required": false, "label": "Commentaire g\u00e9n\u00e9ral sur les datations", @@ -3730,7 +3730,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 33, - "description": "Code permettant de qualifi\u00e9 le mode de projection des donnes (SRS /EPSG). Exemple : \"EPSG:2154\" pour le Lambert 93", + "description": "Code permettant de qualifier le mode de projection des donnes (SRS /EPSG). Exemple : \"EPSG:2154\" pour le Lambert 93", "regexp_pre_filter": null, "required": false, "label": "Syst\u00e8me de r\u00e9f\u00e9rence spatiale", @@ -4536,48 +4536,6 @@ } }, { - "pk": 302, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "operator__name", - "column": 278, - "formater_type": 36, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 38, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "label", - "column": 37, - "formater_type": 3, - "concat_str": null, - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 305, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "in_charge__surname", - "column": 281, - "formater_type": 31, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 308, "model": "ishtar_common.importtarget", "fields": { @@ -4606,20 +4564,6 @@ } }, { - "pk": 314, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "cira_rapporteur__surname", - "column": 290, - "formater_type": 36, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 317, "model": "ishtar_common.importtarget", "fields": { @@ -4746,20 +4690,6 @@ } }, { - "pk": 341, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "description", - "column": 316, - "formater_type": 16, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 344, "model": "ishtar_common.importtarget", "fields": { @@ -4774,20 +4704,6 @@ } }, { - "pk": 347, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "location", - "column": 322, - "formater_type": 16, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 349, "model": "ishtar_common.importtarget", "fields": { @@ -4802,20 +4718,6 @@ } }, { - "pk": 353, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "interpretation", - "column": 328, - "formater_type": 16, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 356, "model": "ishtar_common.importtarget", "fields": { @@ -4858,6 +4760,20 @@ } }, { + "pk": 368, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "is_isolated", + "column": 344, + "formater_type": 19, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { "pk": 371, "model": "ishtar_common.importtarget", "fields": { @@ -4928,28 +4844,42 @@ } }, { - "pk": 384, + "pk": 350, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__comment", - "column": 360, - "formater_type": 33, + "target": "datings__period", + "column": 325, + "formater_type": 6, "concat_str": "", "regexp_filter": null, "concat": false, + "force_new": true + } + }, + { + "pk": 335, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "parcel__external_id", + "column": 311, + "formater_type": 28, + "concat_str": "-", + "regexp_filter": null, + "concat": false, "force_new": false } }, { - "pk": 385, + "pk": 38, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__dating_comment", - "column": 361, - "formater_type": 16, - "concat_str": "", + "target": "label", + "column": 37, + "formater_type": 3, + "concat_str": null, "regexp_filter": null, "concat": false, "force_new": false @@ -5026,20 +4956,6 @@ } }, { - "pk": 306, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "in_charge__name", - "column": 282, - "formater_type": 3, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 309, "model": "ishtar_common.importtarget", "fields": { @@ -5068,20 +4984,6 @@ } }, { - "pk": 315, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "cira_rapporteur__name", - "column": 291, - "formater_type": 3, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 318, "model": "ishtar_common.importtarget", "fields": { @@ -5166,34 +5068,6 @@ } }, { - "pk": 339, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "label", - "column": 314, - "formater_type": 3, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 342, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "comment", - "column": 317, - "formater_type": 16, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 345, "model": "ishtar_common.importtarget", "fields": { @@ -5278,13 +5152,13 @@ } }, { - "pk": 366, + "pk": 384, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__previous_id", - "column": 341, - "formater_type": 3, + "target": "find__comment", + "column": 360, + "formater_type": 35, "concat_str": "", "regexp_filter": null, "concat": false, @@ -5292,13 +5166,181 @@ } }, { - "pk": 372, + "pk": 385, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__conservatory_comment", - "column": 348, - "formater_type": 16, + "target": "find__dating_comment", + "column": 361, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 388, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "find__datings__period", + "column": 364, + "formater_type": 6, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": true + } + }, + { + "pk": 342, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "comment", + "column": 317, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 347, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "location", + "column": 322, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 353, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "interpretation", + "column": 328, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 341, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "description", + "column": 316, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 339, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "label", + "column": 314, + "formater_type": 30, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 302, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "operator__name", + "column": 278, + "formater_type": 10, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 305, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "in_charge__surname", + "column": 281, + "formater_type": 39, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 306, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "in_charge__name", + "column": 282, + "formater_type": 30, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 314, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "cira_rapporteur__surname", + "column": 290, + "formater_type": 39, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 315, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "cira_rapporteur__name", + "column": 291, + "formater_type": 30, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 366, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "find__previous_id", + "column": 341, + "formater_type": 3, "concat_str": "", "regexp_filter": null, "concat": false, @@ -5362,13 +5404,13 @@ } }, { - "pk": 383, + "pk": 386, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__mark", - "column": 359, - "formater_type": 16, + "target": "find__estimated_value", + "column": 362, + "formater_type": 21, "concat_str": "", "regexp_filter": null, "concat": false, @@ -5376,13 +5418,13 @@ } }, { - "pk": 386, + "pk": 297, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__estimated_value", - "column": 362, - "formater_type": 21, + "target": "archaeological_sites__reference", + "column": 271, + "formater_type": 45, "concat_str": "", "regexp_filter": null, "concat": false, @@ -5390,14 +5432,14 @@ } }, { - "pk": 297, + "pk": 336, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "archaeological_sites__reference", - "column": 271, - "formater_type": 45, - "concat_str": "", + "target": "parcel__external_id", + "column": 312, + "formater_type": 11, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false @@ -6062,76 +6104,6 @@ } }, { - "pk": 336, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "parcel__external_id", - "column": 312, - "formater_type": 11, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 335, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "parcel__external_id", - "column": 311, - "formater_type": 28, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 362, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "context_record__external_id", - "column": 337, - "formater_type": 28, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 363, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "context_record__external_id", - "column": 338, - "formater_type": 35, - "concat_str": "-", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 388, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "find__datings__period", - "column": 364, - "formater_type": 6, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": true - } - }, - { "pk": 99, "model": "ishtar_common.importtarget", "fields": { @@ -6748,6 +6720,34 @@ } }, { + "pk": 372, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "find__conservatory_comment", + "column": 348, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 383, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "find__mark", + "column": 359, + "formater_type": 35, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { "pk": 240, "model": "ishtar_common.importtarget", "fields": { @@ -7182,34 +7182,6 @@ } }, { - "pk": 298, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "scientist__title", - "column": 274, - "formater_type": 11, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { - "pk": 304, - "model": "ishtar_common.importtarget", - "fields": { - "comment": "", - "target": "in_charge__title", - "column": 280, - "formater_type": 11, - "concat_str": "", - "regexp_filter": null, - "concat": false, - "force_new": false - } - }, - { "pk": 310, "model": "ishtar_common.importtarget", "fields": { @@ -7392,13 +7364,13 @@ } }, { - "pk": 307, + "pk": 355, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "in_charge__attached_to__name", - "column": 283, - "formater_type": 3, + "target": "identification", + "column": 330, + "formater_type": 24, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7406,13 +7378,13 @@ } }, { - "pk": 316, + "pk": 358, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "cira_rapporteur__attached_to__name", - "column": 292, - "formater_type": 3, + "target": "taq_estimated", + "column": 333, + "formater_type": 1, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7420,13 +7392,13 @@ } }, { - "pk": 352, + "pk": 370, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "filling", - "column": 327, - "formater_type": 16, + "target": "find__material_types", + "column": 346, + "formater_type": 20, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7434,13 +7406,13 @@ } }, { - "pk": 355, + "pk": 373, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "identification", - "column": 330, - "formater_type": 24, + "target": "find__object_types", + "column": 349, + "formater_type": 26, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7448,13 +7420,13 @@ } }, { - "pk": 358, + "pk": 376, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "taq_estimated", - "column": 333, - "formater_type": 1, + "target": "find__remarkabilities", + "column": 352, + "formater_type": 44, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7462,13 +7434,13 @@ } }, { - "pk": 367, + "pk": 387, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__description", - "column": 342, - "formater_type": 16, + "target": "find__image", + "column": 363, + "formater_type": 27, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7476,42 +7448,42 @@ } }, { - "pk": 370, + "pk": 361, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__material_types", - "column": 346, - "formater_type": 20, - "concat_str": "", + "target": "context_record__external_id", + "column": 336, + "formater_type": 11, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 373, + "pk": 362, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__object_types", - "column": 349, - "formater_type": 26, - "concat_str": "", + "target": "context_record__external_id", + "column": 337, + "formater_type": 28, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false } }, { - "pk": 376, + "pk": 363, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__remarkabilities", - "column": 352, - "formater_type": 44, - "concat_str": "", + "target": "context_record__external_id", + "column": 338, + "formater_type": 35, + "concat_str": "-", "regexp_filter": null, "concat": false, "force_new": false @@ -7532,13 +7504,13 @@ } }, { - "pk": 381, + "pk": 389, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__dimensions_comment", - "column": 357, - "formater_type": 16, + "target": "topographic_localisation", + "column": 343, + "formater_type": 3, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7546,13 +7518,13 @@ } }, { - "pk": 387, + "pk": 367, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "find__image", - "column": 363, - "formater_type": 27, + "target": "find__description", + "column": 342, + "formater_type": 35, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7560,13 +7532,13 @@ } }, { - "pk": 389, + "pk": 381, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "topographic_localisation", - "column": 343, - "formater_type": 3, + "target": "find__dimensions_comment", + "column": 357, + "formater_type": 35, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7616,27 +7588,27 @@ } }, { - "pk": 350, + "pk": 393, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "datings__period", - "column": 325, - "formater_type": 6, + "target": "spatial_reference_system", + "column": 368, + "formater_type": 46, "concat_str": "", "regexp_filter": null, "concat": false, - "force_new": true + "force_new": false } }, { - "pk": 393, + "pk": 352, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "spatial_reference_system", - "column": 368, - "formater_type": 46, + "target": "filling", + "column": 327, + "formater_type": 35, "concat_str": "", "regexp_filter": null, "concat": false, @@ -7644,14 +7616,56 @@ } }, { - "pk": 361, + "pk": 304, "model": "ishtar_common.importtarget", "fields": { "comment": "", - "target": "context_record__external_id", - "column": 336, - "formater_type": 11, - "concat_str": "-", + "target": "in_charge__title", + "column": 280, + "formater_type": 47, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 298, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "scientist__title", + "column": 274, + "formater_type": 47, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 307, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "in_charge__attached_to__name", + "column": 283, + "formater_type": 10, + "concat_str": "", + "regexp_filter": null, + "concat": false, + "force_new": false + } + }, + { + "pk": 316, + "model": "ishtar_common.importtarget", + "fields": { + "comment": "", + "target": "cira_rapporteur__attached_to__name", + "column": 292, + "formater_type": 10, + "concat_str": "", "regexp_filter": null, "concat": false, "force_new": false @@ -7883,6 +7897,15 @@ } }, { + "pk": 47, + "model": "ishtar_common.formatertype", + "fields": { + "formater_type": "TypeFormater", + "many_split": "", + "options": "TitleType" + } + }, + { "pk": 35, "model": "ishtar_common.formatertype", "fields": { diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 42440b19a..458368a35 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -6,6 +6,7 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata # Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata +# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" @@ -99,31 +100,31 @@ msgstr "" msgid "Not imported" msgstr "" -#: data_importer.py:1441 +#: data_importer.py:1444 msgid "line" msgstr "" -#: data_importer.py:1441 +#: data_importer.py:1444 msgid "col" msgstr "" -#: data_importer.py:1441 +#: data_importer.py:1444 msgid "error" msgstr "" -#: data_importer.py:1447 +#: data_importer.py:1450 msgid "field" msgstr "" -#: data_importer.py:1447 +#: data_importer.py:1450 msgid "source" msgstr "" -#: data_importer.py:1447 +#: data_importer.py:1450 msgid "result" msgstr "" -#: data_importer.py:1463 +#: data_importer.py:1466 #, python-format msgid "\"%(value)s\" not in %(values)s" msgstr "" @@ -156,12 +157,12 @@ msgstr "" msgid "Add a new item" msgstr "" -#: forms.py:262 models.py:1368 +#: forms.py:262 models.py:1473 msgid "Template" msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:182 -#: forms_common.py:406 models.py:1434 models.py:2826 +#: forms_common.py:406 models.py:1539 models.py:2940 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -177,8 +178,8 @@ msgid "" "french town Saint-Denis in the Seine-Saint-Denis department.</p>" msgstr "" -#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1607 -#: models.py:2453 models.py:2635 models.py:2696 +#: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1712 +#: models.py:2567 models.py:2749 models.py:2810 #: templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -190,63 +191,63 @@ msgid "" msgstr "" #: forms_common.py:170 forms_common.py:327 forms_common.py:451 -#: ishtar_menu.py:75 models.py:1608 models.py:2339 +#: ishtar_menu.py:75 models.py:1713 models.py:2450 models.py:2541 #: templates/ishtar/sheet_organization.html:4 msgid "Organization" msgstr "" #: forms_common.py:173 forms_common.py:210 forms_common.py:322 -#: forms_common.py:376 forms_common.py:446 models.py:1034 models.py:1367 -#: models.py:1653 models.py:1872 models.py:2333 models.py:2439 models.py:2812 +#: forms_common.py:376 forms_common.py:446 models.py:1094 models.py:1472 +#: models.py:1758 models.py:1977 models.py:2444 models.py:2553 models.py:2926 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" msgstr "" -#: forms_common.py:174 models.py:1589 models.py:2003 +#: forms_common.py:174 models.py:1694 models.py:2108 msgid "Organization type" msgstr "" -#: forms_common.py:176 forms_common.py:400 models.py:1429 +#: forms_common.py:176 forms_common.py:400 models.py:1534 #: templates/ishtar/sheet_organization.html:10 msgid "Address" msgstr "" -#: forms_common.py:178 forms_common.py:403 models.py:1430 +#: forms_common.py:178 forms_common.py:403 models.py:1535 #: templates/ishtar/sheet_organization.html:11 msgid "Address complement" msgstr "" -#: forms_common.py:180 forms_common.py:404 models.py:1432 +#: forms_common.py:180 forms_common.py:404 models.py:1537 #: templates/ishtar/sheet_organization.html:12 msgid "Postal code" msgstr "" -#: forms_common.py:183 forms_common.py:407 models.py:1435 +#: forms_common.py:183 forms_common.py:407 models.py:1540 msgid "Country" msgstr "" #: forms_common.py:185 forms_common.py:324 forms_common.py:380 -#: forms_common.py:448 forms_common.py:572 models.py:1462 +#: forms_common.py:448 forms_common.py:572 models.py:1567 msgid "Email" msgstr "" -#: forms_common.py:186 forms_common.py:383 models.py:1447 +#: forms_common.py:186 forms_common.py:383 models.py:1552 #: templates/ishtar/sheet_organization.html:14 #: templates/ishtar/sheet_person.html:19 #: templates/ishtar/wizard/wizard_person.html:17 msgid "Phone" msgstr "" -#: forms_common.py:187 forms_common.py:392 models.py:1459 +#: forms_common.py:187 forms_common.py:392 models.py:1564 #: templates/ishtar/sheet_organization.html:15 #: templates/ishtar/sheet_person.html:37 #: templates/ishtar/wizard/wizard_person.html:35 msgid "Mobile phone" msgstr "" -#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2033 -#: models.py:2335 models.py:2747 templates/sheet_ope.html:85 +#: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2144 +#: models.py:2446 models.py:2861 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:23 @@ -254,7 +255,7 @@ msgstr "" msgid "Type" msgstr "" -#: forms_common.py:220 views.py:142 +#: forms_common.py:220 views.py:146 msgid "Organization search" msgstr "" @@ -270,12 +271,12 @@ msgstr "" msgid "Organization to merge" msgstr "" -#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2437 +#: forms_common.py:323 forms_common.py:374 forms_common.py:447 models.py:2551 #: templates/ishtar/sheet_organization.html:22 msgid "Surname" msgstr "" -#: forms_common.py:339 forms_common.py:434 views.py:107 +#: forms_common.py:339 forms_common.py:434 views.py:111 msgid "Person search" msgstr "" @@ -288,25 +289,25 @@ msgstr "" msgid "Identity" msgstr "" -#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2004 -#: models.py:2431 models.py:2433 models.py:2744 templates/sheet_ope.html:104 +#: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2109 +#: models.py:2545 models.py:2547 models.py:2858 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" -#: forms_common.py:372 models.py:2435 +#: forms_common.py:372 models.py:2549 msgid "Salutation" msgstr "" -#: forms_common.py:378 models.py:2441 +#: forms_common.py:378 models.py:2555 msgid "Raw name" msgstr "" -#: forms_common.py:381 models.py:1448 +#: forms_common.py:381 models.py:1553 msgid "Phone description" msgstr "" -#: forms_common.py:384 models.py:1450 models.py:1452 +#: forms_common.py:384 models.py:1555 models.py:1557 msgid "Phone description 2" msgstr "" @@ -314,11 +315,11 @@ msgstr "" msgid "Phone 2" msgstr "" -#: forms_common.py:388 models.py:1456 +#: forms_common.py:388 models.py:1561 msgid "Phone description 3" msgstr "" -#: forms_common.py:390 models.py:1454 +#: forms_common.py:390 models.py:1559 msgid "Phone 3" msgstr "" @@ -326,23 +327,23 @@ msgstr "" msgid "Current organization" msgstr "" -#: forms_common.py:409 models.py:1437 +#: forms_common.py:409 models.py:1542 msgid "Other address: address" msgstr "" -#: forms_common.py:412 models.py:1440 +#: forms_common.py:412 models.py:1545 msgid "Other address: address complement" msgstr "" -#: forms_common.py:414 models.py:1441 +#: forms_common.py:414 models.py:1546 msgid "Other address: postal code" msgstr "" -#: forms_common.py:416 models.py:1443 +#: forms_common.py:416 models.py:1548 msgid "Other address: town" msgstr "" -#: forms_common.py:418 models.py:1445 +#: forms_common.py:418 models.py:1550 msgid "Other address: country" msgstr "" @@ -358,7 +359,7 @@ msgstr "" msgid "Account search" msgstr "" -#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2387 +#: forms_common.py:510 forms_common.py:550 forms_common.py:554 models.py:2498 msgid "Person type" msgstr "" @@ -366,7 +367,7 @@ msgstr "" msgid "Account" msgstr "" -#: forms_common.py:575 wizards.py:1256 +#: forms_common.py:575 wizards.py:1281 msgid "New password" msgstr "" @@ -390,7 +391,7 @@ msgstr "" msgid "Send the new password by email?" msgstr "" -#: forms_common.py:628 forms_common.py:641 models.py:2827 +#: forms_common.py:628 forms_common.py:641 models.py:2941 msgid "Towns" msgstr "" @@ -406,7 +407,7 @@ msgstr "" msgid "Documentation informations" msgstr "" -#: forms_common.py:775 forms_common.py:823 models.py:2005 models.py:2721 +#: forms_common.py:775 forms_common.py:823 models.py:2110 models.py:2835 msgid "Source type" msgstr "" @@ -418,37 +419,37 @@ msgstr "" msgid "Internal reference" msgstr "" -#: forms_common.py:783 models.py:2758 +#: forms_common.py:783 models.py:2872 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:784 models.py:2760 +#: forms_common.py:784 models.py:2874 msgid "Receipt date" msgstr "" -#: forms_common.py:786 models.py:2162 models.py:2762 +#: forms_common.py:786 models.py:2273 models.py:2876 msgid "Creation date" msgstr "" -#: forms_common.py:789 models.py:2765 +#: forms_common.py:789 models.py:2879 msgid "Receipt date in documentation" msgstr "" -#: forms_common.py:791 forms_common.py:827 models.py:323 models.py:634 -#: models.py:1899 models.py:2445 models.py:2772 +#: forms_common.py:791 forms_common.py:827 models.py:376 models.py:687 +#: models.py:2004 models.py:2559 models.py:2886 msgid "Comment" msgstr "" -#: forms_common.py:793 forms_common.py:826 models.py:1036 models.py:1657 -#: models.py:1831 models.py:1873 models.py:2771 templates/sheet_ope.html:128 +#: forms_common.py:793 forms_common.py:826 models.py:1096 models.py:1762 +#: models.py:1936 models.py:1978 models.py:2885 templates/sheet_ope.html:128 msgid "Description" msgstr "" -#: forms_common.py:796 models.py:2773 +#: forms_common.py:796 models.py:2887 msgid "Additional information" msgstr "" -#: forms_common.py:798 forms_common.py:830 models.py:2775 +#: forms_common.py:798 forms_common.py:830 models.py:2889 msgid "Has a duplicate" msgstr "" @@ -463,7 +464,7 @@ msgid "" "p>" msgstr "" -#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2701 +#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2815 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" @@ -476,7 +477,7 @@ msgstr "" msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:856 models.py:2006 models.py:2689 models.py:2698 +#: forms_common.py:856 models.py:2111 models.py:2803 models.py:2812 msgid "Author type" msgstr "" @@ -488,7 +489,7 @@ msgstr "" msgid "There are identical authors." msgstr "" -#: forms_common.py:893 models.py:2702 models.py:2754 +#: forms_common.py:893 models.py:2816 models.py:2868 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -506,7 +507,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:39 models.py:1163 views.py:1530 +#: ishtar_menu.py:39 models.py:1268 views.py:1548 msgid "Global variables" msgstr "" @@ -534,19 +535,19 @@ msgstr "" msgid "Manual merge" msgstr "" -#: ishtar_menu.py:109 models.py:2173 +#: ishtar_menu.py:109 models.py:2284 msgid "Imports" msgstr "" -#: ishtar_menu.py:112 views.py:1538 +#: ishtar_menu.py:112 views.py:1556 msgid "New import" msgstr "" -#: ishtar_menu.py:116 views.py:1552 +#: ishtar_menu.py:116 views.py:1570 msgid "Current imports" msgstr "" -#: ishtar_menu.py:120 views.py:1588 +#: ishtar_menu.py:120 views.py:1606 msgid "Old imports" msgstr "" @@ -562,204 +563,250 @@ msgstr "" msgid "This item already exists." msgstr "" -#: models.py:319 models.py:633 models.py:1402 models.py:1414 models.py:1828 +#: models.py:372 models.py:686 models.py:1507 models.py:1519 models.py:1933 msgid "Label" msgstr "" -#: models.py:321 +#: models.py:374 msgid "Textual ID" msgstr "" -#: models.py:324 models.py:636 models.py:1371 +#: models.py:377 models.py:689 models.py:1476 msgid "Available" msgstr "" -#: models.py:655 models.py:1945 +#: models.py:713 models.py:2050 msgid "Key" msgstr "" -#: models.py:661 +#: models.py:719 msgid "Specific key to an import" msgstr "" -#: models.py:753 +#: models.py:811 msgid "Last editor" msgstr "" -#: models.py:756 +#: models.py:814 msgid "Creator" msgstr "" -#: models.py:898 models.py:2838 models.py:2894 +#: models.py:956 models.py:2952 models.py:3008 msgid "Order" msgstr "" -#: models.py:899 +#: models.py:957 msgid "Symmetrical" msgstr "" -#: models.py:900 +#: models.py:958 msgid "Tiny label" msgstr "" -#: models.py:914 +#: models.py:972 msgid "Cannot have symmetrical and an inverse_relation" msgstr "" -#: models.py:1028 +#: models.py:1088 msgid "Euro" msgstr "" -#: models.py:1029 +#: models.py:1089 msgid "US dollar" msgstr "" -#: models.py:1035 models.py:1655 +#: models.py:1095 models.py:1760 msgid "Slug" msgstr "" -#: models.py:1037 +#: models.py:1098 +msgid "CSS color code for base module" +msgstr "" + +#: models.py:1100 msgid "Files module" msgstr "" -#: models.py:1038 +#: models.py:1102 +msgid "CSS color code for files module" +msgstr "" + +#: models.py:1104 msgid "Context records module" msgstr "" -#: models.py:1040 +#: models.py:1107 +msgid "CSS color code for context record module" +msgstr "" + +#: models.py:1109 msgid "Finds module" msgstr "" -#: models.py:1041 +#: models.py:1110 msgid "Need context records module" msgstr "" -#: models.py:1043 +#: models.py:1112 +msgid "CSS color code for find module" +msgstr "" + +#: models.py:1115 msgid "Warehouses module" msgstr "" -#: models.py:1044 +#: models.py:1116 msgid "Need finds module" msgstr "" -#: models.py:1045 +#: models.py:1118 +msgid "CSS code for warehouse module" +msgstr "" + +#: models.py:1120 msgid "Mapping module" msgstr "" -#: models.py:1047 +#: models.py:1122 +msgid "CSS code for mapping module" +msgstr "" + +#: models.py:1125 msgid "Home page" msgstr "" -#: models.py:1048 +#: models.py:1126 #, python-brace-format msgid "" "Homepage of Ishtar - if not defined a default homepage will appear. Use the " "markdown syntax. {random_image} can be used to display a random image." msgstr "" -#: models.py:1052 +#: models.py:1130 msgid "File external id" msgstr "" -#: models.py:1054 +#: models.py:1132 msgid "" "Formula to manage file external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1059 +#: models.py:1137 msgid "Parcel external id" msgstr "" -#: models.py:1062 +#: models.py:1140 msgid "" "Formula to manage parcel external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1067 +#: models.py:1145 msgid "Context record external id" msgstr "" -#: models.py:1069 +#: models.py:1147 msgid "" "Formula to manage context record external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1074 +#: models.py:1152 msgid "Base find external id" msgstr "" -#: models.py:1076 +#: models.py:1154 msgid "" "Formula to manage base find external ID. Change this with care. With " "incorrect formula, the application might be unusable and import of external " "data can be destructive." msgstr "" -#: models.py:1081 +#: models.py:1159 msgid "Find external id" msgstr "" -#: models.py:1083 +#: models.py:1161 msgid "" "Formula to manage find external ID. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1088 +#: models.py:1166 +msgid "Container external id" +msgstr "" + +#: models.py:1168 +msgid "" +"Formula to manage container external ID. Change this with care. With " +"incorrect formula, the application might be unusable and import of external " +"data can be destructive." +msgstr "" + +#: models.py:1173 +msgid "Warehouse external id" +msgstr "" + +#: models.py:1175 +msgid "" +"Formula to manage warehouse external ID. Change this with care. With " +"incorrect formula, the application might be unusable and import of external " +"data can be destructive." +msgstr "" + +#: models.py:1180 msgid "Raw name for person" msgstr "" -#: models.py:1090 +#: models.py:1182 msgid "" "Formula to manage person raw_name. Change this with care. With incorrect " "formula, the application might be unusable and import of external data can " "be destructive." msgstr "" -#: models.py:1094 +#: models.py:1186 msgid "Current active" msgstr "" -#: models.py:1095 +#: models.py:1187 msgid "Currency" msgstr "" -#: models.py:1099 +#: models.py:1191 msgid "Ishtar site profile" msgstr "" -#: models.py:1100 +#: models.py:1192 msgid "Ishtar site profiles" msgstr "" -#: models.py:1156 +#: models.py:1261 msgid "Variable name" msgstr "" -#: models.py:1157 +#: models.py:1262 msgid "Description of the variable" msgstr "" -#: models.py:1159 models.py:1946 +#: models.py:1264 models.py:2051 msgid "Value" msgstr "" -#: models.py:1162 +#: models.py:1267 msgid "Global variable" msgstr "" -#: models.py:1272 models.py:1302 +#: models.py:1377 models.py:1407 msgid "Total" msgstr "" -#: models.py:1279 models.py:1403 models.py:1415 +#: models.py:1384 models.py:1508 models.py:1520 #: templates/ishtar/sheet_person.html:22 #: templates/ishtar/dashboards/dashboard_main_detail.html:141 #: templates/ishtar/dashboards/dashboard_main_detail_users.html:26 @@ -767,726 +814,746 @@ msgstr "" msgid "Number" msgstr "" -#: models.py:1366 +#: models.py:1471 msgid "Administrative Act" msgstr "" -#: models.py:1370 +#: models.py:1475 msgid "Associated object" msgstr "" -#: models.py:1374 +#: models.py:1479 msgid "Document template" msgstr "" -#: models.py:1375 +#: models.py:1480 msgid "Document templates" msgstr "" -#: models.py:1406 models.py:1416 models.py:2157 +#: models.py:1511 models.py:1521 models.py:2268 msgid "State" msgstr "" -#: models.py:1420 templates/blocks/JQueryAdvancedTown.html:12 +#: models.py:1525 templates/blocks/JQueryAdvancedTown.html:12 msgid "Department" msgstr "" -#: models.py:1421 +#: models.py:1526 msgid "Departments" msgstr "" -#: models.py:1458 +#: models.py:1563 msgid "Raw phone" msgstr "" -#: models.py:1464 +#: models.py:1569 msgid "Alternative address is prefered" msgstr "" -#: models.py:1503 +#: models.py:1608 msgid "Tel: " msgstr "" -#: models.py:1507 +#: models.py:1612 msgid "Mobile: " msgstr "" -#: models.py:1511 +#: models.py:1616 msgid "Email: " msgstr "" -#: models.py:1516 +#: models.py:1621 msgid "Merge key" msgstr "" -#: models.py:1590 +#: models.py:1695 msgid "Organization types" msgstr "" -#: models.py:1609 views.py:237 +#: models.py:1714 views.py:241 msgid "Operation" msgstr "" -#: models.py:1611 +#: models.py:1716 msgid "Archaeological site" msgstr "" -#: models.py:1612 +#: models.py:1717 msgid "Parcels" msgstr "" -#: models.py:1614 +#: models.py:1719 msgid "Operation source" msgstr "" -#: models.py:1617 views.py:1346 views.py:1396 +#: models.py:1722 views.py:1364 views.py:1414 msgid "Archaeological files" msgstr "" -#: models.py:1619 views.py:1349 views.py:1404 +#: models.py:1724 views.py:1367 views.py:1422 msgid "Context records" msgstr "" -#: models.py:1621 +#: models.py:1726 msgid "Context record relations" msgstr "" -#: models.py:1623 +#: models.py:1728 msgid "Base finds" msgstr "" -#: models.py:1659 templates/ishtar/dashboards/dashboard_main.html:25 +#: models.py:1764 templates/ishtar/dashboards/dashboard_main.html:25 msgid "Users" msgstr "" -#: models.py:1661 +#: models.py:1766 msgid "Associated model" msgstr "" -#: models.py:1664 +#: models.py:1769 msgid "Is template" msgstr "" -#: models.py:1665 +#: models.py:1770 msgid "Unicity keys (separator \";\")" msgstr "" -#: models.py:1669 +#: models.py:1774 msgid "Importer - Type" msgstr "" -#: models.py:1670 +#: models.py:1775 msgid "Importer - Types" msgstr "" -#: models.py:1760 +#: models.py:1865 msgid "Importer - Default" msgstr "" -#: models.py:1761 +#: models.py:1866 msgid "Importer - Defaults" msgstr "" -#: models.py:1796 +#: models.py:1901 msgid "Importer - Default value" msgstr "" -#: models.py:1797 +#: models.py:1902 msgid "Importer - Default values" msgstr "" -#: models.py:1830 +#: models.py:1935 msgid "Column number" msgstr "" -#: models.py:1833 +#: models.py:1938 msgid "Required" msgstr "" -#: models.py:1836 +#: models.py:1941 msgid "Importer - Column" msgstr "" -#: models.py:1837 +#: models.py:1942 msgid "Importer - Columns" msgstr "" -#: models.py:1857 +#: models.py:1962 msgid "Field name" msgstr "" -#: models.py:1859 models.py:1893 +#: models.py:1964 models.py:1998 msgid "Force creation of new items" msgstr "" -#: models.py:1861 models.py:1895 +#: models.py:1966 models.py:2000 msgid "Concatenate with existing" msgstr "" -#: models.py:1863 models.py:1897 +#: models.py:1968 models.py:2002 msgid "Concatenate character" msgstr "" -#: models.py:1867 +#: models.py:1972 msgid "Importer - Duplicate field" msgstr "" -#: models.py:1868 +#: models.py:1973 msgid "Importer - Duplicate fields" msgstr "" -#: models.py:1875 +#: models.py:1980 msgid "Regular expression" msgstr "" -#: models.py:1878 +#: models.py:1983 msgid "Importer - Regular expression" msgstr "" -#: models.py:1879 +#: models.py:1984 msgid "Importer - Regular expressions" msgstr "" -#: models.py:1902 +#: models.py:2007 msgid "Importer - Target" msgstr "" -#: models.py:1903 +#: models.py:2008 msgid "Importer - Targets" msgstr "" -#: models.py:1927 views.py:536 +#: models.py:2032 views.py:545 msgid "True" msgstr "" -#: models.py:1928 views.py:538 +#: models.py:2033 views.py:547 msgid "False" msgstr "" -#: models.py:1947 +#: models.py:2052 msgid "Is set" msgstr "" -#: models.py:1954 +#: models.py:2059 msgid "Importer - Target key" msgstr "" -#: models.py:1955 +#: models.py:2060 msgid "Importer - Targets keys" msgstr "" -#: models.py:2007 models.py:2737 models.py:2750 +#: models.py:2112 models.py:2851 models.py:2864 msgid "Format" msgstr "" -#: models.py:2008 models.py:2842 +#: models.py:2113 models.py:2956 msgid "Operation type" msgstr "" -#: models.py:2009 +#: models.py:2114 msgid "Period" msgstr "" -#: models.py:2010 +#: models.py:2115 msgid "Report state" msgstr "" -#: models.py:2011 +#: models.py:2116 msgid "Remain type" msgstr "" -#: models.py:2012 +#: models.py:2117 msgid "Unit" msgstr "" -#: models.py:2013 +#: models.py:2118 msgid "Activity type" msgstr "" -#: models.py:2014 +#: models.py:2119 msgid "Material" msgstr "" -#: models.py:2016 +#: models.py:2121 msgid "Conservatory state" msgstr "" -#: models.py:2017 +#: models.py:2122 +msgid "Container type" +msgstr "" + +#: models.py:2123 msgid "Preservation type" msgstr "" -#: models.py:2018 +#: models.py:2124 msgid "Object type" msgstr "" -#: models.py:2020 +#: models.py:2125 +msgid "Integrity type" +msgstr "" + +#: models.py:2126 +msgid "Remarkability type" +msgstr "" + +#: models.py:2127 +msgid "Batch type" +msgstr "" + +#: models.py:2129 msgid "Identification type" msgstr "" -#: models.py:2022 +#: models.py:2131 msgid "Context record relation type" msgstr "" -#: models.py:2023 models.py:2729 +#: models.py:2132 models.py:3014 +msgid "Spatial reference system" +msgstr "" + +#: models.py:2133 models.py:2843 msgid "Support type" msgstr "" -#: models.py:2029 +#: models.py:2134 models.py:2510 +msgid "Title type" +msgstr "" + +#: models.py:2140 msgid "Integer" msgstr "" -#: models.py:2030 +#: models.py:2141 msgid "Float" msgstr "" -#: models.py:2031 +#: models.py:2142 msgid "String" msgstr "" -#: models.py:2032 templates/sheet_ope.html:86 +#: models.py:2143 templates/sheet_ope.html:86 msgid "Date" msgstr "" -#: models.py:2034 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 +#: models.py:2145 templates/sheet_ope.html:61 templates/sheet_ope.html.py:83 #: templates/ishtar/dashboards/dashboard_main_detail.html:126 msgid "Year" msgstr "" -#: models.py:2035 +#: models.py:2146 msgid "String to boolean" msgstr "" -#: models.py:2036 +#: models.py:2147 msgctxt "filesystem" msgid "File" msgstr "" -#: models.py:2037 +#: models.py:2148 msgid "Unknow type" msgstr "" -#: models.py:2053 +#: models.py:2164 msgid "4 digit year. e.g.: \"2015\"" msgstr "" -#: models.py:2054 +#: models.py:2165 msgid "4 digit year/month/day. e.g.: \"2015/02/04\"" msgstr "" -#: models.py:2055 +#: models.py:2166 msgid "Day/month/4 digit year. e.g.: \"04/02/2015\"" msgstr "" -#: models.py:2065 +#: models.py:2176 msgid "Options" msgstr "" -#: models.py:2067 +#: models.py:2178 msgid "Split character(s)" msgstr "" -#: models.py:2071 +#: models.py:2182 msgid "Importer - Formater type" msgstr "" -#: models.py:2072 +#: models.py:2183 msgid "Importer - Formater types" msgstr "" -#: models.py:2121 templates/ishtar/dashboards/dashboard_main_detail.html:63 +#: models.py:2232 templates/ishtar/dashboards/dashboard_main_detail.html:63 msgid "Created" msgstr "" -#: models.py:2122 +#: models.py:2233 msgid "Analyse in progress" msgstr "" -#: models.py:2123 +#: models.py:2234 msgid "Analysed" msgstr "" -#: models.py:2124 +#: models.py:2235 msgid "Import pending" msgstr "" -#: models.py:2125 +#: models.py:2236 msgid "Import in progress" msgstr "" -#: models.py:2126 +#: models.py:2237 msgid "Finished with errors" msgstr "" -#: models.py:2127 +#: models.py:2238 msgid "Finished" msgstr "" -#: models.py:2128 +#: models.py:2239 msgid "Archived" msgstr "" -#: models.py:2140 +#: models.py:2252 msgid "Imported file" msgstr "" -#: models.py:2143 +#: models.py:2254 msgid "Associated images (zip file)" msgstr "" -#: models.py:2145 +#: models.py:2256 msgid "Encoding" msgstr "" -#: models.py:2147 +#: models.py:2258 msgid "Skip lines" msgstr "" -#: models.py:2148 templates/ishtar/import_list.html:47 +#: models.py:2259 templates/ishtar/import_list.html:47 msgid "Error file" msgstr "" -#: models.py:2151 +#: models.py:2262 msgid "Result file" msgstr "" -#: models.py:2154 templates/ishtar/import_list.html:53 +#: models.py:2265 templates/ishtar/import_list.html:53 msgid "Match file" msgstr "" -#: models.py:2160 +#: models.py:2271 msgid "Conservative import" msgstr "" -#: models.py:2165 +#: models.py:2276 msgid "End date" msgstr "" -#: models.py:2167 +#: models.py:2278 msgid "Remaining seconds" msgstr "" -#: models.py:2172 +#: models.py:2283 msgid "Import" msgstr "" -#: models.py:2189 +#: models.py:2300 msgid "Analyse" msgstr "" -#: models.py:2191 models.py:2194 +#: models.py:2302 models.py:2305 msgid "Re-analyse" msgstr "" -#: models.py:2192 +#: models.py:2303 msgid "Launch import" msgstr "" -#: models.py:2195 +#: models.py:2306 msgid "Re-import" msgstr "" -#: models.py:2196 +#: models.py:2307 msgid "Archive" msgstr "" -#: models.py:2198 +#: models.py:2309 msgid "Unarchive" msgstr "" -#: models.py:2199 widgets.py:130 templates/ishtar/form_delete.html:11 +#: models.py:2310 widgets.py:130 templates/ishtar/form_delete.html:11 msgid "Delete" msgstr "" -#: models.py:2340 +#: models.py:2451 msgid "Organizations" msgstr "" -#: models.py:2342 +#: models.py:2453 msgid "Can view all Organizations" msgstr "" -#: models.py:2343 +#: models.py:2454 msgid "Can view own Organization" msgstr "" -#: models.py:2344 +#: models.py:2455 msgid "Can add own Organization" msgstr "" -#: models.py:2346 +#: models.py:2457 msgid "Can change own Organization" msgstr "" -#: models.py:2348 +#: models.py:2459 msgid "Can delete own Organization" msgstr "" -#: models.py:2383 +#: models.py:2494 msgid "Groups" msgstr "" -#: models.py:2388 +#: models.py:2499 msgid "Person types" msgstr "" -#: models.py:2399 -msgid "Title type" -msgstr "" - -#: models.py:2400 +#: models.py:2511 msgid "Title types" msgstr "" -#: models.py:2409 +#: models.py:2520 msgid "Mr" msgstr "" -#: models.py:2410 +#: models.py:2521 msgid "Miss" msgstr "" -#: models.py:2411 +#: models.py:2522 msgid "Mr and Mrs" msgstr "" -#: models.py:2412 +#: models.py:2523 msgid "Mrs" msgstr "" -#: models.py:2413 +#: models.py:2524 msgid "Doctor" msgstr "" -#: models.py:2443 +#: models.py:2557 msgid "Contact type" msgstr "" -#: models.py:2446 models.py:2510 +#: models.py:2560 models.py:2624 msgid "Types" msgstr "" -#: models.py:2449 +#: models.py:2563 msgid "Is attached to" msgstr "" -#: models.py:2454 +#: models.py:2568 msgid "Persons" msgstr "" -#: models.py:2456 +#: models.py:2570 msgid "Can view all Persons" msgstr "" -#: models.py:2457 +#: models.py:2571 msgid "Can view own Person" msgstr "" -#: models.py:2458 +#: models.py:2572 msgid "Can add own Person" msgstr "" -#: models.py:2459 +#: models.py:2573 msgid "Can change own Person" msgstr "" -#: models.py:2460 +#: models.py:2574 msgid "Can delete own Person" msgstr "" -#: models.py:2638 +#: models.py:2752 msgid "Advanced shortcut menu" msgstr "" -#: models.py:2641 +#: models.py:2755 msgid "Ishtar user" msgstr "" -#: models.py:2642 +#: models.py:2756 msgid "Ishtar users" msgstr "" -#: models.py:2684 +#: models.py:2798 msgid "To modify the password use the form in Auth > User" msgstr "" -#: models.py:2690 +#: models.py:2804 msgid "Author types" msgstr "" -#: models.py:2722 +#: models.py:2836 msgid "Source types" msgstr "" -#: models.py:2730 +#: models.py:2844 msgid "Support types" msgstr "" -#: models.py:2738 +#: models.py:2852 msgid "Formats" msgstr "" -#: models.py:2745 +#: models.py:2859 msgid "External ID" msgstr "" -#: models.py:2748 +#: models.py:2862 msgid "Support" msgstr "" -#: models.py:2752 +#: models.py:2866 msgid "Scale" msgstr "" -#: models.py:2766 +#: models.py:2880 msgid "Item number" msgstr "" -#: models.py:2767 +#: models.py:2881 msgid "Ref." msgstr "" -#: models.py:2770 +#: models.py:2884 msgid "Internal ref." msgstr "" -#: models.py:2813 +#: models.py:2927 msgid "Surface (m2)" msgstr "" -#: models.py:2814 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2928 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "" -#: models.py:2839 +#: models.py:2953 msgid "Is preventive" msgstr "" -#: models.py:2843 +#: models.py:2957 msgid "Operation types" msgstr "" -#: models.py:2872 +#: models.py:2986 msgid "Preventive" msgstr "" -#: models.py:2873 +#: models.py:2987 msgid "Research" msgstr "" -#: models.py:2895 -msgid "SRID" +#: models.py:3010 +msgid "Authority name" msgstr "" -#: models.py:2898 -msgid "Spatial reference system" +#: models.py:3011 +msgid "Authority SRID" msgstr "" -#: models.py:2899 +#: models.py:3015 msgid "Spatial reference systems" msgstr "" -#: utils.py:83 +#: utils.py:84 msgid " (...)" msgstr "" -#: utils.py:116 +#: utils.py:130 msgid "Load another random image?" msgstr "" -#: views.py:114 +#: views.py:118 msgid "New person" msgstr "" -#: views.py:122 +#: views.py:126 msgid "Person modification" msgstr "" -#: views.py:137 +#: views.py:141 msgid "Person deletion" msgstr "" -#: views.py:148 +#: views.py:152 msgid "New organization" msgstr "" -#: views.py:155 +#: views.py:159 msgid "Organization modification" msgstr "" -#: views.py:171 +#: views.py:175 msgid "Organization deletion" msgstr "" -#: views.py:178 +#: views.py:182 msgid "Account management" msgstr "" -#: views.py:184 +#: views.py:188 msgid "Account deletion" msgstr "" -#: views.py:236 +#: views.py:240 msgid "Archaeological file" msgstr "" -#: views.py:239 +#: views.py:243 msgid "Context record" msgstr "" -#: views.py:241 +#: views.py:245 msgid "Find" msgstr "" -#: views.py:243 +#: views.py:247 msgid "Treatment request" msgstr "" -#: views.py:244 +#: views.py:248 msgid "Treatment" msgstr "" -#: views.py:1285 views.py:1328 +#: views.py:1303 views.py:1346 msgid "Operation not permitted." msgstr "" -#: views.py:1287 +#: views.py:1305 #, python-format msgid "New %s" msgstr "" -#: views.py:1347 views.py:1400 +#: views.py:1365 views.py:1418 msgid "Operations" msgstr "" -#: views.py:1351 views.py:1407 +#: views.py:1369 views.py:1425 msgid "Finds" msgstr "" -#: views.py:1600 templates/ishtar/import_list.html:43 +#: views.py:1618 templates/ishtar/import_list.html:43 msgid "Link unmatched items" msgstr "" -#: views.py:1615 +#: views.py:1633 msgid "Delete import" msgstr "" -#: views.py:1654 +#: views.py:1672 msgid "Merge persons" msgstr "" -#: views.py:1678 +#: views.py:1696 msgid "Select the main person" msgstr "" -#: views.py:1687 +#: views.py:1705 msgid "Merge organization" msgstr "" -#: views.py:1697 +#: views.py:1715 msgid "Select the main organization" msgstr "" -#: views.py:1737 views.py:1753 +#: views.py:1755 views.py:1771 msgid "Corporation manager" msgstr "" @@ -1506,15 +1573,15 @@ msgstr "" msgid "Remove" msgstr "" -#: wizards.py:342 templates/ishtar/import_delete.html:20 +#: wizards.py:343 templates/ishtar/import_delete.html:20 msgid "Yes" msgstr "" -#: wizards.py:344 +#: wizards.py:345 msgid "No" msgstr "" -#: wizards.py:1313 +#: wizards.py:1338 #, python-format msgid "[%(app_name)s] Account creation/modification" msgstr "" @@ -1579,13 +1646,13 @@ msgstr "" msgid "Log in" msgstr "" -#: templates/base.html:59 -msgid "Lang" +#: templates/base.html:82 +msgid "Current items" msgstr "" -#: templates/base.html:59 templates/base.html.py:83 templates/welcome.html:8 -#: templates/welcome.html.py:9 templates/welcome.html:10 -#: templates/welcome.html.py:11 templates/ishtar/manage_basket.html:4 +#: templates/base.html:84 templates/welcome.html:8 templates/welcome.html.py:9 +#: templates/welcome.html:10 templates/welcome.html.py:11 +#: templates/ishtar/manage_basket.html:4 #: templates/ishtar/blocks/window_field.html:1 #: templates/ishtar/blocks/window_field_detail.html:1 #: templates/ishtar/blocks/window_field_multiple.html:1 @@ -1593,23 +1660,19 @@ msgstr "" msgid ":" msgstr "" -#: templates/base.html:81 -msgid "Current items" -msgstr "" - -#: templates/base.html:115 +#: templates/base.html:120 msgid "Processing..." msgstr "" -#: templates/base.html:116 +#: templates/base.html:121 msgid "This can be long." msgstr "" -#: templates/base.html:117 +#: templates/base.html:122 msgid "Time to take a coffee?" msgstr "" -#: templates/base.html:118 +#: templates/base.html:123 msgid "Time to take another coffee?" msgstr "" @@ -2214,6 +2277,13 @@ msgstr "" msgid "Unpin" msgstr "" +#: templates/ishtar/blocks/footer.html:2 +#, python-format +msgid "" +"Powered by <a href=\"https://ishtar-archeo.net/\">Ishtar</a> v%(VERSION)s - " +"a free software under AGPL v3 license." +msgstr "" + #: templates/ishtar/blocks/window_nav.html:6 msgid "Previous version" msgstr "" @@ -2363,7 +2433,7 @@ msgstr "" msgid "Add/Modify" msgstr "" -#: templates/ishtar/wizard/default_wizard.html:59 +#: templates/ishtar/wizard/default_wizard.html:64 msgid "" "The form has changed. If you don't validate it, all your changes will be " "lost." diff --git a/ishtar_common/migrations/0069_auto__chg_field_import_error_file__chg_field_import_match_file__chg_fi.py b/ishtar_common/migrations/0069_auto__chg_field_import_error_file__chg_field_import_match_file__chg_fi.py new file mode 100644 index 000000000..1fbccf642 --- /dev/null +++ b/ishtar_common/migrations/0069_auto__chg_field_import_error_file__chg_field_import_match_file__chg_fi.py @@ -0,0 +1,507 @@ +# -*- 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 'Import.error_file' + db.alter_column('ishtar_common_import', 'error_file', self.gf('django.db.models.fields.files.FileField')(max_length=255, null=True)) + + # Changing field 'Import.match_file' + db.alter_column('ishtar_common_import', 'match_file', self.gf('django.db.models.fields.files.FileField')(max_length=255, null=True)) + + # Changing field 'Import.imported_file' + db.alter_column('ishtar_common_import', 'imported_file', self.gf('django.db.models.fields.files.FileField')(max_length=220)) + + # Changing field 'Import.result_file' + db.alter_column('ishtar_common_import', 'result_file', self.gf('django.db.models.fields.files.FileField')(max_length=255, null=True)) + + # Changing field 'Import.imported_images' + db.alter_column('ishtar_common_import', 'imported_images', self.gf('django.db.models.fields.files.FileField')(max_length=220, null=True)) + + def backwards(self, orm): + + # Changing field 'Import.error_file' + db.alter_column('ishtar_common_import', 'error_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) + + # Changing field 'Import.match_file' + db.alter_column('ishtar_common_import', 'match_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) + + # Changing field 'Import.imported_file' + db.alter_column('ishtar_common_import', 'imported_file', self.gf('django.db.models.fields.files.FileField')(max_length=100)) + + # Changing field 'Import.result_file' + db.alter_column('ishtar_common_import', 'result_file', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) + + # Changing field 'Import.imported_images' + db.alter_column('ishtar_common_import', 'imported_images', self.gf('django.db.models.fields.files.FileField')(max_length=100, null=True)) + + models = { + '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.formatertype': { + 'Meta': {'ordering': "('formater_type', 'options')", 'unique_together': "(('formater_type', 'options', 'many_split'),)", 'object_name': 'FormaterType'}, + 'formater_type': ('django.db.models.fields.CharField', [], {'max_length': '20'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'many_split': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'options': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.globalvar': { + 'Meta': {'ordering': "['slug']", 'object_name': 'GlobalVar'}, + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.historicalorganization': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalOrganization'}, + '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_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'}), + '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_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + '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.historicalperson': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalPerson'}, + '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_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + '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_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'}), + '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'}), + '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_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '70', 'null': 'True', 'blank': 'True'}) + }, + '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': '255', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'imported_file': ('django.db.models.fields.files.FileField', [], {'max_length': '220'}), + 'imported_images': ('django.db.models.fields.files.FileField', [], {'max_length': '220', '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': '255', 'null': 'True', 'blank': 'True'}), + 'result_file': ('django.db.models.fields.files.FileField', [], {'max_length': '255', '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.importercolumn': { + 'Meta': {'ordering': "('importer_type', 'col_number')", 'unique_together': "(('importer_type', 'col_number'),)", 'object_name': 'ImporterColumn'}, + 'col_number': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'columns'", 'to': "orm['ishtar_common.ImporterType']"}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'regexp_pre_filter': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Regexp']", 'null': 'True', 'blank': 'True'}), + 'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'ishtar_common.importerdefault': { + 'Meta': {'object_name': 'ImporterDefault'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'importer_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'defaults'", 'to': "orm['ishtar_common.ImporterType']"}), + 'target': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'ishtar_common.importerdefaultvalues': { + 'Meta': {'object_name': 'ImporterDefaultValues'}, + 'default_target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'default_values'", 'to': "orm['ishtar_common.ImporterDefault']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'target': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + 'value': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'ishtar_common.importerduplicatefield': { + 'Meta': {'object_name': 'ImporterDuplicateField'}, + 'column': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'duplicate_fields'", 'to': "orm['ishtar_common.ImporterColumn']"}), + 'concat': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'concat_str': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True', 'blank': 'True'}), + 'field_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'force_new': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + '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.importtarget': { + 'Meta': {'object_name': 'ImportTarget'}, + 'column': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'targets'", 'to': "orm['ishtar_common.ImporterColumn']"}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'concat': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'concat_str': ('django.db.models.fields.CharField', [], {'max_length': '5', 'null': 'True', 'blank': 'True'}), + 'force_new': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'formater_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.FormaterType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'regexp_filter': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Regexp']", 'null': 'True', 'blank': 'True'}), + 'target': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'ishtar_common.ishtarsiteprofile': { + 'Meta': {'ordering': "['label']", 'object_name': 'IshtarSiteProfile'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'base_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(0, 0, 0, 0)'", 'max_length': '200'}), + 'base_find_external_id': ('django.db.models.fields.TextField', [], {'default': "'{context_record__external_id}-{label}'"}), + 'container_external_id': ('django.db.models.fields.TextField', [], {'default': "'{responsible__external_id}-{index}'"}), + 'context_record': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'context_record_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(210,200,0,0.2)'", 'max_length': '200'}), + 'context_record_external_id': ('django.db.models.fields.TextField', [], {'default': "'{parcel__external_id}-{label}'"}), + 'currency': ('django.db.models.fields.CharField', [], {'default': "u'\\u20ac'", 'max_length': "'5'"}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'file_external_id': ('django.db.models.fields.TextField', [], {'default': "'{year}-{numeric_reference}'"}), + 'files': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'files_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(0, 32, 210, 0.1)'", 'max_length': '200'}), + 'find': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'find_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(210,0,0,0.15)'", 'max_length': '200'}), + 'find_external_id': ('django.db.models.fields.TextField', [], {'default': "'{get_first_base_find__context_record__external_id}-{label}'"}), + 'homepage': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.TextField', [], {}), + 'mapping': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'mapping_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(72, 236, 0, 0.15)'", 'max_length': '200'}), + 'parcel_external_id': ('django.db.models.fields.TextField', [], {'default': "'{associated_file__external_id}{operation__code_patriarche}-{town__numero_insee}-{section}{parcel_number}'"}), + 'person_raw_name': ('django.db.models.fields.TextField', [], {'default': "'{name|upper} {surname}'"}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'warehouse': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'warehouse_color': ('django.db.models.fields.CharField', [], {'default': "'rgba(10,20,200,0.15)'", 'max_length': '200'}), + 'warehouse_external_id': ('django.db.models.fields.TextField', [], {'default': "'{name|slug}'"}) + }, + '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.itemkey': { + 'Meta': {'object_name': 'ItemKey'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'importer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Import']", 'null': 'True', 'blank': 'True'}), + 'key': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}) + }, + '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.regexp': { + 'Meta': {'object_name': 'Regexp'}, + 'description': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'regexp': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + '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.spatialreferencesystem': { + 'Meta': {'ordering': "('label',)", 'object_name': 'SpatialReferenceSystem'}, + 'auth_name': ('django.db.models.fields.CharField', [], {'default': "'EPSG'", 'max_length': '256'}), + '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': '10'}), + 'srid': ('django.db.models.fields.IntegerField', [], {}), + '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.targetkey': { + 'Meta': {'unique_together': "(('target', 'key', 'associated_user', 'associated_import'),)", 'object_name': 'TargetKey'}, + 'associated_import': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Import']", 'null': 'True', 'blank': 'True'}), + 'associated_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.IshtarUser']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_set': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'key': ('django.db.models.fields.TextField', [], {}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'keys'", 'to': "orm['ishtar_common.ImportTarget']"}), + 'value': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}) + }, + '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 = ['ishtar_common'] diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 572bd85e7..723125149 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2124,12 +2124,14 @@ TARGET_MODELS = [ ('archaeological_finds.models.ObjectType', _(u"Object type")), ('archaeological_finds.models.IntegrityType', _(u"Integrity type")), ('archaeological_finds.models.RemarkabilityType', _(u"Remarkability type")), + ('archaeological_finds.models.BatchType', _(u"Batch type")), ('archaeological_context_records.models.IdentificationType', _("Identification type")), ('archaeological_context_records.models.RelationType', _(u"Context record relation type")), ('SpatialReferenceSystem', _(u"Spatial reference system")), ('SupportType', _(u"Support type")), + ('TitleType', _(u"Title type")), ] TARGET_MODELS_KEYS = [tm[0] for tm in TARGET_MODELS] @@ -2246,23 +2248,23 @@ ENCODINGS = [(settings.ENCODING, settings.ENCODING), class Import(models.Model): user = models.ForeignKey('IshtarUser') importer_type = models.ForeignKey(ImporterType) - imported_file = models.FileField(_(u"Imported file"), - upload_to="upload/imports/") + imported_file = models.FileField( + _(u"Imported file"), upload_to="upload/imports/", max_length=220) imported_images = models.FileField( _(u"Associated images (zip file)"), upload_to="upload/imports/", - blank=True, null=True) + blank=True, null=True, max_length=220) encoding = models.CharField(_(u"Encoding"), choices=ENCODINGS, default='utf-8', max_length=15) skip_lines = models.IntegerField(_(u"Skip lines"), default=1) error_file = models.FileField(_(u"Error file"), upload_to="upload/imports/", - blank=True, null=True) + blank=True, null=True, max_length=255) result_file = models.FileField(_(u"Result file"), upload_to="upload/imports/", - blank=True, null=True) + blank=True, null=True, max_length=255) match_file = models.FileField(_(u"Match file"), upload_to="upload/imports/", - blank=True, null=True) + blank=True, null=True, max_length=255) state = models.CharField(_(u"State"), max_length=2, choices=IMPORT_STATE, default='C') conservative_import = models.BooleanField( diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 6fe6e6532..5ff9e9895 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -395,7 +395,7 @@ div#validation-bar.big{ } a.button{ - padding: 8px; + padding: 7px; } #reset_wizards{ diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 870409e41..614a83595 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -1,4 +1,4 @@ -{% load i18n %}{% load url from future%}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" +{% load i18n %}{% load url from future %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{{LANGUAGE_CODE}}" lang="{{LANGUAGE_CODE}}"> @@ -109,10 +109,11 @@ {% block content %}{% endblock %} </div> + {% block footer %} <div id="footer"> - {% block footer %} - {% endblock %} + {% include 'ishtar/blocks/footer.html' %} </div> + {% endblock %} <div id="progress"> <div id='progress-content'> <p class='progress-detail progress-1'>{% trans "Processing..." %}</p> diff --git a/ishtar_common/templates/ishtar/blocks/footer.html b/ishtar_common/templates/ishtar/blocks/footer.html new file mode 100644 index 000000000..8705c5892 --- /dev/null +++ b/ishtar_common/templates/ishtar/blocks/footer.html @@ -0,0 +1,3 @@ +{% load i18n %}<div id="foot"> + {% blocktrans %}Powered by <a href="https://ishtar-archeo.net/">Ishtar</a> v{{VERSION}} - a free software under AGPL v3 license.{% endblocktrans %} +</div>
\ No newline at end of file diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html index fad1895bd..e77484e61 100644 --- a/ishtar_common/templates/ishtar/wizard/default_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html @@ -44,9 +44,14 @@ {% endblock %} <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" /> {{ previous_fields|safe }} +{% block "footer" %} + <div id="footer"> {% block "validation_bar" %} {% include 'ishtar/wizard/validation_bar.html' %} {% endblock %} +{% include 'ishtar/blocks/footer.html' %} +{% endblock %} + </div> </div> </form> {% endblock %} diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 9ced28ea6..9e5fc3466 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -355,7 +355,7 @@ class ShortMenuTest(TestCase): if not user: user = self.other_user from archaeological_operations.models import Operation, OperationType - ope_type = OperationType.objects.create() + ope_type, created = OperationType.objects.get_or_create(label="test") return Operation.objects.create( operation_type=ope_type, history_modifier=user, @@ -662,6 +662,28 @@ class ShortMenuTest(TestCase): self.assertEqual(response.status_code, 200) self.assertFalse(str(treat.cached_label) in response.content) + def test_update_current_item(self): + c = Client() + c.login(username=self.username, password=self.password) + base_find, find = self._create_find() + + response = c.get(reverse('pin', args=['find', find.pk])) + self.assertEqual(response.status_code, 200) + # the selected find is pined + self.assertEqual(c.session['find'], str(find.pk)) + # dependant items are also pined + self.assertEqual(c.session['contextrecord'], + str(base_find.context_record.pk)) + self.assertEqual(c.session['operation'], + str(base_find.context_record.operation.pk)) + + # pin another operation - dependant items are nullify + ope = self._create_ope() + response = c.get(reverse('pin', args=['operation', ope.pk])) + self.assertEqual(response.status_code, 200) + self.assertFalse(c.session['find']) + self.assertFalse(c.session['contextrecord']) + class ImportTest(TestCase): def testDeleteRelated(self): diff --git a/ishtar_common/views.py b/ishtar_common/views.py index e8ae1a458..33f4fac7f 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -368,14 +368,14 @@ def update_current_item(request, item_type=None, pk=None): request.session["operation"] = '' currents['operation'] = None if item_type in ('operation', 'file') and currents['contextrecord'] and \ - (not request.session["operation"] or + (not request.session.get("operation", None) or currents['contextrecord'].operation != currents['operation']): request.session["contextrecord"] = '' currents['contextrecord'] = None from archaeological_finds.models import Find if item_type in ('contextrecord', 'operation', 'file') and \ currents['find'] and \ - (not request.session["contextrecord"] or + (not request.session.get("contextrecord", None) or not Find.objects.filter( downstream_treatment__isnull=True, base_finds__context_record__pk=request.session["contextrecord"], |