Remove pickup address and use single address field for supplier and distributor roles within enterprise

db/migrate/20121028070200_remove_pickup_address_from_enterprises.rb

@@ -0,0 +1,5 @@
+class RemovePickupAddressFromEnterprises < ActiveRecord::Migration
+  def change
+    remove_column :enterprises, :pickup_address_id
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121025012233) do
+ActiveRecord::Schema.define(:version => 20121028070200) do
 
   create_table "cms_blocks", :force => true do |t|
     t.integer  "page_id",    :null => false
@@ -162,7 +162,6 @@ ActiveRecord::Schema.define(:version => 20121025012233) do
     t.string   "acn"
     t.integer  "address_id"
     t.string   "pickup_times"
-    t.integer  "pickup_address_id"
     t.string   "next_collection_at"
     t.datetime "created_at",          :null => false
     t.datetime "updated_at",          :null => false