git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixes and improvements

Browse Source
This commit is contained in:
Thein Lin Kyaw
2019-09-30 16:53:02 +06:30
parent faa0acee6d
commit 94a1f5b2b5
4 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/sale_item.rb
View File

@@ -18,7 +18,6 @@ class SaleItem < ApplicationRecord
sale_items.each do|saleitemObj|
@newsaleitem = SaleItem.new
@newsaleitem = saleitemObj.dup
@newsaleitem.save
@newsaleitem.qty = saleitemObj.qty * (-1)
@newsaleitem.unit_price = saleitemObj.unit_price * (-1)
@newsaleitem.taxable_price = (saleitemObj.unit_price * saleitemObj.qty) * (-1)
@@ -233,12 +232,12 @@ class SaleItem < ApplicationRecord
end
def update_stock_journal
is_void = self.status == "void" && self.status_was != "void"
cancel_void = self.status_was == "void" && self.status.nil?
is_edit = self.qty >= 0 && self.qty != self.qty_was
is_foc = self.status == "foc" && self.status_was != "foc"
cancel_foc = self.status_was == "foc"
is_void = self.status == "void" && self.status_before_last_save != "void"
cancel_void = self.status_before_last_save == "void" && self.status.nil?
is_edit = self.qty >= 0 && self.qty != self.qty_before_last_save
is_foc = self.status == "foc" && self.status_before_last_save != "foc"
cancel_foc = self.status_before_last_save == "foc"
if is_void or cancel_void or is_edit or is_foc or cancel_foc
found, inventory_definition = InventoryDefinition.find_product_in_inventory(self)
if found
@@ -253,7 +252,7 @@ class SaleItem < ApplicationRecord
qty = self.qty
remark = "cancel void"
elsif is_edit
qty = self.qty - self.qty_was
qty = self.qty - self.qty_before_last_save
remark = "edit"
end
StockJournal.add_to_journal(self.item_instance_code, qty, stock.balance, remark, inventory_definition, self.id, StockJournal::SALES_TRANS)
@@ -275,4 +274,5 @@ class SaleItem < ApplicationRecord
end
end
end
end