Merge branch 'master' of github.com:akaunting/akaunting

This commit is contained in:
Cüneyt Şentürk
2020-03-10 17:43:30 +03:00
9 changed files with 15 additions and 20 deletions

View File

@@ -6,6 +6,6 @@
@php $grand_total += $total; @endphp
<th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
@endforeach
<th class="{{ $class->column_name_width }} text-right">@money($grand_total, setting('default.currency'), true)</th>
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th>
</tr>
</tfoot>

View File

@@ -8,6 +8,6 @@
@foreach($class->dates as $date)
<th class="{{ $class->column_value_width }} text-right px-0">{{ $date }}</th>
@endforeach
<th class="{{ $class->column_name_width }} text-right">{{ trans_choice('general.totals', 1) }}</th>
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4">{{ trans_choice('general.totals', 1) }}</th>
</tr>
</thead>

View File

@@ -5,5 +5,5 @@
@php $row_total += $row; @endphp
<td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
@endforeach
<td class="{{ $class->column_name_width }} text-right">@money($row_total, setting('default.currency'), true)</td>
<td class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($row_total, setting('default.currency'), true)</td>
</tr>