Merge branch 'master' into develop

4 files changed, 138 insertions, 132 deletions

diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 0ecd5b28d..e5c244fde 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -156,6 +156,10 @@ class RecordFormGeneral(ManageOldType, forms.Form):
         label=_(u"Depth of appearance (m)"), required=False)
     unit = forms.ChoiceField(label=_(u"Context record type"), required=False,
                              choices=[])
+    opening_date = forms.DateField(label=_(u"Opening date"),
+                                   widget=widgets.JQueryDate, required=False)
+    closing_date = forms.DateField(label=_(u"Closing date"),
+                                   widget=widgets.JQueryDate, required=False)
     documentation = forms.MultipleChoiceField(
         label=_("Documentation"), choices=[], required=False,
         widget=forms.CheckboxSelectMultiple)
diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot
index 3ca377971..993d8228f 100644
--- a/archaeological_context_records/locale/django.pot
+++ b/archaeological_context_records/locale/django.pot
@@ -8,11 +8,11 @@
 msgid ""
 msgstr ""
 
-#: forms.py:47 forms.py:51 models.py:217 models.py:600 wizards.py:77
+#: forms.py:47 forms.py:51 models.py:231 models.py:620 wizards.py:77
 msgid "Operation"
 msgstr ""
 
-#: forms.py:59 forms.py:142 models.py:219 models.py:568
+#: forms.py:59 forms.py:142 models.py:233 models.py:588
 msgid "ID"
 msgstr ""
 
@@ -36,7 +36,7 @@ msgstr ""
 msgid "Search within related operations"
 msgstr ""
 
-#: forms.py:78 forms.py:255 models.py:56
+#: forms.py:78 forms.py:259 models.py:56
 msgid "Period"
 msgstr ""
 
@@ -52,7 +52,7 @@ msgstr ""
 msgid "Search within relations"
 msgstr ""
 
-#: forms.py:112 forms.py:359 views.py:92
+#: forms.py:112 forms.py:363 views.py:92
 msgid "Context record search"
 msgstr ""
 
@@ -64,176 +64,184 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: forms.py:141 models.py:181 models.py:215 models.py:570
+#: forms.py:141 models.py:195 models.py:229 models.py:590
 msgid "Parcel"
 msgstr ""
 
-#: forms.py:144 models.py:220 models.py:571
-#: templates/ishtar/sheet_contextrecord.html:30
+#: forms.py:144 models.py:234 models.py:591
+#: templates/ishtar/sheet_contextrecord.html:33
 msgid "Description"
 msgstr ""
 
-#: forms.py:146 models.py:221
+#: forms.py:146 models.py:235
 msgid "General comment"
 msgstr ""
 
-#: forms.py:149 models.py:268
+#: forms.py:149 models.py:282
 msgid "Excavation technique"
 msgstr ""
 
-#: forms.py:150 models.py:225
+#: forms.py:150 models.py:239
 msgid "Length (m)"
 msgstr ""
 
-#: forms.py:151 models.py:226
+#: forms.py:151 models.py:240
 msgid "Width (m)"
 msgstr ""
 
-#: forms.py:152 models.py:227
+#: forms.py:152 models.py:241
 msgid "Thickness (m)"
 msgstr ""
 
-#: forms.py:153 models.py:229
+#: forms.py:153 models.py:243
 msgid "Diameter (m)"
 msgstr ""
 
-#: forms.py:154 models.py:230
+#: forms.py:154 models.py:244
 msgid "Depth (m)"
 msgstr ""
 
-#: forms.py:156 models.py:232
+#: forms.py:156 models.py:246
 msgid "Depth of appearance (m)"
 msgstr ""
 
-#: forms.py:157 forms.py:379 models.py:242 models.py:569
+#: forms.py:157 forms.py:383 models.py:256 models.py:589
 msgid "Context record type"
 msgstr ""
 
-#: forms.py:160 ishtar_menu.py:48
+#: forms.py:159 models.py:236
+msgid "Opening date"
+msgstr ""
+
+#: forms.py:161 models.py:238 templates/ishtar/sheet_contextrecord.html:87
+msgid "Closing date"
+msgstr ""
+
+#: forms.py:164 ishtar_menu.py:48
 msgid "Documentation"
 msgstr ""
 
-#: forms.py:163 models.py:234
+#: forms.py:167 models.py:248
 msgid "Location"
 msgstr ""
 
-#: forms.py:166
+#: forms.py:170
 msgid "Image"
 msgstr ""
 
