CLDC-4203: Renumber sex/gender fields

app/helpers/bulk_upload/lettings_log_to_csv.rb

@@ -144,39 +144,55 @@ class BulkUpload::LettingsLogToCsv
       log.tenancylength,
       log.age1 || overrides[:age1],
       log.sexrab1,
+      log.gender_same_as_sex1,
+      log.gender_description1,
       log.ethnic,
       log.nationality_all_group,
       log.ecstat1,
       relat_number(log.relat2),
       log.age2 || overrides[:age2],
       log.sexrab2,
+      log.gender_same_as_sex2,
+      log.gender_description2,
       log.ecstat2, # 50
 
       relat_number(log.relat3),
       log.age3 || overrides[:age3],
       log.sexrab3,
+      log.gender_same_as_sex3,
+      log.gender_description3,
       log.ecstat3,
       relat_number(log.relat4),
       log.age4 || overrides[:age4],
       log.sexrab4,
+      log.gender_same_as_sex4,
+      log.gender_description4,
       log.ecstat4,
       relat_number(log.relat5),
       log.age5 || overrides[:age5], # 60
 
       log.sexrab5,
+      log.gender_same_as_sex5,
+      log.gender_description5,
       log.ecstat5,
       relat_number(log.relat6),
       log.age6 || overrides[:age6],
       log.sexrab6,
+      log.gender_same_as_sex6, # 140
+      log.gender_description6,
       log.ecstat6,
       relat_number(log.relat7),
       log.age7 || overrides[:age7],
       log.sexrab7,
+      log.gender_same_as_sex7,
+      log.gender_description7,
       log.ecstat7, # 70
 
       relat_number(log.relat8),
       log.age8 || overrides[:age8],
       log.sexrab8,
+      log.gender_same_as_sex8,
+      log.gender_description8,
       log.ecstat8,
       log.armedforces,
       log.leftreg,
@@ -238,23 +254,6 @@ class BulkUpload::LettingsLogToCsv
       log.supcharg,
       log.hbrentshortfall,
       log.tshortfall,
-
-      log.gender_same_as_sex1, # 130
-      log.gender_description1,
-      log.gender_same_as_sex2,
-      log.gender_description2,
-      log.gender_same_as_sex3,
-      log.gender_description3,
-      log.gender_same_as_sex4,
-      log.gender_description4,
-      log.gender_same_as_sex5,
-      log.gender_description5,
-      log.gender_same_as_sex6, # 140
-      log.gender_description6,
-      log.gender_same_as_sex7,
-      log.gender_description7,
-      log.gender_same_as_sex8,
-      log.gender_description8,
       log.owning_organisation.prp? ? log.referral_register : nil,
       log.referral_noms,
       log.referral_org, # 148