pull origin master

db/migrate/20170403161857_create_sale_items.rb

@@ -4,6 +4,7 @@ class CreateSaleItems < ActiveRecord::Migration[5.1]
       t.string :sale_item_id, :limit => 16, :primary_key => true#custom primary key - to ensure consistence for cloud syncing
       t.string :sale_id, foreign_key: true, :limit => 16
       t.string :product_code, :null => false
+      t.string :item_instance_code
       t.string :product_name, :null => false
       t.string :product_alt_name, :null => false
       t.integer :account_id, :limit => 8, :null => false, :default => 1

db/migrate/20170530072247_create_shops.rb

@@ -20,7 +20,7 @@ class CreateShops < ActiveRecord::Migration[5.1]
       t.string :id_prefix, :null => false, :limit => 3
       t.boolean :is_rounding_adj, :default => false
       t.boolean :quick_sale_summary, :default => false
-
+      t.boolean :calc_tax_order, :default => false
       t.timestamps
     end
   end

db/migrate/20170823081748_create_in_duties.rb

@@ -1,7 +1,9 @@
-class CreateInJuties < ActiveRecord::Migration[5.1]
+class CreateInDuties < ActiveRecord::Migration[5.1]
   def change
-    create_table :in_juties do |t|
+    create_table :in_duties do |t|
       t.integer :dinning_id
+      t.string :booking_id
+      t.string :sale_id
       t.json :commissioner_ids
       t.datetime :in_time
       t.datetime :out_time