Merged changes from mai trunk up to 2.3.1

[fa-stable.git] / admin / db / transactions_db.inc

diff --git a/admin/db/transactions_db.inc b/admin/db/transactions_db.inc
index 594c34d23622216c87c738a0357cc1c72af1d371..0233bc503ea6f26aa9fdc67bfd6560fb19b08bcc 100644 (file)
--- a/admin/db/transactions_db.inc
+++ b/admin/db/transactions_db.inc
@@ -50,9 +50,8 @@ function get_sql_for_view_transactions($filtertype, $from, $to, &$trans_ref)
        elseif ($type_name != null)
                $sql .= " AND t.`$type_name` = ".db_escape($filtertype);
 
-       $sql .= " GROUP BY t.$type_name, t.$trans_no_name";
+       $sql .= " GROUP BY ".($type_name ? "t.$type_name," : '')." t.$trans_no_name";
        $sql .= " ORDER BY t.$trans_no_name";
-
        return $sql;
 }