updated for receipt rpt for shift

app/models/sale.rb

@@ -583,7 +583,7 @@ def self.get_by_shift_sale(from,to,status)
     " grand_total AS grand_total, cash_sales AS cash," +
      "total_taxes AS total_tax,total_discounts As total_discount")    
      .order("shift_sales.id DESC")
-  return query = query.where("shift_sales.shift_started_at between ? and ?" + " or shift_sales.shift_closed_at between ? and ?",from,to ,from,to )
+  return query = query.where("shift_sales.shift_started_at >= ?" + " AND shift_sales.shift_closed_at <= ?", from,to)
 end
 
 def self.get_separate_tax(from,to,payment_type=nil)