-#: forms.py:167
+#: forms.py:171
 #, python-format
 msgid ""
 "<p>Heavy images are resized to: %(width)dx%(height)d (ratio is preserved).</"
 "p>"
 msgstr ""
 
-#: forms.py:244
+#: forms.py:248
 msgid "This ID already exists for this operation."
 msgstr ""
 
-#: forms.py:250 forms.py:277 models.py:67
+#: forms.py:254 forms.py:281 models.py:67
 msgid "Dating"
 msgstr ""
 
-#: forms.py:256 models.py:57
+#: forms.py:260 models.py:57
 msgid "Start date"
 msgstr ""
 
-#: forms.py:257 models.py:58 models.py:224
+#: forms.py:261 models.py:58
 msgid "End date"
 msgstr ""
 
-#: forms.py:258 models.py:61
+#: forms.py:262 models.py:61
 msgid "Quality"
 msgstr ""
 
-#: forms.py:259 models.py:39 models.py:59
+#: forms.py:263 models.py:39 models.py:59
 msgid "Dating type"
 msgstr ""
 
-#: forms.py:286 ishtar_menu.py:29 models.py:642
+#: forms.py:290 ishtar_menu.py:29 models.py:662
 msgid "Context record"
 msgstr ""
 
-#: forms.py:308
+#: forms.py:312
 msgid "Relations"
 msgstr ""
 
-#: forms.py:312 forms.py:320 models.py:245
-#: templates/ishtar/sheet_contextrecord.html:44
+#: forms.py:316 forms.py:324 models.py:259
+#: templates/ishtar/sheet_contextrecord.html:47
 msgid "Interpretation"
 msgstr ""
 
-#: forms.py:316
+#: forms.py:320
 msgid "Comments on dating"
 msgstr ""
 
-#: forms.py:318 models.py:244
+#: forms.py:322 models.py:258
 msgid "Filling"
 msgstr ""
 
-#: forms.py:322 models.py:265
+#: forms.py:326 models.py:279
 msgid "Activity"
 msgstr ""
 
-#: forms.py:324 models.py:263
+#: forms.py:328 models.py:277
 msgid "Identification"
 msgstr ""
 
-#: forms.py:326 models.py:248
+#: forms.py:330 models.py:262
 msgid "TAQ"
 msgstr ""
 
-#: forms.py:327 models.py:252
+#: forms.py:331 models.py:266
 msgid "Estimated TAQ"
 msgstr ""
 
-#: forms.py:329 models.py:255
+#: forms.py:333 models.py:269
 msgid "TPQ"
 msgstr ""
 
-#: forms.py:330 models.py:259
+#: forms.py:334 models.py:273
 msgid "Estimated TPQ"
 msgstr ""
 
-#: forms.py:345
+#: forms.py:349
 msgid "Operation search"
 msgstr ""
 
-#: forms.py:347
+#: forms.py:351
 msgid "You should select an operation."
 msgstr ""
 
-#: forms.py:352
+#: forms.py:356
 msgid "Would you like to delete this context record?"
 msgstr ""
 
-#: forms.py:361
+#: forms.py:365
 msgid "You should select a context record."
 msgstr ""
 
-#: forms.py:366
+#: forms.py:370
 msgid "Year of the operation"
 msgstr ""
 
-#: forms.py:368
+#: forms.py:372
 msgid "Numeric reference"
 msgstr ""
 
-#: forms.py:375
+#: forms.py:379
 msgid "Town of the operation"
 msgstr ""
 
-#: forms.py:377
+#: forms.py:381
 msgid "Period of the context record"
 msgstr ""
 
-#: forms.py:392
+#: forms.py:396
 msgid "Documentation search"
 msgstr ""
 
-#: forms.py:394
+#: forms.py:398
 msgid "You should select a document."
 msgstr ""
 
@@ -273,244 +281,240 @@ msgstr ""
 msgid "Datings"
 msgstr ""
 
-#: models.py:79 models.py:96 models.py:110
+#: models.py:93 models.py:110 models.py:124
 msgid "Order"
 msgstr ""
 
-#: models.py:81
+#: models.py:95
 msgid "Parent context record type"
 msgstr ""
 
-#: models.py:85
+#: models.py:99
 msgid "Context record Type"
 msgstr ""
 
-#: models.py:86
+#: models.py:100
 msgid "Context record Types"
 msgstr ""
 
-#: models.py:99
+#: models.py:113
 msgid "Activity Type"
 msgstr ""
 
-#: models.py:100
+#: models.py:114
 msgid "Activity Types"
 msgstr ""
 
-#: models.py:113
+#: models.py:127
 msgid "Identification Type"
 msgstr ""
 
