Topic: Marker in Void Transactions fixed.

[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 9234a0ad827a7fe0cea4baea345d88f25438f93b..db34a5eeb8f20f206e87df7e1336979ec034cc57 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;
 
@@ -114,7 +114,9 @@ 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,
+                       IFNULL(gl.person_id, IFNULL(sup.supplier_id, IFNULL(debt.debtor_no, bt.person_id))) as person_id,
+            IF(gl.person_id, gl.person_type_id, IF(sup.supplier_id,".  PT_SUPPLIER . "," .  "IF(debt.debtor_no," . PT_CUSTOMER . "," . 
+            "IF(bt.person_id != '' AND !ISNULL(bt.person_id), bt.person_type_id, -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 "
@@ -130,7 +132,7 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
                        LEFT JOIN ".TB_PREF."debtors_master debt ON dt.debtor_no=debt.debtor_no
 
                        LEFT JOIN ".TB_PREF."bank_trans bt ON bt.type=gl.type AND bt.trans_no=gl.type_no AND bt.amount!=0
-                                AND bt.person_type_id=gl.person_type_id AND bt.person_id=gl.person_id
+                                AND (bt.person_id != '' AND !ISNULL(bt.person_id))
 
                        LEFT JOIN ".TB_PREF."journal j ON j.type=gl.type AND j.trans_no=gl.type_no
                        LEFT JOIN ".TB_PREF."audit_trail a ON a.type=gl.type AND a.trans_no=gl.type_no AND NOT ISNULL(gl_seq)
@@ -153,10 +155,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 +170,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 .= " GROUP BY counter";
        $sql .= " ORDER BY tran_date, counter";
 
        return db_query($sql, "The transactions for could not be retrieved");