Update more labels

app/models/form/lettings/questions/managing_organisation.rb

@@ -17,7 +17,7 @@ class Form::Lettings::Questions::ManagingOrganisation < ::Form::Question
     return opts unless log
 
     if log.managing_organisation.present?
-      org_value = log.managing_organisation.status == :deleted ? "#{log.managing_organisation.name} (deleted)" : log.managing_organisation.name
+      org_value = log.managing_organisation.label
       opts = opts.merge({ log.managing_organisation.id => org_value })
     end
 
@@ -76,7 +76,7 @@ class Form::Lettings::Questions::ManagingOrganisation < ::Form::Question
     organisation = Organisation.find_by(id: log.managing_organisation_id)
     return unless organisation
 
-    organisation.status == :deleted ? "#{organisation.name} (deleted)" : organisation.name
+    organisation.label
   end
 
 private

app/models/form/lettings/questions/stock_owner.rb

@@ -17,7 +17,7 @@ class Form::Lettings::Questions::StockOwner < ::Form::Question
     return answer_opts unless log
 
     if log.owning_organisation_id.present?
-      org_value = log.owning_organisation.status == :deleted ? "#{log.owning_organisation.name} (deleted)" : log.owning_organisation.name
+      org_value = log.owning_organisation.label
       answer_opts[log.owning_organisation.id] = org_value
     end
 

app/models/form/sales/questions/managing_organisation.rb

@@ -17,7 +17,7 @@ class Form::Sales::Questions::ManagingOrganisation < ::Form::Question
     return opts unless log
 
     if log.managing_organisation.present?
-      org_value = log.managing_organisation.status == :deleted ? "#{log.managing_organisation.name} (deleted)" : log.managing_organisation.name
+      org_value = log.managing_organisation.label
       opts = opts.merge({ log.managing_organisation.id => org_value })
     end
 

app/models/form/sales/questions/owning_organisation_id.rb

@@ -17,7 +17,7 @@ class Form::Sales::Questions::OwningOrganisationId < ::Form::Question
     return answer_opts unless log
 
     if log.owning_organisation_id.present?
-      org_value = log.owning_organisation.status == :deleted ? "#{log.owning_organisation.name} (deleted)" : log.owning_organisation.name
+      org_value = log.owning_organisation.label
       answer_opts[log.owning_organisation.id] = org_value
     end