Squash migrations

dcc/roster/admin.py

@@ -45,9 +45,9 @@ class RollingStockPropertyInline(admin.TabularInline):
 @admin.register(RollingStock)
 class RollingStockAdmin(admin.ModelAdmin):
     inlines = (
+        RollingStockPropertyInline,
         RollingStockImageInline,
         RollingStockDocInline,
-        RollingStockPropertyInline
     )
     readonly_fields = ("creation_time", "updated_time")
     list_display = (
@@ -74,11 +74,9 @@ class RollingStockAdmin(admin.ModelAdmin):
                 "fields": (
                     "rolling_class",
                     "road_number",
-                    "manufacturer",
                     "scale",
+                    "manufacturer",
                     "sku",
-                    "decoder",
-                    "address",
                     "era",
                     "production_year",
                     "purchase_date",
@@ -87,6 +85,15 @@ class RollingStockAdmin(admin.ModelAdmin):
                 )
             },
         ),
+        (
+            "DCC",
+            {
+                "fields": (
+                    "decoder",
+                    "address",
+                )
+            },
+        ),
         (
             "Audit",
             {