-#: models.py:114
+#: models.py:128
 msgid "Identification Types"
 msgstr ""
 
-#: models.py:125
+#: models.py:139
 msgid "Excavation technique type"
 msgstr ""
 
-#: models.py:126
+#: models.py:140
 msgid "Excavation technique types"
 msgstr ""
 
-#: models.py:134
+#: models.py:148
 msgid "Documentation type"
 msgstr ""
 
-#: models.py:135
+#: models.py:149
 msgid "Documentation types"
 msgstr ""
 
-#: models.py:172 models.py:572
+#: models.py:186 models.py:592
 msgid "Periods"
 msgstr ""
 
-#: models.py:173
+#: models.py:187
 msgid "Datings (period)"
 msgstr ""
 
-#: models.py:174
+#: models.py:188
 msgid "Related context records"
 msgstr ""
 
-#: models.py:177
+#: models.py:191
 msgid "Parcel (external ID)"
 msgstr ""
 
-#: models.py:178 models.py:179
+#: models.py:192 models.py:193
 msgid "Parcel (town)"
 msgstr ""
 
-#: models.py:180
+#: models.py:194
 msgid "Parcel (year)"
 msgstr ""
 
-#: models.py:212
+#: models.py:226
 msgid "External ID"
 msgstr ""
 
-#: models.py:214
+#: models.py:228
 msgid "External ID is set automatically"
 msgstr ""
 
-#: models.py:222
-msgid "Date d'ouverture"
-msgstr ""
-
-#: models.py:235
+#: models.py:249
 msgid "A short description of the location of the context record"
 msgstr ""
 
-#: models.py:240
+#: models.py:254
 msgid "Comment on datings"
 msgstr ""
 
-#: models.py:249
+#: models.py:263
 msgid ""
 "\"Terminus Ante Quem\" the context record can't have been created after this "
 "date"
 msgstr ""
 
-#: models.py:253
+#: models.py:267
 msgid "Estimation of a \"Terminus Ante Quem\""
 msgstr ""
 
-#: models.py:256
+#: models.py:270
 msgid ""
 "\"Terminus Post Quem\" the context record can't have been created before "
 "this date"
 msgstr ""
 
-#: models.py:260
+#: models.py:274
 msgid "Estimation of a \"Terminus Post Quem\""
 msgstr ""
 
-#: models.py:271
+#: models.py:285
 msgid "Point"
 msgstr ""
 
-#: models.py:272
+#: models.py:286
 msgid "Polygon"
 msgstr ""
 
-#: models.py:273
+#: models.py:287
 msgid "Cached name"
 msgstr ""
 
-#: models.py:277 models.py:278 templates/ishtar/sheet_contextrecord.html:4
+#: models.py:291 models.py:292 templates/ishtar/sheet_contextrecord.html:4
 msgid "Context Record"
 msgstr ""
 
-#: models.py:280
+#: models.py:294
 msgid "Can view all Context Records"
 msgstr ""
 
-#: models.py:282
+#: models.py:296
 msgid "Can view own Context Record"
 msgstr ""
 
-#: models.py:284
+#: models.py:298
 msgid "Can add own Context Record"
 msgstr ""
 
-#: models.py:286
+#: models.py:300
 msgid "Can change own Context Record"
 msgstr ""
 
-#: models.py:288
+#: models.py:302
 msgid "Can delete own Context Record"
 msgstr ""
 
-#: models.py:298
+#: models.py:312
 msgctxt "short"
 msgid "Context record"
 msgstr ""
 
-#: models.py:502
+#: models.py:522
 msgid "Inverse relation"
 msgstr ""
 
-#: models.py:506 models.py:529 models.py:567
+#: models.py:526 models.py:549 models.py:587
 msgid "Relation type"
 msgstr ""
 
-#: models.py:507
+#: models.py:527
 msgid "Relation types"
 msgstr ""
 
-#: models.py:524
+#: models.py:544
 msgid "ID (left)"
 msgstr ""
 
-#: models.py:525
+#: models.py:545
 msgid "Context record type (left)"
 msgstr ""
 
-#: models.py:526
+#: models.py:546
 msgid "Parcel (left)"
 msgstr ""
 
-#: models.py:527
+#: models.py:547
 msgid "Description (left)"
 msgstr ""
 
-#: models.py:528
+#: models.py:548
 msgid "Periods (left)"
 msgstr ""
 
-#: models.py:530
+#: models.py:550
 msgid "ID (right)"
 msgstr ""
 
-#: models.py:531
+#: models.py:551
 msgid "Context record type (right)"
 msgstr ""
 
