diff --git a/app/models/sale.rb b/app/models/sale.rb
index 0e090073..b8ab0a10 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -2603,7 +2603,7 @@ end
   end
 
   def self.all_receipts
-    query = Sale.select("sale_payments.created_at as receipt_close_time,
+    query = Sale.select("sales.*,sale_payments.created_at as receipt_close_time,
                 case when (sale_audits.action='SALEPAYMENT') then sale_audits.remark else 0 end as remark,
                 case when (sale_taxes.tax_name='Service Charges') then sale_taxes.tax_payable_amount else 0 end as service_charges,
                 SUM(case when (sale_payments.payment_method='mpu') then sale_payments.payment_amount else 0 end) as mpu_amount,
diff --git a/lib/tasks/receipt.rake b/lib/tasks/receipt.rake
index 3f8c12c5..08692a0e 100644
--- a/lib/tasks/receipt.rake
+++ b/lib/tasks/receipt.rake
@@ -6,7 +6,7 @@ namespace :consolidate do
     shop  = Shop.find(1)
     sales.each do |sale|
       
-     if !sale.shift_sale_id.nil?
+     if sale.shift_sale_id.present?
        shift = ShiftSale.find(sale.shift_sale_id)
       receipt = Receipt.new
       receipt.client_code         = shop.client_code
@@ -69,10 +69,10 @@ namespace :consolidate do
     @item_sequence = 1
     sale_count = sales.to_a.count
     sales.each do |sale|
-
       if sale.qty > 0
 
         if sale.item_instance_code !=nil
+          byebug
           menu_category = MenuCategory.find(MenuItem.find_by_item_code(sale.product_code).menu_category_id)
           name  = menu_category.name
           code  = menu_category.code
@@ -91,7 +91,9 @@ namespace :consolidate do
         
         @receipt_no                = sale.receipt_no
         @requested_at              = sale.requested_at
-
+        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
@@ -116,7 +118,7 @@ namespace :consolidate do
           receipt.sub_category_name   = 0
           receipt.report_group_code   = 0
           receipt.report_group_name   = 0
-          receipt.item_code           = sale.product_code
+          receipt.item_code           = (sale.product_code.to_s=="NULL") ? "0" : sale.product_code
           receipt.item_name           = sale.product_name
           receipt.qty                 = @total_qty
           receipt.transaction_type    = "Tender"
@@ -165,7 +167,7 @@ namespace :consolidate do
           receipt.sub_category_name   = 0
           receipt.report_group_code   = 0
           receipt.report_group_name   = 0
-          receipt.item_code           = menu_code
+          receipt.item_code           = (menu_code.to_s=="NULL") ? "0" : sale.product_code
           receipt.item_name           = menu_name
           receipt.qty                 = sale.qty
           receipt.transaction_type    = (sale.status==nil) ? "Sales" : sale.status
@@ -215,7 +217,7 @@ namespace :consolidate do
           receipt.sub_category_name   = 0
           receipt.report_group_code   = 0
           receipt.report_group_name   = 0
-          receipt.item_code           = menu_code
+          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"