diff --git a/app/views/reports/receipt_no/index.xls.erb b/app/views/reports/receipt_no/index.xls.erb
index 66734e56..94668ee0 100755
--- a/app/views/reports/receipt_no/index.xls.erb
+++ b/app/views/reports/receipt_no/index.xls.erb
@@ -12,25 +12,24 @@
 				<table class="table table-striped" border="0">
 					<thead>
 						<tr>
-							<th colspan="9"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to ? @to.utc.getlocal.strftime("%Y-%b-%d") : '-'%></th>
+							<th colspan="9"> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %>  - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d")  rescue '-'%></th>
 						</tr>
 						<% if @shift_from %>
 						<tr>
-							<% if @shift_data.employee %>		
+							<% if @shift_data.employee %>
 							<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
-							<% end %>			
+							<% end %>
 							<th colspan="9"><%= t("views.right_panel.detail.shift_name") %> =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
 						</tr>
-						<% end %>	 
-
+						<% 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 :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>
 							<% @tax_profiles.each do |tax| %>
-							<th><%= tax.name %></th>		
+								<th><%= tax.name %></th>
 							<% end %>
 							<!-- <th>Other Amount</th> -->
 							<th><%= t("views.right_panel.detail.grand_total") %></th>
@@ -41,132 +40,156 @@
 						</tr>
 					</thead>
 					<tbody>
+					<% if @print_settings.precision.to_i > 0
+						precision = @print_settings.precision
+					else
+						precision = 0
+					end
+					#check delimiter
+					if @print_settings.delimiter
+						delimiter = ","
+				    else
+						delimiter = ""
+				    end %>
+
 						<% grand_total = 0 %>
 						<% old_grand_total = 0 %>
+						<% after_rounding = 0 %>
 						<% total_tax = 0 %>
 						<% guest_count = 0 %>
-						<% total_sum = 0 %>	
-						<% discount_amt = 0 %>		    
+						<% total_sum = 0 %>
+						<% discount_amt = 0 %>
 						<% other_amt = 0 %>
-						<% total_nett = 0 %>	 
-						<% rounding_adj = 0%> 	 <% gov_tax = 0 %> <% service_charge = 0 %>	    
+						<% total_nett = 0 %>
+						<% rounding_adj = 0%> 	 <% gov_tax = 0 %> <% service_charge = 0 %>
 						<% tax_profile_count = @tax_profiles.length %>
 
-						<% 
+						<%
 							ttax_count = tax_profile_count - @sale_taxes.length
 							ttax_flag = true
-							@sale_taxes.each do |tax| 
+							@sale_taxes.each do |tax|
 								if tax.tax_name.downcase.include?("service")
 									ttax_flag = false
 								end
-							end 
+							end
 						%>
 
-						<%if @sale_data %> 
+						<%if !@sale_data.nil? %>
 						<% @sale_data.each do |result| %>
 
-						<% grand_total = grand_total.to_f + result.grand_total.to_f %>
-						<% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %>
+						<% grand_total +=result.grand_total.to_f %>
+						<% old_grand_total += result.grand_total_after_rounding() %>
 						<% total_tax += result.total_tax.to_f %>
-						<% total_sum += result.total_amount.to_f %>	
+						<% total_sum += result.total_amount.to_f %>
 						<% discount_amt += result.total_discount.to_f %>
 						<% rounding_adj += result.rounding_adjustment.to_f %>
 						<% sale_tax_count = result.sale_taxes.length %>
 						<% tax_count = tax_profile_count - sale_tax_count %>
 						<% tax_flag = true %>
-						<% result.sale_taxes.each do |tax| 
+						<% result.sale_taxes.each do |tax|
 							if tax.tax_name.downcase.include?("service")
 								tax_flag = false
 							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>
-							<td><%= result.total_discount rescue '-' %></td>
-							<!-- <%if result.customer.customer_type == "Takeaway"%>
-							    <td>0.0</td>
-							<%end%> -->
-							<% if !result.sale_taxes.empty? %>
-								<% num = 1 
-								if tax_flag && tax_count > 0 %>
-									<% while num <= tax_count %>
-										<td>0</td>
-									<% num += 1 
-									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><%= number_with_precision(result.total_amount, precision: precision.to_i ,delimiter: delimiter) %></td>
+								<td><%= number_with_precision(result.total_discount, precision: precision.to_i ,delimiter: delimiter) rescue '0' %>
+								</td>
+								<% if !result.sale_taxes.empty? %>
+								<% num = 1
+								   if tax_flag && tax_count > 0 %>
+								<% while num <= tax_count %>
+								<td>
+									<%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
+								</td>
+								<% num += 1
+								   end %>
 								<% end %>
 								<% result.sale_taxes.each do |tax| %>
