Fixed broken excel reportsfor non-latin1 encoding.

[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 d2657c65edf328d628d8e2e41f942a04ac8d125b..ca7f01d96fc51fb4afc60a776724d647f6e0079a 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -497,12 +497,11 @@ function write_journal_entries(&$cart, $reverse, $use_transaction=true)
                        ST_JOURNAL, $trans_id, $journal_item->amount, 1, $date_, $memo_);
        }
        
+       $Refs->save($trans_type, $trans_id, $ref);
        if ($new) {
                add_comments($trans_type, $trans_id, $date_, $memo_);
-               $Refs->save($trans_type, $trans_id, $ref);
        } else {
                update_comments($trans_type, $trans_id, null, $memo_);
-               $Refs->update($trans_type, $trans_id, $ref);
        }
 
        add_audit_trail($trans_type, $trans_id, $date_);
@@ -604,49 +603,8 @@ function void_journal_trans($type, $type_no, $use_transaction=true)
                commit_transaction();
 }
 
-function get_sql_for_journal_inquiry()
+function get_sql_for_journal_inquiry($filter, $from, $to, $ref='', $memo='', $alsoclosed=false)
 {
-/*
-       // Tom Hallman 11 Nov 2009
-       // IF(gl.type = 1... statement is for deposits/payments that may not actually result
-       // in a deposit, such as when a fix is made.  Without that statement (and the
-       // joining of the bank_trans table), the fix deposit/payment amount would show up 
-       // incorrectly as only the positive side of the fix.    
-       $sql = "SELECT  IF(ISNULL(a.gl_seq),0,a.gl_seq) as gl_seq,
-               gl.tran_date,
-               gl.type,
-               gl.type_no,
-               refs.reference,
-               IF(gl.type = 1 OR gl.type = 2,
-                 bank_trans.amount,
-                 SUM(IF(gl.amount>0, gl.amount,0))) as amount,
-               com.memo_,
-               IF(ISNULL(u.user_id),'',u.user_id) as user_id
-               FROM ".TB_PREF."gl_trans as gl
-                LEFT JOIN ".TB_PREF."audit_trail as a ON 
-                       (gl.type=a.type AND gl.type_no=a.trans_no)
-                LEFT JOIN ".TB_PREF."comments as com ON 
-                       (gl.type=com.type AND gl.type_no=com.id)
-                LEFT JOIN ".TB_PREF."refs as refs ON 
-                       (gl.type=refs.type AND gl.type_no=refs.id)
-                LEFT JOIN ".TB_PREF."users as u ON 
-                       a.user=u.id
-                LEFT JOIN ".TB_PREF."bank_trans as bank_trans ON 
-                       (gl.type=bank_trans.type AND gl.type_no=bank_trans.trans_no)            
-               WHERE gl.tran_date >= '" . date2sql($_POST['FromDate']) . "'
-               AND gl.tran_date <= '" . date2sql($_POST['ToDate']) . "'
-               AND gl.amount!=0";
-       if (isset($_POST['Ref']) && $_POST['Ref'] != "") {
-               $sql .= " AND reference LIKE '%". $_POST['Ref'] . "%'";
-       }       
-       if (get_post('filterType') != -1) {
-               $sql .= " AND gl.type=".get_post('filterType');
-       }       
-       if (!check_value('AlsoClosed')) {
-               $sql .= " AND gl_seq=0";
-       }
-       $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,
@@ -665,19 +623,19 @@ function get_sql_for_journal_inquiry()
                        (gl.type=refs.type AND gl.type_no=refs.id)
                 LEFT JOIN ".TB_PREF."users as u ON
                        a.user=u.id
-               WHERE gl.tran_date >= '" . date2sql($_POST['FromDate']) . "'
-               AND gl.tran_date <= '" . date2sql($_POST['ToDate']) . "'
+               WHERE gl.tran_date >= '" . date2sql($from) . "'
+               AND gl.tran_date <= '" . date2sql($to) . "'
                AND gl.amount!=0";
-       if (isset($_POST['Ref']) && $_POST['Ref'] != "") {
-               $sql .= " AND reference LIKE '%". $_POST['Ref'] . "%'";
+       if ($ref) {
+               $sql .= " AND reference LIKE ". db_escape("%$ref%");
        }
-       if (isset($_POST['Memo']) && $_POST['Memo'] != "") {
-               $sql .= " AND com.memo_ LIKE '%". $_POST['Memo'] . "%'";
+       if ($memo) {
+               $sql .= " AND com.memo_ LIKE ". db_escape("%$memo%");
        }
-       if (get_post('filterType') != -1) {
-               $sql .= " AND gl.type=".get_post('filterType');
+       if ($filter != -1) {
+               $sql .= " AND gl.type=".db_escape($filter);
        }
-       if (!check_value('AlsoClosed')) {
+       if (!$alsoclosed) {
                $sql .= " AND gl_seq=0";
        }
        $sql .= " GROUP BY gl.type, gl.type_no";