diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-16 19:59:43 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-10-16 19:59:43 +0200 |
commit | 6e6f2261b3a90ca082126b8c76d5d752212ca8b1 (patch) | |
tree | a361730a5192a4c7bccc2cae532bd54b2da6b753 | |
parent | f448b56236ccdf6e7a20e880fac67f8a3c0fc00e (diff) | |
parent | d2c0a727ac08d6e7b0c4851c37bf22fc0c21f995 (diff) | |
download | Ishtar-6e6f2261b3a90ca082126b8c76d5d752212ca8b1.tar.bz2 Ishtar-6e6f2261b3a90ca082126b8c76d5d752212ca8b1.zip |
Merge branch 'master' into develop
-rw-r--r-- | ishtar_common/models_imports.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 10e7be2e5..01a64da22 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -613,10 +613,15 @@ TARGET_MODELS = [ _(u"Conservatory state")), ('archaeological_warehouse.models.ContainerType', _(u"Container type")), ('archaeological_finds.models.TreatmentType', _(u"Treatment type")), + ('archaeological_finds.models.TreatmentEmergencyType', + _(u"Treatment emergency type")), ('archaeological_finds.models.ObjectType', _(u"Object type")), ('archaeological_finds.models.IntegrityType', _(u"Integrity type")), ('archaeological_finds.models.RemarkabilityType', _(u"Remarkability type")), + ('archaeological_finds.models.AlterationType', _(u"Alteration type")), + ('archaeological_finds.models.AlterationCauseType', + _(u"Alteration cause type")), ('archaeological_finds.models.BatchType', _(u"Batch type")), ('archaeological_context_records.models.IdentificationType', _("Identification type")), |