3 files changed, 10 insertions, 4 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index 8f6a07f88..b470f8223 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -81,8 +81,14 @@ class PersonTypeAdmin(admin.ModelAdmin):
 
 admin.site.register(models.PersonType, PersonTypeAdmin)
 
-basic_models = [models.IshtarUser, models.SourceType, models.AuthorType,
-                models.OrganizationType]
+class GeneralTypeAdmin(admin.ModelAdmin):
+    list_display = ('label', 'txt_idx', 'available')
+
+general_models = [models.OrganizationType, models.SourceType, models.AuthorType]
+for model in general_models:
+    admin.site.register(model, GeneralTypeAdmin)
+
+basic_models = [models.IshtarUser]
 if settings.COUNTRY == 'fr':
     basic_models += [models.Arrondissement, models.Canton]
 
diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po
index 636601db5..96a467273 100644
--- a/ishtar_common/locale/fr/LC_MESSAGES/django.po
+++ b/ishtar_common/locale/fr/LC_MESSAGES/django.po
@@ -897,7 +897,7 @@ msgstr "Dossier en relation avec :"
 #: templates/sheet_file.html:46 templates/sheet_ope.html:49
 #: templates/sheet_ope_modif.html:49 templates/sheet_operation.html:49
 msgid "Main address:"
-msgstr "Adresse principale :"
+msgstr "Adresse des terrains :"
 
 #: templates/sheet_file.html:47 templates/sheet_ope.html:50
 #: templates/sheet_ope_modif.html:50 templates/sheet_operation.html:50
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 3e428999e..458802087 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -206,7 +206,7 @@ class GeneralType(models.Model):
         items = cls.objects.filter(**dct)
         if exclude:
             items = items.exclude(txt_idx__in=exclude)
-        for item in items.all():
+        for item in items.order_by(*cls._meta.ordering).all():
             if instances:
                 item.rank = 0
                 yield item