Pull from master

2018-08-20 11:26:07 +06:30
parent 3c2faf5970
commit d1852d24c3
28 changed files with 464 additions and 216 deletions
--- a/app/models/stock_journal.rb
+++ b/app/models/stock_journal.rb
@@ -4,10 +4,11 @@ class StockJournal < ApplicationRecord
  STOCK_CHECK_TRANS = "stock_check"

  def self.add_to_journal(item, balance, stock_message, inventory_definition) # item => saleObj | balance => Stock journal
+    journal = StockJournal.new
+    journal.credit = balance

    balance = calculate_balance(balance, item.qty)
-
-    journal = StockJournal.new
+    
    journal.item_code = item.item_instance_code
    journal.inventory_definition_id = inventory_definition.id
    journal.debit = item.qty