Pull from master

db/migrate/20170403174111_create_sale_audits.rb

@@ -9,7 +9,7 @@ class CreateSaleAudits < ActiveRecord::Migration[5.1]
       t.string :action_by, :null => false
       t.string :approved_by, :null => true
       t.datetime :approved_at, :null => true
-      t.string :remark
+      t.text :remark
       t.timestamps
     end
   end

db/migrate/20170628103624_create_print_settings.rb

@@ -6,13 +6,13 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1]
       t.string  :template  
       t.string  :font, :default => ""    
       t.string  :printer_name, :null => false
-      t.string  :api_settings,
+      t.string  :api_settings
       t.string  :brand_name
       t.string  :type
       t.decimal :page_width, :null => false, :default => 210
       t.decimal :page_height, :null => false, :default => 1450
       t.integer :print_copies, :null => false, :default => 1
-      t.string :precision
+      t.string  :precision
       t.boolean :delimiter
       t.integer :heading_space