diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb
index aa1dd8bd..2e43da0b 100755
--- a/app/controllers/reports/receipt_no_controller.rb
+++ b/app/controllers/reports/receipt_no_controller.rb
@@ -5,18 +5,25 @@ authorize_resource :class => false
 
 		from, to  = get_date_range_from_params
 
-		@shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+		@shift_sale_range = ''
 
 	    @shift = ''
 	    if params[:shift_name].to_i != 0
-	      shift_sale = ShiftSale.find(params[:shift_name])
-	      if to.blank?        
-	        @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at)
-	      else
 
-	        @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)        
+	      @shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
+
+	      @shift_sale = ShiftSale.find(params[:shift_name])
+	      if to.blank?  
+	        @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',@shift_sale.shift_started_at)
+	      else
+	        if @shift_sale.shift_closed_at.blank?
+	          @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL',@shift_sale.shift_started_at)
+	        else
+	          @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',@shift_sale.shift_started_at, @shift_sale.shift_closed_at)
+	        end
 	      end
 	    end
+
 	    payment_type = params[:payment_type]
         @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type) 
         @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type)
@@ -42,18 +49,18 @@ authorize_resource :class => false
 	def show
 		from, to  = get_date_range_from_params
 
-	    @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+	    @sale_data = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
 
-	    date_arr = Array.new
-	    @sale_data.each do |sale|
-	      local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p")
-	      local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p")
-	      opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc
-	      closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc
-	      shift_id = sale.id.nil? ? '-' : sale.id
-	      str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date}
-	      date_arr.push(str)
-	    end
+		date_arr = Array.new
+		@sale_data.each do |sale|
+			local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p")
+			local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p")
+			opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc
+			closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc
+			shift_id = sale.id.nil? ? '-' : sale.id
+			str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date}
+			date_arr.push(str)
+		end
 
 	    out = {:status => 'ok', :message => date_arr}
 	    
diff --git a/app/controllers/reports/shiftsale_controller.rb b/app/controllers/reports/shiftsale_controller.rb
index 21ca498b..300e1079 100755
--- a/app/controllers/reports/shiftsale_controller.rb
+++ b/app/controllers/reports/shiftsale_controller.rb
@@ -28,7 +28,7 @@ class Reports::ShiftsaleController < BaseReportController
   def show
     from, to  = get_date_range_from_params
 
-      @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
+      @sale_data = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED)
 
       date_arr = Array.new
       @sale_data.each do |sale|
diff --git a/app/views/reports/receipt_no/index.xls.erb b/app/views/reports/receipt_no/index.xls.erb
index c8521b0d..0b6a4dd0 100755
--- a/app/views/reports/receipt_no/index.xls.erb
+++ b/app/views/reports/receipt_no/index.xls.erb
@@ -6,7 +6,7 @@
 				<table class="table table-striped" border="0">
 					<thead>
 						<tr>
-							<th colspan="9"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
+							<th colspan="9"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to ? @to.utc.getlocal.strftime("%Y-%b-%d") : '-'%></th>
 						</tr>
 						<% if @shift_from %>
 						<tr>
diff --git a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
index b519adf9..8161d81c 100755
--- a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
@@ -77,7 +77,7 @@
 //Reset the form to pervious values
 <% if params[:shift_name].to_i > 0%>
 shift_id = '<%= params[:shift_name] %>'
-local_date = '<%= @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")%> -<%= @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") %>'
+local_date = '<%= @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")%> -<%= @shift.shift_closed_at ? @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") : "-" %>'
 var shift = $('#shift_name');
 str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
 shift.append(str);
diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb
index f3f418eb..f9b4e233 100755
--- a/app/views/reports/shiftsale/index.html.erb
+++ b/app/views/reports/shiftsale/index.html.erb
@@ -95,7 +95,7 @@
 							<%= result[:employee_name]  rescue '-'%>
 						</td>
 						<td><%= result[:shift_started_at].strftime("%e %b %I:%M%p") rescue '-' %> -  
-							<%= result[:shift_closed_at].strftime("%e %b %I:%M%p") rescue '-'  %>
+							<%= result[:shift_closed_at] ? result[:shift_closed_at].strftime("%e %b %I:%M%p") : '-'  %>
 						</td>
 						<!-- <td style='color:red;'>(<%= sprintf "%.2f",result.void_amount.to_f.to_d  rescue '-'%>)</td> -->
 						<td><%= number_with_precision(result[:cash_sales].to_f,  precision:precision.to_i,delimiter:delimiter) %></td>