diff --git a/app/models/sale.rb b/app/models/sale.rb
index 4dcbba14..104a7280 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1143,16 +1143,25 @@ 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.select("sales.*,sale_payments.*,df.name,df.type")
+              .where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+              .joins("join bookings on bookings.sale_id = sales.sale_id")
+              .joins("left join dining_facilities df on df.id = bookings.dining_facility_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.select("sales.*,sale_payments.*,df.name,df.type")
+              .where("sale_status='completed' #{payment_type} and sale_payments.payment_amount != 0 and sales.shift_sale_id in (?)",shift_sale_range.to_a)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+              .joins("join bookings on bookings.sale_id = sales.sale_id")
+              .joins("left join dining_facilities df on df.id = bookings.dining_facility_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.select("sales.*,sale_payments.*,df.name,df.type")
+              .where("sale_status='completed' and sales.receipt_date between ? and ? #{payment_type} and sale_payments.payment_amount != 0",from,to)
               .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+              .joins("join bookings on bookings.sale_id = sales.sale_id")
+              .joins("left join dining_facilities df on df.id = bookings.dining_facility_id")
               .group("sales.sale_id")
     end
     return query
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb
index 689db837..883e03ce 100755
--- a/app/views/reports/receipt_no/index.html.erb
+++ b/app/views/reports/receipt_no/index.html.erb
@@ -42,6 +42,7 @@
 						<% end %>	 
 
 						<tr>
+							<th><%= t("views.right_panel.detail.dining") %></th>
 							<th><%= t("views.right_panel.detail.receipt_no") %></th>
 							<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>		
 							<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></th>
@@ -113,6 +114,13 @@
 
 						<tr>
 
+							<td>
+								<%if result.type %>
+									<%= result.type %> - <%= result.name %> 
+								<% else %>
+									-
+								<% end %>
+							</td>
 							<td><%= result.receipt_no rescue '-' %> </td>
 							<td><%= result.cashier_name rescue '-' %></td>
 							<td><%= number_with_precision(result.total_amount, precision: precision.to_i ,delimiter: delimiter) %></td>
@@ -157,7 +165,7 @@
 						</tr>
 						<% end %>
 						<tr style="border-top:4px double #666;">
-							<td colspan="2">&nbsp;</td>
+							<td colspan="3">&nbsp;</td>
 							<td><b><%= number_with_precision(total_sum, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
 							<td><b><%= number_with_precision(discount_amt, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
 							<!-- <% if !@sale_taxes.empty? 
@@ -208,7 +216,7 @@
 							<td><b><%= number_with_precision(grand_total.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>				
 						</tr>
 						<tr>
-							<td colspan="2">&nbsp;</td>
+							<td colspan="3">&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>
 							
diff --git a/app/views/reports/receipt_no/index.xls.erb b/app/views/reports/receipt_no/index.xls.erb
index 038798ee..66734e56 100755
--- a/app/views/reports/receipt_no/index.xls.erb
+++ b/app/views/reports/receipt_no/index.xls.erb
@@ -24,6 +24,7 @@
 						<% end %>	 
 
 						<tr>
+							<th><%= t("views.right_panel.detail.dining") %></th>
 							<th><%= t("views.right_panel.detail.receipt_no") %></th>
 							<th><%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>		
 							<th><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></th>
@@ -79,7 +80,13 @@
 							end
 						end %>
 						<tr>
-
+							<td>
+								<%if result.type %>
+									<%= result.type %> - <%= result.name %> 
+								<% else %>
+									-
+								<% end %>
+							</td>
 							<td><%= result.receipt_no rescue '-' %> </td>
 							<td><%= result.cashier_name rescue '-' %></td>
 							<td><%= result.total_amount rescue '-' %></td>
@@ -120,7 +127,7 @@
 
 						<% end %>
 						<tr style="border-top:4px double #666;">
-							<td colspan="2">&nbsp;</td>
+							<td colspan="3">&nbsp;</td>
 							<td><b><%= total_sum  rescue '-'%></b></td>
 							<td><b><%= discount_amt  rescue '-'%></b></td>
 							<!-- <% @sale_taxes.each do |tax| %>
@@ -156,7 +163,7 @@
 							<td><b><%= grand_total.to_f.round + rounding_adj %></b></td>				
 						</tr>
 						<tr>
-							<td colspan="2">&nbsp;</td>
+							<td colspan="3">&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>