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

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index 9234a0ad827a7fe0cea4baea345d88f25438f93b..9c406f6e0c84ee666f8a0d990c912dd89e662b59 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -105,7 +105,7 @@ function add_gl_balance($type, $trans_id, $date_, $amount, $person_type_id=null,
 
 function get_gl_transactions($from_date, $to_date, $trans_no=0,
        $account=null, $dimension=0, $dimension2=0, $filter_type=null,
-       $amount_min=null, $amount_max=null, $person_id=null)
+        $amount_min=null, $amount_max=null, $person_id=null, $memo='')
 {
        global $SysPrefs;
 
@@ -115,6 +115,7 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
        $sql = "SELECT gl.*, j.event_date, j.doc_date, a.gl_seq, u.user_id, st.supp_reference, gl.person_id subcode,
                        IFNULL(IFNULL(sup.supp_name, debt.name), bt.person_id) as person_name, 
                        IFNULL(gl.person_id, IFNULL(sup.supplier_id, debt.debtor_no)) as person_id,
+                        IF(gl.person_id, gl.person_type_id, IF(sup.supplier_id,".  PT_SUPPLIER . "," .  "IF(debt.debtor_no," . PT_CUSTOMER . ", -1))) as person_type_id,
                        IFNULL(st.tran_date, IFNULL(dt.tran_date, IFNULL(bt.trans_date, IFNULL(grn.delivery_date, gl.tran_date)))) as doc_date,
                        coa.account_name, ref.reference
                         FROM "
@@ -153,10 +154,10 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
        if ($account != null)
                $sql .= " AND gl.account = ".db_escape($account);
 
-       if ($dimension > 0)
+       if ($dimension != 0)
                $sql .= " AND gl.dimension_id = ".($dimension<0 ? 0 : db_escape($dimension));
 
-       if ($dimension2 > 0)
+       if ($dimension2 != 0)
                $sql .= " AND gl.dimension2_id = ".($dimension2<0 ? 0 : db_escape($dimension2));
 
        if ($filter_type != null AND is_numeric($filter_type))
@@ -168,6 +169,10 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
        if ($amount_max != null)
                $sql .= " AND ABS(gl.amount) <= ABS(".db_escape($amount_max).")";
 
+        if ($memo) {
+                $sql .= " AND gl.memo_ LIKE ". db_escape("%$memo%");
+        }
+
        $sql .= " ORDER BY tran_date, counter";
 
        return db_query($sql, "The transactions for could not be retrieved");

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++;