diff --git a/app/Models/Document/Document.php b/app/Models/Document/Document.php index 02b5c9af2..dc351bc4c 100644 --- a/app/Models/Document/Document.php +++ b/app/Models/Document/Document.php @@ -132,8 +132,7 @@ class Document extends Model public function transactions() { - return $this->hasMany('App\Models\Banking\Transaction', 'document_id') - ->where('type', config('type.' . $this->type . '.transaction_type')); + return $this->hasMany('App\Models\Banking\Transaction', 'document_id'); } public function totals_sorted() diff --git a/app/Widgets/TotalExpenses.php b/app/Widgets/TotalExpenses.php index 345cde9c7..0c90ab6e6 100644 --- a/app/Widgets/TotalExpenses.php +++ b/app/Widgets/TotalExpenses.php @@ -18,7 +18,7 @@ class TotalExpenses extends Widget { $current = $open = $overdue = 0; - $this->applyFilters(Transaction::expense()->isNotDocument()->isNotTransfer())->each(function ($transaction) use (&$current) { + $this->applyFilters(Transaction::expense()->isNotTransfer())->each(function ($transaction) use (&$current) { $current += $transaction->getAmountConvertedToDefault(); }); diff --git a/app/Widgets/TotalIncome.php b/app/Widgets/TotalIncome.php index 38d8007a9..0d41eb06d 100644 --- a/app/Widgets/TotalIncome.php +++ b/app/Widgets/TotalIncome.php @@ -18,7 +18,7 @@ class TotalIncome extends Widget { $current = $open = $overdue = 0; - $this->applyFilters(Transaction::income()->isNotDocument()->isNotTransfer())->each(function ($transaction) use (&$current) { + $this->applyFilters(Transaction::income()->isNotTransfer())->each(function ($transaction) use (&$current) { $current += $transaction->getAmountConvertedToDefault(); }); diff --git a/app/Widgets/TotalProfit.php b/app/Widgets/TotalProfit.php index 8aa6e6256..5aa30ca94 100644 --- a/app/Widgets/TotalProfit.php +++ b/app/Widgets/TotalProfit.php @@ -19,7 +19,7 @@ class TotalProfit extends Widget $current_income = $open_invoice = $overdue_invoice = 0; $current_expenses = $open_bill = $overdue_bill = 0; - $this->applyFilters(Transaction::isNotDocument()->isNotTransfer())->each(function ($transaction) use (&$current_income, &$current_expenses) { + $this->applyFilters(Transaction::isNotTransfer())->each(function ($transaction) use (&$current_income, &$current_expenses) { $amount = $transaction->getAmountConvertedToDefault(); if ($transaction->type == 'income') {