1 files changed, 31 insertions, 15 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 46c388a13..eabe25fa0 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -50,7 +50,7 @@ from archaeological_finds.forms_treatments import TreatmentSelect, \
 from archaeological_operations.models import Period, ArchaeologicalSite, \
     RelationType as OpeRelationType
 from archaeological_operations.widgets import OAWidget
-from archaeological_warehouse.models import Warehouse
+from archaeological_warehouse.models import Warehouse, Container
 from bootstrap_datepicker.widgets import DatePicker
 from ishtar_common import widgets
 
@@ -1268,36 +1268,52 @@ class FindSelectWarehouseModule(FindSelect):
             reverse_lazy('autocomplete-warehouse'),
             associated_model=Warehouse),
         validators=[valid_id(Warehouse)])
-    container_ref__location = forms.IntegerField(
-        label=_(u"Reference container - Warehouse (location)"),
+    container = forms.IntegerField(
+        label=_("Current container"),
+        widget=widgets.JQueryAutoComplete(
+            reverse_lazy('autocomplete-container'),
+            associated_model=Container),
+        validators=[valid_id(Container)])
+    container__location = forms.IntegerField(
+        label=_("Current container - Warehouse (location)"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-warehouse'),
             associated_model=Warehouse),
         validators=[valid_id(Warehouse)])
-    container_ref__responsible = forms.IntegerField(
-        label=_(u"Reference container - Warehouse (responsible)"),
+    """
+    container__responsible = forms.IntegerField(
+        label=_(u"Current container - Warehouse (responsible)"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-warehouse'),
             associated_model=Warehouse),
         validators=[valid_id(Warehouse)])
-    container_ref__index = forms.IntegerField(
-        label=_(u"Reference container ID"))
-    container_ref__reference = forms.CharField(
-        label=_(u"Reference container ref."))
-    container__location = forms.IntegerField(
-        label=_(u"Current container - Warehouse (location)"),
+    container__index = forms.IntegerField(label=_(u"Current container ID"))
+    container__reference = forms.CharField(label=_(u"Current container ref."))
+    """
+    container_ref = forms.IntegerField(
+        label=_("Reference container"),
+        widget=widgets.JQueryAutoComplete(
+            reverse_lazy('autocomplete-container'),
+            associated_model=Container),
+        validators=[valid_id(Container)])
+    container_ref__location = forms.IntegerField(
+        label=_("Reference container - Warehouse (location)"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-warehouse'),
             associated_model=Warehouse),
         validators=[valid_id(Warehouse)])
-    container__responsible = forms.IntegerField(
-        label=_(u"Current container - Warehouse (responsible)"),
+    """
+    container_ref__responsible = forms.IntegerField(
+        label=_("Reference container - Warehouse (responsible)"),
         widget=widgets.JQueryAutoComplete(
             reverse_lazy('autocomplete-warehouse'),
             associated_model=Warehouse),
         validators=[valid_id(Warehouse)])
-    container__index = forms.IntegerField(label=_(u"Current container ID"))
-    container__reference = forms.CharField(label=_(u"Current container ref."))
+    container_ref__index = forms.IntegerField(
+        label=_(u"Reference container ID"))
+    container_ref__reference = forms.CharField(
+        label=_(u"Reference container ref."))
+    """
 
 
 class FindFormSelection(LockForm, CustomFormSearch):