diff --git a/app/models/sale.rb b/app/models/sale.rb
index 8f208dfc..e6b4e15c 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -2962,7 +2962,7 @@ def self.all_receipt_details
             .joins("join sale_payments on sale_payments.sale_id = sale_items.sale_id")
             .joins("join sales on sales.sale_id = sale_items.sale_id")
             .group("sale_items.sale_item_id")
-   query = query.where("sale_itemsqty > 0 and sales.sale_status !='new'")
+   query = query.where("sale_items.qty > 0 and sales.sale_status !='new'")
        query = query.where("sale_items.created_at between ? and ?", '2017-11-01 00:00:00 +0630','2018-02-05 13:59:59 +0630')
     return query
 end
diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake
index 5e3c524c..cbe74e83 100644
--- a/lib/tasks/receipt.rake
+++ b/lib/tasks/receipt.rake
@@ -3,7 +3,7 @@ namespace :consolidate do
   task :receipt => :environment do
     # Receipt.delete_all
     sales = Sale.all_receipts
-    shop  = current_shop
+    shop  = Shop.first #current_shop
     sales.each do |sale|
       
      if sale.shift_sale_id.present?
@@ -57,7 +57,7 @@ namespace :consolidate do
     ReceiptDetail.delete_all
     sales = Sale.all_receipt_details
 
-    shop  = current_shop
+    shop  = Shop.first #current_shop
 
     sale_id = ''
     count   = 0
@@ -91,9 +91,9 @@ namespace :consolidate do
         
         @receipt_no                = sale.receipt_no
         @requested_at              = sale.requested_at
-        if @receipt_no == '20171130-10464'
-          byebug
-        end
+        # if @receipt_no == '20171130-10464'
+        #   byebug
+        # end
         if sale_id == sale.sale_id || count == 0 || @z ==0
           @total_qty                 += sale.qty
           @total_gross_sales         += sale.price
@@ -199,47 +199,48 @@ namespace :consolidate do
       count += 1
       @item_sequence += 1
       sale_id = sale.sale_id
-    end
     
-    if count == sale_count
-      receipt = ReceiptDetail.new
-          receipt.client_code         = shop.client_code
-          receipt.client_name         = shop.client_name
-          receipt.shop_code           = shop.shop_code
-          receipt.shop_name           = shop.name
-          receipt.receipt_no          = @receipt_no
-          receipt.receipt_date        = @requested_at #requet-at
-          receipt.transaction_date    = @requested_at #before disco/after tax /after/ser_char
-          receipt.item_sequence       = @item_sequence
-          receipt.category_code       = sale.product_code
-          receipt.category_name       = sale.product_name
-          receipt.sub_category_code   = 0
-          receipt.sub_category_name   = 0
-          receipt.report_group_code   = 0
-          receipt.report_group_name   = 0
-          receipt.item_code           = (menu_code.to_s=="NULL") ? "0" : sale.product_code
-          receipt.item_name           = menu_name
-          receipt.qty                 = @total_qty
-          receipt.transaction_type    = "Tender"
-          receipt.gross_sales         = @total_gross_sales
-          receipt.discount_code       = ''
-          receipt.discount_amount     = 0
-          receipt.sales               = @total_sales
-          receipt.tax_amount          = 0
-          receipt.service_charges     = 0
-          receipt.net_sales           = @total_net_sales
-          receipt.is_set_item         = false
-          receipt.is_foc              = false
-          receipt.is_staff_meal       = false
-          receipt.is_raw_wastage      = false
-          receipt.is_semi_wastage     = false
-          receipt.is_wastage          = false
-          receipt.is_spoilage         = false
-          receipt.is_sampling         = false
-          receipt.tax_able            = false
-          receipt.is_void             = false 
-          receipt.remarks             = ""
-          receipt.save
+      if count == sale_count
+        receipt = ReceiptDetail.new
+            receipt.client_code         = shop.client_code
+            receipt.client_name         = shop.client_name
+            receipt.shop_code           = shop.shop_code
+            receipt.shop_name           = shop.name
+            receipt.receipt_no          = @receipt_no
+            receipt.receipt_date        = @requested_at #requet-at
+            receipt.transaction_date    = @requested_at #before disco/after tax /after/ser_char
+            receipt.item_sequence       = @item_sequence
+            receipt.category_code       = sale.product_code
+            receipt.category_name       = sale.product_name
+            receipt.sub_category_code   = 0
+            receipt.sub_category_name   = 0
+            receipt.report_group_code   = 0
+            receipt.report_group_name   = 0
+            receipt.item_code           = (menu_code.to_s=="NULL") ? "0" : sale.product_code
+            receipt.item_name           = menu_name
+            receipt.qty                 = @total_qty
+            receipt.transaction_type    = "Tender"
+            receipt.gross_sales         = @total_gross_sales
+            receipt.discount_code       = ''
+            receipt.discount_amount     = 0
+            receipt.sales               = @total_sales
+            receipt.tax_amount          = 0
+            receipt.service_charges     = 0
+            receipt.net_sales           = @total_net_sales
+            receipt.is_set_item         = false
+            receipt.is_foc              = false
+            receipt.is_staff_meal       = false
+            receipt.is_raw_wastage      = false
+            receipt.is_semi_wastage     = false
+            receipt.is_wastage          = false
+            receipt.is_spoilage         = false
+            receipt.is_sampling         = false
+            receipt.tax_able            = false
+            receipt.is_void             = false 
+            receipt.remarks             = ""
+            receipt.save
+      end
+
     end
   end