rebase too

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2022_12_22_120105) do
+ActiveRecord::Schema[7.0].define(version: 2022_12_22_133600) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -425,10 +425,10 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_22_120105) do
     t.integer "exmonth"
     t.integer "exyear"
     t.integer "resale"
-    t.integer "lanomagr"
-    t.integer "soctenant"
     t.decimal "deposit", precision: 10, scale: 2
     t.decimal "cashdis", precision: 10, scale: 2
+    t.integer "lanomagr"
+    t.integer "soctenant"
     t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id"
     t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id"
     t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"

spec/models/form_handler_spec.rb

@@ -52,14 +52,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(78)
+      expect(form.pages.count).to eq(79)
       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(78)
+      expect(form.pages.count).to eq(79)
       expect(form.name).to eq("2021_2022_sales")
     end
   end