1 files changed, 7 insertions, 7 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 983dbb869..41e4a1e20 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -24,22 +24,22 @@ import datetime
 from itertools import groupby
 
 from django import forms
+from django.conf import settings
 from django.core import validators
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Max
 from django.utils.translation import ugettext_lazy as _
 
-from ishtar import settings
-
 from ishtar_common.models import valid_id
 from archaeological_operations.models import Period, Parcel, Operation
 import models
-import widgets
-from forms import FinalForm, FormSet, \
+
+from ishtar_common import widgets
+from ishtar_common.forms import FinalForm, FinalForm, FormSet, \
                   formset_factory, get_now, reverse_lazy, get_form_selection
-from forms_common import get_town_field, SourceForm, \
-                         SourceSelect, AuthorFormset
-from forms_operations import OperationSelect
+from ishtar_common.forms_common import get_town_field, SourceForm, \
+                                       SourceSelect, AuthorFormset
+from archaeological_operations.forms import OperationSelect
 
 class RecordSelect(forms.Form):
     parcel__town = get_town_field()