remove conflict data

app/controllers/reports/product_sale_controller.rb

@@ -0,0 +1,21 @@
+class Reports::ProductSaleController < BaseReportController
+	authorize_resource :class => false
+
+	def index
+		@order_by = 'desc'
+		if !params[:order_by].nil?
+			@order_by = params[:order_by]
+		end
+
+	    @sale_data = Sale.get_menu_item_query(@order_by)
+
+	    # get printer info
+	    @print_settings = PrintSetting.get_precision_delimiter()
+
+		respond_to do |format|
+			format.html
+			format.json 
+			format.xls
+		end
+  	end
+end

app/controllers/reports/saleitem_controller.rb

@@ -33,7 +33,7 @@ class Reports::SaleitemController < BaseReportController
 
     @from       = from
     @to         = to
-
+    
     # get printer info
     @print_settings = PrintSetting.get_precision_delimiter()
 

app/controllers/reports/stock_check_controller.rb

@@ -17,7 +17,7 @@ class Reports::StockCheckController < BaseReportController
     @from       = from_date
     @to         = to_date
     # get printer info
-  @print_settings = PrintSetting.get_precision_delimiter()
+    @print_settings = PrintSetting.get_precision_delimiter()
     respond_to do |format|
       format.html
       format.xls