Bug 4817: g/l account inquiry can timeout due to slow sql. @Braath Waate.

[fa-stable.git] / gl / inquiry / gl_account_inquiry.php

diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php
index 0d95a482aadfd20c53bf9c01b626b58cc9b4da79..bc755e14d5d871dc5695dcfae18768825372e64a 100644 (file)
--- a/gl/inquiry/gl_account_inquiry.php
+++ b/gl/inquiry/gl_account_inquiry.php
@@ -111,9 +111,9 @@ function show_results()
        $_POST['Dimension2'] = 0;
        $result = get_gl_transactions($_POST['TransFromDate'], $_POST['TransToDate'], -1,
        $_POST["account"], $_POST['Dimension'], $_POST['Dimension2'], null,
-       input_num('amount_min'), input_num('amount_max'), null, $_POST['Memo']);
+       input_num('amount_min'), input_num('amount_max'), null, null, $_POST['Memo']);
 
-       $colspan = ($dim == 2 ? "6" : ($dim == 1 ? "5" : "4"));
+       $colspan = ($dim == 2 ? "7" : ($dim == 1 ? "6" : "5"));
 
        if ($_POST["account"] != null)
                display_heading($_POST["account"]. "   ".$act_name);
@@ -125,7 +125,7 @@ function show_results()
                
        start_table(TABLESTYLE);
        
-       $first_cols = array(_("Type"), _("#"), _("Date"));
+       $first_cols = array(_("Type"), _("#"), _("Reference"), _("Date"));
        
        if ($_POST["account"] == null)
            $account_col = array(_("Account"));
@@ -183,6 +183,7 @@ function show_results()
 
        label_cell($systypes_array[$myrow["type"]]);
                label_cell(get_gl_view_str($myrow["type"], $myrow["type_no"], $myrow["type_no"], true));
+               label_cell(get_trans_view_str($myrow["type"],$myrow["type_no"],$myrow['reference']));
        label_cell($trandate);
        
        if ($_POST["account"] == null)