Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar

4 files changed, 415 insertions, 135 deletions

diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 72834d8f0..0b2555148 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -111,7 +111,8 @@ ParcelFormSet = formset_factory(ParcelForm, can_delete=True,
 ParcelFormSet.form_label = _(u"Parcels")
 
 class OperationSelect(TableSelect):
-    common_name = forms.CharField(label=_(u"Name"), max_length=30)
+    common_name = forms.CharField(label=_(u"Name (full text search)"),
+                                  max_length=30)
     if settings.COUNTRY == 'fr':
         code_patriarche = forms.IntegerField(
          widget=widgets.JQueryAutoComplete("/" + settings.URL_PATH + \
diff --git a/archaeological_operations/locale/fr/LC_MESSAGES/django.po b/archaeological_operations/locale/fr/LC_MESSAGES/django.po
index 4d16482b7..94b05a01c 100644
--- a/archaeological_operations/locale/fr/LC_MESSAGES/django.po
+++ b/archaeological_operations/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-22 00:24+0200\n"
+"POT-Creation-Date: 2013-04-17 00:39+0200\n"
 "PO-Revision-Date: 2010-12-09\n"
 "Last-Translator: Étienne Loks <etienne.loks at peacefrogs net>\n"
 "Language-Team: \n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: forms.py:46 forms.py:94 forms.py:278 forms.py:299 forms.py:303
-#: models.py:316
+#: forms.py:57 forms.py:111 forms.py:325 forms.py:346 forms.py:350
+#: models.py:327 templates/ishtar/sheet_operation.html:63
 msgid "Parcels"
 msgstr "Parcelles"
 
-#: forms.py:49 forms.py:256 models.py:310
+#: forms.py:60 forms.py:303 models.py:321
 #: templates/ishtar/dashboards/dashboard_operation.html:302
 #: templates/ishtar/dashboards/dashboard_operation.html:315
 #: templates/ishtar/dashboards/dashboard_operation.html:485
@@ -31,102 +31,133 @@ msgstr "Parcelles"
 msgid "Town"
 msgstr "Commune"
 
-#: forms.py:51 models.py:311
+#: forms.py:62 forms.py:134 forms.py:226 models.py:81 models.py:319
+#: templates/ishtar/sheet_operation.html:61
+#: templates/ishtar/sheet_operation.html:82
+msgid "Year"
+msgstr "Année"
+
+#: forms.py:65 models.py:322 templates/ishtar/sheet_operation.html:62
 msgid "Section"
 msgstr "Section"
 
-#: forms.py:53 models.py:312
+#: forms.py:67 models.py:323
 msgid "Parcel number"
 msgstr "Numéro de parcelle"
 
-#: forms.py:55 forms.py:103 forms.py:179 models.py:77 models.py:308
-msgid "Year"
-msgstr "Année"
-
-#: forms.py:82
+#: forms.py:95
 msgid "Town section and parcel number fields are required."
 msgstr "La commune, la section et le numéro de parcelle sont obligatoire."
 
-#: forms.py:90
+#: forms.py:107
 msgid "There are identical parcels."
 msgstr "Il y a des parcelles identiques."
 
-#: forms.py:97
-msgid "Name"
-msgstr "Nom"
+#: forms.py:114
+msgid "Name (full text search)"
+msgstr "Nom (recherche texte intégral)"
 
-#: forms.py:99 forms.py:169 forms.py:388 models.py:37 models.py:83
+#: forms.py:122 forms.py:216 forms.py:435 models.py:39 models.py:88
 msgid "Operation type"
 msgstr "Type d'opération"
 
-#: forms.py:101 models.py:85
+#: forms.py:129 models.py:80
+msgid "In charge"
+msgstr "Responsable"
+
+#: forms.py:130 models.py:90
 msgid "Remains"
 msgstr "Vestiges"
 
-#: forms.py:104
+#: forms.py:132 forms.py:370 forms.py:384 models.py:93
+#: templates/ishtar/sheet_operation.html:150
+msgid "Periods"
+msgstr "Périodes"
+
+#: forms.py:135
+msgid "Started before"
+msgstr "Commencé avant"
+
+#: forms.py:137
+msgid "Started after"
+msgstr "Commencé après"
+
+#: forms.py:139
+msgid "Ended before"
+msgstr "Terminé avant"
+
+#: forms.py:141
+msgid "Ended after"
+msgstr "Terminé après"
+
+#: forms.py:143
+msgid "Parcel (section/number)"
+msgstr "Parcelle (section/numéro)"
+
+#: forms.py:144
 msgid "Is open?"
 msgstr "Est ouvert ?"
 
-#: forms.py:112 forms.py:382 views.py:102
+#: forms.py:159 forms.py:429 views.py:137
 msgid "Operation search"
 msgstr "Recherche d'opérations"
 
-#: forms.py:124 forms.py:384
+#: forms.py:171 forms.py:431
 msgid "You should select an operation."
 msgstr "Vous devez sélectionner une opération."
 
-#: forms.py:152 forms.py:438
+#: forms.py:199 forms.py:485 templates/ishtar/sheet_operation.html:5
 msgid "General"
 msgstr "Général"
 
-#: forms.py:158 models.py:263
+#: forms.py:205 models.py:274
 msgid "Person in charge of the operation"
 msgstr "Responsable d'opération"
 
-#: forms.py:165 models.py:247 models.py:275
+#: forms.py:212 models.py:258 models.py:286
 msgid "Archaelogical file"
 msgstr "Dossier archéologique"
 
-#: forms.py:171 models.py:56 models.py:71 models.py:334
+#: forms.py:218 models.py:60 models.py:75 models.py:360
 msgid "Start date"
 msgstr "Date de début"
 
-#: forms.py:173 models.py:72
+#: forms.py:220 models.py:76
 msgid "Excavation end date"
 msgstr "Date de fin de chantier"
 
-#: forms.py:176 templates/ishtar/dashboards/dashboard_operation.html:315
+#: forms.py:223 templates/ishtar/dashboards/dashboard_operation.html:315
 msgid "Total surface (m²)"
 msgstr "Surface totale des terrains (m²)"
 
-#: forms.py:183 models.py:78 models.py:157
+#: forms.py:230 models.py:82 models.py:166
 msgid "Operation code"
 msgstr "Code de l'opération"
 
-#: forms.py:186 models.py:113
+#: forms.py:233 models.py:118
 msgid "Generic name"
 msgstr "Nom générique"
 
-#: forms.py:188 models.py:111
+#: forms.py:235 models.py:116
 msgid "Operator reference"
 msgstr "Référence de l'opérateur"
 
-#: forms.py:195 models.py:115
+#: forms.py:242 models.py:120
 msgid "Comment"
 msgstr "Commentaire"
 
-#: forms.py:208
+#: forms.py:255
 msgid ""
 "If you want to set an excavation end date you have to provide a start date."
 msgstr ""
 "Avant de renseigner la date de fin de chantier, il est nécessaire de "
 "renseigner une date de début."
 
-#: forms.py:211
+#: forms.py:258
 msgid "The excavation end date cannot be before the start date."
 msgstr "La date de fin de chantier ne peut être avant la date de début."
 
-#: forms.py:223
+#: forms.py:270
 #, python-format
 msgid ""
 "Operation code already exist for year: %(year)d - use a value bigger than "
@@ -135,88 +166,86 @@ msgstr ""
 "Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur "
 "plus grande que %(last_val)d"
 
-#: forms.py:229
+#: forms.py:276
 msgid "Preventive informations - excavation"
 msgstr "Information archéologie préventive - fouille"
 
-#: forms.py:230 models.py:87
+#: forms.py:277 models.py:92
 #: templates/ishtar/dashboards/dashboard_operation.html:498
 msgid "Cost (€)"
 msgstr "Cout (€)"
 
-#: forms.py:231 models.py:89
+#: forms.py:278 models.py:94
 msgid "Scheduled man-days"
 msgstr "Jours-hommes prévus"
 
-#: forms.py:233 models.py:91
+#: forms.py:280 models.py:96
 msgid "Optional man-days"
 msgstr "Jours-hommes optionnels"
 
-#: forms.py:235 models.py:93
+#: forms.py:282 models.py:98
 msgid "Effective man-days"
 msgstr "Jours-hommes effectifs"
 
-#: forms.py:244
+#: forms.py:291
 msgid "Preventive informations - diagnostic"
 msgstr "Information archéologie préventive - diagnostic"
 
-#: forms.py:247 models.py:106
+#: forms.py:294 models.py:111
 msgid "Prescription on zoning"
 msgstr "Prescription sur zonage"
 
-#: forms.py:249 models.py:108
+#: forms.py:296 models.py:113
 msgid "Prescription on large area"
 msgstr "Prescription sur une vaste surface"
 
-#: forms.py:251 models.py:110
+#: forms.py:298 models.py:115
 msgid "Prescription on geoarchaeological context"
 msgstr "Prescription sur un contexte géoarchéologique"
 
-#: forms.py:254 forms.py:275 models.py:86
+#: forms.py:301 forms.py:322 models.py:91
 msgid "Towns"
 msgstr "Communes"
 
-#: forms.py:280 models.py:315 models.py:333
+#: forms.py:327 models.py:326 models.py:359
+#: templates/ishtar/sheet_operation.html:127
+#: templates/ishtar/sheet_operation.html:154
 msgid "Parcel"
 msgstr "Parcelle"
 
-#: forms.py:306 forms.py:320 models.py:52
+#: forms.py:353 forms.py:367 models.py:56
 msgid "Remain types"
 msgstr "Types de vestige"
 
-#: forms.py:309 models.py:51
+#: forms.py:356 models.py:55
 msgid "Remain type"
 msgstr "Type de vestige"
 
-#: forms.py:316
+#: forms.py:363
 msgid "There are identical remain types"
 msgstr "Il y a des types de vestige identiques."
 
-#: forms.py:323 forms.py:337 models.py:88
-msgid "Periods"
-msgstr "Périodes"
-
-#: forms.py:326
+#: forms.py:373
 msgid "Period"
 msgstr "Période"
 
-#: forms.py:333
+#: forms.py:380
 msgid "There are identical periods"
 msgstr "Il y a des périodes identiques."
 
-#: forms.py:341
+#: forms.py:388
 msgid "Would you like to close this operation?"
 msgstr "Voulez vous clore cette opération ?"
 
-#: forms.py:345
+#: forms.py:392
 msgid "Would you like to delete this operation?"
 msgstr "Voulez vous supprimer cette opération ?"
 
-#: forms.py:353 models.py:242
+#: forms.py:400 models.py:253
 msgid "Index"
 msgstr "Index"
 
-#: forms.py:376
+#: forms.py:423
 #, python-format
 msgid ""
 "Index already exist for operation: %(operation)s - use a value bigger than "
@@ -225,52 +254,52 @@ msgstr ""
 "Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur "
 "plus grande que %(last_val)d"
 
-#: forms.py:387
+#: forms.py:434
 msgid "Operation's town"
 msgstr "Commune de l'opération"
 
-#: forms.py:390
+#: forms.py:437
 msgid "Operation's year"
 msgstr "Année de l'opération"
 
-#: forms.py:401
+#: forms.py:448
 msgid "Documentation search"
 msgstr "Recherche de document"
 
-#: forms.py:403
+#: forms.py:450
 msgid "You should select a document."
 msgstr "Vous devez sélectionner un document."
 
-#: forms.py:411 forms.py:441 models.py:253 models.py:261
+#: forms.py:458 forms.py:488 models.py:264 models.py:272
 msgid "Act type"
 msgstr "Type d'acte"
 
-#: forms.py:421
+#: forms.py:468
 msgid "Administrative act search"
 msgstr "Recherche d'actes administratifs"
 
-#: forms.py:433
+#: forms.py:480
 msgid "You should select an administrative act."
 msgstr "Vous devez sélectionner un acte administratif."
 
-#: forms.py:442 models.py:269
+#: forms.py:489 models.py:280
 msgid "Signatory"
 msgstr "Signataire"
 
-#: forms.py:446 models.py:278
+#: forms.py:493 models.py:289
 msgid "Object"
 msgstr "Objet"
 
-#: forms.py:448 models.py:276
+#: forms.py:495 models.py:287
 msgid "Signature date"
 msgstr "Date de signature"
 
-#: forms.py:462
+#: forms.py:509
 msgid "Would you like to delete this administrative act?"
 msgstr "Voulez vous supprimer cet acte administratif ?"
 
-#: ishtar_menu.py:27 models.py:119 models.py:229 models.py:240 models.py:248
-#: models.py:271 models.py:307
+#: ishtar_menu.py:27 models.py:124 models.py:240 models.py:251 models.py:259
+#: models.py:282 models.py:318
 msgid "Operation"
 msgstr "Opération"
 
@@ -294,7 +323,7 @@ msgstr "Clotûre"
 msgid "Deletion"
 msgstr "Suppression"
 
-#: ishtar_menu.py:50 models.py:284
+#: ishtar_menu.py:50 models.py:295
 msgid "Administrative act"
 msgstr "Acte administratif"
 
@@ -314,207 +343,207 @@ msgstr "Tableau de bord"
 msgid "General informations"
 msgstr "Informations générales"
 
-#: ishtar_menu.py:93 models.py:120
+#: ishtar_menu.py:93 models.py:125
 #: templates/ishtar/dashboards/dashboard_operation.html:9
 msgid "Operations"
 msgstr "Opérations"
 
-#: models.py:38
+#: models.py:37
+msgid "Is preventive"
+msgstr ""
+
+#: models.py:40
 msgid "Operation types"
 msgstr "Types d'opération"
 
-#: models.py:55
+#: models.py:59
 msgid "Order"
 msgstr "Ordre"
 
-#: models.py:57 models.py:335
+#: models.py:61 models.py:361
 msgid "End date"
 msgstr "Date de fin"
 
-#: models.py:58
+#: models.py:62
 msgid "Parent period"
 msgstr "Période parente"
 
-#: models.py:62
+#: models.py:66
 msgid "Type Period"
 msgstr "Type de période"
 
-#: models.py:63
+#: models.py:67
 msgid "Types Period"
 msgstr "Types de période"
 
-#: models.py:74
+#: models.py:78
 msgid "Closing date"
 msgstr "Date de clotûre"
 
-#: models.py:76
-msgid "In charge"
-msgstr "Responsable"
-
-#: models.py:81 models.py:305
+#: models.py:86 models.py:316
 msgid "File"
 msgstr "Dossier"
 
-#: models.py:84
+#: models.py:89
 msgid "Surface (m²)"
 msgstr "Area (m²)"
 
-#: models.py:122
+#: models.py:127
 msgid "Can view own Operation"
 msgstr "Peut voir sa propre Opération"
 
-#: models.py:123
+#: models.py:128
 msgid "Can add own Operation"
 msgstr "Peut ajouter sa propre Opération"
 
-#: models.py:124
+#: models.py:129
 msgid "Can change own Operation"
 msgstr "Peut changer sa propre Opération"
 
-#: models.py:125
+#: models.py:130
 msgid "Can delete own Operation"
 msgstr "Peut supprimer sa propre Opération"
 
-#: models.py:129
+#: models.py:134
 msgid "Intercommunal"
 msgstr "Intercommunal"
 
-#: models.py:170
+#: models.py:181
 msgid "This operation code already exists for this year"
 msgstr "Cet code d'opération existe déjà pour cette année."
 
-#: models.py:230 templates/ishtar/dashboards/dashboard_operation.html:273
+#: models.py:241 templates/ishtar/dashboards/dashboard_operation.html:273
 #: templates/ishtar/dashboards/dashboard_operation.html:286
 #: templates/ishtar/dashboards/dashboard_operation.html:456
 #: templates/ishtar/dashboards/dashboard_operation.html:469
 msgid "Department"
 msgstr "Département"
 
-#: models.py:238
+#: models.py:249
 msgid "Operation documentation"
 msgstr "Documentation d'une opération"
 
-#: models.py:239
+#: models.py:250
 msgid "Operation documentations"
 msgstr "Documentations des opérations"
 
-#: models.py:250
+#: models.py:261
 msgid "Intended to"
 msgstr "Destiné à"
 
-#: models.py:254
+#: models.py:265
 msgid "Act types"
 msgstr "Types d'acte"
 
-#: models.py:265
+#: models.py:276
 msgid "Archaeological preventive operator"
 msgstr "Opérateur d'archéologie préventive"
 
-#: models.py:267
+#: models.py:278
 msgid "Person in charge of the scientific part"
 msgstr "Responsable scientifique"
 
-#: models.py:285
+#: models.py:296 templates/ishtar/sheet_operation.html:80
 msgid "Administrative acts"
 msgstr "Actes administratifs"
 
-#: models.py:288
+#: models.py:299
 msgid "Can view own Administrative act"
 msgstr "Peut voir son propre Acte administratif"
 
-#: models.py:290
+#: models.py:301
 msgid "Can add own Administrative act"
 msgstr "Peut ajouter son propre Acte administratif"
 
-#: models.py:292
+#: models.py:303
 msgid "Can change own Administrative act"
 msgstr "Peut changer son propre Acte administratif"
 
-#: models.py:294
+#: models.py:305
 msgid "Can delete own Administrative act"
 msgstr "Peut supprimer son propre Acte administratif"
 
-#: models.py:332
+#: models.py:358
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: models.py:338
+#: models.py:364
 msgid "Parcel owner"
 msgstr "Propriétaire de parcelle"
 
-#: models.py:339
+#: models.py:365
 msgid "Parcel owners"
 msgstr "Propriétaires de parcelle"
 
-#: models.py:363
+#: models.py:389
 msgid "Recorded"
 msgstr "Enregistré"
 
-#: models.py:364
+#: models.py:390
 msgid "Effective"
 msgstr "Effectif"
 
-#: models.py:365
+#: models.py:391
 msgid "Active"
 msgstr "Actif"
 
-#: models.py:366
+#: models.py:392
 msgid "Field completed"
 msgstr "Terrain achevé"
 
-#: models.py:367
+#: models.py:393
 msgid "Associated report"
 msgstr "Rapport associé"
 
-#: models.py:368
+#: models.py:394
 msgid "Closed"
 msgstr "Fermé"
 
-#: models.py:369
+#: models.py:395
 msgid "Documented and closed"
 msgstr "Documenté et clôt"
 
-#: views.py:116
+#: views.py:151
 msgid "New operation"
 msgstr "Nouvelle opération"
 
-#: views.py:147
+#: views.py:182
 msgid "Operation modification"
 msgstr "Modification d'une opération"
 
-#: views.py:170
+#: views.py:205
 msgid "Operation closing"
 msgstr "Clotûre de l'opération"
 
-#: views.py:176
+#: views.py:211
 msgid "Operation deletion"
 msgstr "Suppression d'une opération"
 
-#: views.py:184
+#: views.py:219
 msgid "Operation: source creation"
 msgstr "Operation : nouvelle documentation associée"
 
-#: views.py:192
+#: views.py:227
 msgid "Operation: source modification"
 msgstr "Operation : modification d'une documentation associée"
 
-#: views.py:198
+#: views.py:233
 msgid "Operation: source deletion"
 msgstr "Operation : suppression d'une documentation associée"
 
-#: views.py:207
+#: views.py:242
 msgid "Operation: new administrative act"
 msgstr "Operation : nouvel acte administratif"
 
-#: views.py:217
+#: views.py:252
 msgid "Operation: administrative act modification"
 msgstr "Operation : modification d'un acte administratif"
 
-#: views.py:226
+#: views.py:261
 msgid "Operation: administrative act deletion"
 msgstr "Operation : suppression d'un acte administratif"
 
-#: wizards.py:128
+#: wizards.py:134
 msgid ""
 "Warning: No Archaelogical File is provided. If you have forget it return to "
 "the first step."
@@ -522,6 +551,263 @@ msgstr ""
 "Attention : Aucun dossier archéologique n'a été précisé. S'il s'agit d'un "
 "oubli, définissez le à la première étape."
 
+#: templates/ishtar/sheet_operation.html:4
+msgid "Export as:"
+msgstr ""
+
+#: templates/ishtar/sheet_operation.html:4
+msgid "OpenOffice.org file"
+msgstr ""
+
+#: templates/ishtar/sheet_operation.html:4
+msgid "PDF file"
+msgstr ""
+
+#: templates/ishtar/sheet_operation.html:6
+msgid "Name:"
+msgstr "Nom :"
+
+#: templates/ishtar/sheet_operation.html:7
+msgid "Year:"
+msgstr "Année :"
+
+#: templates/ishtar/sheet_operation.html:8
+msgid "Numerical reference:"
+msgstr "Identifiant numérique :"
+
+#: templates/ishtar/sheet_operation.html:10
+msgid "Patriarche OA code:"
+msgstr "Code d'opération Patriarche"
+
+#: templates/ishtar/sheet_operation.html:11
+msgid "Patriarche OA code not yet recorded!"
+msgstr "Code d'opération Patriarche non renseigné !"
+
+#: templates/ishtar/sheet_operation.html:13
+msgid "Edition date:"
+msgstr "Date d'édition :"
+
+#: templates/ishtar/sheet_operation.html:15
+msgid "Begining date:"
+msgstr "Date de début :"
+
+#: templates/ishtar/sheet_operation.html:16
+msgid "Excavation end date:"
+msgstr "Date de fin de chantier :"
+
+#: templates/ishtar/sheet_operation.html:18
+msgid "Head scientist:"
+msgstr "Responsable scientifique :"
+
+#: templates/ishtar/sheet_operation.html:19
+msgid "State:"
+msgstr "État :"
+
+#: templates/ishtar/sheet_operation.html:19
+msgid "Active file"
+msgstr "Dossier archéologique actif"
+
+#: templates/ishtar/sheet_operation.html:20
+msgid "Closed operation"
+msgstr "Opération fermée"
+
+#: templates/ishtar/sheet_operation.html:21
+msgid "Closing date:"
+msgstr "Date de clotûre :"
+
+#: templates/ishtar/sheet_operation.html:21
+msgid "by"
+msgstr "par"
+
+#: templates/ishtar/sheet_operation.html:23
+msgid "Type:"
+msgstr "Type :"
+
+#: templates/ishtar/sheet_operation.html:24
+msgid "Surface:"
+msgstr "Surface :"
+
+#: templates/ishtar/sheet_operation.html:25
+msgid "Cost:"
+msgstr "Coût :"
+
+#: templates/ishtar/sheet_operation.html:26
+msgid "Duration:"
+msgstr "Durée :"
+
+#: templates/ishtar/sheet_operation.html:26
+msgid "Day"
+msgstr "Jour"
+
+#: templates/ishtar/sheet_operation.html:28
+msgid "Remains:"
+msgstr "Vestiges :"
+
+#: templates/ishtar/sheet_operation.html:29
+msgid "Periods:"
+msgstr "Périodes :"
+
+#: templates/ishtar/sheet_operation.html:32
+msgid "Associated file:"
+msgstr "Dossier archéologique associé :"
+
+#: templates/ishtar/sheet_operation.html:35
+msgid "Town planning service:"
+msgstr "Service instructeur :"
+
+#: templates/ishtar/sheet_operation.html:36
+msgid "Permit type:"
+msgstr "Type de permis :"
+
+#: templates/ishtar/sheet_operation.html:37
+msgid "Permit reference:"
+msgstr "Référence du permis :"
+
+#: templates/ishtar/sheet_operation.html:38
+msgid "General contractor organisation:"
+msgstr "Organisation de l'aménageur :"
+
+#: templates/ishtar/sheet_operation.html:39
+msgid "General contractor:"
+msgstr "Aménageur :"
+
+#: templates/ishtar/sheet_operation.html:43
+msgid "Comment:"
+msgstr "Commentaire :"
+
+#: templates/ishtar/sheet_operation.html:45
+msgid "Localisation"
+msgstr "Localisation"
+
+#: templates/ishtar/sheet_operation.html:46
+msgid "Towns:"
+msgstr "Communes :"
+
+#: templates/ishtar/sheet_operation.html:48
+msgid "Main address:"
+msgstr "Adresse des terrains :"
+
+#: templates/ishtar/sheet_operation.html:49
+msgid "Complement:"
+msgstr "Complément :"
+
+#: templates/ishtar/sheet_operation.html:50
+msgid "Postal code:"
+msgstr "Code postal :"
+
+#: templates/ishtar/sheet_operation.html:58
+msgid "Associated parcels"
+msgstr "Parcelles associées"
+
+#: templates/ishtar/sheet_operation.html:60
+msgid "Commune"
+msgstr "Commune"
+
+#: templates/ishtar/sheet_operation.html:75
+msgid "No parcel associated to this operation"
+msgstr "Pas de parcelle associée à cette opération"
+
+#: templates/ishtar/sheet_operation.html:83
+msgid "Reference"
+msgstr "Référence"
+
+#: templates/ishtar/sheet_operation.html:84
+#: templates/ishtar/sheet_operation.html:104
+#: templates/ishtar/sheet_operation.html:124
+#: templates/ishtar/dashboards/dashboard_operation.html:82
+msgid "Type"
+msgstr "Type"
+
+#: templates/ishtar/sheet_operation.html:85
+msgid "Date"
+msgstr "Date"
+
+#: templates/ishtar/sheet_operation.html:95
+msgid "No acts associated to this operation"
+msgstr "Pas d'acte associé à cette opération"
+
+#: templates/ishtar/sheet_operation.html:99
+msgid "Scientific documentation"
+msgstr "Documentation scientifique"
+
+#: templates/ishtar/sheet_operation.html:101
+msgid "Documents"
+msgstr "Documents"
+
+#: templates/ishtar/sheet_operation.html:103
+msgid "Title"
+msgstr "Titre"
+
+#: templates/ishtar/sheet_operation.html:105
+msgid "Authors"
+msgstr "Auteurs"
+
+#: templates/ishtar/sheet_operation.html:116
+msgid "No scientific document associated to this operation"
+msgstr "Pas de document scientifique associé à cette opération"
+
+#: templates/ishtar/sheet_operation.html:121
+msgid "Context records"
+msgstr "Unité d'Enregistrement"
+
+#: templates/ishtar/sheet_operation.html:123
+msgid "ID"
+msgstr "Identifiant"
+
+#: templates/ishtar/sheet_operation.html:125
+msgid "Chronology"
+msgstr "Chronologie"
+
+#: templates/ishtar/sheet_operation.html:126
+#: templates/ishtar/sheet_operation.html:151
+msgid "Description"
+msgstr "Description"
+
+#: templates/ishtar/sheet_operation.html:137
+#: templates/ishtar/sheet_operation.html:170
+msgid "Details"
+msgstr "Détails"
+
+#: templates/ishtar/sheet_operation.html:140
+msgid "No context record associated to this operation"
+msgstr "Pas d'Unité d'Enregistrement associée à cette opération"
+
+#: templates/ishtar/sheet_operation.html:145
+msgid "Finds"
+msgstr "Mobilier"
+
+#: templates/ishtar/sheet_operation.html:147
+msgid "Find"
+msgstr "Mobilier"
+
+#: templates/ishtar/sheet_operation.html:148
+msgid "Material type"
+msgstr "Type de matériau"
+
+#: templates/ishtar/sheet_operation.html:149
+msgid "Context record"
+msgstr "Unité d'Enregistrement"
+
+#: templates/ishtar/sheet_operation.html:152
+msgid "Weight"
+msgstr "Poids"
+
+#: templates/ishtar/sheet_operation.html:153
+msgid "Numbers"
+msgstr "Nombre"
+
+#: templates/ishtar/sheet_operation.html:174
+msgid "No find associated to context record"
+msgstr "Pas de mobilier associé à cette Unité d'Enregistrement"
+
+#: templates/ishtar/sheet_operation.html:177
+msgid "No find associated to parcel"
+msgstr "Pas de mobilier associé à cette parcelle"
+
+#: templates/ishtar/sheet_operation.html:177
+msgid "(no context record)"
+msgstr "(pas d'Unité d'Enregistrement)"
+
 #: templates/ishtar/dashboards/dashboard_operation.html:11
 msgid "Global informations"
 msgstr "Informations générales"
@@ -591,10 +877,6 @@ msgstr "Par année de réalisation"
 msgid "Effective operation by type and year"
 msgstr "Opération effective par type et année"
 
-#: templates/ishtar/dashboards/dashboard_operation.html:82
-msgid "Type"
-msgstr "Type"
-
 #: templates/ishtar/dashboards/dashboard_operation.html:93
 msgid "By realisation month"
 msgstr "Par mois de réalisation"
@@ -752,4 +1034,3 @@ msgstr "Coût FNAP"
 #: templates/ishtar/dashboards/dashboard_operation.html:496
 msgid "Main towns by cost"
 msgstr "Principales communes par coût"
-
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 491304125..2fab55a39 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -3,14 +3,13 @@
 {% block content %}
 <div class='tool'>{%trans "Export as:"%} <a href='{% url show-operation item.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-operation item.pk "pdf" %}'>{%trans "PDF file"%}</a></div>
 <h3>{% trans "General"%}</h3>
+{% if item.common_name %}<p><label>{%trans "Name:"%}</label> <span class='value'>{{ item.common_name }}</span></p>{% endif %}
 <p><label>{%trans "Year:"%}</label> <span class='value'>{{ item.year }}</span></p>
 {% if item.operation.operation_code %}<p><label>{%trans "Numerical reference:"%}</label> <span class='value'>{{ item.operation_code }}</span></p>{% endif %}
 
 {% if item.code_patriarche %}<p><label>{%trans "Patriarche OA code:"%}</label> <span class='value'>{{ item.code_patriarche }}</span></p>{%else%}
 <p class='alert'>{%trans "Patriarche OA code not yet recorded!"%}</p>{%endif%}
 
-{#<p><label>{%trans "Operation's name:"%}</label> <span class='value'>{{ item.internal_reference }}</span></p>#}
-
 <p><label>{%trans "Edition date:"%}</label> <span class='value'>{{ item.history.all.0.history_date }}</span></p> <!-- date = now -->
 
 {% if item.start_date %}<p><label>{%trans "Begining date:"%}</label> <span class='value'>{{ item.start_date }}</span></p>
diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po
index 96a467273..d6cd9f86d 100644
--- a/ishtar_common/locale/fr/LC_MESSAGES/django.po
+++ b/ishtar_common/locale/fr/LC_MESSAGES/django.po
@@ -447,9 +447,8 @@ msgid "Localisation"
 msgstr "Localisation"
 
 #: views.py:79
-#, fuzzy
 msgid "New person"
-msgstr "Peut voir les Personnes"
+msgstr "Nouvelle personne"
 
 #: views.py:86
 msgid "Person modification"
@@ -632,7 +631,7 @@ msgstr "Identifiant complet :"
 #: templates/sheet_contextrecord.html:11 templates/sheet_contextrecord.html:54
 #: templates/sheet_operation.html:10
 msgid "Patriarche OA code not yet recorded!"
-msgstr "Code Patriarche pas encore enregistré !"
+msgstr "Code d'opération Patriarche non renseigné !"
 
 #: templates/sheet_contextrecord.html:12
 msgid "Temporary ID:"