Merge remote-tracking branch 'origin/CLDC-1482-sales-log-buyer-company' into CLDC-1482-sales-log-buyer-company

# Conflicts:
#	app/models/form/sales/subsections/setup.rb
#	db/schema.rb
#	spec/models/form/sales/subsections/setup_spec.rb
#	spec/models/form_handler_spec.rb
#	spec/models/form_spec.rb

spec/models/form_handler_spec.rb

@@ -61,14 +61,14 @@ RSpec.describe FormHandler do
     it "is able to load a current sales form" do
       form = form_handler.get_form("current_sales")
       expect(form).to be_a(Form)
-      expect(form.pages.count).to eq(15)
+      expect(form.pages.count).to eq(16)
       expect(form.name).to eq("2022_2023_sales")
     end
 
     it "is able to load a previous sales form" do
       form = form_handler.get_form("previous_sales")
       expect(form).to be_a(Form)
-      expect(form.pages.count).to eq(15)
+      expect(form.pages.count).to eq(16)
       expect(form.name).to eq("2021_2022_sales")
     end
   end