Merge branch 'master' into v0.9

2 files changed, 61 insertions, 46 deletions

diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot
index 3eecfc8cd..966c983c8 100644
--- a/archaeological_files/locale/django.pot
+++ b/archaeological_files/locale/django.pot
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 
 #: forms.py:47 forms.py:210 forms.py:255 forms.py:396 forms.py:423
-#: models.py:108 templates/ishtar/sheet_file.html:146
+#: models.py:108 templates/ishtar/sheet_file.html:157
 msgid "Year"
 msgstr ""
 
@@ -55,11 +55,11 @@ msgid "Permit reference"
 msgstr ""
 
 #: forms.py:63 forms.py:227 forms.py:364 models.py:180
-#: templates/ishtar/sheet_file.html:99
+#: templates/ishtar/sheet_file.html:110
 msgid "Comment"
 msgstr ""
 
-#: forms.py:65 templates/ishtar/sheet_file.html:119
+#: forms.py:65 templates/ishtar/sheet_file.html:130
 msgid "In charge"
 msgstr ""
 
@@ -164,12 +164,12 @@ msgstr ""
 msgid "Total developed surface (m2)"
 msgstr ""
 
-#: forms.py:333 templates/ishtar/sheet_file.html:89
+#: forms.py:333 templates/ishtar/sheet_file.html:100
 #: templates/ishtar/dashboards/dashboard_file.html:45
 msgid "Research archaeology"
 msgstr ""
 
-#: forms.py:341 models.py:183 templates/ishtar/sheet_file.html:90
+#: forms.py:341 models.py:183 templates/ishtar/sheet_file.html:101
 msgid "Departments"
 msgstr ""
 
@@ -177,7 +177,7 @@ msgstr ""
 msgid "Scientist in charge"
 msgstr ""
 
-#: forms.py:353 models.py:186 templates/ishtar/sheet_file.html:92
+#: forms.py:353 models.py:186 templates/ishtar/sheet_file.html:103
 msgid "Requested operation type"
 msgstr ""
 
@@ -185,11 +185,11 @@ msgstr ""
 msgid "Lead organization"
 msgstr ""
 
-#: forms.py:371 models.py:196 templates/ishtar/sheet_file.html:97
+#: forms.py:371 models.py:196 templates/ishtar/sheet_file.html:108
 msgid "Classified area"
 msgstr ""
 
-#: forms.py:373 models.py:198 templates/ishtar/sheet_file.html:98
+#: forms.py:373 models.py:198 templates/ishtar/sheet_file.html:109
 msgid "Protected area"
 msgstr ""
 
@@ -363,7 +363,7 @@ msgstr ""
 msgid "Main address - postal code"
 msgstr ""
 
-#: models.py:188 templates/ishtar/sheet_file.html:93
+#: models.py:188 templates/ishtar/sheet_file.html:104
 msgid "Organization"
 msgstr ""
 
@@ -455,7 +455,7 @@ msgstr ""
 msgid "File: administrative act deletion"
 msgstr ""
 
-#: wizards.py:124 templates/ishtar/sheet_file.html:111
+#: wizards.py:124 templates/ishtar/sheet_file.html:122
 msgid "Associated operations"
 msgstr ""
 
@@ -471,118 +471,122 @@ msgstr ""
 msgid "Generate"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:22
-msgid "Edition date:"
+#: templates/ishtar/sheet_file.html:23
+msgid "Creation:"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:36
+#: templates/ishtar/sheet_file.html:30
+msgid "Modification:"
+msgstr ""
+
+#: templates/ishtar/sheet_file.html:47
 msgid "State:"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:36
+#: templates/ishtar/sheet_file.html:47
 msgid "Active file"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:37
+#: templates/ishtar/sheet_file.html:48
 msgid "Closed file"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:39
+#: templates/ishtar/sheet_file.html:50
 msgid "Closing date:"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:39
+#: templates/ishtar/sheet_file.html:50
 msgid "by"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:44
+#: templates/ishtar/sheet_file.html:55
 msgid "Related file:"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:49
+#: templates/ishtar/sheet_file.html:60
 msgid "Localisation"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:50
