Ordering of formset items martch to the meta ordering if available otherwise ordered by pk (refs #1595)

1 files changed, 4 insertions, 1 deletions

diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py
index 368c6e627..190a7fc86 100644
--- a/ishtar_common/wizards.py
+++ b/ishtar_common/wizards.py
@@ -750,7 +750,10 @@ class Wizard(NamedUrlWizardView):
             if not hasattr(obj, key):
                 return initial
             keys = c_form.form.base_fields.keys()
-            for child_obj in getattr(obj, key).order_by('pk').all():
+            query = getattr(obj, key)
+            if not obj._meta.ordering:
+                query = query.order_by('pk')
+            for child_obj in query.all():
                 if not keys:
                     break
                 vals = {}