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

removed tax from profit & loss

Browse Source
This commit is contained in:
denisdulici
2020-05-16 11:37:56 +03:00
parent af66baa226
commit ce84e47705
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Abstracts/Report.php
View File

@ -329,7 +329,7 @@ abstract class Report
event(new RowsShowing($this));
}
public function setTotals($items, $date_field, $check_type = false, $table = 'default')
public function setTotals($items, $date_field, $check_type = false, $table = 'default', $with_tax = true)
{
foreach ($items as $item) {
// Make groups extensible
@ -347,7 +347,7 @@ abstract class Report
continue;
}
$amount = $item->getAmountConvertedToDefault();
$amount = $item->getAmountConvertedToDefault(false, $with_tax);
$type = (($item instanceof Invoice) || (($item instanceof Transaction) && ($item->type == 'income'))) ? 'income' : 'expense';