+#: templates/ishtar/sheet_file.html:61
 msgid "Towns:"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:51
+#: templates/ishtar/sheet_file.html:62
 msgid "Departments:"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:53
+#: templates/ishtar/sheet_file.html:64
 msgid "Main address:"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:54
+#: templates/ishtar/sheet_file.html:65
 msgid "Complement:"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:55
+#: templates/ishtar/sheet_file.html:66
 msgid "Postal code:"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:57
+#: templates/ishtar/sheet_file.html:68
 msgid "Surface:"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:62
+#: templates/ishtar/sheet_file.html:73
 msgid "Preventive archaeological file"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:64
+#: templates/ishtar/sheet_file.html:75
 msgid "Developed surface:"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:90 templates/ishtar/sheet_file.html:91
-#: templates/ishtar/sheet_file.html:92 templates/ishtar/sheet_file.html:93
-#: templates/ishtar/sheet_file.html:99
+#: templates/ishtar/sheet_file.html:101 templates/ishtar/sheet_file.html:102
+#: templates/ishtar/sheet_file.html:103 templates/ishtar/sheet_file.html:104
+#: templates/ishtar/sheet_file.html:110
 #: templates/ishtar/dashboards/dashboard_file.html:14
 msgid ":"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:91
+#: templates/ishtar/sheet_file.html:102
 msgid "Head scientist"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:105
+#: templates/ishtar/sheet_file.html:116
 msgid "Associated parcels"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:108
+#: templates/ishtar/sheet_file.html:119
 msgid "Administrative acts"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:116 templates/ishtar/sheet_file.html:147
+#: templates/ishtar/sheet_file.html:127 templates/ishtar/sheet_file.html:158
 msgid "Ref."
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:118 templates/ishtar/sheet_file.html:148
+#: templates/ishtar/sheet_file.html:129 templates/ishtar/sheet_file.html:159
 msgid "Type"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:120
+#: templates/ishtar/sheet_file.html:131
 msgid "Start date"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:121
+#: templates/ishtar/sheet_file.html:132
 msgid "Excavation end date"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:135
+#: templates/ishtar/sheet_file.html:146
 msgid "No operation associated to this archaeological file"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:141
+#: templates/ishtar/sheet_file.html:152
 msgid "Admninistrative acts linked to associated operations"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:149
+#: templates/ishtar/sheet_file.html:160
 msgid "Date"
 msgstr ""
 
-#: templates/ishtar/sheet_file.html:159
+#: templates/ishtar/sheet_file.html:170
 msgid "No administrative act linked to operations"
 msgstr ""
 
diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index 071db20ee..408edde34 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -18,12 +18,23 @@
 {% field_li "Numerical reference" item.numeric_reference "<strong>" "</strong>" %}
 {% field_li "Other reference" item.internal_reference %}
 {% field_li "Name" item.name %}
+  {% field_li "Reception date" item.reception_date|date:"DATE_FORMAT" %}
+
+  <li><label>{%trans "Creation:"%}</label>
+    <span class='value'>
+        {{item.history_creator.ishtaruser.person}}<br/>
+        <small><em>{{item.history_creation_date|date:"DATETIME_FORMAT"}}</em></small>
+    </span>
+  </li>
+  {% if item.history_creation_date != item.last_edition_date %}
+  <li><label>{%trans "Modification:"%}</label>
+    <span class='value'>
+        {{item.history_modifier.ishtaruser.person}}<br/>
+        <small><em>{% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}</em></small>
+    </span>
+  </li>
+  {% endif %}
 
-<li><label>{%trans "Edition date:"%}</label> <span class='value'>{% if item.history_date %}{{ item.history_date }}{% else %}{{ item.history.all.0.history_date }}{% endif %}</span></li> <!-- date = now -->
-
-{% field_li "Reception date" item.reception_date|date:"DATE_FORMAT" %}
-{% field_li "Creation date" item.creation_date|date:"DATE_FORMAT" %}
-{% field_li_detail "Created by" item.history_creator.ishtaruser.person %}
 
 {% comment %}
 {% if item.deadline_date and not item.acts %}