Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev
# Conflicts: # app/Http/Controllers/Common/Items.php # resources/views/modules/item/documentation.blade.php # resources/views/modules/item/show.blade.php # resources/views/partials/admin/header.blade.php # resources/views/purchases/bills/show.blade.php # resources/views/purchases/vendors/show.blade.php # resources/views/sales/customers/show.blade.php # resources/views/sales/invoices/show.blade.php # resources/views/wizard/companies/edit.blade.php # resources/views/wizard/currencies/index.blade.php # resources/views/wizard/finish/index.blade.php # resources/views/wizard/taxes/index.blade.php
This commit is contained in:
		| @@ -92,15 +92,17 @@ | ||||
|                                                 <a class="dropdown-item" href="{{ route('payments.edit', $item->id) }}">{{ trans('general.edit') }}</a> | ||||
|                                                 <div class="dropdown-divider"></div> | ||||
|                                             @endif | ||||
|                                             @if (empty($item->document_id)) | ||||
|                                             @permission('create-purchases-payments') | ||||
|                                                 <a class="dropdown-item" href="{{ route('payments.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a> | ||||
|                                                 <div class="dropdown-divider"></div> | ||||
|                                             @endpermission | ||||
|                                             @endif | ||||
|                                             @if (!$item->reconciled) | ||||
|                                             @permission('delete-purchases-payments') | ||||
|                                                 @if (!$item->reconciled) | ||||
|                                                     <div class="dropdown-divider"></div> | ||||
|                                                     {!! Form::deleteLink($item, 'payments.destroy') !!} | ||||
|                                                 @endif | ||||
|                                                 {!! Form::deleteLink($item, 'payments.destroy') !!} | ||||
|                                             @endpermission | ||||
|                                             @endif | ||||
|                                         </div> | ||||
|                                     </div> | ||||
|                                 </td> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user