3 files changed, 24 insertions, 10 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 44d883b0f..8cb2fd0aa 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -43,7 +43,7 @@ from ishtar_common.forms import FormSet, FloatField, \
     ManageOldType, FieldType, IshtarForm, FormHeader
 
 from ishtar_common.forms_common import get_town_field, \
-    SourceSelect, CustomForm, BaseImageForm, BaseImageFormset
+    SourceSelect, CustomForm, BaseImageForm, BaseImageFormset, SourceForm
 from ishtar_common.utils import convert_coordinates_to_point
 from ishtar_common import widgets
 from bootstrap_datepicker.widgets import DatePicker
@@ -63,7 +63,8 @@ from archaeological_finds.forms_treatments import TreatmentSelect, \
     AdministrativeActTreatmentFileModifForm, SourceTreatmentFormSelection, \
     SourceTreatmentFileFormSelection, TreatmentSourceFormSelection, \
     TreatmentFileSourceFormSelection, DashboardForm as DashboardTreatmentForm, \
-    DashboardTreatmentFileForm, TreatmentImagesFormset
+    DashboardTreatmentFileForm, TreatmentImagesFormset, \
+    TreatmentFileSourceForm, TreatmentSourceForm
 
 __all__ = [
     'TreatmentSelect', 'TreatmentFormSelection', 'BaseTreatmentForm',
@@ -78,7 +79,8 @@ __all__ = [
     'AdministrativeActTreatmentFileModifForm', 'SourceTreatmentFormSelection',
     'SourceTreatmentFileFormSelection', 'TreatmentSourceFormSelection',
     'TreatmentFileSourceFormSelection', 'DashboardTreatmentForm',
-    'DashboardTreatmentFileForm',
+    'DashboardTreatmentFileForm', 'TreatmentSourceForm',
+    'TreatmentFileSourceForm',
     'RecordFormSelection', 'FindForm', 'DateForm', 'DatingFormSet',
     'PreservationForm', 'ImagesFormset',
     'FindSelect', 'FindFormSelection', 'FindFormSelectionWarehouseModule',
@@ -89,7 +91,7 @@ __all__ = [
     'FindDeletionForm', 'UpstreamFindFormSelection', 'SourceFindFormSelection',
     'FindSourceSelect', 'FindSourceFormSelection', 'NewFindBasketForm',
     'SelectFindBasketForm', 'DeleteFindBasketForm', 'FindBasketAddItemForm',
-    'TreatmentImagesFormset'
+    'TreatmentImagesFormset', 'FindSourceForm'
 ]
 
 logger = logging.getLogger(__name__)
@@ -864,3 +866,7 @@ class FindBasketAddItemForm(forms.Form):
             raise PermissionDenied
         basket.items.add(item)
         return basket
+
+
+class FindSourceForm(SourceForm):
+    form_slug = "findsource-general"
diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py
index b5daf146f..a61e56f5e 100644
--- a/archaeological_finds/forms_treatments.py
+++ b/archaeological_finds/forms_treatments.py
@@ -32,13 +32,13 @@ from archaeological_operations.models import ActType, AdministrativeAct
 from archaeological_warehouse.models import Warehouse, Container
 import models
 
-from archaeological_operations.forms import AdministrativeActOpeForm, \
+from archaeological_operations.forms import AdministrativeActForm, \
     AdministrativeActOpeFormSelection, AdministrativeActModifForm
 
 from ishtar_common.forms import reverse_lazy, TableSelect, FinalForm, \
     ManageOldType, get_form_selection, CustomForm, FieldType, IshtarForm
 from ishtar_common.forms_common import SourceSelect, BaseImageForm, \
-    BaseImageFormset
+    BaseImageFormset, SourceForm
 
 from ishtar_common import widgets
 from bootstrap_datepicker.widgets import DatePicker
@@ -386,7 +386,7 @@ class AdministrativeActTreatmentFormSelection(
         validators=[valid_id(AdministrativeAct)])
 
 
-class AdministrativeActTreatmentForm(AdministrativeActOpeForm):
+class AdministrativeActTreatmentForm(AdministrativeActForm):
     form_admin_name = _(u"Treatment - Administrative act - General")
     form_slug = "treatment-adminact-general"
     act_type = forms.ChoiceField(label=_(u"Act type"), choices=[])
@@ -647,7 +647,7 @@ class AdministrativeActTreatmentFileFormSelection(
         validators=[valid_id(AdministrativeAct)])
 
 
-class AdministrativeActTreatmentFileForm(AdministrativeActOpeForm):
+class AdministrativeActTreatmentFileForm(AdministrativeActForm):
     form_admin_name = _(u"Treatment request - Administrative act - General")
     form_slug = "treatmentfile-adminact-general"
     act_type = forms.ChoiceField(label=_(u"Act type"), choices=[])
@@ -700,6 +700,10 @@ TreatmentSourceFormSelection = get_form_selection(
     _(u"You should select a document."))
 
 
+class TreatmentSourceForm(SourceForm):
+    form_slug = "treatmentsource-general"
+
+
 class TreatmentFileSourceSelect(SourceSelect):
     treatment_file__name = forms.CharField(
         label=_(u"Treatment request name"), max_length=200)
@@ -724,3 +728,7 @@ TreatmentFileSourceFormSelection = get_form_selection(
     'TreatmentFileSourceFormSelection', _(u"Documentation search"), 'pk',
     models.TreatmentFileSource, TreatmentFileSourceSelect,
     'get-treatmentfilesource', _(u"You should select a document."))
+
+
+class TreatmentFileSourceForm(SourceForm):
+    form_slug = "treatmentfilesource-general"
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index 99b2968f3..04264080e 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -222,7 +222,7 @@ find_source_search_wizard = SearchWizard.as_view([
 
 find_source_creation_wizard = FindSourceWizard.as_view([
     ('selec-find_source_creation', SourceFindFormSelection),
-    ('source-find_source_creation', SourceForm),
+    ('source-find_source_creation', FindSourceForm),
     ('authors-find_source_creation', AuthorFormset),
     ('final-find_source_creation', FinalForm)],
     label=_(u"Find: new source"),
@@ -230,7 +230,7 @@ find_source_creation_wizard = FindSourceWizard.as_view([
 
 find_source_modification_wizard = FindSourceWizard.as_view([
     ('selec-find_source_modification', FindSourceFormSelection),
-    ('source-find_source_modification', SourceForm),
+    ('source-find_source_modification', FindSourceForm),
     ('authors-find_source_modification', AuthorFormset),
     ('final-find_source_modification', FinalForm)],
     label=_(u"Find: source modification"),