-#: models.py:532
+#: models.py:552
 msgid "Parcel (right)"
 msgstr ""
 
-#: models.py:533
+#: models.py:553
 msgid "Description (right)"
 msgstr ""
 
-#: models.py:534
+#: models.py:554
 msgid "Periods (right)"
 msgstr ""
 
-#: models.py:543
+#: models.py:563
 msgid "Record relation"
 msgstr ""
 
-#: models.py:544
+#: models.py:564
 msgid "Record relations"
 msgstr ""
 
-#: models.py:627
+#: models.py:647
 msgid "Context record documentation"
 msgstr ""
 
-#: models.py:628
+#: models.py:648
 msgid "Context record documentations"
 msgstr ""
 
-#: models.py:631
+#: models.py:651
 msgid "Can view all Context record sources"
 msgstr ""
 
-#: models.py:633
+#: models.py:653
 msgid "Can view own Context record source"
 msgstr ""
 
-#: models.py:635
+#: models.py:655
 msgid "Can add own Context record source"
 msgstr ""
 
-#: models.py:637
+#: models.py:657
 msgid "Can change own Context record source"
 msgstr ""
 
-#: models.py:639
+#: models.py:659
 msgid "Can delete own Context record source"
 msgstr ""
 
@@ -550,71 +554,67 @@ msgstr ""
 msgid "Temporary ID"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:56
+#: templates/ishtar/sheet_contextrecord.html:59
 msgid "Datations"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:65
+#: templates/ishtar/sheet_contextrecord.html:68
 msgid "Context record relations"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:72
+#: templates/ishtar/sheet_contextrecord.html:75
 msgid "Operation summary"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:74
+#: templates/ishtar/sheet_contextrecord.html:77
 msgid "Patriarche OA code not yet recorded!"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:78
+#: templates/ishtar/sheet_contextrecord.html:81
 msgid "Numerical reference"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:82
+#: templates/ishtar/sheet_contextrecord.html:85
 msgid "State"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:82
+#: templates/ishtar/sheet_contextrecord.html:85
 msgid "Active file"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:82
+#: templates/ishtar/sheet_contextrecord.html:85
 msgid "Closed operation"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:84
-msgid "Closing date"
-msgstr ""
-
-#: templates/ishtar/sheet_contextrecord.html:84
+#: templates/ishtar/sheet_contextrecord.html:87
 msgid "by"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:92
+#: templates/ishtar/sheet_contextrecord.html:95
 msgid "Localisation"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:93
+#: templates/ishtar/sheet_contextrecord.html:96
 msgid "Towns"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:94
+#: templates/ishtar/sheet_contextrecord.html:97
 msgid "Related operation"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:96
+#: templates/ishtar/sheet_contextrecord.html:99
 msgid "No operation linked to this context unit!"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:99
+#: templates/ishtar/sheet_contextrecord.html:102
 msgid "Document from this context record"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:104
+#: templates/ishtar/sheet_contextrecord.html:107
 msgid "Finds"
 msgstr ""
 
-#: templates/ishtar/sheet_contextrecord.html:109
+#: templates/ishtar/sheet_contextrecord.html:112
 msgid "Documents from associated finds"
 msgstr ""
 
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 6ebdb8033..ccc3268f4 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -235,9 +235,9 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem, ImageModel, OwnPerms,
     label = models.CharField(_(u"ID"), max_length=200)
     description = models.TextField(_(u"Description"), blank=True, null=True)
     comment = models.TextField(_(u"General comment"), blank=True, null=True)
-    opening_date = models.DateField(_(u"Date d'ouverture"),
+    opening_date = models.DateField(_(u"Opening date"),
                                     blank=True, null=True)
-    closing_date = models.DateField(_(u"End date"), blank=True, null=True)
+    closing_date = models.DateField(_(u"Closing date"), blank=True, null=True)
     length = models.FloatField(_(u"Length (m)"), blank=True, null=True)
     width = models.FloatField(_(u"Width (m)"), blank=True, null=True)
     thickness = models.FloatField(_(u"Thickness (m)"), blank=True,
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index fb5106faf..170c2d87c 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -24,6 +24,8 @@
     {% field_li_multiple "Chronology" item.datings %}
     {% field_li "Town" item.parcel.town %}
     {% field_li_multiple "Documentation" item.documentations %}
+    {% field_li "Opening date" item.opening_date %}
+    {% field_li "Closing date" item.closing_date %}
 </ul>
 {% field "Comment on datings" item.datings_comment "<pre>" "</pre>" %}