Merging changes form main trunk 2.2.5-2.2.6

[fa-stable.git] / gl / includes / db / gl_db_trans.inc

diff --git a/gl/includes/db/gl_db_trans.inc b/gl/includes/db/gl_db_trans.inc
index 7c94063a6e399f477e898fe708dce141851209b0..51a83e9518e72341629f43a106de62015356cf54 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -619,6 +619,7 @@ function get_sql_for_journal_inquiry()
        }
        $sql .= " GROUP BY gl.type, gl.type_no";
 */
+
        $sql = "SELECT  IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq,
                gl.tran_date,
                gl.type,
@@ -642,6 +643,9 @@ function get_sql_for_journal_inquiry()
        if (isset($_POST['Ref']) && $_POST['Ref'] != "") {
                $sql .= " AND reference LIKE '%". $_POST['Ref'] . "%'";
        }
+       if (isset($_POST['Memo']) && $_POST['Memo'] != "") {
+               $sql .= " AND com.memo_ LIKE '%". $_POST['Memo'] . "%'";
+       }
        if (get_post('filterType') != -1) {
                $sql .= " AND gl.type=".get_post('filterType');
        }