[OE-4695] - use items orders without the need of display_order in the generic admin form
[OE-4695] - re-adding code to handle default behaviour