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

fixed #248

Browse Source
This commit is contained in:
denisdulici
2018-03-08 11:51:29 +03:00
parent e4f35368b1
commit 96a55a8225
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Expenses/Payments.php
View File

@ -24,7 +24,7 @@ class Payments extends Controller
*/ */
public function index() public function index()
{ {
$payments = Payment::with(['vendor', 'account', 'category'])->collect(['paid_at'=> 'desc']); $payments = Payment::with(['vendor', 'account', 'category'])->isNotTransfer()->collect(['paid_at'=> 'desc']);
$vendors = collect(Vendor::enabled()->pluck('name', 'id')) $vendors = collect(Vendor::enabled()->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.vendors', 2)]), ''); ->prepend(trans('general.all_type', ['type' => trans_choice('general.vendors', 2)]), '');

2
app/Http/Controllers/Incomes/Revenues.php
View File

@ -26,7 +26,7 @@ class Revenues extends Controller
*/ */
public function index() public function index()
{ {
$revenues = Revenue::with(['account', 'category', 'customer'])->collect(['paid_at'=> 'desc']); $revenues = Revenue::with(['account', 'category', 'customer'])->isNotTransfer()->collect(['paid_at'=> 'desc']);
$customers = collect(Customer::enabled()->pluck('name', 'id')) $customers = collect(Customer::enabled()->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.customers', 2)]), ''); ->prepend(trans('general.all_type', ['type' => trans_choice('general.customers', 2)]), '');