-									<td>
-										<%= tax.tax_payable_amount rescue '-' %>
-									</td>
+								<td>
+									<%= number_with_precision(tax.tax_payable_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
+								</td>
 								<%end%>
-								<% num = 1 
-								if tax_flag==false && tax_count > 0 %>
-									<% while num <= tax_count %>
-										<td>0</td>
-									<% num += 1 
-									end %>
+								<% num = 1
+								   if tax_flag==false && tax_count > 0 %>
+								<% while num <= tax_count %>
+								<td>
+									<%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
+								</td>
+								<% num += 1
+								   end %>
 								<% end %>
-							<% else %>
+							    <% else %>
 								<% @tax_profiles.each do |tax| %>
-									<td>0</td>
-								<% end %>
-							<%end%>
+									<td><%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+									<% end %>
+							    <%end%>
 
-							<td><%= result.grand_total %></td>			
-							<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
-							<td><%= result.grand_total_after_rounding()  rescue '-'%></td>
-						</tr>
+	                            <% if result.old_grand_total.nil? %>
+								<td><%= number_with_precision(result.grand_total, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+	                            <%else%>
+	                            <td><%= number_with_precision(result.old_grand_total, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+	                            <%end%>
 
+								<td><%= result.rounding_adjustment.to_f rescue '-' %></td>
+								<td><%= number_with_precision(result.grand_total, precision: precision.to_i ,delimiter: delimiter) %></td>
+							</tr>
 						<% end %>
 						<tr style="border-top:4px double #666;">
 							<td colspan="3">&nbsp;</td>
-							<td><b><%= total_sum  rescue '-'%></b></td>
-							<td><b><%= discount_amt  rescue '-'%></b></td>
-							<!-- <% @sale_taxes.each do |tax| %>
-							<td><b><%= tax.st_amount.round(2) %></b></td>
-							<% end %> -->
+							<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? %>
-								<% num = 1 
+								<% num = 1
 								if ttax_flag && ttax_count > 0 %>
 									<% while num <= ttax_count %>
-										<td>0.00</td>
-									<% num += 1 
+										<td>
+											<%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
+										</td>
+									<% num += 1
 									end %>
 								<% end %>
 								<% @sale_taxes.each do |tax| %>
 									<td>
-										<%= tax.st_amount.to_f.round(2) %>
+										<%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %>
 									</td>
 								<%end%>
-								<% num = 1 
+								<% num = 1
 								if ttax_flag==false && ttax_count > 0 %>
 									<% while num <= ttax_count %>
-										<td>0.00</td>
-									<% num += 1 
+										<td>
+											<%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %>
+										</td>
+									<% num += 1
 									end %>
 								<% end %>
 							<% else %>
 								<% @tax_profiles.each do |tax| %>
-									<td>0.00</td>
+									<td><%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 								<% end %>
 							<%end%>
-							<td><b><%= grand_total.to_f.round(2)  rescue '-'%></b></td>		
-							<td><b><%= rounding_adj  rescue '-'%></b></td>		
-							<td><b><%= grand_total.to_f.round + rounding_adj %></b></td>				
+
+							<td><b><%= number_with_precision(old_grand_total.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '0'  %></b></td>
+
+							<td><b><%= rounding_adj.to_f rescue '-' %></b></td>
+							<td><b><%= number_with_precision(grand_total.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
+							<td></td>
 						</tr>
 						<tr>
 							<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>
-							
+
 							<% @tax_profiles.each do |tax| %>
 								<td><%= tax.name %></td>
 							<% end %>
@@ -175,8 +198,10 @@
 							<td><%= t("views.right_panel.detail.grand_total") %> +<br/>
 								<%= t("views.right_panel.detail.rnd_adj_sh") %>
 							</td>
+							<td>
+							</td>
 						</tr>
-						<%end%>
+					<%end%>
 					</tbody>
 				</table>
 			</div>