diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-10 18:44:34 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-10 18:44:34 +0200 |
| commit | 5c0bf0be2be939aa535d64b18063dbf16465a899 (patch) | |
| tree | daf9c406be228607487439908721cee459e9ef03 /ishtar_common | |
| parent | 9bbf5f161cf3e5d480a3dfc85c1a89f09795eecb (diff) | |
| parent | 3d5384b51415350bc1a775587c6d6dbd501d070a (diff) | |
| download | Ishtar-5c0bf0be2be939aa535d64b18063dbf16465a899.tar.bz2 Ishtar-5c0bf0be2be939aa535d64b18063dbf16465a899.zip | |
Merge branch 'develop'
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/fixtures/initial_importtypes-fr.json | 6 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index c5ca39297..4386b6de7 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -3432,7 +3432,7 @@ "model": "ishtar_common.formatertype", "fields": { "formater_type": "TypeFormater", - "options": "archaeological_finds.models.PreservationType", + "options": "archaeological_finds.models.TreatmentType", "many_split": "&" } }, @@ -5312,7 +5312,7 @@ "regexp_filter": null, "formater_type": [ "TypeFormater", - "archaeological_finds.models.PreservationType", + "archaeological_finds.models.TreatmentType", "&" ], "force_new": false, @@ -7292,7 +7292,7 @@ "regexp_filter": null, "formater_type": [ "TypeFormater", - "archaeological_finds.models.PreservationType", + "archaeological_finds.models.TreatmentType", "&" ], "force_new": false, diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index d6106f33b..10e7be2e5 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -612,7 +612,7 @@ TARGET_MODELS = [ ('archaeological_finds.models.ConservatoryState', _(u"Conservatory state")), ('archaeological_warehouse.models.ContainerType', _(u"Container type")), - ('archaeological_finds.models.PreservationType', _(u"Preservation type")), + ('archaeological_finds.models.TreatmentType', _(u"Treatment type")), ('archaeological_finds.models.ObjectType', _(u"Object type")), ('archaeological_finds.models.IntegrityType', _(u"Integrity type")), ('archaeological_finds.models.RemarkabilityType', |