merge with origin master

2017-06-29 14:08:20 +06:30
parent b63155a315 11c3be8f4a
commit fbeab17b3c
25 changed files with 369 additions and 29 deletions
--- a/db/migrate/20170627035218_create_payment_journals.rb
+++ b/db/migrate/20170627035218_create_payment_journals.rb
@@ -8,7 +8,7 @@ class CreatePaymentJournals < ActiveRecord::Migration[5.1]
      t.string :payment_method,:null => false, :default => "CASH"
      t.string :payment_status,:null => false, :default => "NEW"
      t.string :payment_method_references
-
+      t.integer :created_by, :null => false
      t.timestamps
    end
  end