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

This commit is contained in:
denisdulici 2020-01-13 17:20:36 +03:00
commit 57cdfe96b6
5 changed files with 13 additions and 13 deletions

View File

@ -3,11 +3,11 @@
@if ($table == 'default')
<th>{{ $class->groups[$class->report->group] }}</th>
@else
<th class="text-center">{{ $table }}</th>
<th class="text-right">{{ $table }}</th>
@endif
@foreach($class->dates as $date)
<th class="text-center">{{ $date }}</th>
<th class="text-right">{{ $date }}</th>
@endforeach
<th class="text-center">{{ trans_choice('general.totals', 1) }}</th>
<th class="text-right">{{ trans_choice('general.totals', 1) }}</th>
</tr>
</thead>

View File

@ -387,9 +387,9 @@
@stack($total->code . '_td_end')
@else
@if ($bill->paid)
<tr class="text-success">
<th>{{ trans('bills.paid') }}:</th>
<td class="text-right">- @money($bill->paid, $bill->currency_code, true)</td>
<tr>
<th class="text-success">{{ trans('bills.paid') }}:</th>
<td class="text-success text-right">- @money($bill->paid, $bill->currency_code, true)</td>
</tr>
@endif
@stack('grand_total_td_start')

View File

@ -2,9 +2,9 @@
<table class="table align-items-center">
<thead class="border-top-style">
<tr>
<th class="long-texts report-column text-center"></th>
<th class="long-texts report-column text-right"></th>
@foreach($class->dates as $date)
<th class="long-texts report-column text-center">{{ $date }}</th>
<th class="long-texts report-column text-right">{{ $date }}</th>
@endforeach
<th class="long-texts report-column text-right">
<h5>{{ trans_choice('general.totals', 1) }}</h5>

View File

@ -2,9 +2,9 @@
<table class="table align-items-center">
<thead class="border-top-style">
<tr>
<th class="long-texts report-column text-center"></th>
<th class="long-texts report-column text-right"></th>
@foreach($class->dates as $date)
<th class="long-texts report-column text-center">{{ $date }}</th>
<th class="long-texts report-column text-right">{{ $date }}</th>
@endforeach
<th class="long-texts report-column text-right">
<h5>{{ trans_choice('general.totals', 1) }}</h5>

View File

@ -410,9 +410,9 @@
@stack($total->code . '_td_end')
@else
@if ($invoice->paid)
<tr class="text-success">
<th>{{ trans('invoices.paid') }}:</th>
<td class="text-right">- @money($invoice->paid, $invoice->currency_code, true)</td>
<tr>
<th class="text-success">{{ trans('invoices.paid') }}:</th>
<td class="text-success text-right">- @money($invoice->paid, $invoice->currency_code, true)</td>
</tr>
@endif
@stack('grand_total_td_start')