diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index a4dcb31d..c00c35f0 100755
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -43,7 +43,7 @@ class Origami::SaleEditController < BaseOrigamiController
     @newsaleitem = saleitemObj.dup
     @newsaleitem.save
     @newsaleitem.qty = saleitemObj.qty * -1      
-    @newsaleitem.unit_price = saleitemObj.unit_price * -1
+    @newsaleitem.unit_price = saleitemObj.unit_price * 1
     @newsaleitem.taxable_price = saleitemObj.taxable_price * -1
     @newsaleitem.price = saleitemObj.price * -1
     @newsaleitem.product_name = saleitemObj.product_name + ' (FOC)'
diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb
index 3ca19e9d..6d536ee7 100755
--- a/app/controllers/reports/receipt_no_controller.rb
+++ b/app/controllers/reports/receipt_no_controller.rb
@@ -20,7 +20,11 @@ authorize_resource :class => false
 	    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)
+        @tax_profiles = TaxProfile.order('order_by asc')
 
+puts @sale_taxes.to_json
+puts "sssssss"
+puts @tax_profiles.to_json
         @from       = from
         @to         = to
 
diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index bd933f83..422c3020 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -16,8 +16,7 @@ class Reports::SaleitemController < BaseReportController
       end
     end
     @sale_data, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED)
-    puts @sale_data.to_json
-    puts "SSSSSSSSSSS"
+
     @account_cate_count = Hash.new {|hash, key| hash[key] = 0}
 
 
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 7cacedf3..17f49a12 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -725,19 +725,19 @@ def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_ty
     query = Sale.all
     if shift.present?
 
-      query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a)
+      query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sales.payment_status= 'paid' and sale_payments.payment_amount != 0", shift.to_a)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .group("sales.sale_id")
 
     elsif shift_sale_range.present?
 
-      query = query.where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.shift_sale_id in (?)",shift_sale_range.to_a)
+      query = query.where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.payment_status= 'paid' and sales.shift_sale_id in (?)",shift_sale_range.to_a)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .group("sales.sale_id")
 
     else
 
-      query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sale_payments.payment_amount != 0",from,to)
+      query = query.where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sales.payment_status= 'paid' and sale_payments.payment_amount != 0",from,to)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
               .group("sales.sale_id")
     end
@@ -795,19 +795,19 @@ def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type)
            .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id")
            .where("sales.shift_sale_id in (?) and sale_status= 'completed'", shift.to_a)
            .group("sale_taxes.tax_name")
-           .order("sale_taxes.sale_tax_id asc")
+           .order("sale_taxes.tax_name desc")
   elsif shift_sale_range.present?
     query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
            .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id")
            .where("sales.shift_sale_id in (?) and sale_status= 'completed'", shift_sale_range.to_a)
            .group("sale_taxes.tax_name")
-           .order("sale_taxes.sale_tax_id asc")
+           .order("sale_taxes.tax_name desc")
   else
     query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name")
            .joins("LEFT JOIN sales ON sales.sale_id = sale_taxes.sale_id")
            .where("sales.receipt_date between ? and ? and sale_status= 'completed'", from,to)
            .group("sale_taxes.tax_name")
-           .order("sale_taxes.sale_tax_id asc")
+           .order("sale_taxes.tax_name desc")
   end
 end
 
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 961a556f..c24b8271 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -174,7 +174,7 @@ class SalePayment < ApplicationRecord
     sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }'")
     
     sale_items.each do|item|
-      SaleItem.update_existing_item(item.qty, item, self.sale.sale_id, "foc", item.unit_price, item.price)
+      SaleItem.update_existing_item(item.qty,item.item_instance_code, item, self.sale.sale_id, "foc", item.unit_price, item.price)
     end
 
     self.payment_method = "foc"
diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb
index fa32f91c..25d91a7d 100755
--- a/app/views/reports/payment_method/index.html.erb
+++ b/app/views/reports/payment_method/index.html.erb
@@ -103,7 +103,7 @@
 								<td><%= payment.cashier_name rescue '-' %></td>
 								<!--<td><%= payment.sale.customer.name rescue '-' %></td>-->
 								<td><%= payment.payment_method rescue '-' %></td>
-								<td><%= payment.payment_amount rescue '-' %></td>
+								<td><%= payment.payment_amount + payment.outstanding_amount%> </td>
 								<td><%= payment.sale.grand_total rescue '-' %></td>
 								
 							</tr>
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb
index 76756e0f..08386eb7 100755
--- a/app/views/reports/receipt_no/index.html.erb
+++ b/app/views/reports/receipt_no/index.html.erb
@@ -46,8 +46,8 @@
 							<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>		
 							<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></th>
 							<th><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> </th>
-							<% @sale_taxes.each do |tax| %>
-							<th><%= tax.tax_name %></th>		
+							<% @tax_profiles.each do |tax| %>
+							<th><%= tax.name %></th>		
 							<% end %>
 							<!-- <th>Other Amount</th> -->
 							<th><%= t("views.right_panel.detail.grand_total") %></th>
@@ -83,6 +83,9 @@
 							<td><%= result.cashier_name rescue '-' %></td>
 							<td><%= result.total_amount rescue '-' %></td>
 							<td><%= result.total_discount rescue '-' %></td>
+							<%if result.customer.customer_type == "Takeaway"%>
+							    <td>0.0</td>
+							<%end%>
 							<% result.sale_taxes.each do |tax| %>
 							<td><%= tax.tax_payable_amount rescue '-' %></td>
 							<%end%>
@@ -108,8 +111,9 @@
 							<td colspan="2">&nbsp;</td>
 							<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
 							<td><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
-							<% @sale_taxes.each do |tax| %>
-							<td><%= tax.tax_name %></td>
+							
+							<% @tax_profiles.each do |tax| %>
+								<td><%= tax.name %></td>
 							<% end %>
 							<td><%= t("views.right_panel.detail.grand_total") %></td>
 							<td><%= t("views.right_panel.detail.rnd_adj_sh") %></td>