diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb
index a69177bd..3ca19e9d 100644
--- a/app/controllers/reports/receipt_no_controller.rb
+++ b/app/controllers/reports/receipt_no_controller.rb
@@ -19,7 +19,7 @@ authorize_resource :class => false
 	    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,from,to,payment_type)
+        @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type)
 
         @from       = from
         @to         = to
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 0e634d8f..324bb608 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -617,7 +617,17 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty
                                      
 end  
 
-def self.get_separate_tax(shift,from,to,payment_type)
+# def self.get_separate_tax(from,to,payment_method=nil)
+        
+#     query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
+#                   .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id")
+#                   .group("sale_taxes.tax_name")
+#                   .order("sale_taxes.sale_tax_id asc")
+                       
+#       return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to)
+# end
+
+def self.get_separate_tax(shift_sale_range,shift,from,to,payment_type)
 
   if payment_type.blank?
     payment_type = ''
@@ -629,28 +639,23 @@ def self.get_separate_tax(shift,from,to,payment_type)
     end
   end
   
-  query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
-  .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id")
-  .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")  
-  .group("sale_taxes.tax_name")
-  .order("sale_taxes.sale_tax_id asc")
-  
+  puts "SSSSSSSSSSS"
   if shift.present?
-    query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a)
+    query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
+           .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id")
+           .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")  
+           .group("sale_taxes.tax_name")
+           .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed'", shift.to_a)
   else
-    query = query.where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' ",from,to)
+    query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
+           .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id")
+           .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+           .where("sales.receipt_date between ? and ? #{payment_type} and sale_status= 'completed' and sales.shift_sale_id in (?)",from,to,shift_sale_range.to_a)
+           .group("sale_taxes.tax_name")
   end 
+  
 end
 
-# def self.get_separate_tax(from,to,payment_method=nil)
-        
-#     query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
-#                   .joins("INNER JOIN sales ON sales.sale_id = sale_taxes.sale_id")
-#                   .group("sale_taxes.tax_name")
-                       
-#       return query = query.where("sale_status=? and receipt_date between ? and ?","completed",from,to)
-# end
-
 def grand_total_after_rounding
     return self.old_grand_total.to_f + self.rounding_adjustment.to_f
 end