shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
denisdulici 2017-12-16 16:02:47 +03:00
commit 7c1673b8db
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/expenses/bills/show.blade.php
View File

@ -389,7 +389,7 @@
html += ' <h4 class="modal-title" id="emailModalLabel">Overflowing text</h4>'; html += ' <h4 class="modal-title" id="emailModalLabel">Overflowing text</h4>';
html += ' </div>'; html += ' </div>';
html += ' <div class="modal-body">'; html += ' <div class="modal-body">';
html += ' N/A'; html += ' {{ trans('general.na') }}';
html += ' </div>'; html += ' </div>';
html += ' <div class="modal-footer">'; html += ' <div class="modal-footer">';
html += ' <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('general.cancel') }}</button>'; html += ' <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('general.cancel') }}</button>';

2
resources/views/expenses/payments/index.blade.php
View File

@ -47,7 +47,7 @@
<tr> <tr>
<td><a href="{{ url('expenses/payments/' . $item->id . '/edit') }}">{{ Date::parse($item->paid_at)->format($date_format) }}</a></td> <td><a href="{{ url('expenses/payments/' . $item->id . '/edit') }}">{{ Date::parse($item->paid_at)->format($date_format) }}</a></td>
<td>@money($item->amount, $item->currency_code, true)</td> <td>@money($item->amount, $item->currency_code, true)</td>
<td class="hidden-xs">{{ !empty($item->vendor->name) ? $item->vendor->name : 'N/A'}}</td> <td class="hidden-xs">{{ !empty($item->vendor->name) ? $item->vendor->name : trans('general.na') }}</td>
<td class="hidden-xs">{{ $item->category->name }}</td> <td class="hidden-xs">{{ $item->category->name }}</td>
<td class="hidden-xs">{{ $item->account->name }}</td> <td class="hidden-xs">{{ $item->account->name }}</td>
<td class="text-center"> <td class="text-center">

2
resources/views/expenses/vendors/index.blade.php vendored
View File

@ -43,7 +43,7 @@
@foreach($vendors as $item) @foreach($vendors as $item)
<tr> <tr>
<td><a href="{{ url('expenses/vendors/' . $item->id . '/edit') }}">{{ $item->name }}</a></td> <td><a href="{{ url('expenses/vendors/' . $item->id . '/edit') }}">{{ $item->name }}</a></td>
<td class="hidden-xs">{{ !empty($item->email) ? $item->email : 'N/A'}}</td> <td class="hidden-xs">{{ !empty($item->email) ? $item->email : trans('general.na') }}</td>
<td>{{ $item->phone }}</td> <td>{{ $item->phone }}</td>
<td class="hidden-xs"> <td class="hidden-xs">
@if ($item->enabled) @if ($item->enabled)

2
resources/views/incomes/customers/index.blade.php
View File

@ -43,7 +43,7 @@
@foreach($customers as $item) @foreach($customers as $item)
<tr> <tr>
<td><a href="{{ url('incomes/customers/' . $item->id . '/edit') }}">{{ $item->name }}</a></td> <td><a href="{{ url('incomes/customers/' . $item->id . '/edit') }}">{{ $item->name }}</a></td>
<td class="hidden-xs">{{ !empty($item->email) ? $item->email : 'N/A'}}</td> <td class="hidden-xs">{{ !empty($item->email) ? $item->email : trans('general.na') }}</td>
<td>{{ $item->phone }}</td> <td>{{ $item->phone }}</td>
<td class="hidden-xs"> <td class="hidden-xs">
@if ($item->enabled) @if ($item->enabled)

2
resources/views/incomes/invoices/show.blade.php
View File

@ -398,7 +398,7 @@
html += ' <h4 class="modal-title" id="emailModalLabel">Overflowing text</h4>'; html += ' <h4 class="modal-title" id="emailModalLabel">Overflowing text</h4>';
html += ' </div>'; html += ' </div>';
html += ' <div class="modal-body">'; html += ' <div class="modal-body">';
html += ' N/A'; html += ' {{ trans('general.na') }}';
html += ' </div>'; html += ' </div>';
html += ' <div class="modal-footer">'; html += ' <div class="modal-footer">';
html += ' <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('general.cancel') }}</button>'; html += ' <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('general.cancel') }}</button>';

2
resources/views/incomes/revenues/index.blade.php
View File

@ -47,7 +47,7 @@
<tr> <tr>
<td><a href="{{ url('incomes/revenues/' . $item->id . '/edit') }}">{{ Date::parse($item->paid_at)->format($date_format) }}</a></td> <td><a href="{{ url('incomes/revenues/' . $item->id . '/edit') }}">{{ Date::parse($item->paid_at)->format($date_format) }}</a></td>
<td>@money($item->amount, $item->currency_code, true)</td> <td>@money($item->amount, $item->currency_code, true)</td>
<td class="hidden-xs">{{ !empty($item->customer->name) ? $item->customer->name : 'N/A'}}</td> <td class="hidden-xs">{{ !empty($item->customer->name) ? $item->customer->name : trans('general.na') }}</td>
<td class="hidden-xs">{{ $item->category->name }}</td> <td class="hidden-xs">{{ $item->category->name }}</td>
<td class="hidden-xs">{{ $item->account->name }}</td> <td class="hidden-xs">{{ $item->account->name }}</td>
<td class="text-center"> <td class="text-center">