kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fixed some other displays of money

Browse Source
This commit is contained in:
James Cole
2015-05-20 18:09:44 +02:00
parent 568ab26db1
commit 411f77fd29
4 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -81,7 +81,10 @@ class CategoryController extends Controller
$set = $repository->getCategoriesAndExpensesCorrected($start, $end);
foreach ($set as $entry) {
$chart->addRow($entry['name'], floatval($entry['sum']));
$sum = floatval($entry['sum']);
if($sum != 0) {
$chart->addRow($entry['name'], $sum);
}
}
$chart->generate();

2
app/Http/Controllers/TagController.php
View File

@@ -133,7 +133,7 @@ class TagController extends Controller
* changes to an advancePayment.
*/
if ($tag->tagMode == 'balancingAct') {
if ($tag->tagMode == 'balancingAct' || $tag->tagMode == 'nothing') {
foreach ($tag->transactionjournals as $journal) {
if ($journal->transactionType->type == 'Transfer') {
$allowToAdvancePayment = false;