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

Merge pull request #1466 from denisdulici/master

Browse Source 
Prevent duplicating document transactions
This commit is contained in:
Denis Duliçi 2020-06-04 19:19:35 +03:00 committed by GitHub
commit 54411ad3c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Models/Banking/Transaction.php
View File

@ -218,6 +218,11 @@ class Transaction extends Model
return $query->where('reconciled', 0); return $query->where('reconciled', 0);
} }
public function onCloning($src, $child = null)
{
$this->document_id = null;
}
/** /**
* Convert amount to double. * Convert amount to double.
* *

10
resources/views/purchases/payments/index.blade.php
View File

@ -92,15 +92,17 @@
<a class="dropdown-item" href="{{ route('payments.edit', $item->id) }}">{{ trans('general.edit') }}</a> <a class="dropdown-item" href="{{ route('payments.edit', $item->id) }}">{{ trans('general.edit') }}</a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
@endif @endif
@if (empty($item->document_id))
@permission('create-purchases-payments') @permission('create-purchases-payments')
<a class="dropdown-item" href="{{ route('payments.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a> <a class="dropdown-item" href="{{ route('payments.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
<div class="dropdown-divider"></div>
@endpermission @endpermission
@endif
@if (!$item->reconciled)
@permission('delete-purchases-payments') @permission('delete-purchases-payments')
@if (!$item->reconciled) {!! Form::deleteLink($item, 'payments.destroy') !!}
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'payments.destroy') !!}
@endif
@endpermission @endpermission
@endif
</div> </div>
</div> </div>
</td> </td>

10
resources/views/sales/revenues/index.blade.php
View File

@ -92,15 +92,17 @@
<a class="dropdown-item" href="{{ route('revenues.edit', $item->id) }}">{{ trans('general.edit') }}</a> <a class="dropdown-item" href="{{ route('revenues.edit', $item->id) }}">{{ trans('general.edit') }}</a>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
@endif @endif
@if (empty($item->document_id))
@permission('create-sales-revenues') @permission('create-sales-revenues')
<a class="dropdown-item" href="{{ route('revenues.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a> <a class="dropdown-item" href="{{ route('revenues.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
<div class="dropdown-divider"></div>
@endpermission @endpermission
@endif
@if (!$item->reconciled)
@permission('delete-sales-revenues') @permission('delete-sales-revenues')
@if (!$item->reconciled) {!! Form::deleteLink($item, 'revenues.destroy') !!}
<div class="dropdown-divider"></div>
{!! Form::deleteLink($item, 'revenues.destroy') !!}
@endif
@endpermission @endpermission
@endif
</div> </div>
</div> </div>
</td> </td>