diff options
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/forms.py | 3 | ||||
| -rw-r--r-- | archaeological_files/models.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index a9936c47a..71de4d891 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -30,8 +30,9 @@ from ishtar_common.utils import ugettext_lazy as _ from django.utils.safestring import mark_safe from ishtar_common.models import Person, Organization, \ - valid_id, valid_ids, Department, person_type_pks_lazy, \ + valid_id, valid_ids, person_type_pks_lazy, \ person_type_pk_lazy, organization_type_pks_lazy +from ishtar_common.models_common import Department from archaeological_operations.models import ActType, AdministrativeAct, \ OperationType from . import models diff --git a/archaeological_files/models.py b/archaeological_files/models.py index fbea67c81..8afd57d01 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -32,11 +32,13 @@ from ishtar_common.utils import cached_label_changed, get_cache, \ get_current_year, m2m_historization_changed from ishtar_common.models import GeneralType, BaseHistorizedItem, \ - HistoricalRecords, OwnPerms, Person, Organization, Department, Town, \ + OwnPerms, Person, Organization, Town, \ Dashboard, DashboardFormItem, ValueGetter, ShortMenuItem, \ OperationType, get_external_id, post_save_cache, Document, HistoryModel, \ SearchAltName, SearchVectorConfig, DocumentItem +from ishtar_common.models_common import HistoricalRecords, Department + from archaeological_operations.models import get_values_town_related, \ ClosedItem, ParcelItem |