GL Inquiry: search by memo, added journal edition link.

[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 400885561ee29198fec0970d3bca3956195de6c4..0d95a482aadfd20c53bf9c01b626b58cc9b4da79 100644 (file)
--- a/gl/inquiry/gl_account_inquiry.php
+++ b/gl/inquiry/gl_account_inquiry.php
@@ -13,6 +13,7 @@ $page_security = 'SA_GLTRANSVIEW';
 $path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 
+include($path_to_root . "/includes/db_pager.inc");
 
 include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
@@ -80,6 +81,7 @@ function gl_inquiry_controls()
        if ($dim > 1)
                dimensions_list_cells(_("Dimension")." 2:", 'Dimension2', null, true, " ", false, 2);
 
+       ref_cells(_("Memo:"), 'Memo', '',null, _('Enter memo fragment or leave empty'));
        small_amount_cells(_("Amount min:"), 'amount_min', null, " ");
        small_amount_cells(_("Amount max:"), 'amount_max', null, " ");
        submit_cells('Show',_("Show"),'','', 'default');
@@ -109,7 +111,7 @@ 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'));
+       input_num('amount_min'), input_num('amount_max'), null, $_POST['Memo']);
 
        $colspan = ($dim == 2 ? "6" : ($dim == 1 ? "5" : "4"));
 
@@ -138,9 +140,9 @@ function show_results()
                $dim_cols = array();
        
        if ($show_balances)
-           $remaining_cols = array(_("Person/Item"), _("Debit"), _("Credit"), _("Balance"), _("Memo"));
+           $remaining_cols = array(_("Person/Item"), _("Debit"), _("Credit"), _("Balance"), _("Memo"), "");
        else
-           $remaining_cols = array(_("Person/Item"), _("Debit"), _("Credit"), _("Memo"));
+           $remaining_cols = array(_("Person/Item"), _("Debit"), _("Credit"), _("Memo"), "");
            
        $th = array_merge($first_cols, $account_col, $dim_cols, $remaining_cols);
                        
@@ -197,6 +199,10 @@ function show_results()
                if ($myrow['memo_'] == "")
                        $myrow['memo_'] = get_comments_string($myrow['type'], $myrow['type_no']);
        label_cell($myrow['memo_']);
+        if ($myrow["type"] == ST_JOURNAL)
+            echo "<td>" . trans_editor_link( $myrow["type"], $myrow["type_no"]) . "</td>";
+        else
+            label_cell("");
        end_row();
 
        $j++;