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

fixed #695

Browse Source
This commit is contained in:
denisdulici
2018-12-22 14:59:58 +03:00
parent 44fe707b09
commit ca0b21b583
4 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Reports/ProfitLoss.php
View File

@ -156,7 +156,7 @@ class ProfitLoss extends Controller
private function setAmount(&$totals, &$compares, $items, $type, $date_field)
{
foreach ($items as $item) {
if ($item['table'] == 'bill_payments' || $item['table'] == 'invoice_payments') {
if (($item['table'] == 'bill_payments') || ($item['table'] == 'invoice_payments')) {
$type_item = $item->$type;
$item->category_id = $type_item->category_id;
@ -170,7 +170,7 @@ class ProfitLoss extends Controller
continue;
}
$amount = $item->getConvertedAmount();
$amount = $item->getConvertedAmount(false, false);
// Forecasting
if ((($type == 'invoice') || ($type == 'bill')) && ($date_field == 'due_at')) {