Merge 2fe038c9f7 into e079455f65

app/services/bulk_upload/sales/year2025/row_parser.rb

@@ -781,7 +781,7 @@ private
       postcode_full: %i[field_21 field_22],
       wchair: %i[field_27],
 
-      type: %i[field_9 field_11 field_8],
+      type: sale_type_fields,
       resale: %i[field_78],
       hodate: %i[field_80 field_81 field_82],
 
@@ -1209,6 +1209,13 @@ private
     field_109 if staircasing?
   end
 
+  def sale_type_fields
+    return %i[field_8 field_9] if shared_ownership?
+    return %i[field_8 field_11] if discounted_ownership?
+
+    %i[field_9 field_11 field_8]
+  end
+
   def value_fields
     return [:field_86] if shared_ownership_initial_purchase?
     return [:field_113] if discounted_ownership?

app/services/bulk_upload/sales/year2026/row_parser.rb

@@ -836,7 +836,7 @@ private
       postcode_full: %i[field_21 field_22],
       wchair: %i[field_28],
 
-      type: %i[field_9 field_11 field_8],
+      type: sale_type_fields,
       resale: %i[field_91],
       hodate: %i[field_93 field_94 field_95],
 
@@ -1342,6 +1342,13 @@ private
     field_122 if staircasing?
   end
 
+  def sale_type_fields
+    return %i[field_8 field_9] if shared_ownership?
+    return %i[field_8 field_11] if discounted_ownership?
+
+    %i[field_9 field_11 field_8]
+  end
+
   def value_fields
     return [:field_99] if shared_ownership_initial_purchase?
     return [:field_128] if discounted_ownership?