only annotate errors to the other fields if there was an error

app/services/bulk_upload/lettings/year2024/row_parser.rb

@@ -945,8 +945,11 @@ private
       errors.add(field, I18n.t("#{ERROR_BASE_KEY}.charges.missing_charges", sentence_fragment: charge))
     end
 
-    other_charge_fields.each_key do |field|
-      errors.add(field, I18n.t("#{ERROR_BASE_KEY}.charges.related_to_missing_charge"))
+    # if there were any errors, add an error to all the remaining present charges to make this entire section invalid
+    if blank_charge_fields.any?
+      other_charge_fields.each_key do |field|
+        errors.add(field, I18n.t("#{ERROR_BASE_KEY}.charges.related_to_missing_charge"))
+      end
     end
   end
 

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

@@ -944,8 +944,11 @@ private
       errors.add(field, I18n.t("#{ERROR_BASE_KEY}.charges.missing_charges", sentence_fragment: charge))
     end
 
-    other_charge_fields.each_key do |field|
-      errors.add(field, I18n.t("#{ERROR_BASE_KEY}.charges.related_to_missing_charge"))
+    # if there were any errors, add an error to all the remaining present charges to make this entire section invalid
+    if blank_charge_fields.any?
+      other_charge_fields.each_key do |field|
+        errors.add(field, I18n.t("#{ERROR_BASE_KEY}.charges.related_to_missing_charge"))
+      end
     end
   end