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 c4f48306ce34a3d575f86e9d40ac2a33d5362b2e..0233bc503ea6f26aa9fdc67bfd6560fb19b08bcc 100644 (file)
--- a/admin/db/transactions_db.inc
+++ b/admin/db/transactions_db.inc
@@ -25,7 +25,7 @@ function get_sql_for_view_transactions($filtertype, $from, $to, &$trans_ref)
        $trans_ref = $db_info[3];
        $trans_date = $db_info[4];
 
-       $sql = "SELECT DISTINCT t.$trans_no_name as trans_no";
+       $sql = "SELECT t.$trans_no_name as trans_no";
 
        if ($trans_ref)
                $sql .= " ,t.$trans_ref as ref ";
@@ -49,9 +49,9 @@ function get_sql_for_view_transactions($filtertype, $from, $to, &$trans_ref)
        }
        elseif ($type_name != null)
                $sql .= " AND t.`$type_name` = ".db_escape($filtertype);
-       
-       $sql .= " ORDER BY 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;
 }