diff --git a/app/models/sale.rb b/app/models/sale.rb index 699a2a19..c2a6e6bc 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -878,10 +878,9 @@ def self.get_by_shift_sale_by_item(from,to,status) end def self.get_item_query(type) - - if type == "revenue" || type.nil? - sale_type = "i.qty != 0 " - elsif type == "all" + if type == "revenue" + sale_type = "i.qty > 0 and status IS NULL" + elsif type == "all" || type.nil? sale_type = "" elsif type == "discount" sale_type = "i.status = 'Discount'"