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 | 78391c1fc7fa8383ad58e7705c9dadcfa79b7b32 (patch) | |
tree | a361730a5192a4c7bccc2cae532bd54b2da6b753 /ishtar_common | |
parent | 41946bbe345a8a33bd0ddd08a8139f8662fbc9ec (diff) | |
parent | a1d4bf22cd278b8afe4cc09d6621d174b66fefdb (diff) | |
download | Ishtar-78391c1fc7fa8383ad58e7705c9dadcfa79b7b32.tar.bz2 Ishtar-78391c1fc7fa8383ad58e7705c9dadcfa79b7b32.zip |
Merge branch 'master' into develop
Diffstat (limited to 'ishtar_common')
-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")), |