merge with august_spring

db/migrate/20170824110103_create_inventory_definitions.rb

@@ -4,6 +4,8 @@ class CreateInventoryDefinitions < ActiveRecord::Migration[5.1]
       t.string :item_code
       t.integer :min_order_level, :default => 0
       t.integer :max_stock_level, :default => 0
+      t.integer :created_by
+      t.boolean :is_active, :default => true
       t.timestamps
     end
   end

db/migrate/20170824110130_create_stock_check_items.rb

@@ -1,7 +1,7 @@
 class CreateStockCheckItems < ActiveRecord::Migration[5.1]
   def change
     create_table :stock_check_items do |t|
-      t.integer :stock_check_id, :null => false
+      t.integer :stock_check_id
       t.string :item_code, :null => false
       t.integer :stock_count, :default => 0
       t.integer :stock_journal_id