diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-02 10:10:59 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-09-02 10:10:59 +0200 |
| commit | 151e42654a4bcfcff408c7799db199c71e81b5c5 (patch) | |
| tree | 02786db1039902c7cc75f76aa7159829299970ac /archaeological_files/data_importer.py | |
| parent | 661218e0acd24fc3bca76229b61d0cb91a54be1c (diff) | |
| parent | 5eb8667794636e379a8c324da46c617ad365747a (diff) | |
| download | Ishtar-151e42654a4bcfcff408c7799db199c71e81b5c5.tar.bz2 Ishtar-151e42654a4bcfcff408c7799db199c71e81b5c5.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_files/data_importer.py')
| -rw-r--r-- | archaeological_files/data_importer.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/archaeological_files/data_importer.py b/archaeological_files/data_importer.py index ba92c63ab..96b2ee007 100644 --- a/archaeological_files/data_importer.py +++ b/archaeological_files/data_importer.py @@ -23,7 +23,7 @@ import unicodecsv from django.conf import settings from ishtar_common.data_importer import * -from ishtar_common.models import Person, OrganizationType +from ishtar_common.models import OrganizationType from archaeological_operations.data_importer import * @@ -113,7 +113,7 @@ class FileImporterSraPdL(FilePostProcessing, Importer): None, # D, 4 ImportFormater( "general_contractor__title", # E, 5 - StrChoiceFormater(Person.TYPE, cli=True), + TypeFormater(models.TitleType), required=False, comment=u"Aménageur - titre"), None, # F, 6 |