From 055888c689d56d8b0c7115d9ec7e2ed3e31015fc Mon Sep 17 00:00:00 2001
From: Arthur Campbell <arfa.camble@gmail.com>
Date: Tue, 2 May 2023 16:05:54 +0100
Subject: [PATCH] minor alterations after rebase to account for changes made on
 other branches

---
 app/services/csv/sales_log_csv_service.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/services/csv/sales_log_csv_service.rb b/app/services/csv/sales_log_csv_service.rb
index eab6876c3..a9573df41 100644
--- a/app/services/csv/sales_log_csv_service.rb
+++ b/app/services/csv/sales_log_csv_service.rb
@@ -22,6 +22,7 @@ module Csv
       month: %i[saledate month],
       year: %i[saledate year],
       is_dpo: %i[created_by is_dpo],
+      created_by_name: %i[created_by name],
       owning_organisation_name: %i[owning_organisation name],
     }.freeze
 
@@ -33,8 +34,6 @@ module Csv
     FIELDS_ALWAYS_EXPORTED_AS_LABELS = {
       "la_label" => "la",
       "prevloc_label" => "prevloc",
-      "created_by_name" => "created_by_id",
-      "owning_organisation_name" => "owning_organisation_id",
     }.freeze
 
     DATE_FIELDS = %w[