Container: collection -> responsibility. Deactivate collection fot finds

1 files changed, 30 insertions, 30 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 4a93ffce4..58adb1de8 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -149,7 +149,7 @@ class BasicFindForm(CustomForm, ManageOldType):
         'material_type_quality': models.MaterialTypeQualityType,
         'object_type_quality': models.ObjectTypeQualityType,
         'checked_type': models.CheckedType,
-        'collection': Warehouse,
+        #'collection': Warehouse,
     }
     field_order = [
         'label', 'denomination', 'previous_id', 'museum_id', 'laboratory_id',
@@ -175,12 +175,12 @@ class BasicFindForm(CustomForm, ManageOldType):
     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)
-    collection = forms.IntegerField(
-        label=_("Collection (warehouse)"),
-        widget=widgets.JQueryAutoComplete(
-            reverse_lazy('autocomplete-warehouse'),
-            associated_model=Warehouse, new=True),
-        validators=[valid_id(Warehouse)], required=False)
+    #collection = forms.IntegerField(
+    #    label=_("Collection (warehouse)"),
+    #    widget=widgets.JQueryAutoComplete(
+    #        reverse_lazy('autocomplete-warehouse'),
+    #        associated_model=Warehouse, new=True),
+    #    validators=[valid_id(Warehouse)], required=False)
 
     HEADERS['description'] = FormHeader(_(u"Description"))
     description = forms.CharField(label=_(u"Description"),
@@ -307,7 +307,7 @@ class FindForm(BasicFindForm):
     field_order = [
         'label', 'denomination', 'previous_id',
         'get_first_base_find__excavation_id', 'museum_id', 'laboratory_id',
-        'seal_number', 'mark', 'collection', 'description',
+        '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',
@@ -371,9 +371,9 @@ class FindForm(BasicFindForm):
             'get_first_base_find__estimated_error_z',
             'get_first_base_find__spatial_reference_system'
         ],
-        'warehouse': [
-            'collection'
-        ]
+        #'warehouse': [
+        #    'collection'
+        #]
     }
 
     def clean(self):
@@ -590,7 +590,7 @@ class QAFindFormMulti(QAForm):
     REPLACE_FIELDS = [
         'qa_denomination', 'qa_ue', 'qa_manufacturing_place', 'qa_checked_type',
         'qa_check_date', 'qa_conservatory_state', 'qa_treatment_emergency',
-        'qa_appraisal_date', 'qa_collection',
+        'qa_appraisal_date', # 'qa_collection',
     ]
 
     HEADERS = {
@@ -625,12 +625,12 @@ class QAFindFormMulti(QAForm):
                                        required=False)
     qa_seal_number = forms.CharField(label=_(u"Seal number"), required=False)
     qa_mark = forms.CharField(label=_(u"Mark"), required=False)
-    qa_collection = forms.IntegerField(
-        label=_("Collection"),
-        widget=widgets.JQueryAutoComplete(
-            reverse_lazy('autocomplete-warehouse'),
-            associated_model=Warehouse),
-        validators=[valid_id(Warehouse)], required=False)
+    #qa_collection = forms.IntegerField(
+    #    label=_("Collection"),
+    #    widget=widgets.JQueryAutoComplete(
+    #        reverse_lazy('autocomplete-warehouse'),
+    #        associated_model=Warehouse),
+    #    validators=[valid_id(Warehouse)], required=False)
 
     qa_description = forms.CharField(
         label=_(u"Description"), widget=forms.Textarea, required=False)
@@ -692,12 +692,12 @@ class QAFindFormMulti(QAForm):
             return ""
         return value
 
-    def _get_qa_collection(self, value):
-        try:
-            value = Warehouse.objects.get(pk=value).name
-        except Warehouse.DoesNotExist:
-            return ""
-        return value
+    #def _get_qa_collection(self, value):
+    #    try:
+    #        value = Warehouse.objects.get(pk=value).name
+    #    except Warehouse.DoesNotExist:
+    #        return ""
+    #    return value
 
     def _set_qa_ue(self, item, user):
         ue = self.cleaned_data['qa_ue']
@@ -1267,12 +1267,12 @@ class FindSelect(DocumentItemSelect, PeriodSelect):
 
 
 class FindSelectWarehouseModule(FindSelect):
-    collection = forms.IntegerField(
-        label=_("Collection (warehouse)"),
-        widget=widgets.JQueryAutoComplete(
-            reverse_lazy('autocomplete-warehouse'),
-            associated_model=Warehouse),
-        validators=[valid_id(Warehouse)])
+    #collection = forms.IntegerField(
+    #    label=_("Collection (warehouse)"),
+    #    widget=widgets.JQueryAutoComplete(
+    #        reverse_lazy('autocomplete-warehouse'),
+    #        associated_model=Warehouse),
+    #    validators=[valid_id(Warehouse)])
     container = forms.IntegerField(
         label=_("Current container"),
         widget=widgets.JQueryAutoComplete(