Fixed Tax Report on Screen.

[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 b2560f75b1779ca2932adf6948cf5d6b40de3344..9234a0ad827a7fe0cea4baea345d88f25438f93b 100644 (file)
--- a/gl/includes/db/gl_db_trans.inc
+++ b/gl/includes/db/gl_db_trans.inc
@@ -141,9 +141,8 @@ function get_gl_transactions($from_date, $to_date, $trans_no=0,
                WHERE coa.account_code=gl.account
                AND ISNULL(v.date_)
                AND gl.tran_date >= '$from'
-               AND gl.tran_date <= '$to'";
-       if (isset($SysPrefs->show_voided_gl_trans) && $SysPrefs->show_voided_gl_trans == 0)
-               $sql .= " AND gl.amount <> 0"; 
+               AND gl.tran_date <= '$to'
+               AND gl.amount <> 0"; 
 
        if ($person_id)
                $sql .= " AND gl.person_id=".db_escape($person_id); 
@@ -514,15 +513,15 @@ function get_tax_summary($from, $to, $also_zero_purchases=false)
        $todate = date2sql($to);
 
        $sql = "SELECT 
-                               SUM(IF(trans_type=".ST_SUPPCREDIT.",-1,1)*
+                               SUM(IF(trans_type=".ST_CUSTCREDIT.",-1,1)*
                                IF((reg_type=".TR_OUTPUT.")"
-                                       ." || ((trans_type IN(".ST_SUPPINVOICE.",".ST_SUPPCREDIT.") OR (trans_type=".ST_JOURNAL." AND reg_type=".TR_INPUT."))
+                                       ." || ((trans_type IN(".ST_SALESINVOICE.",".ST_CUSTCREDIT.") OR (trans_type=".ST_JOURNAL." AND reg_type=".TR_INPUT."))
                                        ), net_amount*ex_rate,0)
                                ) net_output,
 
-                               SUM(IF(trans_type=".ST_SUPPCREDIT.",-1,1)*
+                               SUM(IF(trans_type=".ST_CUSTCREDIT.",-1,1)*
                                IF((reg_type=".TR_OUTPUT.")"
-                                       ." || ((trans_type IN(".ST_SUPPINVOICE.",".ST_SUPPCREDIT.") OR (trans_type=".ST_JOURNAL." AND reg_type=".TR_INPUT."))
+                                       ." || ((trans_type IN(".ST_SALESINVOICE.",".ST_CUSTCREDIT.") OR (trans_type=".ST_JOURNAL." AND reg_type=".TR_INPUT."))
                                        ), amount*ex_rate,0)) payable,
 
                                SUM(IF(trans_type IN(".ST_SUPPCREDIT."),-1,1)*