From 5aff0c49430b66063f6c5e083f32facac01edd97 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 11 Dec 2015 18:35:49 +0100
Subject: [PATCH] Some fixes for #129

---
 app/Helpers/Report/ReportHelper.php           | 4 ++--
 public/js/reports.js                          | 2 +-
 resources/twig/partials/reports/expenses.twig | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php
index bbca7c667e..95ff61c46a 100644
--- a/app/Helpers/Report/ReportHelper.php
+++ b/app/Helpers/Report/ReportHelper.php
@@ -365,7 +365,7 @@ class ReportHelper implements ReportHelperInterface
         $object = new Expense;
         $set    = $this->query->expenseInPeriodCorrected($start, $end, $shared);
         foreach ($set as $entry) {
-            $object->addToTotal($entry->amount_positive);
+            $object->addToTotal($entry->amount);
             $object->addOrCreateExpense($entry);
         }
 
@@ -515,7 +515,7 @@ class ReportHelper implements ReportHelperInterface
         $object = new Expense;
         $set    = $this->query->expenseInPeriodCorrectedForList($start, $end, $accounts);
         foreach ($set as $entry) {
-            $object->addToTotal($entry->amount_positive);
+            $object->addToTotal($entry->amount);
             $object->addOrCreateExpense($entry);
         }
 
diff --git a/public/js/reports.js b/public/js/reports.js
index 483f3ad326..0ff3f6ffba 100644
--- a/public/js/reports.js
+++ b/public/js/reports.js
@@ -42,7 +42,7 @@ $(function () {
             datePicker.setEndDate(endDate);
         }
     }
-    
+
     $('.openModal').on('click', openModal);
 
     $('.date-select').on('click', preSelectDate);
diff --git a/resources/twig/partials/reports/expenses.twig b/resources/twig/partials/reports/expenses.twig
index c8c6f6b860..b561c5dba5 100644
--- a/resources/twig/partials/reports/expenses.twig
+++ b/resources/twig/partials/reports/expenses.twig
@@ -32,7 +32,7 @@
             {% endif %}
             <tr>
                 <td><em>{{ 'sum'|_ }}</em></td>
-                <td><span class="text-danger">{{ (expenses.getTotal)|formatAmountPlain }}</span></td>
+                <td>{{ (expenses.getTotal)|formatAmountPlain }}</td>
             </tr>
             </tfoot>
         </table>