? storm--685140-3.patch
? storm--770526-10.patch
? storm--770526-6.patch
Index: stormexpense/stormexpense.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormexpense/stormexpense.admin.inc,v
retrieving revision 1.2.4.12
diff -u -p -r1.2.4.12 stormexpense.admin.inc
--- stormexpense/stormexpense.admin.inc	3 Sep 2009 14:26:27 -0000	1.2.4.12
+++ stormexpense/stormexpense.admin.inc	1 Feb 2011 21:13:14 -0000
@@ -431,9 +431,14 @@ function stormexpense_list_form_report_s
 function stormexpense_list_report($report, $language) {
   $timetrackings = array();
 
-  $sql = $_SESSION['stormexpense_list_filter']['sql'];
-  $args = $_SESSION['stormexpense_list_filter']['args'];
+  $s = "SELECT n.*,  sex.* FROM {node} AS n INNER JOIN {stormexpense} AS sex ON n.vid=sex.vid WHERE n.status=1 AND n.type='stormexpense' ";
+  $s = stormexpense_access_sql($s, array());
+  $s = db_rewrite_sql($s);
+
+  $sql = isset($_SESSION['stormexpense_list_filter']['sql']) ? $_SESSION['stormexpense_list_filter']['sql'] : $s;
+  $args = isset($_SESSION['stormexpense_list_filter']['args']) ? $_SESSION['stormexpense_list_filter']['args'] : array();
   $r = db_query($sql, $args);
+  $expenses = array();
   while ($e = db_fetch_object($r)) {
     $expense = node_load($e->nid);
     $expenses[] = $expense;
Index: stormexpense/stormexpense.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormexpense/Attic/stormexpense.test,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 stormexpense.test
--- stormexpense/stormexpense.test	31 Jan 2011 22:00:23 -0000	1.1.2.1
+++ stormexpense/stormexpense.test	1 Feb 2011 21:13:14 -0000
@@ -34,5 +34,14 @@ class StormexpenseTestCase extends Drupa
 
     $this->assertText(t('Expense @title has been created.', array('@title' => $expense['title'])));
   }
+
+  public function testStormexpenseReports() {
+    // Create and login user
+    $user = $this->drupalCreateUser(array('Storm expense: access'));
+    $this->drupalLogin($user);
+
+    // Create a team
+    $this->drupalGet('storm/expenses/report/std/en');
+  }
 }
 
Index: stormexpense/stormexpense.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormexpense/stormexpense.theme.inc,v
retrieving revision 1.1.4.18
diff -u -p -r1.1.4.18 stormexpense.theme.inc
--- stormexpense/stormexpense.theme.inc	14 Jun 2010 19:09:11 -0000	1.1.4.18
+++ stormexpense/stormexpense.theme.inc	1 Feb 2011 21:13:14 -0000
@@ -234,6 +234,7 @@ function theme_stormexpense_list_report(
         t('Date', array(), $language),
         t('Total', array(), $language));
       $expenses_total = 0;
+      $rows = array();
       foreach ($expenses as $expense) {
         $rows[] = array(
           check_plain($expense->organization_title),