Find: add laboratory ID

1 files changed, 11 insertions, 7 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 5162065c8..5fcf57a27 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -148,10 +148,10 @@ class BasicFindForm(CustomForm, ManageOldType):
         'checked_type': models.CheckedType,
     }
     field_order = [
-        'label', 'denomination', 'previous_id', 'museum_id', 'seal_number',
-        'mark', 'description', 'public_description', 'is_complete',
-        'material_type', 'material_type_quality', 'material_comment',
-        'object_type', 'object_type_quality', 'find_number',
+        'label', 'denomination', 'previous_id', 'museum_id', 'laboratory_id',
+        'seal_number', 'mark', 'description', 'public_description',
+        'is_complete', 'material_type', 'material_type_quality',
+        'material_comment', 'object_type', 'object_type_quality', 'find_number',
         'min_number_of_individuals', 'inscription', 'decoration',
         'manufacturing_place', 'communicabilitie', 'comment',
         'cultural_attribution', 'dating_comment',
@@ -168,6 +168,7 @@ class BasicFindForm(CustomForm, ManageOldType):
     denomination = forms.CharField(label=_(u"Denomination"), required=False)
     previous_id = forms.CharField(label=_("Previous ID"), required=False)
     museum_id = forms.CharField(label=_(u"Museum ID"), required=False)
+    laboratory_id = forms.CharField(label=_(u"Laboratory ID"), required=False)
     seal_number = forms.CharField(label=_(u"Seal number"), required=False)
     mark = forms.CharField(label=_(u"Mark"), required=False)
 
@@ -294,8 +295,8 @@ class FindForm(BasicFindForm):
     })
     field_order = [
         'label', 'denomination', 'previous_id',
-        'get_first_base_find__excavation_id', 'museum_id', 'seal_number',
-        'mark', 'description', 'public_description',
+        'get_first_base_find__excavation_id', 'museum_id', 'laboratory_id',
+        'seal_number', 'mark', 'description', 'public_description',
         'get_first_base_find__discovery_date',
         'get_first_base_find__discovery_date_taq', 'get_first_base_find__batch',
         'is_complete', 'material_type', 'material_type_quality',
@@ -587,7 +588,7 @@ class QAFindFormMulti(QAForm):
     SINGLE_FIELDS = [
         'qa_label', 'qa_previous_id',
         'qa_get_first_base_find__excavation_id', 'qa_museum_id',
-        'qa_seal_number', 'qa_mark',
+        'qa_laboratory_id', 'qa_seal_number', 'qa_mark',
     ]
     qa_ue = forms.IntegerField(
         label=_(u"Context record"),
@@ -604,6 +605,8 @@ class QAFindFormMulti(QAForm):
     qa_get_first_base_find__excavation_id = forms.CharField(
         label=_(u"Excavation ID"), required=False)
     qa_museum_id = forms.CharField(label=_(u"Museum ID"), required=False)
+    qa_laboratory_id = forms.CharField(label=_(u"Laboratory ID"),
+                                       required=False)
     qa_seal_number = forms.CharField(label=_(u"Seal number"), required=False)
     qa_mark = forms.CharField(label=_(u"Mark"), required=False)
 
@@ -948,6 +951,7 @@ class FindSelect(HistorySelect):
     base_finds__excavation_id = forms.CharField(label=_(u"Excavation ID"))
     seal_number = forms.CharField(label=_(u"Seal number"))
     museum_id = forms.CharField(label=_(u"Museum ID"))
+    laboratory_id = forms.CharField(label=_(u"Laboratory ID"))
     mark = forms.CharField(label=_(u"Mark"))
 
     base_finds__cache_short_id = forms.CharField(