fix grand total in receipt no

This commit is contained in:
Yan
2017-07-10 09:59:26 +06:30
parent 0031300947
commit 9402cde2bc
3 changed files with 4 additions and 2 deletions

View File

@@ -596,7 +596,7 @@ def self.get_separate_tax(from,to,payment_type=nil)
end
def grand_total_after_rounding
return self.grand_total.to_f + self.rounding_adjustment.to_f
return self.old_grand_total.to_f + self.rounding_adjustment.to_f
end
def get_cash_amount

View File

@@ -53,6 +53,7 @@
</thead>
<tbody>
<% grand_total = 0 %>
<% old_grand_total = 0 %>
<% total_tax = 0 %>
<% guest_count = 0 %>
<% total_sum = 0 %>
@@ -66,6 +67,7 @@
@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 %>
<% total_tax += result.total_tax.to_f %>
<% total_sum += result.total_amount.to_f %>
<% discount_amt += result.total_discount.to_f %>
@@ -98,7 +100,7 @@
<!-- <td><b><%= other_amt rescue '-'%></b></td> -->
<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><%= old_grand_total.to_f.round + rounding_adj %></b></td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>

BIN
dump.rdb

Binary file not shown.