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

fixed #553

Browse Source
This commit is contained in:
denisdulici 2018-11-06 17:34:53 +03:00
parent fbdeb95f1e
commit ff08aec93c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Reports/TaxSummary.php
View File

@ -104,7 +104,7 @@ class TaxSummary extends Controller
private function setAmount(&$items, &$totals, $rows, $type, $date_field) private function setAmount(&$items, &$totals, $rows, $type, $date_field)
{ {
foreach ($rows as $row) { foreach ($rows as $row) {
if ($row['table'] == 'bill_payments' || $row['table'] == 'invoice_payments') { if ($row->getTable() == 'bill_payments' || $row->getTable() == 'invoice_payments') {
$type_row = $row->$type; $type_row = $row->$type;
$row->category_id = $type_row->category_id; $row->category_id = $type_row->category_id;
@ -127,7 +127,14 @@ class TaxSummary extends Controller
continue; continue;
} }
$amount = $this->convert($row_total->amount, $row->currency_code, $row->currency_rate); if ($date_field == 'paid_at') {
$rate = ($row->amount * 100) / $type_row->amount;
$row_amount = ($row_total->amount / 100) * $rate;
} else {
$row_amount = $row_total->amount;
}
$amount = $this->convert($row_amount, $row->currency_code, $row->currency_rate);
$items[$row_total->name][$date]['amount'] += $amount; $items[$row_total->name][$date]['amount'] += $amount;