git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2017-12-07 13:24:20 +06:30
parent 42f1375472 e4b4a3d986
commit 1fc18628f9
11 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/reports/saleitem/index.html.erb
View File

@@ -202,7 +202,7 @@
<td colspan="5">&nbsp;</td>
<td style="border-top:2px solid grey;">Net Amount</td>
<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
<td style="border-top:2px solid grey;"><%= grand_total + total_tax%></td>
<td style="border-top:2px solid grey;"><%= grand_total.to_f + total_tax.to_f%></td>
</tr>
<!-- <tr>
<td colspan="5">&nbsp;</td>