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
Show Stats 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';

12
app/Reports/ProfitLoss.php
View File

@ -47,33 +47,33 @@ class ProfitLoss extends Report
case 'cash':
// Revenues
$revenues = $income_transactions->get();
$this->setTotals($revenues, 'paid_at', true, $this->tables['income']);
$this->setTotals($revenues, 'paid_at', true, $this->tables['income'], false);
// Payments
$payments = $expense_transactions->get();
$this->setTotals($payments, 'paid_at', true, $this->tables['expense']);
$this->setTotals($payments, 'paid_at', true, $this->tables['expense'], false);
break;
default:
// Invoices
$invoices = $this->applyFilters(Invoice::accrued(), ['date_field' => 'invoiced_at'])->get();
Recurring::reflect($invoices, 'invoiced_at');
$this->setTotals($invoices, 'invoiced_at', true, $this->tables['income']);
$this->setTotals($invoices, 'invoiced_at', true, $this->tables['income'], false);
// Revenues
$revenues = $income_transactions->isNotDocument()->get();
Recurring::reflect($revenues, 'paid_at');
$this->setTotals($revenues, 'paid_at', true, $this->tables['income']);
$this->setTotals($revenues, 'paid_at', true, $this->tables['income'], false);
// Bills
$bills = $this->applyFilters(Bill::accrued(), ['date_field' => 'billed_at'])->get();
Recurring::reflect($bills, 'bill', 'billed_at');
$this->setTotals($bills, 'billed_at', true, $this->tables['expense']);
$this->setTotals($bills, 'billed_at', true, $this->tables['expense'], false);
// Payments
$payments = $expense_transactions->isNotDocument()->get();
Recurring::reflect($payments, 'paid_at');
$this->setTotals($payments, 'paid_at', true, $this->tables['expense']);
$this->setTotals($payments, 'paid_at', true, $this->tables['expense'], false);
break;
}

2
app/Reports/TaxSummary.php
View File

@ -70,7 +70,7 @@ class TaxSummary extends Report
}
}
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