fixed conflict after merge with dev

2019-11-28 16:47:12 +06:30
parent 858ddfd93b 2010b6a4bb
commit d41d957688
37 changed files with 295 additions and 430 deletions
--- a/app/models/sale_item.rb
+++ b/app/models/sale_item.rb
@@ -369,10 +369,10 @@ class SaleItem < ApplicationRecord
            if self.qty.to_i >= 0
              qty = self.qty - self.qty_was
              if stock.balance.to_i >= qty
-                puts ">> stock is greater than order qty"
+                Rails.logger.info ">> stock is greater than order qty"
                remark = "ok"
              else
-                puts " << stock is less than order qty"
+                Rails.logger.info " << stock is less than order qty"
                remark = "out of stock"
              end
            end