pull origin master

2017-09-18 13:53:28 +06:30
parent 4f3b831771
commit 8966f290b5
122 changed files with 3964 additions and 2277 deletions
--- a/db/migrate/20170403161857_create_sale_items.rb
+++ b/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